progress: stop using the_repository
Stop using `the_repository` in the "progress" subsystem by passing in a repository when initializing `struct progress`. Furthermore, store a pointer to the repository in that struct so that we can pass it to the trace2 API when logging information. Adjust callers accordingly by using `the_repository`. While there may be some callers that have a repository available in their context, this trivial conversion allows for easier verification and bubbles up the use of `the_repository` by one level. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
913a1e157c
commit
1f7e6478dc
@@ -282,7 +282,8 @@ static unsigned check_objects(void)
|
||||
max = get_max_object_index();
|
||||
|
||||
if (verbose)
|
||||
progress = start_delayed_progress(_("Checking objects"), max);
|
||||
progress = start_delayed_progress(the_repository,
|
||||
_("Checking objects"), max);
|
||||
|
||||
for (i = 0; i < max; i++) {
|
||||
foreign_nr += check_object(get_indexed_object(i));
|
||||
@@ -1249,6 +1250,7 @@ static void parse_pack_objects(unsigned char *hash)
|
||||
|
||||
if (verbose)
|
||||
progress = start_progress(
|
||||
the_repository,
|
||||
progress_title ? progress_title :
|
||||
from_stdin ? _("Receiving objects") : _("Indexing objects"),
|
||||
nr_objects);
|
||||
@@ -1329,7 +1331,8 @@ static void resolve_deltas(struct pack_idx_option *opts)
|
||||
QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry);
|
||||
|
||||
if (verbose || show_resolving_progress)
|
||||
progress = start_progress(_("Resolving deltas"),
|
||||
progress = start_progress(the_repository,
|
||||
_("Resolving deltas"),
|
||||
nr_ref_deltas + nr_ofs_deltas);
|
||||
|
||||
nr_dispatched = 0;
|
||||
|
||||
Reference in New Issue
Block a user