upload-pack: support define shallow boundary by excluding revisions
This should allow the user to say "create a shallow clone of this branch after version <some-tag>". Short refs are accepted and expanded at the server side with expand_ref() because we cannot expand (unknown) refs from the client side. Like deepen-since, deepen-not cannot be used with deepen. But deepen-not can be mixed with deepen-since. The result is exactly how you do the command "git rev-list --since=... --not ref". Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 12, 2016 at 17:54 UTC
269a7a831636b7c7a453f6621fc8b440ff28a408
3 files changed
+32
-3
Documentation/technical/pack-protocol.txt
+2
-1
@@ -220,7 +220,8 @@ out of what the server said it could do with the first 'want' line.
220
shallow-line = PKT-LINE("shallow" SP obj-id)
221
222
depth-request = PKT-LINE("deepen" SP depth) /
223
- PKT-LINE("deepen-since" SP timestamp)
223
+ PKT-LINE("deepen-since" SP timestamp) /
224
+ PKT-LINE("deepen-not" SP ref)
225
226
first-want = PKT-LINE("want" SP obj-id SP capability-list)
227
additional-want = PKT-LINE("want" SP obj-id)
Documentation/technical/protocol-capabilities.txt
+9
@@ -188,6 +188,15 @@ specific time, instead of depth. Internally it's equivalent of doing
188
"rev-list --max-age=<timestamp>" on the server side. "deepen-since"
189
cannot be used with "deepen".
190
191
+deepen-not
192
+----------
193
+
194
+This capability adds "deepen-not" command to fetch-pack/upload-pack
195
+protocol so the client can request shallow clones that are cut at a
196
+specific revision, instead of depth. Internally it's equivalent of
197
+doing "rev-list --not <rev>" on the server side. "deepen-not"
198
+cannot be used with "deepen", but can be used with "deepen-since".
199
+
200
no-progress
201
-----------
202
upload-pack.c
+21
-2
@@ -645,6 +645,7 @@ static void deepen_by_rev_list(int ac, const char **av,
645
static void receive_needs(void)
646
{
647
struct object_array shallows = OBJECT_ARRAY_INIT;
648
+ struct string_list deepen_not = STRING_LIST_INIT_DUP;
649
int depth = 0;
650
int has_non_tip = 0;
651
unsigned long deepen_since = 0;
@@ -695,6 +696,16 @@ static void receive_needs(void)
696
deepen_rev_list = 1;
697
continue;
698
}
699
+ if (skip_prefix(line, "deepen-not ", &arg)) {
700
+ char *ref = NULL;
701
+ unsigned char sha1[20];
702
+ if (expand_ref(arg, strlen(arg), sha1, &ref) != 1)
703
+ die("git upload-pack: ambiguous deepen-not: %s", line);
704
+ string_list_append(&deepen_not, ref);
705
+ free(ref);
706
+ deepen_rev_list = 1;
707
+ continue;
708
+ }
709
if (!skip_prefix(line, "want ", &arg) ||
710
get_sha1_hex(arg, sha1_buf))
711
die("git upload-pack: protocol error, "
@@ -749,7 +760,7 @@ static void receive_needs(void)
760
if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
761
return;
762
if (depth > 0 && deepen_rev_list)
752
- die("git upload-pack: deepen and deepen-since cannot be used together");
763
+ die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
764
if (depth > 0)
765
deepen(depth, &shallows);
766
else if (deepen_rev_list) {
@@ -759,6 +770,14 @@ static void receive_needs(void)
770
argv_array_push(&av, "rev-list");
771
if (deepen_since)
772
argv_array_pushf(&av, "--max-age=%lu", deepen_since);
773
+ if (deepen_not.nr) {
774
+ argv_array_push(&av, "--not");
775
+ for (i = 0; i < deepen_not.nr; i++) {
776
+ struct string_list_item *s = deepen_not.items + i;
777
+ argv_array_push(&av, s->string);
778
+ }
779
+ argv_array_push(&av, "--not");
780
+ }
781
for (i = 0; i < want_obj.nr; i++) {
782
struct object *o = want_obj.objects[i].item;
783
argv_array_push(&av, oid_to_hex(&o->oid));
@@ -814,7 +833,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
833
int flag, void *cb_data)
834
{
835
static const char *capabilities = "multi_ack thin-pack side-band"
817
- " side-band-64k ofs-delta shallow deepen-since no-progress"
836
+ " side-band-64k ofs-delta shallow deepen-since deepen-not no-progress"
837
" include-tag multi_ack_detailed";
838
const char *refname_nons = strip_namespace(refname);
839
struct object_id peeled;