The "Writing out" progress output was off-by-one because I'd screwed
up a merge conflict. Fix that, and update the various progress output.
On my test setup the "Annotating commit graph" progress sometimes
shows up on linux.git, sometimes not, it's right on that edge of
taking 1 second. So always show it in the commit message examples,
that's less confusing for the reader.
SZEDER Gábor (2):
commit-graph: rename 'num_extra_edges' variable to 'num_large_edges'
commit-graph: don't call write_graph_chunk_large_edges() unnecessarily
Ævar Arnfjörð Bjarmason (8):
commit-graph write: rephrase confusing progress output
commit-graph write: add "Writing out" progress output
commit-graph write: more descriptive "writing out" output
commit-graph write: show progress for object search
commit-graph write: add more descriptive progress output
commit-graph write: remove empty line for readability
commit-graph write: add itermediate progress
commit-graph write: emit a percentage for all progress
commit-graph.c | 130 ++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 102 insertions(+), 28 deletions(-)
Range-diff:
1: 2b52ad2284 ! 1: 9c17f56ed3 commit-graph write: add "Writing out" progress
output
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -15,10 +15,11 @@
$ ~/g/git/git --exec-path=$HOME/g/git commit-graph write
Finding commits for commit graph: 6365442, done.
+ Annotating commit graph: 2391666, done.
Computing commit graph generation numbers: 100% (797222/797222),
done.
- Writing out commit graph: 100% (3986110/3986110), done.
+ Writing out commit graph: 100% (3188888/3188888), done.
- This "Writing out" number is 4x or 5x the number of commits, depending
+ This "Writing out" number is 3x or 4x the number of commits, depending
on the graph we're processing. A later change will make this explicit
to the user.
@@ -126,7 +127,7 @@
+ * below loops over our N commits. This number must be
+ * kept in sync with the number of passes we're doing.
+ */
-+ int graph_passes = 4;
++ int graph_passes = 3;
+ if (num_large_edges)
+ graph_passes++;
+ progress = start_delayed_progress(
2: b1773677b1 ! 2: 79b0a467d9 commit-graph write: more descriptive "writing
out" output
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -3,7 +3,7 @@
commit-graph write: more descriptive "writing out" output
Make the "Writing out" part of the progress output more
- descriptive. Depending on the shape of the graph we either make 4 or 5
+ 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
@@ -13,8 +13,9 @@
$ ~/g/git/git --exec-path=$HOME/g/git commit-graph write
Finding commits for commit graph: 6365442, done.
+ Annotating commit graph: 2391666, done.
Computing commit graph generation numbers: 100% (797222/797222),
done.
- Writing out commit graph in 5 passes: 100% (3986110/3986110), done.
+ Writing out commit graph in 4 passes: 100% (3188888/3188888), 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
@@ -35,7 +36,7 @@
if (!commit_graph_compatible(the_repository))
return;
@@
- int graph_passes = 4;
+ int graph_passes = 3;
if (num_large_edges)
graph_passes++;
+ strbuf_addf(&progress_title,
3: 3138b00a2c ! 3: b32be83b38 commit-graph write: show progress for object
search
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -8,12 +8,12 @@
Before we'd emit on e.g. linux.git with "commit-graph write":
- Finding commits for commit graph: 6365492, done.
+ Finding commits for commit graph: 6365442, done.
[...]
And now:
- Finding commits for commit graph: 100% (6365492/6365492), done.
+ Finding commits for commit graph: 100% (6365442/6365442), done.
[...]
Since the commit graph only includes those commits that are packed
4: f41e3b3eb3 ! 4: 54276723c0 commit-graph write: add more descriptive
progress output
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -10,7 +10,7 @@
we support:
$ git commit-graph write
- Finding commits for commit graph among packed objects: 100%
(6365492/6365492), done.
+ Finding commits for commit graph among packed objects: 100%
(6365442/6365442), done.
[...]
# Actually we don't emit this since this takes almost no time at
@@ -20,7 +20,7 @@
[...]
$ (cd .git/objects/pack/ && ls *idx) | git commit-graph write
--stdin-pack
- Finding commits for commit graph in 3 packs: 6365492, done.
+ Finding commits for commit graph in 2 packs: 6365442, done.
[...]
The middle on of those is going to be the output users might see in
5: 74037032d3 = 5: 0e847366e1 commit-graph write: remove empty line for
readability
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
6: 502da68d14 ! 6: c388aff73e commit-graph write: add itermediate progress
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -10,22 +10,22 @@
million objects we'll now emit:
$ ~/g/git/git --exec-path=$HOME/g/git commit-graph write
- Finding commits for commit graph among packed objects: 100%
(50026015/50026015), done.
- Annotating commit graph: 21567407, done.
- Counting distinct commits in commit graph: 100% (7189147/7189147),
done.
- Finding extra edges in commit graph: 100% (7189147/7189147), done.
- Computing commit graph generation numbers: 100% (7144680/7144680),
done.
- Writing out commit graph: 21434417, done.
+ Finding commits for commit graph among packed objects: 100%
(48333911/48333911), done.
+ Annotating commit graph: 21435984, done.
+ Counting distinct commits in commit graph: 100% (7145328/7145328),
done.
+ Finding extra edges in commit graph: 100% (7145328/7145328), done.
+ Computing commit graph generation numbers: 100% (7145328/7145328),
done.
+ Writing out commit graph in 4 passes: 100% (28581312/28581312),
done.
Whereas on a medium-sized repository such as linux.git these new
progress bars won't have time to kick in and as before and we'll still
emit output like:
$ ~/g/git/git --exec-path=$HOME/g/git commit-graph write
- Finding commits for commit graph among packed objects: 100%
(6365492/6365492), done.
+ Finding commits for commit graph among packed objects: 100%
(6365442/6365442), done.
Annotating commit graph: 2391666, done.
Computing commit graph generation numbers: 100% (797222/797222),
done.
- Writing out commit graph: 2399912, done.
+ Writing out commit graph in 4 passes: 100% (3188888/3188888), done.
The "Counting distinct commits in commit graph" phase will spend most
of its time paused at "0/*" as we QSORT(...) the list. That's not
7: dfaf840983 ! 7: fd692499e0 commit-graph write: emit a percentage for all
progress
a => b | 0
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -7,22 +7,13 @@
write: add progress output", 2018-09-17) and evidently didn't notice
how easy it was to add a completion percentage.
- Now for the very large test repository mentioned in previous commits
- we'll emit (shows all progress output):
-
- Finding commits for commit graph among packed objects: 100%
(48333911/48333911), done.
- Annotating commit graph: 100% (21435984/21435984), done.
- Counting distinct commits in commit graph: 100% (7145328/7145328),
done.
- Finding extra edges in commit graph: 100% (7145328/7145328), done.
- Computing commit graph generation numbers: 100% (7145328/7145328),
done.
- Writing out commit graph in 5 passes: 100% (35726640/35726640),
done.
-
- And for linux.git:
+ Now for e.g. linux.git we'll emit:
+ ~/g/git/git --exec-path=$HOME/g/git commit-graph write
Finding commits for commit graph among packed objects: 100%
(6365442/6365442), done.
Annotating commit graph: 100% (2391666/2391666), done.
Computing commit graph generation numbers: 100% (797222/797222),
done.
- Writing out commit graph in 5 passes: 100% (3986110/3986110), done.
+ Writing out commit graph in 4 passes: 100% (3188888/3188888), done.
Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]>
--
2.20.0.rc0.387.gc7a69e6b6c
