From: "Albert Cui via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Albert Cui <albertqcui@gmail.com>, Albert Cui <albertqcui@gmail.com>
Subject: [PATCH] fetch: show progress for packfile uri downloads
Date: Wed, 17 Mar 2021 19:03:13 +0000 [thread overview]
Message-ID: <pull.907.git.1616007794513.gitgitgadget@gmail.com> (raw)
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.
Signed-off-by: Albert Cui <albertqcui@gmail.com>
---
fetch: show progress for packfile uri downloads
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.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-907%2Falbertcui%2Fprogress-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-907/albertcui/progress-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/907
fetch-pack.c | 8 ++++++++
t/t5702-protocol-v2.sh | 5 ++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/fetch-pack.c b/fetch-pack.c
index 6a61a464283e..5646d151293d 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -23,6 +23,7 @@
#include "fetch-negotiator.h"
#include "fsck.h"
#include "shallow.h"
+#include "progress.h"
static int transfer_unpack_limit = -1;
static int fetch_unpack_limit = -1;
@@ -1585,6 +1586,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
struct fetch_negotiator *negotiator;
int seen_ack = 0;
struct string_list packfile_uris = STRING_LIST_INIT_DUP;
+ struct progress *packfile_uri_progress;
int i;
struct strvec index_pack_args = STRVEC_INIT;
struct oidset gitmodules_oids = OIDSET_INIT;
@@ -1689,6 +1691,8 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
}
}
+ packfile_uri_progress = start_progress(_("Downloading packs"), packfile_uris.nr);
+
for (i = 0; i < packfile_uris.nr; i++) {
int j;
struct child_process cmd = CHILD_PROCESS_INIT;
@@ -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);
strvec_push(&cmd.args, "http-fetch");
strvec_pushf(&cmd.args, "--packfile=%.*s",
(int) the_hash_algo->hexsz,
@@ -1739,6 +1744,9 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
get_object_directory(),
packname));
}
+
+ stop_progress(&packfile_uri_progress);
+
string_list_clear(&packfile_uris, 0);
strvec_clear(&index_pack_args);
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 &&
# 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 &&
+
# 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
--
gitgitgadget
next reply other threads:[~2021-03-17 19:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 19:03 Albert Cui via GitGitGadget [this message]
2021-03-17 19:21 ` [PATCH] fetch: show progress for packfile uri downloads Jeff King
2021-03-17 19:31 ` Junio C Hamano
2021-04-09 22:44 ` [PATCH v2] " Albert Cui via GitGitGadget
2021-04-11 1:30 ` Junio C Hamano
2021-06-30 23:09 ` Jonathan Nieder
2021-04-10 8:31 ` [PATCH] " Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.907.git.1616007794513.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=albertqcui@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).