From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, sunshine@sunshineco.com
Subject: [PATCHv2 0/8] Add color test for range-diff, simplify diff.c
Date: Mon, 30 Jul 2018 17:31:33 -0700 [thread overview]
Message-ID: <20180731003141.105192-1-sbeller@google.com> (raw)
In-Reply-To: <20180728030448.192177-1-sbeller@google.com>
addressed all of Erics feedback:
* reworded commit messages
* dropped q_to_tab and use cat instead
* use -\EOF isntead of -EOF
Thanks,
Stefan
Stefan Beller (8):
test_decode_color: understand FAINT and ITALIC
t3206: add color test for range-diff --dual-color
diff.c: simplify caller of emit_line_0
diff.c: reorder arguments for emit_line_ws_markup
diff.c: add set_sign to emit_line_0
diff: use emit_line_0 once per line
diff.c: compute reverse locally in emit_line_0
diff.c: rewrite emit_line_0 more understandably
diff.c | 94 +++++++++++++++++++++++------------------
t/t3206-range-diff.sh | 39 +++++++++++++++++
t/test-lib-functions.sh | 2 +
3 files changed, 93 insertions(+), 42 deletions(-)
./git-range-diff ws_cleanup-ontop-range-diff-2@{2.hours.ago}...HEAD >>0000-cover-letter.patch
[dropped changes to range-diff itself]
13: a02ea020ae7 ! 13: 16f71b43f48 t3206: add color test for range-diff --dual-color
@@ -2,9 +2,7 @@
t3206: add color test for range-diff --dual-color
- The 'expect'ed outcome is taken by running the 'range-diff |decode';
- it is not meant as guidance, rather as a documentation of the current
- situation.
+ The 'expect'ed outcome has been taken by running the 'range-diff | decode'.
Signed-off-by: Stefan Beller <sbeller@google.com>
@@ -15,8 +13,8 @@
test_cmp expected actual
'
-+test_expect_success 'simple coloring' '
-+ q_to_tab >expect <<-EOF &&
++test_expect_success 'dual-coloring' '
++ cat >expect <<-\EOF &&
+ <YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET>
+ <RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET>
+ <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
14: c8734075229 = 14: abd1ec80608 diff.c: simplify caller of emit_line_0
15: ba98acffcda = 15: bc29037f4f0 diff.c: reorder arguments for emit_line_ws_markup
16: 5a576baeb49 ! 16: 8f6ee340f1e diff.c: add set_sign to emit_line_0
@@ -5,9 +5,10 @@
For now just change the signature, we'll reason about the actual
change in a follow up patch.
- Pass set_sign (which is output before the sign) and set that is setting
- the color after the sign. Hence, promote any 'set's to set_sign as
- we want to have color before the sign for now.
+ Pass 'set_sign' (which is output before the sign) and 'set' which
+ controls the color after the first character. Hence, promote any
+ 'set's to 'set_sign' as we want to have color before the sign
+ for now.
Signed-off-by: Stefan Beller <sbeller@google.com>
17: 4e2d5a4c7f3 = 17: 0ab5920a9ab diff: use emit_line_0 once per line
18: 460713e1c3c = 18: 2d05ebdd280 diff.c: compute reverse locally in emit_line_0
19: e442d722b7f ! 19: 001e6042d81 diff.c: rewrite emit_line_0 more understandably
@@ -7,9 +7,9 @@
and set_sign, but let's defer that to a later patch.
'first' used be output always no matter if it was 0, but that got lost
- got lost at e8c285c4f9c (diff: add an internal option to dual-color
- diffs of diffs, 2018-07-21), as there we broadened the meaning of 'first'
- to also signal an early return.
+ at "diff: add an internal option to dual-color diffs of diffs",
+ 2018-07-21), as there we broadened the meaning of 'first' to also
+ signal an early return.
The change in 'emit_line' makes sure that 'first' is never content, but
always under our control, a sign or special character in the beginning
next prev parent reply other threads:[~2018-07-31 0:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-28 3:04 [PATCH 0/8] Add color test for range-diff, simplify diff.c Stefan Beller
2018-07-28 3:04 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-07-28 3:04 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-07-28 6:27 ` Eric Sunshine
2018-07-30 19:55 ` Stefan Beller
2018-07-28 3:04 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-07-28 3:04 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-07-28 3:04 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-07-28 6:30 ` Eric Sunshine
2018-07-28 3:04 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-07-28 3:04 ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-07-28 3:04 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-07-28 6:33 ` Eric Sunshine
2018-07-31 0:31 ` Stefan Beller [this message]
2018-07-31 0:31 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-07-31 0:31 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-07-31 20:51 ` Junio C Hamano
2018-07-31 0:31 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-07-31 0:31 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-07-31 0:31 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-07-31 0:31 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-07-31 0:31 ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-07-31 0:31 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-01 19:13 ` [PATCHv2 0/8] Add color test for range-diff, simplify diff.c Junio C Hamano
2018-08-01 19:46 ` Stefan Beller
2018-08-02 15:48 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731003141.105192-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.