kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

midx: honor the MIDX_PROGRESS flag in verify_midx_file 

Update verify_midx_file to only display progress when
the MIDX_PROGRESS flag is set.

Signed-off-by: William Baker <William.Baker@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
William Baker 2019-10-21 18:40:01 +00:00 committed by Junio C Hamano
parent 8dc18f8937
commit ad60096d1c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
midx.c
View File

@ -1097,15 +1097,16 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
{ {
struct pair_pos_vs_id *pairs = NULL; struct pair_pos_vs_id *pairs = NULL;
uint32_t i; uint32_t i;
struct progress *progress; struct progress *progress = NULL;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
verify_midx_error = 0; verify_midx_error = 0;


if (!m) if (!m)
return 0; return 0;


progress = start_progress(_("Looking for referenced packfiles"), if (flags & MIDX_PROGRESS)
m->num_packs); progress = start_progress(_("Looking for referenced packfiles"),
m->num_packs);
for (i = 0; i < m->num_packs; i++) { for (i = 0; i < m->num_packs; i++) {
if (prepare_midx_pack(r, m, i)) if (prepare_midx_pack(r, m, i))
midx_report("failed to load pack in position %d", i); midx_report("failed to load pack in position %d", i);
@ -1123,8 +1124,9 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
i, oid_fanout1, oid_fanout2, i + 1); i, oid_fanout1, oid_fanout2, i + 1);
} }


progress = start_sparse_progress(_("Verifying OID order in MIDX"), if (flags & MIDX_PROGRESS)
m->num_objects - 1); progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"),
m->num_objects - 1);
for (i = 0; i < m->num_objects - 1; i++) { for (i = 0; i < m->num_objects - 1; i++) {
struct object_id oid1, oid2; struct object_id oid1, oid2;


@ -1151,13 +1153,15 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i); pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i);
} }


progress = start_sparse_progress(_("Sorting objects by packfile"), if (flags & MIDX_PROGRESS)
m->num_objects); progress = start_sparse_progress(_("Sorting objects by packfile"),
m->num_objects);
display_progress(progress, 0); /* TODO: Measure QSORT() progress */ display_progress(progress, 0); /* TODO: Measure QSORT() progress */
QSORT(pairs, m->num_objects, compare_pair_pos_vs_id); QSORT(pairs, m->num_objects, compare_pair_pos_vs_id);
stop_progress(&progress); stop_progress(&progress);


progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects); if (flags & MIDX_PROGRESS)
progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
for (i = 0; i < m->num_objects; i++) { for (i = 0; i < m->num_objects; i++) {
struct object_id oid; struct object_id oid;
struct pack_entry e; struct pack_entry e;