commit-graph write: more descriptive "writing out" output
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 19 Jan 2019 20:21:16 +0000 (21:21 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Jan 2019 21:14:08 +0000 (13:14 -0800)
Make the "Writing out" part of the progress output more
descriptive. Depending on the shape of the graph we either make 3 or 4
passes over it.

Let's present this information to the user in case they're wondering
what this number, which is much larger than their number of commits,
has to do with writing out the commit graph. Now e.g. on linux.git we
emit:

    $ ~/g/git/git --exec-path=$HOME/g/git -C ~/g/linux commit-graph write
    Finding commits for commit graph: 6529159, done.
    Expanding reachable commits in commit graph: 815990, done.
    Computing commit graph generation numbers: 100% (815983/815983), done.
    Writing out commit graph in 4 passes: 100% (3263932/3263932), done.

A note on i18n: Why are we using the Q_() function and passing a
number & English text for a singular which'll never be used? Because
the plural rules of translated languages may not match those of
English, and to use the plural function we need to use this format.

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

index a407d5b..7c639c6 100644 (file)
@@ -784,6 +784,7 @@ void write_commit_graph(const char *obj_dir,
        struct commit_list *parent;
        struct progress *progress = NULL;
        uint64_t progress_cnt = 0;
+       struct strbuf progress_title = STRBUF_INIT;
 
        if (!commit_graph_compatible(the_repository))
                return;
@@ -959,16 +960,23 @@ void write_commit_graph(const char *obj_dir,
                hashwrite(f, chunk_write, 12);
        }
 
-       if (report_progress)
+       if (report_progress) {
+               strbuf_addf(&progress_title,
+                           Q_("Writing out commit graph in %d pass",
+                              "Writing out commit graph in %d passes",
+                              num_chunks),
+                           num_chunks);
                progress = start_delayed_progress(
-                       _("Writing out commit graph"),
+                       progress_title.buf,
                        num_chunks * commits.nr);
+       }
        write_graph_chunk_fanout(f, commits.list, commits.nr, progress, &progress_cnt);
        write_graph_chunk_oids(f, GRAPH_OID_LEN, commits.list, commits.nr, progress, &progress_cnt);
        write_graph_chunk_data(f, GRAPH_OID_LEN, commits.list, commits.nr, progress, &progress_cnt);
        if (num_extra_edges)
                write_graph_chunk_extra_edges(f, commits.list, commits.nr, progress, &progress_cnt);
        stop_progress(&progress);
+       strbuf_release(&progress_title);
 
        close_commit_graph(the_repository);
        finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC);