mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-graph.c: pass progress to verify_one_commit_graph()

Browse Source 
This is the final step to prepare for consolidating the output of `git
commit-graph verify`. Instead of having each call to
`verify_one_commit_graph()` initialize its own progress struct, have the
caller pass one in instead.

This patch does not alter the output of `git commit-graph verify`, but
the next commit will consolidate the output.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2023-07-07 20:31:42 -04:00
committed by Junio C Hamano
parent f5facaa465
commit 7248857b6e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
commit-graph.c
View File

@ -2545,12 +2545,11 @@ static int commit_graph_checksum_valid(struct commit_graph *g)
static int verify_one_commit_graph(struct repository *r, static int verify_one_commit_graph(struct repository *r,
struct commit_graph *g, struct commit_graph *g,
int flags) struct progress *progress)
{ {
uint32_t i, cur_fanout_pos = 0; uint32_t i, cur_fanout_pos = 0;
struct object_id prev_oid, cur_oid; struct object_id prev_oid, cur_oid;
int generation_zero = 0; int generation_zero = 0;
struct progress *progress = NULL;
verify_commit_graph_error = verify_commit_graph_lite(g); verify_commit_graph_error = verify_commit_graph_lite(g);
if (verify_commit_graph_error) if (verify_commit_graph_error)
@ -2601,10 +2600,6 @@ static int verify_one_commit_graph(struct repository *r,
if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH) if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH)
return verify_commit_graph_error; return verify_commit_graph_error;
if (flags & COMMIT_GRAPH_WRITE_PROGRESS)
progress = start_progress(_("Verifying commits in commit graph"),
g->num_commits);
for (i = 0; i < g->num_commits; i++) { for (i = 0; i < g->num_commits; i++) {
struct commit *graph_commit, *odb_commit; struct commit *graph_commit, *odb_commit;
struct commit_list *graph_parents, *odb_parents; struct commit_list *graph_parents, *odb_parents;
@ -2694,7 +2689,6 @@ static int verify_one_commit_graph(struct repository *r,
graph_commit->date, graph_commit->date,
odb_commit->date); odb_commit->date);
} }
stop_progress(&progress);
return verify_commit_graph_error; return verify_commit_graph_error;
} }
@ -2709,9 +2703,16 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
} }
for (; g; g = g->base_graph) { for (; g; g = g->base_graph) {
local_error |= verify_one_commit_graph(r, g, flags); struct progress *progress = NULL;
if (flags & COMMIT_GRAPH_WRITE_PROGRESS)
progress = start_progress(_("Verifying commits in commit graph"),
g->num_commits);
local_error |= verify_one_commit_graph(r, g, progress);
if (flags & COMMIT_GRAPH_VERIFY_SHALLOW) if (flags & COMMIT_GRAPH_VERIFY_SHALLOW)
break; break;
stop_progress(&progress);
} }
return local_error; return local_error;