Hello Git contributors, This is the third iteration of changes for adding support for --[no-]progress to multi-pack-index, and it includes the following updates for the feedback I received on v2: * Fixed commit message formatting * Updated 'pack_paths_checked' from u32 to unsigned Thanks, William William Baker (6): midx: add MIDX_PROGRESS flag midx: add progress to write_midx_file midx: add progress to expire_midx_packs midx: honor the MIDX_PROGRESS flag in verify_midx_file midx: honor the MIDX_PROGRESS flag in midx_repack multi-pack-index: add [--[no-]progress] option. Documentation/git-multi-pack-index.txt | 6 ++- builtin/multi-pack-index.c | 18 +++++-- builtin/repack.c | 2 +- midx.c | 71 ++++++++++++++++++++------ midx.h | 10 ++-- t/t5319-multi-pack-index.sh | 69 +++++++++++++++++++++++++ 6 files changed, 149 insertions(+), 27 deletions(-) base-commit: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-337%2Fwilbaker%2Fmulti-pack-index-progress-toggle-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-337/wilbaker/multi-pack-index-progress-toggle-v3 Pull-Request: https://github.com/gitgitgadget/git/pull/337 Range-diff vs v2: 1: 6badd9ceaf ! 1: cd041107de midx: add MIDX_PROGRESS flag Add the MIDX_PROGRESS flag and update the write|verify|expire|repack functions in midx.h to accept a flags parameter. The MIDX_PROGRESS flag indicates whether the caller of the function would like progress information to be displayed. This patch only changes the method prototypes and does not change the functionality. The functionality change will be handled by a later patch. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> midx: add MIDX_PROGRESS flag + Add the MIDX_PROGRESS flag and update the write|verify|expire|repack functions in midx.h to accept a flags parameter. The MIDX_PROGRESS 2: 3bc8677ea7 ! 2: 0117f55c9d midx: add progress to write_midx_file Add progress to write_midx_file. Progress is displayed when the MIDX_PROGRESS flag is set. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> midx: add progress to write_midx_file + Add progress to write_midx_file. Progress is displayed when the MIDX_PROGRESS flag is set. @@ -14,7 +15,7 @@ uint32_t alloc; struct multi_pack_index *m; + struct progress *progress; -+ uint32_t pack_paths_checked; ++ unsigned pack_paths_checked; }; static void add_pack_to_midx(const char *full_path, size_t full_path_len, 3: 3374574001 ! 3: d741dc60bc midx: add progress to expire_midx_packs Add progress to expire_midx_packs. Progress is displayed when the MIDX_PROGRESS flag is set. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> midx: add progress to expire_midx_packs + Add progress to expire_midx_packs. Progress is displayed when the MIDX_PROGRESS flag is set. 4: 29d03771c0 ! 4: f208c09639 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. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> 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. 5: 57f6742f09 ! 5: 7566090769 midx: honor the MIDX_PROGRESS flag in midx_repack Update midx_repack to only display progress when the MIDX_PROGRESS flag is set. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> midx: honor the MIDX_PROGRESS flag in midx_repack + Update midx_repack to only display progress when the MIDX_PROGRESS flag is set. 6: 5b933ab744 ! 6: a3c50948d9 multi-pack-index: add [--[no-]progress] option. Add the --[no-]progress option to git multi-pack-index. Pass the MIDX_PROGRESS flag to the subcommand functions when progress should be displayed by multi-pack-index. The progress feature was added to 'verify' in 144d703 ("multi-pack-index: report progress during 'verify'", 2018-09-13) but some subcommands were not updated to display progress, and the ability to opt-out was overlooked. @@ -1,6 +1,7 @@ Author: William Baker <William.Baker@xxxxxxxxxxxxx> multi-pack-index: add [--[no-]progress] option. + Add the --[no-]progress option to git multi-pack-index. Pass the MIDX_PROGRESS flag to the subcommand functions when progress should be displayed by multi-pack-index. -- gitgitgadget
