Commit 2dae54a9 by Ben Straub

Improve clone sample's formatting

parent 9c05c17b
...@@ -19,17 +19,14 @@ static void print_progress(const progress_data *pd) ...@@ -19,17 +19,14 @@ static void print_progress(const progress_data *pd)
int network_percent = (100*pd->fetch_progress.received) / pd->fetch_progress.total; int network_percent = (100*pd->fetch_progress.received) / pd->fetch_progress.total;
int index_percent = (100*pd->fetch_progress.processed) / pd->fetch_progress.total; int index_percent = (100*pd->fetch_progress.processed) / pd->fetch_progress.total;
int checkout_percent = pd->total_steps > 0 int checkout_percent = pd->total_steps > 0
? (100.f * pd->completed_steps) / pd->total_steps ? (100 * pd->completed_steps) / pd->total_steps
: 0.f; : 0.f;
int kbytes = pd->fetch_progress.bytes / 1024; int kbytes = pd->fetch_progress.bytes / 1024;
printf("net %3d%% (%6d kb) / idx %3d%% / chk %3d%% %50s\n", printf("net %3d%% (%4d kb, %5d/%5d) / idx %3d%% (%5d/%5d) / chk %3d%% (%4lu/%4lu) %s\n",
network_percent, kbytes, index_percent, checkout_percent, pd->path); network_percent, kbytes, pd->fetch_progress.received, pd->fetch_progress.total,
/* index_percent, pd->fetch_progress.processed, pd->fetch_progress.total,
printf("net %5d /%5d – idx %5d /%5d – chk %.04f %20s\n", checkout_percent, pd->completed_steps, pd->total_steps,
pd->fetch_progress.received, pd->fetch_progress.total, pd->path);
pd->fetch_progress.processed, pd->fetch_progress.total,
pd->checkout_progress, pd->path);
*/
} }
static void fetch_progress(const git_indexer_stats *stats, void *payload) static void fetch_progress(const git_indexer_stats *stats, void *payload)
......
...@@ -192,7 +192,6 @@ static int checkout_blob( ...@@ -192,7 +192,6 @@ static int checkout_blob(
error = blob_content_to_file( error = blob_content_to_file(
blob, git_buf_cstr(data->path), file->mode, data->checkout_opts); blob, git_buf_cstr(data->path), file->mode, data->checkout_opts);
report_progress(data, file->path);
git_blob_free(blob); git_blob_free(blob);
return error; return error;
...@@ -265,11 +264,13 @@ static int checkout_create_the_new( ...@@ -265,11 +264,13 @@ static int checkout_create_the_new(
if (!is_submodule && !data->create_submodules) { if (!is_submodule && !data->create_submodules) {
error = checkout_blob(data, &delta->old_file); error = checkout_blob(data, &delta->old_file);
data->completed_steps++; data->completed_steps++;
report_progress(data, delta->old_file.path);
} }
else if (is_submodule && data->create_submodules) { else if (is_submodule && data->create_submodules) {
error = checkout_submodule(data, &delta->old_file); error = checkout_submodule(data, &delta->old_file);
data->completed_steps++; data->completed_steps++;
report_progress(data, delta->old_file.path);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment