commit-graph write: show progress for object search

Show the percentage progress for the "Finding commits for commit
graph" phase for the common case where we're operating on all packs in
the repository, as "commit-graph write" or "gc" will do.

Before we'd emit on e.g. linux.git with "commit-graph write":

Finding commits for commit graph: 6529159, done.
[...]

And now:

Finding commits for commit graph: 100% (6529159/6529159), done.
[...]

Since the commit graph only includes those commits that are packed
(via for_each_packed_object(...)) the approximate_object_count()
returns the actual number of objects we're going to process.

Still, it is possible due to a race with "gc" or another process
maintaining packs that the number of objects we're going to process is
lower than what approximate_object_count() reported. In that case we
don't want to stop the progress bar short of 100%. So let's make sure
it snaps to 100% at the end.

The inverse case is also possible and more likely. I.e. that a new
pack has been added between approximate_object_count() and
for_each_packed_object(). In that case the percentage will go beyond
100%, and we'll do nothing to snap it back to 100% at the end.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit-graph.c b/commit-graph.c
index 7c639c6a650f683f1edf6148b6e6d97872e969f8..3124dfae13142ef6784e81fece723f4d19633966 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -785,12 +785,14 @@ void write_commit_graph(const char *obj_dir,
        struct progress *progress = NULL;
        uint64_t progress_cnt = 0;
        struct strbuf progress_title = STRBUF_INIT;
        struct progress *progress = NULL;
        uint64_t progress_cnt = 0;
        struct strbuf progress_title = STRBUF_INIT;

+       unsigned long approx_nr_objects;

 
        if (!commit_graph_compatible(the_repository))
                return;
 
        oids.nr = 0;
 
        if (!commit_graph_compatible(the_repository))
                return;
 
        oids.nr = 0;

-       oids.alloc = approximate_object_count() / 32;
+       approx_nr_objects = approximate_object_count();
+       oids.alloc = approx_nr_objects / 32;

        oids.progress = NULL;
        oids.progress_done = 0;
 
        oids.progress = NULL;
        oids.progress_done = 0;
 


@@ -871,9 +873,12 @@ void write_commit_graph(const char *obj_dir,
        if (!pack_indexes && !commit_hex) {
                if (report_progress)
                        oids.progress = start_delayed_progress(
        if (!pack_indexes && !commit_hex) {
                if (report_progress)
                        oids.progress = start_delayed_progress(

-                               _("Finding commits for commit graph"), 0);
+                               _("Finding commits for commit graph"),
+                               approx_nr_objects);

                for_each_packed_object(add_packed_commits, &oids,
                                       FOR_EACH_OBJECT_PACK_ORDER);
                for_each_packed_object(add_packed_commits, &oids,
                                       FOR_EACH_OBJECT_PACK_ORDER);

+               if (oids.progress_done < approx_nr_objects)
+                       display_progress(oids.progress, approx_nr_objects);

                stop_progress(&oids.progress);
        }
 
                stop_progress(&oids.progress);
        }