undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-parseopt: convert --color-words

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2019-03-05 19:30:20 +07:00 committed by Junio C Hamano
parent 797df119a2
commit 212db69d8c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -4901,6 +4901,18 @@ static int diff_opt_char(const struct option *opt,
return 0; return 0;
} }
static int diff_opt_color_words(const struct option *opt,
const char *arg, int unset)
{
struct diff_options *options = opt->value;
BUG_ON_OPT_NEG(unset);
options->use_color = 1;
options->word_diff = DIFF_WORDS_COLOR;
options->word_regex = arg;
return 0;
}
static int diff_opt_compact_summary(const struct option *opt, static int diff_opt_compact_summary(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
@ -5272,6 +5284,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"), OPT_CALLBACK_F(0, "word-diff-regex", options, N_("<regex>"),
N_("use <regex> to decide what a word is"), N_("use <regex> to decide what a word is"),
PARSE_OPT_NONEG, diff_opt_word_diff_regex), PARSE_OPT_NONEG, diff_opt_word_diff_regex),
OPT_CALLBACK_F(0, "color-words", options, N_("<regex>"),
N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
OPT_GROUP(N_("Diff other options")), OPT_GROUP(N_("Diff other options")),
OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"), OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
@ -5331,11 +5346,7 @@ int diff_opt_parse(struct diff_options *options,
if (cm & COLOR_MOVED_WS_ERROR) if (cm & COLOR_MOVED_WS_ERROR)
return -1; return -1;
options->color_moved_ws_handling = cm; options->color_moved_ws_handling = cm;
} else if (skip_to_optional_arg_default(arg, "--color-words", &options->word_regex, NULL)) { } else if (!strcmp(arg, "--exit-code"))
options->use_color = 1;
options->word_diff = DIFF_WORDS_COLOR;
}
else if (!strcmp(arg, "--exit-code"))
options->flags.exit_with_status = 1; options->flags.exit_with_status = 1;
else if (!strcmp(arg, "--quiet")) else if (!strcmp(arg, "--quiet"))
options->flags.quick = 1; options->flags.quick = 1;