git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-02-04 03:33:01 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

survey: show progress during object walk

Browse Source 
Signed-off-by: Derrick Stolee <stolee@gmail.com>
This commit is contained in:
Derrick Stolee 2024-09-01 21:21:54 -04:00 committed by Johannes Schindelin
parent 53ec7ac7c8
commit a2cb463a8c
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/survey.c
View File

@ -629,6 +629,9 @@ static int survey_objects_path_walk_fn(const char *path,
type, oids->nr);
increment_object_totals(ctx, oids, type);
ctx->progress_nr += oids->nr;
display_progress(ctx->progress, ctx->progress_nr);
return 0;
}
@ -658,13 +661,26 @@ static void survey_phase_objects(struct survey_context *ctx)
repo_init_revisions(ctx->repo, &revs, "");
revs.tag_objects = 1;
ctx->progress_nr = 0;
ctx->progress_total = ctx->ref_array.nr;
if (ctx->opts.show_progress)
ctx->progress = start_progress(ctx->repo,
_("Preparing object walk"),
ctx->progress_total);
for (int i = 0; i < ctx->ref_array.nr; i++) {
struct ref_array_item *item = ctx->ref_array.items[i];
add_pending_oid(&revs, NULL, &item->objectname, add_flags);
display_progress(ctx->progress, ++(ctx->progress_nr));
}
stop_progress(&ctx->progress);
ctx->progress_nr = 0;
ctx->progress_total = 0;
if (ctx->opts.show_progress)
ctx->progress = start_progress(ctx->repo,
_("Walking objects"), 0);
walk_objects_by_path(&info);
stop_progress(&ctx->progress);
release_revisions(&revs);
trace2_region_leave("survey", "phase/objects", ctx->repo);

5
t/t8100-git-survey.sh
View File

@ -25,6 +25,11 @@ test_expect_success 'create a semi-interesting repo' '
git update-ref -d refs/tags/two
'
test_expect_success 'git survey --progress' '
GIT_PROGRESS_DELAY=0 git survey --all-refs --progress >out 2>err &&
grep "Preparing object walk" err
'
test_expect_success 'git survey (default)' '
git survey --all-refs >out 2>err &&
test_line_count = 0 err &&