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

diff-parseopt: convert --diff-filter

Browse Source 
While at it, mark one more string for translation

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-24 15:20:03 +07:00 committed by Junio C Hamano
parent a75f28cbda
commit d2d3f27300
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
diff.c
View File

@ -4736,10 +4736,13 @@ static unsigned filter_bit_tst(char status, const struct diff_options *opt)
return opt->filter & filter_bit[(int) status]; return opt->filter & filter_bit[(int) status];
} }
static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt) static int diff_opt_diff_filter(const struct option *option,
const char *optarg, int unset)
{ {
struct diff_options *opt = option->value;
int i, optch; int i, optch;
BUG_ON_OPT_NEG(unset);
prepare_filter_bits(); prepare_filter_bits();
/* /*
@ -4770,7 +4773,8 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)
bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0; bit = (0 <= optch && optch <= 'Z') ? filter_bit[optch] : 0;
if (!bit) if (!bit)
return optarg[i]; return error(_("unknown change class '%c' in --diff-filter=%s"),
optarg[i], optarg);
if (negate) if (negate)
opt->filter &= ~bit; opt->filter &= ~bit;
else else
@ -5389,6 +5393,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"), OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
N_("look for differences that change the number of occurrences of the specified object"), N_("look for differences that change the number of occurrences of the specified object"),
PARSE_OPT_NONEG, diff_opt_find_object), PARSE_OPT_NONEG, diff_opt_find_object),
OPT_CALLBACK_F(0, "diff-filter", options, N_("[(A|C|D|M|R|T|U|X|B)...[*]]"),
N_("select files by diff type"),
PARSE_OPT_NONEG, diff_opt_diff_filter),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"), { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
N_("Output to a specific file"), N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output }, PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@ -5441,13 +5448,6 @@ int diff_opt_parse(struct diff_options *options,
} }
/* misc options */ /* misc options */
else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
int offending = parse_diff_filter_opt(optarg, options);
if (offending)
die("unknown change class '%c' in --diff-filter=%s",
offending, optarg);
return argcount;
}
else if (!strcmp(arg, "--no-abbrev")) else if (!strcmp(arg, "--no-abbrev"))
options->abbrev = 0; options->abbrev = 0;
else if (!strcmp(arg, "--abbrev")) else if (!strcmp(arg, "--abbrev"))