From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Stefan Beller <sbeller@google.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH 2/8] t3206: add color test for range-diff --dual-color
Date: Mon, 13 Aug 2018 14:05:39 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1808131404370.71@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20180810223441.30428-3-sbeller@google.com>
Hi Stefan,
On Fri, 10 Aug 2018, Stefan Beller wrote:
> +test_expect_success 'dual-coloring' '
> + 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>
That's a neat trick to have an indented here-doc that contains
indentation. I should use this myself.
The rest of the diff looks good, too, thanks!
Dscho
> + : <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 &&
> + test_cmp expect actual
> +'
> +
> test_done
> --
> 2.18.0.865.gffc8e1a3cd6-goog
>
>
next prev parent reply other threads:[~2018-08-13 12:05 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 22:34 [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-10 22:34 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-08-10 22:34 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-08-13 12:05 ` Johannes Schindelin [this message]
2018-08-13 18:30 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-08-13 12:07 ` Johannes Schindelin
2018-08-10 22:34 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-08-13 12:09 ` Johannes Schindelin
2018-08-10 22:34 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-08-13 12:16 ` Johannes Schindelin
2018-08-13 23:42 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-08-13 12:22 ` Johannes Schindelin
2018-08-10 22:34 ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-08-13 12:26 ` Johannes Schindelin
2018-08-13 19:00 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-13 12:42 ` Johannes Schindelin
2018-08-13 18:57 ` Stefan Beller
2018-08-13 23:36 ` [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-14 1:41 ` [PATCHv2 " Stefan Beller
2018-08-14 1:41 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-08-14 1:41 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-08-14 1:41 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-08-14 1:41 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-08-14 1:41 ` [PATCH 7/8] diff.c: omit check for line prefix in emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-14 15:05 ` [PATCHv2 0/8] Resending sb/range-diff-colors Johannes Schindelin
2018-08-14 16:45 ` Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
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 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-31 0:31 ` [PATCHv2 0/8] Add color test for range-diff, simplify diff.c 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
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=nycvar.QRO.7.76.6.1808131404370.71@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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.