commit-graph: don't show progress percentages while expanding reachable commits

Commit 49bbc57a57 (commit-graph write: emit a percentage for all progress, 2019-01-19) was a bit overeager when it added progress percentages to the "Expanding reachable commits in commit graph" phase as well, because most of the time the number of commits that phase has to iterate over is not known in advance and grows significantly, and, consequently, we end up with nonsensical numbers: $ git commit-graph write --reachable Expanding reachable commits in commit graph: 138606% (824706/595), done. [...] $ git rev-parse v5.0 | git commit-graph write --stdin-commits Expanding reachable commits in commit graph: 81264400% (812644/1), done. [...] Even worse, because the percentage grows so quickly, the progress code outputs much more often than it should (because it ticks every second, or every 1%), slowing the whole process down. My time for "git commit-graph write --reachable" on linux.git went from 13.463s to 12.521s with this patch, ~7% savings. Therefore, don't show progress percentages in the "Expanding reachable commits in commit graph" phase. Note that the current code does sometimes do the right thing, if we picked up all commits initially (e.g., omitting "--reachable" in a fully-packed repository would get the correct count without any parent traversal). So it may be possible to come up with a way to tell when we could use a percentage here. But in the meantime, let's make sure we robustly avoid printing nonsense. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Sep 7, 2019 at 01:01 UTC 67fa6aac5af508b307c0d6968a28d50d14e7c026
1 file changed +1 -1
commit-graph.c
+1 -1
@@ -1049,7 +1049,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
1049 if (ctx->report_progress)
1050 ctx->progress = start_delayed_progress(
1051 _("Expanding reachable commits in commit graph"),
1052 - ctx->oids.nr);
1052 + 0);
1053 for (i = 0; i < ctx->oids.nr; i++) {
1054 display_progress(ctx->progress, i + 1);
1055 commit = lookup_commit(ctx->r, &ctx->oids.list[i]);