зеркало из https://github.com/microsoft/git.git
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached: log: parse separate option for --glob log: parse separate options like git log --grep foo diff: parse separate options --stat-width n, --stat-name-width n diff: split off a function for --stat-* option parsing diff: parse separate options like -S foo Conflicts: revision.c
This commit is contained in:
Junio C Hamano
Коммит
e40b34b1ec
167
diff.c
167
diff.c
|
|
@ -3002,9 +3002,100 @@ static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *va
|
|||
|
||||
static int diff_scoreopt_parse(const char *opt);
|
||||
|
||||
static inline int short_opt(char opt, const char **argv,
|
||||
const char **optarg)
|
||||
{
|
||||
const char *arg = argv[0];
|
||||
if (arg[0] != '-' || arg[1] != opt)
|
||||
return 0;
|
||||
if (arg[2] != '\0') {
|
||||
*optarg = arg + 2;
|
||||
return 1;
|
||||
}
|
||||
if (!argv[1])
|
||||
die("Option '%c' requires a value", opt);
|
||||
*optarg = argv[1];
|
||||
return 2;
|
||||
}
|
||||
|
||||
int parse_long_opt(const char *opt, const char **argv,
|
||||
const char **optarg)
|
||||
{
|
||||
const char *arg = argv[0];
|
||||
if (arg[0] != '-' || arg[1] != '-')
|
||||
return 0;
|
||||
arg += strlen("--");
|
||||
if (prefixcmp(arg, opt))
|
||||
return 0;
|
||||
arg += strlen(opt);
|
||||
if (*arg == '=') { /* sticked form: --option=value */
|
||||
*optarg = arg + 1;
|
||||
return 1;
|
||||
}
|
||||
if (*arg != '\0')
|
||||
return 0;
|
||||
/* separate form: --option value */
|
||||
if (!argv[1])
|
||||
die("Option '--%s' requires a value", opt);
|
||||
*optarg = argv[1];
|
||||
return 2;
|
||||
}
|
||||
|
||||
static int stat_opt(struct diff_options *options, const char **av)
|
||||
{
|
||||
const char *arg = av[0];
|
||||
char *end;
|
||||
int width = options->stat_width;
|
||||
int name_width = options->stat_name_width;
|
||||
int argcount = 1;
|
||||
|
||||
arg += strlen("--stat");
|
||||
end = (char *)arg;
|
||||
|
||||
switch (*arg) {
|
||||
case '-':
|
||||
if (!prefixcmp(arg, "-width")) {
|
||||
arg += strlen("-width");
|
||||
if (*arg == '=')
|
||||
width = strtoul(arg + 1, &end, 10);
|
||||
else if (!*arg && !av[1])
|
||||
die("Option '--stat-width' requires a value");
|
||||
else if (!*arg) {
|
||||
width = strtoul(av[1], &end, 10);
|
||||
argcount = 2;
|
||||
}
|
||||
} else if (!prefixcmp(arg, "-name-width")) {
|
||||
arg += strlen("-name-width");
|
||||
if (*arg == '=')
|
||||
name_width = strtoul(arg + 1, &end, 10);
|
||||
else if (!*arg && !av[1])
|
||||
die("Option '--stat-name-width' requires a value");
|
||||
else if (!*arg) {
|
||||
name_width = strtoul(av[1], &end, 10);
|
||||
argcount = 2;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case '=':
|
||||
width = strtoul(arg+1, &end, 10);
|
||||
if (*end == ',')
|
||||
name_width = strtoul(end+1, &end, 10);
|
||||
}
|
||||
|
||||
/* Important! This checks all the error cases! */
|
||||
if (*end)
|
||||
return 0;
|
||||
options->output_format |= DIFF_FORMAT_DIFFSTAT;
|
||||
options->stat_name_width = name_width;
|
||||
options->stat_width = width;
|
||||
return argcount;
|
||||
}
|
||||
|
||||
int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
||||
{
|
||||
const char *arg = av[0];
|
||||
const char *optarg;
|
||||
int argcount;
|
||||
|
||||
/* Output format options */
|
||||
if (!strcmp(arg, "-p") || !strcmp(arg, "-u") || !strcmp(arg, "--patch"))
|
||||
|
|
@ -3041,33 +3132,9 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
options->output_format |= DIFF_FORMAT_NAME_STATUS;
|
||||
else if (!strcmp(arg, "-s"))
|
||||
options->output_format |= DIFF_FORMAT_NO_OUTPUT;
|
||||
else if (!prefixcmp(arg, "--stat")) {
|
||||
char *end;
|
||||
int width = options->stat_width;
|
||||
int name_width = options->stat_name_width;
|
||||
arg += 6;
|
||||
end = (char *)arg;
|
||||
|
||||
switch (*arg) {
|
||||
case '-':
|
||||
if (!prefixcmp(arg, "-width="))
|
||||
width = strtoul(arg + 7, &end, 10);
|
||||
else if (!prefixcmp(arg, "-name-width="))
|
||||
name_width = strtoul(arg + 12, &end, 10);
|
||||
break;
|
||||
case '=':
|
||||
width = strtoul(arg+1, &end, 10);
|
||||
if (*end == ',')
|
||||
name_width = strtoul(end+1, &end, 10);
|
||||
}
|
||||
|
||||
/* Important! This checks all the error cases! */
|
||||
if (*end)
|
||||
return 0;
|
||||
options->output_format |= DIFF_FORMAT_DIFFSTAT;
|
||||
options->stat_name_width = name_width;
|
||||
options->stat_width = width;
|
||||
}
|
||||
else if (!prefixcmp(arg, "--stat"))
|
||||
/* --stat, --stat-width, or --stat-name-width */
|
||||
return stat_opt(options, av);
|
||||
|
||||
/* renames options */
|
||||
else if (!prefixcmp(arg, "-B")) {
|
||||
|
|
@ -3161,10 +3228,11 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
else
|
||||
die("bad --word-diff argument: %s", type);
|
||||
}
|
||||
else if (!prefixcmp(arg, "--word-diff-regex=")) {
|
||||
else if ((argcount = parse_long_opt("word-diff-regex", av, &optarg))) {
|
||||
if (options->word_diff == DIFF_WORDS_NONE)
|
||||
options->word_diff = DIFF_WORDS_PLAIN;
|
||||
options->word_regex = arg + 18;
|
||||
options->word_regex = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if (!strcmp(arg, "--exit-code"))
|
||||
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
|
||||
|
|
@ -3194,18 +3262,26 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
/* misc options */
|
||||
else if (!strcmp(arg, "-z"))
|
||||
options->line_termination = 0;
|
||||
else if (!prefixcmp(arg, "-l"))
|
||||
options->rename_limit = strtoul(arg+2, NULL, 10);
|
||||
else if (!prefixcmp(arg, "-S"))
|
||||
options->pickaxe = arg + 2;
|
||||
else if ((argcount = short_opt('l', av, &optarg))) {
|
||||
options->rename_limit = strtoul(optarg, NULL, 10);
|
||||
return argcount;
|
||||
}
|
||||
else if ((argcount = short_opt('S', av, &optarg))) {
|
||||
options->pickaxe = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if (!strcmp(arg, "--pickaxe-all"))
|
||||
options->pickaxe_opts = DIFF_PICKAXE_ALL;
|
||||
else if (!strcmp(arg, "--pickaxe-regex"))
|
||||
options->pickaxe_opts = DIFF_PICKAXE_REGEX;
|
||||
else if (!prefixcmp(arg, "-O"))
|
||||
options->orderfile = arg + 2;
|
||||
else if (!prefixcmp(arg, "--diff-filter="))
|
||||
options->filter = arg + 14;
|
||||
else if ((argcount = short_opt('O', av, &optarg))) {
|
||||
options->orderfile = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if ((argcount = parse_long_opt("diff-filter", av, &optarg))) {
|
||||
options->filter = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if (!strcmp(arg, "--abbrev"))
|
||||
options->abbrev = DEFAULT_ABBREV;
|
||||
else if (!prefixcmp(arg, "--abbrev=")) {
|
||||
|
|
@ -3215,20 +3291,25 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
|
|||
else if (40 < options->abbrev)
|
||||
options->abbrev = 40;
|
||||
}
|
||||
else if (!prefixcmp(arg, "--src-prefix="))
|
||||
options->a_prefix = arg + 13;
|
||||
else if (!prefixcmp(arg, "--dst-prefix="))
|
||||
options->b_prefix = arg + 13;
|
||||
else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
|
||||
options->a_prefix = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
|
||||
options->b_prefix = optarg;
|
||||
return argcount;
|
||||
}
|
||||
else if (!strcmp(arg, "--no-prefix"))
|
||||
options->a_prefix = options->b_prefix = "";
|
||||
else if (opt_arg(arg, '\0', "inter-hunk-context",
|
||||
&options->interhunkcontext))
|
||||
;
|
||||
else if (!prefixcmp(arg, "--output=")) {
|
||||
options->file = fopen(arg + strlen("--output="), "w");
|
||||
else if ((argcount = parse_long_opt("output", av, &optarg))) {
|
||||
options->file = fopen(optarg, "w");
|
||||
if (!options->file)
|
||||
die_errno("Could not open '%s'", arg + strlen("--output="));
|
||||
options->close_file = 1;
|
||||
return argcount;
|
||||
} else
|
||||
return 0;
|
||||
return 1;
|
||||
|
|
|
|||
7
diff.h
7
diff.h
|
|
@ -218,6 +218,13 @@ extern void diff_unmerge(struct diff_options *,
|
|||
#define DIFF_SETUP_USE_CACHE 2
|
||||
#define DIFF_SETUP_USE_SIZE_CACHE 4
|
||||
|
||||
/*
|
||||
* Poor man's alternative to parse-option, to allow both sticked form
|
||||
* (--option=value) and separate form (--option value).
|
||||
*/
|
||||
extern int parse_long_opt(const char *opt, const char **argv,
|
||||
const char **optarg);
|
||||
|
||||
extern int git_diff_basic_config(const char *var, const char *value, void *cb);
|
||||
extern int git_diff_ui_config(const char *var, const char *value, void *cb);
|
||||
extern int diff_use_color_default;
|
||||
|
|
|
|||
81
revision.c
81
revision.c
|
|
@ -1148,6 +1148,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
int *unkc, const char **unkv)
|
||||
{
|
||||
const char *arg = argv[0];
|
||||
const char *optarg;
|
||||
int argcount;
|
||||
|
||||
/* pseudo revision arguments */
|
||||
if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
|
||||
|
|
@ -1160,11 +1162,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (!prefixcmp(arg, "--max-count=")) {
|
||||
revs->max_count = atoi(arg + 12);
|
||||
if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
|
||||
revs->max_count = atoi(optarg);
|
||||
revs->no_walk = 0;
|
||||
} else if (!prefixcmp(arg, "--skip=")) {
|
||||
revs->skip_count = atoi(arg + 7);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
|
||||
revs->skip_count = atoi(optarg);
|
||||
return argcount;
|
||||
} else if ((*arg == '-') && isdigit(arg[1])) {
|
||||
/* accept -<digit>, like traditional "head" */
|
||||
revs->max_count = atoi(arg + 1);
|
||||
|
|
@ -1178,18 +1182,24 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
} else if (!prefixcmp(arg, "-n")) {
|
||||
revs->max_count = atoi(arg + 2);
|
||||
revs->no_walk = 0;
|
||||
} else if (!prefixcmp(arg, "--max-age=")) {
|
||||
revs->max_age = atoi(arg + 10);
|
||||
} else if (!prefixcmp(arg, "--since=")) {
|
||||
revs->max_age = approxidate(arg + 8);
|
||||
} else if (!prefixcmp(arg, "--after=")) {
|
||||
revs->max_age = approxidate(arg + 8);
|
||||
} else if (!prefixcmp(arg, "--min-age=")) {
|
||||
revs->min_age = atoi(arg + 10);
|
||||
} else if (!prefixcmp(arg, "--before=")) {
|
||||
revs->min_age = approxidate(arg + 9);
|
||||
} else if (!prefixcmp(arg, "--until=")) {
|
||||
revs->min_age = approxidate(arg + 8);
|
||||
} else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
|
||||
revs->max_age = atoi(optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("since", argv, &optarg))) {
|
||||
revs->max_age = approxidate(optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("after", argv, &optarg))) {
|
||||
revs->max_age = approxidate(optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
|
||||
revs->min_age = atoi(optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("before", argv, &optarg))) {
|
||||
revs->min_age = approxidate(optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("until", argv, &optarg))) {
|
||||
revs->min_age = approxidate(optarg);
|
||||
return argcount;
|
||||
} else if (!strcmp(arg, "--first-parent")) {
|
||||
revs->first_parent_only = 1;
|
||||
} else if (!strcmp(arg, "--ancestry-path")) {
|
||||
|
|
@ -1295,6 +1305,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
revs->pretty_given = 1;
|
||||
get_commit_format(arg+8, revs);
|
||||
} else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
|
||||
/*
|
||||
* Detached form ("--pretty X" as opposed to "--pretty=X")
|
||||
* not allowed, since the argument is optional.
|
||||
*/
|
||||
revs->verbose_header = 1;
|
||||
revs->pretty_given = 1;
|
||||
get_commit_format(arg+9, revs);
|
||||
|
|
@ -1359,21 +1373,25 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
} else if (!strcmp(arg, "--relative-date")) {
|
||||
revs->date_mode = DATE_RELATIVE;
|
||||
revs->date_mode_explicit = 1;
|
||||
} else if (!strncmp(arg, "--date=", 7)) {
|
||||
revs->date_mode = parse_date_format(arg + 7);
|
||||
} else if ((argcount = parse_long_opt("date", argv, &optarg))) {
|
||||
revs->date_mode = parse_date_format(optarg);
|
||||
revs->date_mode_explicit = 1;
|
||||
return argcount;
|
||||
} else if (!strcmp(arg, "--log-size")) {
|
||||
revs->show_log_size = 1;
|
||||
}
|
||||
/*
|
||||
* Grepping the commit log
|
||||
*/
|
||||
else if (!prefixcmp(arg, "--author=")) {
|
||||
add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9);
|
||||
} else if (!prefixcmp(arg, "--committer=")) {
|
||||
add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12);
|
||||
} else if (!prefixcmp(arg, "--grep=")) {
|
||||
add_message_grep(revs, arg+7);
|
||||
else if ((argcount = parse_long_opt("author", argv, &optarg))) {
|
||||
add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
|
||||
add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
|
||||
return argcount;
|
||||
} else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
|
||||
add_message_grep(revs, optarg);
|
||||
return argcount;
|
||||
} else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
|
||||
revs->grep_filter.regflags |= REG_EXTENDED;
|
||||
} else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
|
||||
|
|
@ -1382,12 +1400,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
revs->grep_filter.fixed = 1;
|
||||
} else if (!strcmp(arg, "--all-match")) {
|
||||
revs->grep_filter.all_match = 1;
|
||||
} else if (!prefixcmp(arg, "--encoding=")) {
|
||||
arg += 11;
|
||||
if (strcmp(arg, "none"))
|
||||
git_log_output_encoding = xstrdup(arg);
|
||||
} else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
|
||||
if (strcmp(optarg, "none"))
|
||||
git_log_output_encoding = xstrdup(optarg);
|
||||
else
|
||||
git_log_output_encoding = "";
|
||||
return argcount;
|
||||
} else if (!strcmp(arg, "--reverse")) {
|
||||
revs->reverse ^= 1;
|
||||
} else if (!strcmp(arg, "--children")) {
|
||||
|
|
@ -1467,6 +1485,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
|
||||
const char **prune_data = NULL;
|
||||
const char *submodule = NULL;
|
||||
const char *optarg;
|
||||
int argcount;
|
||||
|
||||
if (opt)
|
||||
submodule = opt->submodule;
|
||||
|
|
@ -1516,10 +1536,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--glob=")) {
|
||||
if ((argcount = parse_long_opt("glob", argv + i, &optarg))) {
|
||||
struct all_refs_cb cb;
|
||||
i += argcount - 1;
|
||||
init_all_refs_cb(&cb, revs, flags);
|
||||
for_each_glob_ref(handle_one_ref, arg + 7, &cb);
|
||||
for_each_glob_ref(handle_one_ref, optarg, &cb);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--branches=")) {
|
||||
|
|
|
|||
|
|
@ -208,6 +208,7 @@ log -p --first-parent master
|
|||
log -m -p --first-parent master
|
||||
log -m -p master
|
||||
log -SF master
|
||||
log -S F master
|
||||
log -SF -p master
|
||||
log --decorate --all
|
||||
log --decorate=full --all
|
||||
|
|
@ -282,4 +283,8 @@ diff master master^ side
|
|||
diff --dirstat master~1 master~2
|
||||
EOF
|
||||
|
||||
test_expect_success 'log -S requires an argument' '
|
||||
test_must_fail git log -S
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
$ git log -S F master
|
||||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
$
|
||||
|
|
@ -100,13 +100,11 @@ test_expect_success 'oneline' '
|
|||
|
||||
test_expect_success 'diff-filter=A' '
|
||||
|
||||
actual=$(git log --pretty="format:%s" --diff-filter=A HEAD) &&
|
||||
expect=$(echo fifth ; echo fourth ; echo third ; echo initial) &&
|
||||
test "$actual" = "$expect" || {
|
||||
echo Oops
|
||||
echo "Actual: $actual"
|
||||
false
|
||||
}
|
||||
git log --pretty="format:%s" --diff-filter=A HEAD > actual &&
|
||||
git log --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
|
||||
printf "fifth\nfourth\nthird\ninitial" > expect &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect actual-separate
|
||||
|
||||
'
|
||||
|
||||
|
|
@ -203,6 +201,13 @@ test_expect_success 'log --grep' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'log --grep option parsing' '
|
||||
echo second >expect &&
|
||||
git log -1 --pretty="tformat:%s" --grep sec >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_must_fail git log -1 --pretty="tformat:%s" --grep
|
||||
'
|
||||
|
||||
test_expect_success 'log -i --grep' '
|
||||
echo Second >expect &&
|
||||
git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
|
||||
|
|
|
|||
|
|
@ -123,6 +123,12 @@ test_expect_success 'rev-list --glob=refs/heads/subspace/*' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob refs/heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob=heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче