mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
* jn/setup-revisions-glob-and-friends-passthru: revisions: allow --glob and friends in parse_options-enabled commands revisions: split out handle_revision_pseudo_opt function
This commit is contained in:
Junio C Hamano
commit
3e1a363b1f
137
revision.c
137
revision.c
|
|
@ -1180,7 +1180,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
|||
!strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
|
||||
!strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
|
||||
!strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
|
||||
!strcmp(arg, "--bisect"))
|
||||
!strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") ||
|
||||
!prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") ||
|
||||
!prefixcmp(arg, "--remotes="))
|
||||
{
|
||||
unkv[(*unkc)++] = arg;
|
||||
return 1;
|
||||
|
|
@ -1535,6 +1537,69 @@ static void append_prune_data(const char ***prune_data, const char **av)
|
|||
*prune_data = prune;
|
||||
}
|
||||
|
||||
static int handle_revision_pseudo_opt(const char *submodule,
|
||||
struct rev_info *revs,
|
||||
int argc, const char **argv, int *flags)
|
||||
{
|
||||
const char *arg = argv[0];
|
||||
const char *optarg;
|
||||
int argcount;
|
||||
|
||||
/*
|
||||
* NOTE!
|
||||
*
|
||||
* Commands like "git shortlog" will not accept the options below
|
||||
* unless parse_revision_opt queues them (as opposed to erroring
|
||||
* out).
|
||||
*
|
||||
* When implementing your new pseudo-option, remember to
|
||||
* register it in the list at the top of handle_revision_opt.
|
||||
*/
|
||||
if (!strcmp(arg, "--all")) {
|
||||
handle_refs(submodule, revs, *flags, for_each_ref_submodule);
|
||||
handle_refs(submodule, revs, *flags, head_ref_submodule);
|
||||
} else if (!strcmp(arg, "--branches")) {
|
||||
handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
|
||||
} else if (!strcmp(arg, "--bisect")) {
|
||||
handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
|
||||
handle_refs(submodule, revs, *flags ^ UNINTERESTING, for_each_good_bisect_ref);
|
||||
revs->bisect = 1;
|
||||
} else if (!strcmp(arg, "--tags")) {
|
||||
handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
|
||||
} else if (!strcmp(arg, "--remotes")) {
|
||||
handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
|
||||
} else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, *flags);
|
||||
for_each_glob_ref(handle_one_ref, optarg, &cb);
|
||||
return argcount;
|
||||
} else if (!prefixcmp(arg, "--branches=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, *flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
|
||||
} else if (!prefixcmp(arg, "--tags=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, *flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
|
||||
} else if (!prefixcmp(arg, "--remotes=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, *flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
|
||||
} else if (!strcmp(arg, "--reflog")) {
|
||||
handle_reflog(revs, *flags);
|
||||
} else if (!strcmp(arg, "--not")) {
|
||||
*flags ^= UNINTERESTING;
|
||||
} else if (!strcmp(arg, "--no-walk")) {
|
||||
revs->no_walk = 1;
|
||||
} else if (!strcmp(arg, "--do-walk")) {
|
||||
revs->no_walk = 0;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse revision information, filling in the "rev_info" structure,
|
||||
* and removing the used arguments from the argument list.
|
||||
|
|
@ -1547,8 +1612,6 @@ 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;
|
||||
|
|
@ -1575,70 +1638,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
if (*arg == '-') {
|
||||
int opts;
|
||||
|
||||
if (!strcmp(arg, "--all")) {
|
||||
handle_refs(submodule, revs, flags, for_each_ref_submodule);
|
||||
handle_refs(submodule, revs, flags, head_ref_submodule);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--branches")) {
|
||||
handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--bisect")) {
|
||||
handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
|
||||
handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
|
||||
revs->bisect = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--tags")) {
|
||||
handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--remotes")) {
|
||||
handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
|
||||
continue;
|
||||
}
|
||||
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, optarg, &cb);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--branches=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 11, "refs/heads/", &cb);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--tags=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 7, "refs/tags/", &cb);
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--remotes=")) {
|
||||
struct all_refs_cb cb;
|
||||
init_all_refs_cb(&cb, revs, flags);
|
||||
for_each_glob_ref_in(handle_one_ref, arg + 10, "refs/remotes/", &cb);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--reflog")) {
|
||||
handle_reflog(revs, flags);
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--not")) {
|
||||
flags ^= UNINTERESTING;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--no-walk")) {
|
||||
revs->no_walk = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--do-walk")) {
|
||||
revs->no_walk = 0;
|
||||
opts = handle_revision_pseudo_opt(submodule,
|
||||
revs, argc - i, argv + i,
|
||||
&flags);
|
||||
if (opts > 0) {
|
||||
i += opts - 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!strcmp(arg, "--stdin")) {
|
||||
if (revs->disable_stdin) {
|
||||
argv[left++] = arg;
|
||||
|
|
|
|||
|
|
@ -69,6 +69,18 @@ test_expect_success 'rev-parse --glob=heads/subspace' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse accepts --glob as detached option' '
|
||||
|
||||
compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
|
||||
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse is not confused by option-like glob' '
|
||||
|
||||
compare rev-parse "master" "--glob --symbolic master"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --branches=subspace/*' '
|
||||
|
||||
compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
|
||||
|
|
@ -129,6 +141,12 @@ test_expect_success 'rev-list --glob refs/heads/subspace/*' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list not confused by option-like --glob arg' '
|
||||
|
||||
compare rev-list "master" "--glob -0 master"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob=heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
|
||||
|
|
@ -213,4 +231,36 @@ test_expect_success 'rev-list --remotes=foo' '
|
|||
|
||||
'
|
||||
|
||||
test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
|
||||
|
||||
compare shortlog "subspace/one subspace/two" --branches=subspace &&
|
||||
compare shortlog \
|
||||
"master subspace-x someref other/three subspace/one subspace/two" \
|
||||
--branches &&
|
||||
compare shortlog master "--glob=heads/someref/* master" &&
|
||||
compare shortlog "subspace/one subspace/two other/three" \
|
||||
"--glob=heads/subspace/* --glob=heads/other/*" &&
|
||||
compare shortlog \
|
||||
"master other/three someref subspace-x subspace/one subspace/two" \
|
||||
"--glob=heads/*" &&
|
||||
compare shortlog foo/bar --tags=foo &&
|
||||
compare shortlog foo/bar --tags &&
|
||||
compare shortlog foo/baz --remotes=foo
|
||||
|
||||
'
|
||||
|
||||
test_expect_failure 'shortlog accepts --glob as detached option' '
|
||||
|
||||
compare shortlog \
|
||||
"master other/three someref subspace-x subspace/one subspace/two" \
|
||||
"--glob heads/*"
|
||||
|
||||
'
|
||||
|
||||
test_expect_failure 'shortlog --glob is not confused by option-like argument' '
|
||||
|
||||
compare shortlog master "--glob -e master"
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Reference in a new issue