undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-curl: show progress for fetches over dumb HTTP

Browse Source 
Fetching over dumb HTTP transport doesn't show any progress, even with
the option --progress.  If the connection is slow or there is a lot of
data to get then this can take a long time while the user is left to
wonder if git got stuck.

We don't know the number of objects to fetch at the outset, but we can
count the ones we got.  Show an open-ended progress indicator based on
that number if the user asked for it.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2020-03-03 21:55:34 +01:00 committed by Junio C Hamano
parent d0654dc308
commit 7655b4119d
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
remote-curl.c
View File

@ -1026,6 +1026,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
walker = get_http_walker(url.buf); walker = get_http_walker(url.buf);
walker->get_verbosely = options.verbosity >= 3; walker->get_verbosely = options.verbosity >= 3;
walker->get_progress = options.progress;
walker->get_recover = 0; walker->get_recover = 0;
ret = walker_fetch(walker, nr_heads, targets, NULL, NULL); ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);
walker_free(walker); walker_free(walker);

13
walker.c
View File

@ -8,6 +8,7 @@
#include "tag.h" #include "tag.h"
#include "blob.h" #include "blob.h"
#include "refs.h" #include "refs.h"
#include "progress.h"
static struct object_id current_commit_oid; static struct object_id current_commit_oid;
@ -162,6 +163,11 @@ static int process(struct walker *walker, struct object *obj)
static int loop(struct walker *walker) static int loop(struct walker *walker)
{ {
struct object_list *elem; struct object_list *elem;
struct progress *progress = NULL;
uint64_t nr = 0;
if (walker->get_progress)
progress = start_delayed_progress(_("Fetching objects"), 0);
while (process_queue) { while (process_queue) {
struct object *obj = process_queue->item; struct object *obj = process_queue->item;
@ -176,15 +182,20 @@ static int loop(struct walker *walker)
*/ */
if (! (obj->flags & TO_SCAN)) { if (! (obj->flags & TO_SCAN)) {
if (walker->fetch(walker, obj->oid.hash)) { if (walker->fetch(walker, obj->oid.hash)) {
stop_progress(&progress);
report_missing(obj); report_missing(obj);
return -1; return -1;
} }
} }
if (!obj->type) if (!obj->type)
parse_object(the_repository, &obj->oid); parse_object(the_repository, &obj->oid);
if (process_object(walker, obj)) if (process_object(walker, obj)) {
stop_progress(&progress);
return -1; return -1;
}
display_progress(progress, ++nr);
} }
stop_progress(&progress);
return 0; return 0;
} }

1
walker.h
View File

@ -10,6 +10,7 @@ struct walker {
int (*fetch)(struct walker *, unsigned char *sha1); int (*fetch)(struct walker *, unsigned char *sha1);
void (*cleanup)(struct walker *); void (*cleanup)(struct walker *);
int get_verbosely; int get_verbosely;
int get_progress;
int get_recover; int get_recover;
int corrupt_object_found; int corrupt_object_found;