Re: [PATCH] fetch: show progress for packfile uri downloads
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 17, 2021, 19:31 UTC
- Message-ID
- <xmqqsg4ttw5g.fsf@gitster.g>
- In-Reply-To
- <pull.907.git.1616007794513.gitgitgadget@gmail.com>
"Albert Cui via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 7 quoted lines
> From: Albert Cui <albertqcui@gmail.com> > > Git appears to hang when downloading packfiles as this part of the > fetch is silent, causing user confusion. This change implements > progress for the number of packfiles downloaded; a progress display > for bytes would involve deeper changes at the http-fetch layer > instead of fetch-pack, the caller.
... "hence we do not do so in this patch"?
That's probably a very sensible way to go.
I expect that http-fetch will in the longer term become a mere fallback default used by those who do not have anything better. Because we are not in the business of writing a performant HTTP downloader, we would be better off if we make it easy to plug an external HTTP downloader other people write in to this codepath.
> + packfile_uri_progress = start_progress(_("Downloading packs"), packfile_uris.nr);OK, so we plan to count from 0 up to .nr; and the message is made localizable. Good.
Show 5 quoted lines
> @@ -1696,6 +1700,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, > const char *uri = packfile_uris.items[i].string + > the_hash_algo->hexsz + 1; > > + display_progress(packfile_uri_progress, i+1);
display_progress(packfile_uri_progress, i + 1);
Show 11 quoted lines
> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh > index 2e1243ca40b0..8964a4003678 100755 > --- a/t/t5702-protocol-v2.sh > +++ b/t/t5702-protocol-v2.sh > @@ -851,7 +851,8 @@ test_expect_success 'part of packfile response provided as URI' ' > GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \ > git -c protocol.version=2 \ > -c fetch.uriprotocols=http,https \ > - clone "$HTTPD_URL/smart/http_parent" http_child && > + clone "$HTTPD_URL/smart/http_parent" http_child \ > + --progress 2>progress &&
Some existing tests use GIT_PROGRESS_DELAY to protect against an operation that is too quick to complete. Don't we need to do the same? If not, then perhaps we need to allow delaying the progress meter we add with this patch for "too quick" case, perhaps?
Show 7 quoted lines
> # Ensure that my-blob and other-blob are in separate packfiles. > for idx in http_child/.git/objects/pack/*.idx > @@ -875,6 +876,8 @@ test_expect_success 'part of packfile response provided as URI' ' > test -f hfound && > test -f h2found && > > + test_i18ngrep "Downloading packs" progress &&
Also, I am not sure with all the terminal control junk, 'grep' should be expected to reliably pick this substring in the output. Are we expecting any other output to the standard error stream? Some tests in t5318 seem to just see if the output is non-empty, and I am wondering if that is an approach more appropriate here (not rhetorical---I simply do not know the answer).
Show 5 quoted lines
> # Ensure that there are exactly 3 packfiles with associated .idx > ls http_child/.git/objects/pack/*.pack \ > http_child/.git/objects/pack/*.idx >filelist && > > base-commit: a5828ae6b52137b913b978e16cd2334482eb4c1f