diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-09-03 19:08:33 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-05 22:25:26 -0700 |
| commit | 6523078b96cd39f681e6fa11135049808591fb95 (patch) | |
| tree | 5bd0eb04eedd873db87c2fe67eecbdf7eb461200 /upload-pack.c | |
| parent | 86386829d425a3d3ae6ce713c58328607e50e523 (diff) | |
| download | git-6523078b96cd39f681e6fa11135049808591fb95.tar.gz git-6523078b96cd39f681e6fa11135049808591fb95.tar.xz | |
make shallow repository deepening more network efficient
First of all, I can't find any reason why thin pack generation is
explicitly disabled when dealing with a shallow repository. The
possible delta base objects are collected from the edge commits which
are always obtained through history walking with the same shallow refs
as the client, Therefore the client is always going to have those base
objects available. So let's remove that restriction.
Then we can make shallow repository deepening much more efficient by
using the remote's unshallowed commits as edge commits to get preferred
base objects for thin pack generation. On git.git, this makes the data
transfer for the deepening of a shallow repository from depth 1 to depth 2
around 134 KB instead of 3.68 MB.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index edc786122..7428ff715 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -31,6 +31,7 @@ static int use_thin_pack, use_ofs_delta, use_include_tag; static int no_progress; static struct object_array have_obj; static struct object_array want_obj; +static struct object_array extra_edge_obj; static unsigned int timeout; /* 0 for no sideband, * otherwise maximum packet size (up to 65520 bytes). @@ -136,6 +137,10 @@ static int do_rev_list(int fd, void *create_full_pack) if (prepare_revision_walk(&revs)) die("revision walk setup failed"); mark_edges_uninteresting(revs.commits, &revs, show_edge); + if (use_thin_pack) + for (i = 0; i < extra_edge_obj.nr; i++) + fprintf(pack_pipe, "-%s\n", sha1_to_hex( + extra_edge_obj.objects[i].item->sha1)); traverse_commit_list(&revs, show_commit, show_object, NULL); fflush(pack_pipe); fclose(pack_pipe); @@ -466,7 +471,6 @@ static void receive_needs(void) if (!prefixcmp(line, "shallow ")) { unsigned char sha1[20]; struct object *object; - use_thin_pack = 0; if (get_sha1(line + 8, sha1)) die("invalid shallow line: %s", line); object = parse_object(sha1); @@ -478,7 +482,6 @@ static void receive_needs(void) } if (!prefixcmp(line, "deepen ")) { char *end; - use_thin_pack = 0; depth = strtol(line + 7, &end, 0); if (end == line + 7 || depth <= 0) die("Invalid deepen: %s", line); @@ -556,6 +559,7 @@ static void receive_needs(void) NULL, &want_obj); parents = parents->next; } + add_object_array(object, NULL, &extra_edge_obj); } /* make sure commit traversal conforms to client */ register_shallow(object->sha1); |