Skip to content

gvfs-helper: simplify progress output during prefetch #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derrickstolee merged 2 commits into from
Aug 8, 2023
Merged

gvfs-helper: simplify progress output during prefetch #594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c999ac
gvfs-helper: stop showing index-pack progress
derrickstolee Aug 7, 2023
3981c02
gvfs-helper: show progress of multiple prefetch packs
derrickstolee Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions gvfs-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,13 +1855,8 @@ static void my_run_index_pack(struct gh__request_params *params,
strvec_push(&ip.args, "git");
strvec_push(&ip.args, "index-pack");

if (gh__cmd_opts.show_progress) {
strvec_push(&ip.args, "-v");
ip.err = 0;
} else {
ip.err = -1;
ip.no_stderr = 1;
}
ip.err = -1;
ip.no_stderr = 1;

/* Skip generating the rev index, we don't need it. */
strvec_push(&ip.args, "--no-rev-index");
Expand Down Expand Up @@ -2350,12 +2345,17 @@ static void install_prefetch(struct gh__request_params *params,
trace2_data_intmax(TR2_CAT, NULL,
"prefetch/packfile_count", np);

if (gh__cmd_opts.show_progress)
params->progress = start_progress("Installing prefetch packfiles", np);

for (k = 0; k < np; k++) {
extract_packfile_from_multipack(params, status, fd, k);
display_progress(params->progress, k + 1);
if (status->ec != GH__ERROR_CODE__OK)
break;
nr_installed++;
}
stop_progress(&params->progress);

if (nr_installed)
delete_stale_keep_files(params, status);
Expand Down