From: Kyle Meyer <kyle@kyleam.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] range-diff: update stale summary of --no-dual-color
Date: Thu, 23 Aug 2018 00:04:39 -0400 [thread overview]
Message-ID: <87d0u9ybhk.fsf@kyleam.com> (raw)
In-Reply-To: <20180823032238.GI92374@aiede.svl.corp.google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
>>>> - N_("color both diff and diff-between-diffs")),
>>>> + N_("restrict coloring to outer diff markers")),
[...]
> Aha: I think you're missing a few words (e.g. "color only according to
> outer diff markers"). Though based on the output, I'm not sure the
> focus on diff markers captures the difference. (After all, some lines
> are multiple colors in --no-dual-color mode and have no diff markers.)
>
> "Restrict coloring to outer -/+ diff markers" would mean that
> everything will be in plain text, except for the minus or plus sign at
> the beginning of each line. So you'd see a colorful strip on the left
> and everything else monochrome.
Eh, you're right, it would read like that. Thanks.
> I think what you mean is something like "color only based on the
> diff-between-diffs".
Yeah, I that sounds OK to me. I played around with a few different
summary lines and couldn't come up with anything that I thought was
particularly good, and then of course I ended up settling on a summary
line that didn't preserve my intended meaning :/
> Or it might be simpler to do something like
> the following. What do you think?
>
> diff --git i/builtin/range-diff.c w/builtin/range-diff.c
> index f52d45d9d6..88c19f48d3 100644
> --- i/builtin/range-diff.c
> +++ w/builtin/range-diff.c
> @@ -20,12 +20,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
> {
> int creation_factor = 60;
> struct diff_options diffopt = { NULL };
> - int simple_color = -1;
> + int dual_color = -1;
> struct option options[] = {
> OPT_INTEGER(0, "creation-factor", &creation_factor,
> N_("Percentage by which creation is weighted")),
> - OPT_BOOL(0, "no-dual-color", &simple_color,
> - N_("color both diff and diff-between-diffs")),
> + OPT_BOOL(0, "dual-color", &dual_color,
> + N_("color both diff and diff-between-diffs (default)")),
I don't have a strong preference, though I lean towards making 'git
range-diff -h' show --no-dual-color since it's not the default.
next prev parent reply other threads:[~2018-08-23 4:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 2:39 [PATCH] range-diff: update stale summary of --no-dual-color Kyle Meyer
2018-08-23 2:47 ` Jonathan Nieder
2018-08-23 3:03 ` Kyle Meyer
2018-08-23 3:22 ` Jonathan Nieder
2018-08-23 4:04 ` Kyle Meyer [this message]
2018-08-23 8:27 ` Jonathan Nieder
2018-08-23 12:00 ` [PATCH v2] " Kyle Meyer
2018-08-23 21:10 ` Jonathan Nieder
2018-08-23 21:57 ` [PATCH v3] " Kyle Meyer
2018-08-23 22:02 ` Jonathan Nieder
2018-08-23 22:08 ` Junio C Hamano
2018-08-23 22:11 ` Jonathan Nieder
2018-08-27 17:57 ` Junio C Hamano
2018-08-23 14:31 ` [PATCH] " Johannes Schindelin
2018-08-23 21:12 ` Jonathan Nieder
2018-08-23 20:54 ` Johannes Schindelin
2018-08-23 21:18 ` Junio C Hamano
2018-08-23 21:27 ` Kyle Meyer
2018-08-23 21:48 ` Junio C Hamano
2018-08-23 21:41 ` Johannes Schindelin
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=87d0u9ybhk.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).