diff: add --word-diff option that generalizes --color-words
This teaches the --color-words engine a more general interface that supports two new modes: * --word-diff=plain, inspired by the 'wdiff' utility (most similar to 'wdiff -n <old> <new>'): uses delimiters [-removed-] and {+added+} * --word-diff=porcelain, which generates an ad-hoc machine readable format: - each diff unit is prefixed by [-+ ] and terminated by newline as in unified diff - newlines in the input are output as a line consisting only of a tilde '~' Both of these formats still support color if it is enabled, using it to highlight the differences. --color-words becomes a synonym for --word-diff=color, which is the color-only format. Also adds some compatibility/convenience options. Thanks to Junio C Hamano and Miles Bader for good ideas. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6555b196f0
commit
882749a04f
@ -126,11 +126,39 @@ any of those replacements occurred.
|
||||
gives the default to color output.
|
||||
Same as `--color=never`.
|
||||
|
||||
--color-words[=<regex>]::
|
||||
Show colored word diff, i.e., color words which have changed.
|
||||
By default, words are separated by whitespace.
|
||||
--word-diff[=<mode>]::
|
||||
Show a word diff, using the <mode> to delimit changed words.
|
||||
By default, words are delimited by whitespace; see
|
||||
`--word-diff-regex` below. The <mode> defaults to 'plain', and
|
||||
must be one of:
|
||||
+
|
||||
When a <regex> is specified, every non-overlapping match of the
|
||||
--
|
||||
color::
|
||||
Highlight changed words using only colors. Implies `--color`.
|
||||
plain::
|
||||
Show words as `[-removed-]` and `{+added+}`. Makes no
|
||||
attempts to escape the delimiters if they appear in the input,
|
||||
so the output may be ambiguous.
|
||||
porcelain::
|
||||
Use a special line-based format intended for script
|
||||
consumption. Added/removed/unchanged runs are printed in the
|
||||
usual unified diff format, starting with a `+`/`-`/` `
|
||||
character at the beginning of the line and extending to the
|
||||
end of the line. Newlines in the input are represented by a
|
||||
tilde `~` on a line of its own.
|
||||
none::
|
||||
Disable word diff again.
|
||||
--
|
||||
+
|
||||
Note that despite the name of the first mode, color is used to
|
||||
highlight the changed parts in all modes if enabled.
|
||||
|
||||
--word-diff-regex=<regex>::
|
||||
Use <regex> to decide what a word is, instead of considering
|
||||
runs of non-whitespace to be a word. Also implies
|
||||
`--word-diff` unless it was already enabled.
|
||||
+
|
||||
Every non-overlapping match of the
|
||||
<regex> is considered a word. Anything between these matches is
|
||||
considered whitespace and ignored(!) for the purposes of finding
|
||||
differences. You may want to append `|[^[:space:]]` to your regular
|
||||
@ -142,6 +170,10 @@ The regex can also be set via a diff driver or configuration option, see
|
||||
linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
|
||||
overrides any diff driver or configuration setting. Diff drivers
|
||||
override configuration settings.
|
||||
|
||||
--color-words[=<regex>]::
|
||||
Equivalent to `--word-diff=color` plus (if a regex was
|
||||
specified) `--word-diff-regex=<regex>`.
|
||||
endif::git-format-patch[]
|
||||
|
||||
--no-renames::
|
||||
|
@ -360,7 +360,7 @@ patterns are available:
|
||||
Customizing word diff
|
||||
^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
You can customize the rules that `git diff --color-words` uses to
|
||||
You can customize the rules that `git diff --word-diff` uses to
|
||||
split words in a line, by specifying an appropriate regular expression
|
||||
in the "diff.*.wordRegex" configuration variable. For example, in TeX
|
||||
a backslash followed by a sequence of letters forms a command, but
|
||||
|
28
color.c
28
color.c
@ -211,31 +211,3 @@ int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...)
|
||||
va_end(args);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function splits the buffer by newlines and colors the lines individually.
|
||||
*
|
||||
* Returns 0 on success.
|
||||
*/
|
||||
int color_fwrite_lines(FILE *fp, const char *color,
|
||||
size_t count, const char *buf)
|
||||
{
|
||||
if (!*color)
|
||||
return fwrite(buf, count, 1, fp) != 1;
|
||||
while (count) {
|
||||
char *p = memchr(buf, '\n', count);
|
||||
if (p != buf && (fputs(color, fp) < 0 ||
|
||||
fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
|
||||
fputs(GIT_COLOR_RESET, fp) < 0))
|
||||
return -1;
|
||||
if (!p)
|
||||
return 0;
|
||||
if (fputc('\n', fp) < 0)
|
||||
return -1;
|
||||
count -= p + 1 - buf;
|
||||
buf = p + 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
1
color.h
1
color.h
@ -61,6 +61,5 @@ __attribute__((format (printf, 3, 4)))
|
||||
int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
|
||||
__attribute__((format (printf, 3, 4)))
|
||||
int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
|
||||
int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
|
||||
|
||||
#endif /* COLOR_H */
|
||||
|
139
diff.c
139
diff.c
@ -572,16 +572,68 @@ static void diff_words_append(char *line, unsigned long len,
|
||||
buffer->text.ptr[buffer->text.size] = '\0';
|
||||
}
|
||||
|
||||
struct diff_words_style_elem
|
||||
{
|
||||
const char *prefix;
|
||||
const char *suffix;
|
||||
const char *color; /* NULL; filled in by the setup code if
|
||||
* color is enabled */
|
||||
};
|
||||
|
||||
struct diff_words_style
|
||||
{
|
||||
enum diff_words_type type;
|
||||
struct diff_words_style_elem new, old, ctx;
|
||||
const char *newline;
|
||||
};
|
||||
|
||||
struct diff_words_style diff_words_styles[] = {
|
||||
{ DIFF_WORDS_PORCELAIN, {"+", "\n"}, {"-", "\n"}, {" ", "\n"}, "~\n" },
|
||||
{ DIFF_WORDS_PLAIN, {"{+", "+}"}, {"[-", "-]"}, {"", ""}, "\n" },
|
||||
{ DIFF_WORDS_COLOR, {"", ""}, {"", ""}, {"", ""}, "\n" }
|
||||
};
|
||||
|
||||
struct diff_words_data {
|
||||
struct diff_words_buffer minus, plus;
|
||||
const char *current_plus;
|
||||
FILE *file;
|
||||
regex_t *word_regex;
|
||||
enum diff_words_type type;
|
||||
struct diff_words_style *style;
|
||||
};
|
||||
|
||||
static int fn_out_diff_words_write_helper(FILE *fp,
|
||||
struct diff_words_style_elem *st_el,
|
||||
const char *newline,
|
||||
size_t count, const char *buf)
|
||||
{
|
||||
while (count) {
|
||||
char *p = memchr(buf, '\n', count);
|
||||
if (p != buf) {
|
||||
if (st_el->color && fputs(st_el->color, fp) < 0)
|
||||
return -1;
|
||||
if (fputs(st_el->prefix, fp) < 0 ||
|
||||
fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
|
||||
fputs(st_el->suffix, fp) < 0)
|
||||
return -1;
|
||||
if (st_el->color && *st_el->color
|
||||
&& fputs(GIT_COLOR_RESET, fp) < 0)
|
||||
return -1;
|
||||
}
|
||||
if (!p)
|
||||
return 0;
|
||||
if (fputs(newline, fp) < 0)
|
||||
return -1;
|
||||
count -= p + 1 - buf;
|
||||
buf = p + 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
|
||||
{
|
||||
struct diff_words_data *diff_words = priv;
|
||||
struct diff_words_style *style = diff_words->style;
|
||||
int minus_first, minus_len, plus_first, plus_len;
|
||||
const char *minus_begin, *minus_end, *plus_begin, *plus_end;
|
||||
|
||||
@ -605,16 +657,17 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
|
||||
plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
|
||||
|
||||
if (diff_words->current_plus != plus_begin)
|
||||
fwrite(diff_words->current_plus,
|
||||
plus_begin - diff_words->current_plus, 1,
|
||||
diff_words->file);
|
||||
fn_out_diff_words_write_helper(diff_words->file,
|
||||
&style->ctx, style->newline,
|
||||
plus_begin - diff_words->current_plus,
|
||||
diff_words->current_plus);
|
||||
if (minus_begin != minus_end)
|
||||
color_fwrite_lines(diff_words->file,
|
||||
diff_get_color(1, DIFF_FILE_OLD),
|
||||
fn_out_diff_words_write_helper(diff_words->file,
|
||||
&style->old, style->newline,
|
||||
minus_end - minus_begin, minus_begin);
|
||||
if (plus_begin != plus_end)
|
||||
color_fwrite_lines(diff_words->file,
|
||||
diff_get_color(1, DIFF_FILE_NEW),
|
||||
fn_out_diff_words_write_helper(diff_words->file,
|
||||
&style->new, style->newline,
|
||||
plus_end - plus_begin, plus_begin);
|
||||
|
||||
diff_words->current_plus = plus_end;
|
||||
@ -697,11 +750,12 @@ static void diff_words_show(struct diff_words_data *diff_words)
|
||||
xdemitconf_t xecfg;
|
||||
xdemitcb_t ecb;
|
||||
mmfile_t minus, plus;
|
||||
struct diff_words_style *style = diff_words->style;
|
||||
|
||||
/* special case: only removal */
|
||||
if (!diff_words->plus.text.size) {
|
||||
color_fwrite_lines(diff_words->file,
|
||||
diff_get_color(1, DIFF_FILE_OLD),
|
||||
fn_out_diff_words_write_helper(diff_words->file,
|
||||
&style->old, style->newline,
|
||||
diff_words->minus.text.size, diff_words->minus.text.ptr);
|
||||
diff_words->minus.text.size = 0;
|
||||
return;
|
||||
@ -722,10 +776,10 @@ static void diff_words_show(struct diff_words_data *diff_words)
|
||||
free(plus.ptr);
|
||||
if (diff_words->current_plus != diff_words->plus.text.ptr +
|
||||
diff_words->plus.text.size)
|
||||
fwrite(diff_words->current_plus,
|
||||
fn_out_diff_words_write_helper(diff_words->file,
|
||||
&style->ctx, style->newline,
|
||||
diff_words->plus.text.ptr + diff_words->plus.text.size
|
||||
- diff_words->current_plus, 1,
|
||||
diff_words->file);
|
||||
- diff_words->current_plus, diff_words->current_plus);
|
||||
diff_words->minus.text.size = diff_words->plus.text.size = 0;
|
||||
}
|
||||
|
||||
@ -837,6 +891,9 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
|
||||
|
||||
if (len < 1) {
|
||||
emit_line(ecbdata->file, reset, reset, line, len);
|
||||
if (ecbdata->diff_words
|
||||
&& ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN)
|
||||
fputs("~\n", ecbdata->file);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -851,9 +908,13 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
|
||||
return;
|
||||
}
|
||||
diff_words_flush(ecbdata);
|
||||
line++;
|
||||
len--;
|
||||
emit_line(ecbdata->file, plain, reset, line, len);
|
||||
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
|
||||
emit_line(ecbdata->file, plain, reset, line, len);
|
||||
fputs("~\n", ecbdata->file);
|
||||
} else {
|
||||
/* don't print the prefix character */
|
||||
emit_line(ecbdata->file, plain, reset, line+1, len-1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1755,10 +1816,13 @@ static void builtin_diff(const char *name_a,
|
||||
xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
|
||||
else if (!prefixcmp(diffopts, "-u"))
|
||||
xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
|
||||
if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) {
|
||||
if (o->word_diff) {
|
||||
int i;
|
||||
|
||||
ecbdata.diff_words =
|
||||
xcalloc(1, sizeof(struct diff_words_data));
|
||||
ecbdata.diff_words->file = o->file;
|
||||
ecbdata.diff_words->type = o->word_diff;
|
||||
if (!o->word_regex)
|
||||
o->word_regex = userdiff_word_regex(one);
|
||||
if (!o->word_regex)
|
||||
@ -1774,10 +1838,23 @@ static void builtin_diff(const char *name_a,
|
||||
die ("Invalid regular expression: %s",
|
||||
o->word_regex);
|
||||
}
|
||||
for (i = 0; i < ARRAY_SIZE(diff_words_styles); i++) {
|
||||
if (o->word_diff == diff_words_styles[i].type) {
|
||||
ecbdata.diff_words->style =
|
||||
&diff_words_styles[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (DIFF_OPT_TST(o, COLOR_DIFF)) {
|
||||
struct diff_words_style *st = ecbdata.diff_words->style;
|
||||
st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
|
||||
st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
|
||||
st->ctx.color = diff_get_color_opt(o, DIFF_PLAIN);
|
||||
}
|
||||
}
|
||||
xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
|
||||
&xpp, &xecfg, &ecb);
|
||||
if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
|
||||
if (o->word_diff)
|
||||
free_diff_words_data(&ecbdata);
|
||||
if (textconv_one)
|
||||
free(mf1.ptr);
|
||||
@ -2845,13 +2922,37 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
||||
DIFF_OPT_CLR(options, COLOR_DIFF);
|
||||
else if (!strcmp(arg, "--color-words")) {
|
||||
DIFF_OPT_SET(options, COLOR_DIFF);
|
||||
DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
|
||||
options->word_diff = DIFF_WORDS_COLOR;
|
||||
}
|
||||
else if (!prefixcmp(arg, "--color-words=")) {
|
||||
DIFF_OPT_SET(options, COLOR_DIFF);
|
||||
DIFF_OPT_SET(options, COLOR_DIFF_WORDS);
|
||||
options->word_diff = DIFF_WORDS_COLOR;
|
||||
options->word_regex = arg + 14;
|
||||
}
|
||||
else if (!strcmp(arg, "--word-diff")) {
|
||||
if (options->word_diff == DIFF_WORDS_NONE)
|
||||
options->word_diff = DIFF_WORDS_PLAIN;
|
||||
}
|
||||
else if (!prefixcmp(arg, "--word-diff=")) {
|
||||
const char *type = arg + 12;
|
||||
if (!strcmp(type, "plain"))
|
||||
options->word_diff = DIFF_WORDS_PLAIN;
|
||||
else if (!strcmp(type, "color")) {
|
||||
DIFF_OPT_SET(options, COLOR_DIFF);
|
||||
options->word_diff = DIFF_WORDS_COLOR;
|
||||
}
|
||||
else if (!strcmp(type, "porcelain"))
|
||||
options->word_diff = DIFF_WORDS_PORCELAIN;
|
||||
else if (!strcmp(type, "none"))
|
||||
options->word_diff = DIFF_WORDS_NONE;
|
||||
else
|
||||
die("bad --word-diff argument: %s", type);
|
||||
}
|
||||
else if (!prefixcmp(arg, "--word-diff-regex=")) {
|
||||
if (options->word_diff == DIFF_WORDS_NONE)
|
||||
options->word_diff = DIFF_WORDS_PLAIN;
|
||||
options->word_regex = arg + 18;
|
||||
}
|
||||
else if (!strcmp(arg, "--exit-code"))
|
||||
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
|
||||
else if (!strcmp(arg, "--quiet"))
|
||||
|
10
diff.h
10
diff.h
@ -54,7 +54,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
|
||||
#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
|
||||
#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
|
||||
#define DIFF_OPT_COLOR_DIFF (1 << 8)
|
||||
#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
|
||||
/* (1 << 9) unused */
|
||||
#define DIFF_OPT_HAS_CHANGES (1 << 10)
|
||||
#define DIFF_OPT_QUICK (1 << 11)
|
||||
#define DIFF_OPT_NO_INDEX (1 << 12)
|
||||
@ -79,6 +79,13 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
|
||||
#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
|
||||
#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
|
||||
|
||||
enum diff_words_type {
|
||||
DIFF_WORDS_NONE = 0,
|
||||
DIFF_WORDS_PORCELAIN,
|
||||
DIFF_WORDS_PLAIN,
|
||||
DIFF_WORDS_COLOR
|
||||
};
|
||||
|
||||
struct diff_options {
|
||||
const char *filter;
|
||||
const char *orderfile;
|
||||
@ -108,6 +115,7 @@ struct diff_options {
|
||||
int stat_width;
|
||||
int stat_name_width;
|
||||
const char *word_regex;
|
||||
enum diff_words_type word_diff;
|
||||
|
||||
/* this is set by diffcore for DIFF_FORMAT_PATCH */
|
||||
int found_changes;
|
||||
|
@ -55,6 +55,93 @@ test_expect_success 'word diff with runs of whitespace' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_success '--word-diff=color' '
|
||||
|
||||
word_diff --word-diff=color
|
||||
|
||||
'
|
||||
|
||||
test_expect_success '--color --word-diff=color' '
|
||||
|
||||
word_diff --color --word-diff=color
|
||||
|
||||
'
|
||||
|
||||
sed 's/#.*$//' > expect <<EOF
|
||||
diff --git a/pre b/post
|
||||
index 330b04f..5ed8eff 100644
|
||||
--- a/pre
|
||||
+++ b/post
|
||||
@@ -1,3 +1,7 @@
|
||||
-h(4)
|
||||
+h(4),hh[44]
|
||||
~
|
||||
# significant space
|
||||
~
|
||||
a = b + c
|
||||
~
|
||||
~
|
||||
+aa = a
|
||||
~
|
||||
~
|
||||
+aeff = aeff * ( aaa )
|
||||
~
|
||||
EOF
|
||||
|
||||
test_expect_success '--word-diff=porcelain' '
|
||||
|
||||
word_diff --word-diff=porcelain
|
||||
|
||||
'
|
||||
|
||||
cat > expect <<EOF
|
||||
diff --git a/pre b/post
|
||||
index 330b04f..5ed8eff 100644
|
||||
--- a/pre
|
||||
+++ b/post
|
||||
@@ -1,3 +1,7 @@
|
||||
[-h(4)-]{+h(4),hh[44]+}
|
||||
|
||||
a = b + c
|
||||
|
||||
{+aa = a+}
|
||||
|
||||
{+aeff = aeff * ( aaa )+}
|
||||
EOF
|
||||
|
||||
test_expect_success '--word-diff=plain' '
|
||||
|
||||
word_diff --word-diff=plain
|
||||
|
||||
'
|
||||
|
||||
test_expect_success '--word-diff=plain --no-color' '
|
||||
|
||||
word_diff --word-diff=plain --no-color
|
||||
|
||||
'
|
||||
|
||||
cat > expect <<EOF
|
||||
<WHITE>diff --git a/pre b/post<RESET>
|
||||
<WHITE>index 330b04f..5ed8eff 100644<RESET>
|
||||
<WHITE>--- a/pre<RESET>
|
||||
<WHITE>+++ b/post<RESET>
|
||||
<CYAN>@@ -1,3 +1,7 @@<RESET>
|
||||
<RED>[-h(4)-]<RESET><GREEN>{+h(4),hh[44]+}<RESET>
|
||||
|
||||
a = b + c<RESET>
|
||||
|
||||
<GREEN>{+aa = a+}<RESET>
|
||||
|
||||
<GREEN>{+aeff = aeff * ( aaa )+}<RESET>
|
||||
EOF
|
||||
|
||||
test_expect_success '--word-diff=plain --color' '
|
||||
|
||||
word_diff --word-diff=plain --color
|
||||
|
||||
'
|
||||
|
||||
cat > expect <<\EOF
|
||||
<WHITE>diff --git a/pre b/post<RESET>
|
||||
<WHITE>index 330b04f..5ed8eff 100644<RESET>
|
||||
@ -143,6 +230,25 @@ test_expect_success 'command-line overrides config' '
|
||||
word_diff --color-words="[a-z]+"
|
||||
'
|
||||
|
||||
cat > expect <<\EOF
|
||||
<WHITE>diff --git a/pre b/post<RESET>
|
||||
<WHITE>index 330b04f..5ed8eff 100644<RESET>
|
||||
<WHITE>--- a/pre<RESET>
|
||||
<WHITE>+++ b/post<RESET>
|
||||
<CYAN>@@ -1,3 +1,7 @@<RESET>
|
||||
h(4),<GREEN>{+hh+}<RESET>[44]
|
||||
|
||||
a = b + c<RESET>
|
||||
|
||||
<GREEN>{+aa = a+}<RESET>
|
||||
|
||||
<GREEN>{+aeff = aeff * ( aaa+}<RESET> )
|
||||
EOF
|
||||
|
||||
test_expect_success 'command-line overrides config: --word-diff-regex' '
|
||||
word_diff --color --word-diff-regex="[a-z]+"
|
||||
'
|
||||
|
||||
cp expect.non-whitespace-is-word expect
|
||||
|
||||
test_expect_success '.gitattributes override config' '
|
||||
@ -209,4 +315,20 @@ test_expect_success 'test when words are only removed at the end' '
|
||||
|
||||
'
|
||||
|
||||
cat > expect <<\EOF
|
||||
diff --git a/pre b/post
|
||||
index 289cb9d..2d06f37 100644
|
||||
--- a/pre
|
||||
+++ b/post
|
||||
@@ -1 +1 @@
|
||||
-(:
|
||||
+(
|
||||
EOF
|
||||
|
||||
test_expect_success '--word-diff=none' '
|
||||
|
||||
word_diff --word-diff=plain --word-diff=none
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user