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

revision: separate walk and unsorted flags

Browse Source 
The `--no-walk` flag supports two modes: either it sorts the revisions
given as input input or it doesn't. This is reflected in a single
`no_walk` flag, which reflects one of the three states "walk", "don't
walk but without sorting" and "don't walk but with sorting".

Split up the flag into two separate bits, one indicating whether we
should walk or not and one indicating whether the input should be sorted
or not. This will allow us to more easily introduce a new flag
`--unsorted-input`, which only impacts the sorting bit.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2021-08-05 13:25:24 +02:00 committed by Junio C Hamano
parent e5a14ddd2d
commit 29ef1f27fe
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -637,7 +637,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
repo_init_revisions(the_repository, &rev, prefix); repo_init_revisions(the_repository, &rev, prefix);
rev.diff = 1; rev.diff = 1;
rev.always_show_header = 1; rev.always_show_header = 1;
rev.no_walk = REVISION_WALK_NO_WALK_SORTED; rev.no_walk = 1;
rev.diffopt.stat_width = -1; /* Scale to real terminal size */ rev.diffopt.stat_width = -1; /* Scale to real terminal size */
memset(&opt, 0, sizeof(opt)); memset(&opt, 0, sizeof(opt));

3
builtin/revert.c
View File

@ -191,7 +191,8 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
struct setup_revision_opt s_r_opt; struct setup_revision_opt s_r_opt;
opts->revs = xmalloc(sizeof(*opts->revs)); opts->revs = xmalloc(sizeof(*opts->revs));
repo_init_revisions(the_repository, opts->revs, NULL); repo_init_revisions(the_repository, opts->revs, NULL);
opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; opts->revs->no_walk = 1;
opts->revs->unsorted_input = 1;
if (argc < 2) if (argc < 2)
usage_with_options(usage_str, options); usage_with_options(usage_str, options);
if (!strcmp(argv[1], "-")) if (!strcmp(argv[1], "-"))

9
revision.c
View File

@ -2651,16 +2651,17 @@ static int handle_revision_pseudo_opt(const char *submodule,
} else if (!strcmp(arg, "--not")) { } else if (!strcmp(arg, "--not")) {
*flags ^= UNINTERESTING | BOTTOM; *flags ^= UNINTERESTING | BOTTOM;
} else if (!strcmp(arg, "--no-walk")) { } else if (!strcmp(arg, "--no-walk")) {
revs->no_walk = REVISION_WALK_NO_WALK_SORTED; revs->no_walk = 1;
} else if (skip_prefix(arg, "--no-walk=", &optarg)) { } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
/* /*
* Detached form ("--no-walk X" as opposed to "--no-walk=X") * Detached form ("--no-walk X" as opposed to "--no-walk=X")
* not allowed, since the argument is optional. * not allowed, since the argument is optional.
*/ */
revs->no_walk = 1;
if (!strcmp(optarg, "sorted")) if (!strcmp(optarg, "sorted"))
revs->no_walk = REVISION_WALK_NO_WALK_SORTED; revs->unsorted_input = 0;
else if (!strcmp(optarg, "unsorted")) else if (!strcmp(optarg, "unsorted"))
revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; revs->unsorted_input = 1;
else else
return error("invalid argument to --no-walk"); return error("invalid argument to --no-walk");
} else if (!strcmp(arg, "--do-walk")) { } else if (!strcmp(arg, "--do-walk")) {
@ -3584,7 +3585,7 @@ int prepare_revision_walk(struct rev_info *revs)
if (!revs->reflog_info) if (!revs->reflog_info)
prepare_to_use_bloom_filter(revs); prepare_to_use_bloom_filter(revs);
if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED) if (!revs->unsorted_input)
commit_list_sort_by_date(&revs->commits); commit_list_sort_by_date(&revs->commits);
if (revs->no_walk) if (revs->no_walk)
return 0; return 0;

7
revision.h
View File

@ -79,10 +79,6 @@ struct rev_cmdline_info {
} *rev; } *rev;
}; };
#define REVISION_WALK_WALK 0
#define REVISION_WALK_NO_WALK_SORTED 1
#define REVISION_WALK_NO_WALK_UNSORTED 2
struct oidset; struct oidset;
struct topo_walk_info; struct topo_walk_info;
@ -129,7 +125,8 @@ struct rev_info {
/* Traversal flags */ /* Traversal flags */
unsigned int dense:1, unsigned int dense:1,
prune:1, prune:1,
no_walk:2, no_walk:1,
unsorted_input:1,
remove_empty_trees:1, remove_empty_trees:1,
simplify_history:1, simplify_history:1,
show_pulls:1, show_pulls:1,