Re: [PATCHv2 0/8] Add color test for range-diff, simplify diff.c
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 1, 2018, 19:13 UTC
- Message-ID
- <xmqq8t5p7veb.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180731003141.105192-1-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 14 quoted lines
> 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(-)
As I cannot merge this as is to 'pu' and keep going, I'll queue the following to the tip. I think it can be squashed to "t3206: add color test" but for now they will remain separate patches.
Subject: [PATCH] fixup! t3206: add color test for range-diff --dual-color
--- t/t3206-range-diff.sh | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index 019724e61a..e3b0764b43 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -143,38 +143,38 @@ test_expect_success 'changed message' ' ' 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> - <RESET> - s/4/A/<RESET> - <RESET> - <REVERSE><GREEN>+<RESET> <BOLD> Also a silly comment here!<RESET> - <REVERSE><GREEN>+<RESET> - diff --git a/file b/file<RESET> - <RED> --- a/file<RESET> - <GREEN> +++ b/file<RESET> - <RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> - <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET> - 9<RESET> - 10<RESET> - <RED> -11<RESET> - <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET> - <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET> - 12<RESET> - 13<RESET> - 14<RESET> - <RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> - <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET> - <CYAN> @@<RESET> - 9<RESET> - 10<RESET> - <REVERSE><RED>-<RESET><FAINT> BB<RESET> - <REVERSE><GREEN>+<RESET> <BOLD>B<RESET> - <RED> -12<RESET> - <GREEN> +B<RESET> - 13<RESET> + sed -e "s|^:||" >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> + : <RESET> + : s/4/A/<RESET> + : <RESET> + : <REVERSE><GREEN>+<RESET> <BOLD> Also a silly comment here!<RESET> + : <REVERSE><GREEN>+<RESET> + : diff --git a/file b/file<RESET> + : <RED> --- a/file<RESET> + : <GREEN> +++ b/file<RESET> + :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> + : <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET> + : 9<RESET> + : 10<RESET> + : <RED> -11<RESET> + : <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET> + : <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET> + : 12<RESET> + : 13<RESET> + : 14<RESET> + :<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> + : <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET> + : <CYAN> @@<RESET> + : 9<RESET> + : 10<RESET> + : <REVERSE><RED>-<RESET><FAINT> BB<RESET> + : <REVERSE><GREEN>+<RESET> <BOLD>B<RESET> + : <RED> -12<RESET> + : <GREEN> +B<RESET> + : 13<RESET> EOF git range-diff changed...changed-message --color --dual-color >actual.raw && test_decode_color >actual <actual.raw &&
-- 2.18.0-321-gffc6fa0e39