@@ -47,7 +47,11 @@ struct expire_reflog_policy_cb {
struct commit *tip_commit;
struct commit_list *tips;
unsigned int dry_run:1,
- verbose:1;
+ verbose:1,
+ show_progress:1,
+ no_reachable_progress:1;
+ struct progress *reachable_progress;
+ uint64_t reachable_progress_cnt;
};
struct worktree_reflogs {
@@ -235,6 +239,8 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb)
while (pending) {
struct commit_list *parent;
struct commit *commit = pop_commit(&pending);
+
+ display_progress(cb->reachable_progress, ++cb->reachable_progress_cnt);
if (commit->object.flags & REACHABLE)
continue;
if (parse_commit(commit))
@@ -375,16 +381,27 @@ static void reflog_expiry_prepare(const char *refname,
cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
}
- if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
+ if (cb->cmd.expire_unreachable <= cb->cmd.expire_total) {
+ if (cb->show_progress &&
+ cb->unreachable_expire_kind == UE_HEAD)
+ cb->no_reachable_progress = 1;
cb->unreachable_expire_kind = UE_ALWAYS;
+ }
switch (cb->unreachable_expire_kind) {
case UE_ALWAYS:
return;
case UE_HEAD:
+ if (cb->show_progress) {
+ const char *s = _("Iterating (un)reachable HEAD");
+ cb->reachable_progress = start_delayed_progress(s, 0);
+ }
for_each_ref(push_tip_to_list, &cb->tips);
- for (elem = cb->tips; elem; elem = elem->next)
+ for (elem = cb->tips; elem; elem = elem->next) {
+ display_progress(cb->reachable_progress,
+ ++cb->reachable_progress_cnt);
commit_list_insert(elem->item, &cb->mark_list);
+ }
break;
case UE_NORMAL:
commit_list_insert(commit, &cb->mark_list);
@@ -633,9 +650,9 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
struct worktree_reflogs collected = {
.reflogs = STRING_LIST_INIT_NODUP,
};
- struct string_list_item *item;
struct worktree **worktrees, **p;
- uint64_t progress_cnt;
+ int show_head_progress = show_progress;
+ size_t j;
if (show_progress)
collected.progress = start_delayed_progress(_("Enumerating reflogs"),
@@ -652,27 +669,31 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
free_worktrees(worktrees);
stop_progress(&collected.progress);
- if (show_progress) {
- progress_cnt = 0;
- progress = start_delayed_progress(_("Expiring reflogs"),
- collected.reflogs.nr);
- }
-
- for_each_string_list_item(item, &collected.reflogs) {
+ for (j = 0; j < collected.reflogs.nr; j++) {
+ const char *string = collected.reflogs.items[j].string;
struct expire_reflog_policy_cb cb = {
.cmd = cmd,
.dry_run = !!(flags & EXPIRE_REFLOGS_DRY_RUN),
.verbose = verbose,
+ .show_progress = show_head_progress,
};
-
- display_progress(progress, ++progress_cnt);
- set_reflog_expiry_param(&cb.cmd, explicit_expiry, item->string);
- status |= reflog_expire(item->string, flags,
+ display_progress(progress, j + 1);
+ set_reflog_expiry_param(&cb.cmd, explicit_expiry, string);
+ status |= reflog_expire(string, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
&cb);
+
+ if (show_head_progress &&
+ (cb.reachable_progress || cb.no_reachable_progress)) {
+ stop_progress(&cb.reachable_progress);
+ show_head_progress = 0;
+ progress = start_delayed_progress(_("Expiring reflogs"),
+ collected.reflogs.nr);
+ }
}
+ display_progress(progress, collected.reflogs.nr); /* only HEAD? */
stop_progress(&progress);
collected.reflogs.strdup_strings = 1;
string_list_clear(&collected.reflogs, 0);
Change the "git reflog expire --all" progress output to show progress on mark_reachable() in addition to the "Expiring reflogs" output added in the preceding commit. This is a major UI improvement to the "git gc" progress output, which in large repositories would seem to hang before the "initial" "Enumerating objects" phase. E.g. on a linux.git checkout I've got it previously took me around 10 seconds before I saw any output. With the change to add the "Expiring reflogs" output in the preceding commit that ~10 second delay was perhaps ~8-9, now it's pretty much guaranteed to show output within the first couple of seconds (our default progress delay). Why? Because as we iterate through our reflogs to expire in reflog_exire() we'd always check the reflog for "HEAD" first, and as we hadn't previously marked anything REACHABLE in mark_reachable() would almost certainly end up needing to walk a substantial amount of history to mark commits. In linux.git north of 1 million commits. Now we'll instead show: $ git gc Iterating (un)reachable HEAD: 1137354, done. Expiring reflogs: 100% (45/45), done. ^Enmerating objects: 662499^C [...] The implementation is a bit of a hack. Ideally we'd support nested progress bars, and the ability to "attach" a sub-progress bar to a running one. I.e. to optimistically show either: Expiring reflogs: X (Y/Z) Or: Expiring reflogs: X (Y/Z) iterating unreachable HEAD: 123456 In this case the problem is that if we have done our initial big "REACHABLE" iteration we're usually going to process the reflog quite quickly, but if we haven't we'd stall. So as a hack pass down a "show_progress" to reflog_expiry_prepare(), which will only be shown if we haven't processed the UE_HEAD case. We'll then start a progress bar, which when passed through to mark_reachable() will almost certainly result in a substantial initial iteration. Then when we've done that initial walk we'll stop that progress bar in our main loop, and start the "Expiring reflogs" progress bar. We'll usually start it at 2/X, since our "HEAD" was the 1/X usurped by the "Iterating (un)reachable HEAD" progress bar. The "usually" would assume that we wouldn't hit the "cb->no_reachable_progress = 1" case being added here. I.e. if our configuration is such that we're not going to do the UE_HEAD walk we'll just fall back on only using "Expiring reflogs". We'll still start the count at the 2nd reflog, but it shouldn't matter, on e.g. my linux.git checkout it doesn't, the progress bar goes by too fast to notice. It would have been nicer to be able to compute the "cb->unreachable_expire_kind" before we call reflog_expire(), but to do that we'd need the "oid", which we'll only know once we lock it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/reflog.c | 53 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-)