summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:28 (GMT)
commitd4c90270215ba5600ca9cab69185da2027bbf892 (patch)
treefd28c6175ca1c54660dba8f377dde507c92ddf57
parentd6f05a435f9c89f8c9860c7af692942768d81584 (diff)
parent01ca387774b6e0f9949f3c1cf6a1ffa3a2409865 (diff)
downloadgit-d4c90270215ba5600ca9cab69185da2027bbf892.zip
git-d4c90270215ba5600ca9cab69185da2027bbf892.tar.gz
git-d4c90270215ba5600ca9cab69185da2027bbf892.tar.bz2
Merge branch 'ab/commit-graph-progress-fix'
* ab/commit-graph-progress-fix: commit-graph: split up close_reachable() progress output
-rw-r--r--commit-graph.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/commit-graph.c b/commit-graph.c
index 99163c2..5c8fb4b 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -638,26 +638,29 @@ static void add_missing_parents(struct packed_oid_list *oids, struct commit *com
static void close_reachable(struct packed_oid_list *oids, int report_progress)
{
- int i;
+ int i, j;
struct commit *commit;
struct progress *progress = NULL;
- int j = 0;
if (report_progress)
progress = start_delayed_progress(
- _("Annotating commits in commit graph"), 0);
+ _("Loading known commits in commit graph"), j = 0);
for (i = 0; i < oids->nr; i++) {
display_progress(progress, ++j);
commit = lookup_commit(the_repository, &oids->list[i]);
if (commit)
commit->object.flags |= UNINTERESTING;
}
+ stop_progress(&progress);
/*
* As this loop runs, oids->nr may grow, but not more
* than the number of missing commits in the reachable
* closure.
*/
+ if (report_progress)
+ progress = start_delayed_progress(
+ _("Expanding reachable commits in commit graph"), j = 0);
for (i = 0; i < oids->nr; i++) {
display_progress(progress, ++j);
commit = lookup_commit(the_repository, &oids->list[i]);
@@ -665,7 +668,11 @@ static void close_reachable(struct packed_oid_list *oids, int report_progress)
if (commit && !parse_commit(commit))
add_missing_parents(oids, commit);
}
+ stop_progress(&progress);
+ if (report_progress)
+ progress = start_delayed_progress(
+ _("Clearing commit marks in commit graph"), j = 0);
for (i = 0; i < oids->nr; i++) {
display_progress(progress, ++j);
commit = lookup_commit(the_repository, &oids->list[i]);