From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, avarab@gmail.com, peff@peff.net,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/6] diff.c: change the default for move coloring to zebra
Date: Tue, 27 Jun 2017 17:56:47 -0700 [thread overview]
Message-ID: <20170628005651.8110-3-sbeller@google.com> (raw)
In-Reply-To: <20170628005651.8110-1-sbeller@google.com>
Introduce a new mode COLOR_MOVED_DEFAULT, which is the same as
COLOR_MOVED_ZEBRA. But having two different symbols allows us to
differentiate them in the code.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Documentation/diff-options.txt | 3 +++
diff.c | 13 ++++++++++++-
diff.h | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 058c8014ed..d2c6a60af2 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -243,6 +243,9 @@ endif::git-diff[]
--
no::
Moved lines are not highlighted.
+default::
+ Is a synonym for `zebra`. This may change to more sensible modes
+ in the future.
plain::
Any line that is added in one location and was removed
in another location will be colored with 'color.diff.newMoved'.
diff --git a/diff.c b/diff.c
index 5311dcf133..31cdec05ac 100644
--- a/diff.c
+++ b/diff.c
@@ -256,12 +256,23 @@ int git_diff_heuristic_config(const char *var, const char *value, void *cb)
static int parse_color_moved(const char *arg)
{
+ int v = git_parse_maybe_bool(arg);
+
+ if (v != -1) {
+ if (v == 0)
+ return COLOR_MOVED_NO;
+ else if (v == 1)
+ return COLOR_MOVED_DEFAULT;
+ }
+
if (!strcmp(arg, "no"))
return COLOR_MOVED_NO;
else if (!strcmp(arg, "plain"))
return COLOR_MOVED_PLAIN;
else if (!strcmp(arg, "zebra"))
return COLOR_MOVED_ZEBRA;
+ else if (!strcmp(arg, "default"))
+ return COLOR_MOVED_DEFAULT;
else if (!strcmp(arg, "dimmed_zebra"))
return COLOR_MOVED_ZEBRA_DIM;
else
@@ -4654,7 +4665,7 @@ int diff_opt_parse(struct diff_options *options,
if (diff_color_moved_default)
options->color_moved = diff_color_moved_default;
if (options->color_moved == COLOR_MOVED_NO)
- options->color_moved = COLOR_MOVED_ZEBRA_DIM;
+ options->color_moved = COLOR_MOVED_DEFAULT;
} else if (!strcmp(arg, "--no-color-moved"))
options->color_moved = COLOR_MOVED_NO;
else if (skip_prefix(arg, "--color-moved=", &arg)) {
diff --git a/diff.h b/diff.h
index 98abd75521..9298d211d7 100644
--- a/diff.h
+++ b/diff.h
@@ -192,6 +192,7 @@ struct diff_options {
COLOR_MOVED_NO = 0,
COLOR_MOVED_PLAIN = 1,
COLOR_MOVED_ZEBRA = 2,
+ COLOR_MOVED_DEFAULT = 2,
COLOR_MOVED_ZEBRA_DIM = 3,
} color_moved;
};
--
2.13.0.31.g9b732c453e
next prev parent reply other threads:[~2017-06-28 0:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 0:56 [PATCH 0/6] Fixing up sb/diff-color-moved Stefan Beller
2017-06-28 0:56 ` [PATCH 1/6] diff.c: factor out shrinking of potential moved line blocks Stefan Beller
2017-06-28 0:56 ` Stefan Beller [this message]
2017-06-28 3:14 ` [PATCH 2/6] diff.c: change the default for move coloring to zebra Junio C Hamano
2017-06-28 19:54 ` Stefan Beller
2017-06-28 0:56 ` [PATCH 3/6] diff.c: better reporting on color.moved bogus configuration Stefan Beller
2017-06-28 0:56 ` [PATCH 4/6] Documentation/diff: reword color moved Stefan Beller
2017-06-28 3:25 ` Junio C Hamano
2017-06-28 0:56 ` [PATCH 5/6] diff.c: omit uninteresting moved lines Stefan Beller
2017-06-28 3:31 ` Junio C Hamano
2017-06-28 20:00 ` Stefan Beller
2017-06-28 0:56 ` [PATCH 6/6] diff.c: detect blocks despite whitespace changes Stefan Beller
2017-06-28 3:41 ` Junio C Hamano
2017-06-28 5:06 ` Junio C Hamano
2017-06-28 20:36 ` Stefan Beller
2017-06-28 21:16 ` Junio C Hamano
2017-06-29 21:01 ` Stefan Beller
2017-06-29 23: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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170628005651.8110-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).