]>
Commit | Line | Data |
---|---|---|
745f7a8c | 1 | #include "cache.h" |
a49d2834 | 2 | #include "repository.h" |
b2141fc1 | 3 | #include "config.h" |
697cc8ef | 4 | #include "lockfile.h" |
745f7a8c NTND |
5 | #include "refs.h" |
6 | #include "pkt-line.h" | |
7 | #include "commit.h" | |
8 | #include "tag.h" | |
d807c4a0 | 9 | #include "exec-cmd.h" |
745f7a8c NTND |
10 | #include "pack.h" |
11 | #include "sideband.h" | |
12 | #include "fetch-pack.h" | |
13 | #include "remote.h" | |
14 | #include "run-command.h" | |
47a59185 | 15 | #include "connect.h" |
745f7a8c NTND |
16 | #include "transport.h" |
17 | #include "version.h" | |
fe299ec5 | 18 | #include "oid-array.h" |
fdb69d33 | 19 | #include "oidset.h" |
0abe14f6 | 20 | #include "packfile.h" |
cbd53a21 | 21 | #include "object-store.h" |
cf1e7c07 | 22 | #include "connected.h" |
ec062838 | 23 | #include "fetch-negotiator.h" |
1362df0d | 24 | #include "fsck.h" |
120ad2b0 | 25 | #include "shallow.h" |
745f7a8c NTND |
26 | |
27 | static int transfer_unpack_limit = -1; | |
28 | static int fetch_unpack_limit = -1; | |
29 | static int unpack_limit = 100; | |
30 | static int prefer_ofs_delta = 1; | |
31 | static int no_done; | |
508ea882 | 32 | static int deepen_since_ok; |
a45a2600 | 33 | static int deepen_not_ok; |
745f7a8c NTND |
34 | static int fetch_fsck_objects = -1; |
35 | static int transfer_fsck_objects = -1; | |
36 | static int agent_supported; | |
640d8b72 | 37 | static int server_supports_filtering; |
cac4b8e2 | 38 | static struct shallow_lock shallow_lock; |
6035d6aa | 39 | static const char *alternate_shallow_file; |
1362df0d | 40 | static struct strbuf fsck_msg_types = STRBUF_INIT; |
745f7a8c | 41 | |
208acbfb | 42 | /* Remember to update object flag allocation in object.h */ |
745f7a8c | 43 | #define COMPLETE (1U << 0) |
ec062838 | 44 | #define ALTERNATE (1U << 1) |
745f7a8c NTND |
45 | |
46 | /* | |
47 | * After sending this many "have"s if we do not get any new ACK , we | |
48 | * give up traversing our history. | |
49 | */ | |
50 | #define MAX_IN_VAIN 256 | |
51 | ||
d30fe89c | 52 | static int multi_ack, use_sideband; |
7199c093 FM |
53 | /* Allow specifying sha1 if it is a ref tip. */ |
54 | #define ALLOW_TIP_SHA1 01 | |
68ee6289 FM |
55 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ |
56 | #define ALLOW_REACHABLE_SHA1 02 | |
7199c093 | 57 | static unsigned int allow_unadvertised_object_request; |
745f7a8c | 58 | |
0d789a5b NTND |
59 | __attribute__((format (printf, 2, 3))) |
60 | static inline void print_verbose(const struct fetch_pack_args *args, | |
61 | const char *fmt, ...) | |
62 | { | |
63 | va_list params; | |
64 | ||
65 | if (!args->verbose) | |
66 | return; | |
67 | ||
68 | va_start(params, fmt); | |
69 | vfprintf(stderr, fmt, params); | |
70 | va_end(params); | |
71 | fputc('\n', stderr); | |
72 | } | |
73 | ||
41a078c6 JK |
74 | struct alternate_object_cache { |
75 | struct object **items; | |
76 | size_t nr, alloc; | |
77 | }; | |
78 | ||
bdf4276c | 79 | static void cache_one_alternate(const struct object_id *oid, |
41a078c6 JK |
80 | void *vcache) |
81 | { | |
82 | struct alternate_object_cache *cache = vcache; | |
109cd76d | 83 | struct object *obj = parse_object(the_repository, oid); |
41a078c6 JK |
84 | |
85 | if (!obj || (obj->flags & ALTERNATE)) | |
86 | return; | |
87 | ||
88 | obj->flags |= ALTERNATE; | |
89 | ALLOC_GROW(cache->items, cache->nr + 1, cache->alloc); | |
90 | cache->items[cache->nr++] = obj; | |
91 | } | |
92 | ||
ec062838 JT |
93 | static void for_each_cached_alternate(struct fetch_negotiator *negotiator, |
94 | void (*cb)(struct fetch_negotiator *, | |
d30fe89c | 95 | struct object *)) |
41a078c6 JK |
96 | { |
97 | static int initialized; | |
98 | static struct alternate_object_cache cache; | |
99 | size_t i; | |
100 | ||
101 | if (!initialized) { | |
102 | for_each_alternate_ref(cache_one_alternate, &cache); | |
103 | initialized = 1; | |
104 | } | |
105 | ||
106 | for (i = 0; i < cache.nr; i++) | |
ec062838 | 107 | cb(negotiator, cache.items[i]); |
745f7a8c NTND |
108 | } |
109 | ||
ec062838 | 110 | static int rev_list_insert_ref(struct fetch_negotiator *negotiator, |
d30fe89c JT |
111 | const char *refname, |
112 | const struct object_id *oid) | |
745f7a8c | 113 | { |
a74093da SB |
114 | struct object *o = deref_tag(the_repository, |
115 | parse_object(the_repository, oid), | |
109cd76d | 116 | refname, 0); |
745f7a8c NTND |
117 | |
118 | if (o && o->type == OBJ_COMMIT) | |
ec062838 | 119 | negotiator->add_tip(negotiator, (struct commit *)o); |
745f7a8c NTND |
120 | |
121 | return 0; | |
122 | } | |
123 | ||
b1b49c6e MH |
124 | static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid, |
125 | int flag, void *cb_data) | |
745f7a8c | 126 | { |
d30fe89c | 127 | return rev_list_insert_ref(cb_data, refname, oid); |
745f7a8c NTND |
128 | } |
129 | ||
130 | enum ack_type { | |
131 | NAK = 0, | |
132 | ACK, | |
133 | ACK_continue, | |
134 | ACK_common, | |
135 | ACK_ready | |
136 | }; | |
137 | ||
01f9ec64 MS |
138 | static void consume_shallow_list(struct fetch_pack_args *args, |
139 | struct packet_reader *reader) | |
745f7a8c | 140 | { |
79891cb9 | 141 | if (args->stateless_rpc && args->deepen) { |
745f7a8c NTND |
142 | /* If we sent a depth we will get back "duplicate" |
143 | * shallow and unshallow commands every time there | |
144 | * is a block of have lines exchanged. | |
145 | */ | |
01f9ec64 MS |
146 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
147 | if (starts_with(reader->line, "shallow ")) | |
745f7a8c | 148 | continue; |
01f9ec64 | 149 | if (starts_with(reader->line, "unshallow ")) |
745f7a8c | 150 | continue; |
1dd73e20 | 151 | die(_("git fetch-pack: expected shallow list")); |
745f7a8c | 152 | } |
01f9ec64 MS |
153 | if (reader->status != PACKET_READ_FLUSH) |
154 | die(_("git fetch-pack: expected a flush packet after shallow list")); | |
745f7a8c NTND |
155 | } |
156 | } | |
157 | ||
01f9ec64 MS |
158 | static enum ack_type get_ack(struct packet_reader *reader, |
159 | struct object_id *result_oid) | |
745f7a8c | 160 | { |
74543a04 | 161 | int len; |
82e56767 | 162 | const char *arg; |
745f7a8c | 163 | |
01f9ec64 | 164 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
bc9d4dc5 | 165 | die(_("git fetch-pack: expected ACK/NAK, got a flush packet")); |
01f9ec64 MS |
166 | len = reader->pktlen; |
167 | ||
168 | if (!strcmp(reader->line, "NAK")) | |
745f7a8c | 169 | return NAK; |
01f9ec64 | 170 | if (skip_prefix(reader->line, "ACK ", &arg)) { |
f6af19a9 | 171 | const char *p; |
172 | if (!parse_oid_hex(arg, result_oid, &p)) { | |
173 | len -= p - reader->line; | |
82e56767 | 174 | if (len < 1) |
030e9dd6 | 175 | return ACK; |
f6af19a9 | 176 | if (strstr(p, "continue")) |
745f7a8c | 177 | return ACK_continue; |
f6af19a9 | 178 | if (strstr(p, "common")) |
745f7a8c | 179 | return ACK_common; |
f6af19a9 | 180 | if (strstr(p, "ready")) |
745f7a8c NTND |
181 | return ACK_ready; |
182 | return ACK; | |
183 | } | |
184 | } | |
01f9ec64 | 185 | die(_("git fetch-pack: expected ACK/NAK, got '%s'"), reader->line); |
745f7a8c NTND |
186 | } |
187 | ||
188 | static void send_request(struct fetch_pack_args *args, | |
189 | int fd, struct strbuf *buf) | |
190 | { | |
191 | if (args->stateless_rpc) { | |
192 | send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX); | |
193 | packet_flush(fd); | |
37c80012 JK |
194 | } else { |
195 | if (write_in_full(fd, buf->buf, buf->len) < 0) | |
196 | die_errno(_("unable to write to remote")); | |
197 | } | |
745f7a8c NTND |
198 | } |
199 | ||
ec062838 | 200 | static void insert_one_alternate_object(struct fetch_negotiator *negotiator, |
d30fe89c | 201 | struct object *obj) |
745f7a8c | 202 | { |
ec062838 | 203 | rev_list_insert_ref(negotiator, NULL, &obj->oid); |
745f7a8c NTND |
204 | } |
205 | ||
206 | #define INITIAL_FLUSH 16 | |
207 | #define PIPESAFE_FLUSH 32 | |
da470981 | 208 | #define LARGE_FLUSH 16384 |
745f7a8c | 209 | |
685fbd32 | 210 | static int next_flush(int stateless_rpc, int count) |
745f7a8c | 211 | { |
685fbd32 | 212 | if (stateless_rpc) { |
da470981 JT |
213 | if (count < LARGE_FLUSH) |
214 | count <<= 1; | |
215 | else | |
216 | count = count * 11 / 10; | |
217 | } else { | |
218 | if (count < PIPESAFE_FLUSH) | |
219 | count <<= 1; | |
220 | else | |
221 | count += PIPESAFE_FLUSH; | |
222 | } | |
745f7a8c NTND |
223 | return count; |
224 | } | |
225 | ||
3390e42a JT |
226 | static void mark_tips(struct fetch_negotiator *negotiator, |
227 | const struct oid_array *negotiation_tips) | |
228 | { | |
229 | int i; | |
230 | ||
231 | if (!negotiation_tips) { | |
232 | for_each_ref(rev_list_insert_ref_oid, negotiator); | |
233 | return; | |
234 | } | |
235 | ||
236 | for (i = 0; i < negotiation_tips->nr; i++) | |
237 | rev_list_insert_ref(negotiator, NULL, | |
238 | &negotiation_tips->oid[i]); | |
239 | return; | |
240 | } | |
241 | ||
ec062838 | 242 | static int find_common(struct fetch_negotiator *negotiator, |
d30fe89c | 243 | struct fetch_pack_args *args, |
1b283377 | 244 | int fd[2], struct object_id *result_oid, |
745f7a8c NTND |
245 | struct ref *refs) |
246 | { | |
247 | int fetching; | |
248 | int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval; | |
1b283377 | 249 | const struct object_id *oid; |
745f7a8c NTND |
250 | unsigned in_vain = 0; |
251 | int got_continue = 0; | |
252 | int got_ready = 0; | |
253 | struct strbuf req_buf = STRBUF_INIT; | |
254 | size_t state_len = 0; | |
01f9ec64 | 255 | struct packet_reader reader; |
745f7a8c NTND |
256 | |
257 | if (args->stateless_rpc && multi_ack == 1) | |
1dd73e20 | 258 | die(_("--stateless-rpc requires multi_ack_detailed")); |
745f7a8c | 259 | |
01f9ec64 | 260 | packet_reader_init(&reader, fd[0], NULL, 0, |
2d103c31 MS |
261 | PACKET_READ_CHOMP_NEWLINE | |
262 | PACKET_READ_DIE_ON_ERR_PACKET); | |
01f9ec64 | 263 | |
12f19a98 JT |
264 | if (!args->no_dependents) { |
265 | mark_tips(negotiator, args->negotiation_tips); | |
266 | for_each_cached_alternate(negotiator, insert_one_alternate_object); | |
267 | } | |
745f7a8c NTND |
268 | |
269 | fetching = 0; | |
270 | for ( ; refs ; refs = refs->next) { | |
1b283377 | 271 | struct object_id *remote = &refs->old_oid; |
745f7a8c NTND |
272 | const char *remote_hex; |
273 | struct object *o; | |
274 | ||
275 | /* | |
276 | * If that object is complete (i.e. it is an ancestor of a | |
277 | * local ref), we tell them we have it but do not have to | |
278 | * tell them about its ancestors, which they already know | |
279 | * about. | |
280 | * | |
281 | * We use lookup_object here because we are only | |
282 | * interested in the case we *know* the object is | |
283 | * reachable and we have already scanned it. | |
12f19a98 JT |
284 | * |
285 | * Do this only if args->no_dependents is false (if it is true, | |
286 | * we cannot trust the object flags). | |
745f7a8c | 287 | */ |
12f19a98 | 288 | if (!args->no_dependents && |
d0229abd | 289 | ((o = lookup_object(the_repository, remote)) != NULL) && |
745f7a8c NTND |
290 | (o->flags & COMPLETE)) { |
291 | continue; | |
292 | } | |
293 | ||
1b283377 | 294 | remote_hex = oid_to_hex(remote); |
745f7a8c NTND |
295 | if (!fetching) { |
296 | struct strbuf c = STRBUF_INIT; | |
297 | if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed"); | |
298 | if (multi_ack == 1) strbuf_addstr(&c, " multi_ack"); | |
299 | if (no_done) strbuf_addstr(&c, " no-done"); | |
300 | if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k"); | |
301 | if (use_sideband == 1) strbuf_addstr(&c, " side-band"); | |
cccf74e2 | 302 | if (args->deepen_relative) strbuf_addstr(&c, " deepen-relative"); |
745f7a8c NTND |
303 | if (args->use_thin_pack) strbuf_addstr(&c, " thin-pack"); |
304 | if (args->no_progress) strbuf_addstr(&c, " no-progress"); | |
305 | if (args->include_tag) strbuf_addstr(&c, " include-tag"); | |
306 | if (prefer_ofs_delta) strbuf_addstr(&c, " ofs-delta"); | |
508ea882 | 307 | if (deepen_since_ok) strbuf_addstr(&c, " deepen-since"); |
a45a2600 | 308 | if (deepen_not_ok) strbuf_addstr(&c, " deepen-not"); |
745f7a8c NTND |
309 | if (agent_supported) strbuf_addf(&c, " agent=%s", |
310 | git_user_agent_sanitized()); | |
640d8b72 JH |
311 | if (args->filter_options.choice) |
312 | strbuf_addstr(&c, " filter"); | |
745f7a8c NTND |
313 | packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf); |
314 | strbuf_release(&c); | |
315 | } else | |
316 | packet_buf_write(&req_buf, "want %s\n", remote_hex); | |
317 | fetching++; | |
318 | } | |
319 | ||
320 | if (!fetching) { | |
321 | strbuf_release(&req_buf); | |
322 | packet_flush(fd[1]); | |
323 | return 1; | |
324 | } | |
325 | ||
c8813487 | 326 | if (is_repository_shallow(the_repository)) |
1a30f5a2 | 327 | write_shallow_commits(&req_buf, 1, NULL); |
745f7a8c NTND |
328 | if (args->depth > 0) |
329 | packet_buf_write(&req_buf, "deepen %d", args->depth); | |
508ea882 | 330 | if (args->deepen_since) { |
dddbad72 | 331 | timestamp_t max_age = approxidate(args->deepen_since); |
cb71f8bd | 332 | packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age); |
508ea882 | 333 | } |
a45a2600 NTND |
334 | if (args->deepen_not) { |
335 | int i; | |
336 | for (i = 0; i < args->deepen_not->nr; i++) { | |
337 | struct string_list_item *s = args->deepen_not->items + i; | |
338 | packet_buf_write(&req_buf, "deepen-not %s", s->string); | |
339 | } | |
340 | } | |
87c2d9d3 | 341 | if (server_supports_filtering && args->filter_options.choice) { |
cf9ceb5a MD |
342 | const char *spec = |
343 | expand_list_objects_filter_spec(&args->filter_options); | |
344 | packet_buf_write(&req_buf, "filter %s", spec); | |
87c2d9d3 | 345 | } |
745f7a8c NTND |
346 | packet_buf_flush(&req_buf); |
347 | state_len = req_buf.len; | |
348 | ||
79891cb9 | 349 | if (args->deepen) { |
ae021d87 | 350 | const char *arg; |
1b283377 | 351 | struct object_id oid; |
745f7a8c NTND |
352 | |
353 | send_request(args, fd[1], &req_buf); | |
01f9ec64 MS |
354 | while (packet_reader_read(&reader) == PACKET_READ_NORMAL) { |
355 | if (skip_prefix(reader.line, "shallow ", &arg)) { | |
1b283377 | 356 | if (get_oid_hex(arg, &oid)) |
01f9ec64 | 357 | die(_("invalid shallow line: %s"), reader.line); |
19143f13 | 358 | register_shallow(the_repository, &oid); |
745f7a8c NTND |
359 | continue; |
360 | } | |
01f9ec64 | 361 | if (skip_prefix(reader.line, "unshallow ", &arg)) { |
1b283377 | 362 | if (get_oid_hex(arg, &oid)) |
01f9ec64 | 363 | die(_("invalid unshallow line: %s"), reader.line); |
d0229abd | 364 | if (!lookup_object(the_repository, &oid)) |
01f9ec64 | 365 | die(_("object not found: %s"), reader.line); |
745f7a8c | 366 | /* make sure that it is parsed as shallow */ |
109cd76d | 367 | if (!parse_object(the_repository, &oid)) |
01f9ec64 | 368 | die(_("error in object: %s"), reader.line); |
e92b848c | 369 | if (unregister_shallow(&oid)) |
01f9ec64 | 370 | die(_("no shallow found: %s"), reader.line); |
745f7a8c NTND |
371 | continue; |
372 | } | |
01f9ec64 | 373 | die(_("expected shallow/unshallow, got %s"), reader.line); |
745f7a8c NTND |
374 | } |
375 | } else if (!args->stateless_rpc) | |
376 | send_request(args, fd[1], &req_buf); | |
377 | ||
378 | if (!args->stateless_rpc) { | |
379 | /* If we aren't using the stateless-rpc interface | |
380 | * we don't need to retain the headers. | |
381 | */ | |
382 | strbuf_setlen(&req_buf, 0); | |
383 | state_len = 0; | |
384 | } | |
385 | ||
5fc31180 | 386 | trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository); |
745f7a8c NTND |
387 | flushes = 0; |
388 | retval = -1; | |
88e2f9ed JT |
389 | if (args->no_dependents) |
390 | goto done; | |
ec062838 | 391 | while ((oid = negotiator->next(negotiator))) { |
1b283377 | 392 | packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid)); |
393 | print_verbose(args, "have %s", oid_to_hex(oid)); | |
745f7a8c NTND |
394 | in_vain++; |
395 | if (flush_at <= ++count) { | |
396 | int ack; | |
397 | ||
398 | packet_buf_flush(&req_buf); | |
399 | send_request(args, fd[1], &req_buf); | |
400 | strbuf_setlen(&req_buf, state_len); | |
401 | flushes++; | |
685fbd32 | 402 | flush_at = next_flush(args->stateless_rpc, count); |
745f7a8c NTND |
403 | |
404 | /* | |
405 | * We keep one window "ahead" of the other side, and | |
406 | * will wait for an ACK only on the next one | |
407 | */ | |
408 | if (!args->stateless_rpc && count == INITIAL_FLUSH) | |
409 | continue; | |
410 | ||
01f9ec64 | 411 | consume_shallow_list(args, &reader); |
745f7a8c | 412 | do { |
01f9ec64 | 413 | ack = get_ack(&reader, result_oid); |
0d789a5b | 414 | if (ack) |
1dd73e20 | 415 | print_verbose(args, _("got %s %d %s"), "ack", |
1b283377 | 416 | ack, oid_to_hex(result_oid)); |
745f7a8c NTND |
417 | switch (ack) { |
418 | case ACK: | |
419 | flushes = 0; | |
420 | multi_ack = 0; | |
421 | retval = 0; | |
422 | goto done; | |
423 | case ACK_common: | |
424 | case ACK_ready: | |
425 | case ACK_continue: { | |
426 | struct commit *commit = | |
c1f5eb49 SB |
427 | lookup_commit(the_repository, |
428 | result_oid); | |
d093bc75 | 429 | int was_common; |
3a2a1dc1 | 430 | |
745f7a8c | 431 | if (!commit) |
1b283377 | 432 | die(_("invalid commit %s"), oid_to_hex(result_oid)); |
ec062838 | 433 | was_common = negotiator->ack(negotiator, commit); |
745f7a8c NTND |
434 | if (args->stateless_rpc |
435 | && ack == ACK_common | |
d093bc75 | 436 | && !was_common) { |
745f7a8c NTND |
437 | /* We need to replay the have for this object |
438 | * on the next RPC request so the peer knows | |
439 | * it is in common with us. | |
440 | */ | |
1b283377 | 441 | const char *hex = oid_to_hex(result_oid); |
745f7a8c NTND |
442 | packet_buf_write(&req_buf, "have %s\n", hex); |
443 | state_len = req_buf.len; | |
06b3d386 JT |
444 | /* |
445 | * Reset in_vain because an ack | |
446 | * for this commit has not been | |
447 | * seen. | |
448 | */ | |
449 | in_vain = 0; | |
450 | } else if (!args->stateless_rpc | |
451 | || ack != ACK_common) | |
452 | in_vain = 0; | |
745f7a8c | 453 | retval = 0; |
745f7a8c | 454 | got_continue = 1; |
21bcf6e4 | 455 | if (ack == ACK_ready) |
745f7a8c | 456 | got_ready = 1; |
745f7a8c NTND |
457 | break; |
458 | } | |
459 | } | |
460 | } while (ack); | |
461 | flushes--; | |
462 | if (got_continue && MAX_IN_VAIN < in_vain) { | |
1dd73e20 | 463 | print_verbose(args, _("giving up")); |
745f7a8c NTND |
464 | break; /* give up */ |
465 | } | |
21bcf6e4 JT |
466 | if (got_ready) |
467 | break; | |
745f7a8c NTND |
468 | } |
469 | } | |
470 | done: | |
5fc31180 | 471 | trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository); |
745f7a8c NTND |
472 | if (!got_ready || !no_done) { |
473 | packet_buf_write(&req_buf, "done\n"); | |
474 | send_request(args, fd[1], &req_buf); | |
475 | } | |
1dd73e20 | 476 | print_verbose(args, _("done")); |
745f7a8c NTND |
477 | if (retval != 0) { |
478 | multi_ack = 0; | |
479 | flushes++; | |
480 | } | |
481 | strbuf_release(&req_buf); | |
482 | ||
ff62eca7 | 483 | if (!got_ready || !no_done) |
01f9ec64 | 484 | consume_shallow_list(args, &reader); |
745f7a8c | 485 | while (flushes || multi_ack) { |
01f9ec64 | 486 | int ack = get_ack(&reader, result_oid); |
745f7a8c | 487 | if (ack) { |
1dd73e20 | 488 | print_verbose(args, _("got %s (%d) %s"), "ack", |
1b283377 | 489 | ack, oid_to_hex(result_oid)); |
745f7a8c NTND |
490 | if (ack == ACK) |
491 | return 0; | |
492 | multi_ack = 1; | |
493 | continue; | |
494 | } | |
495 | flushes--; | |
496 | } | |
497 | /* it is no error to fetch into a completely empty repo */ | |
498 | return count ? retval : 0; | |
499 | } | |
500 | ||
501 | static struct commit_list *complete; | |
502 | ||
1b283377 | 503 | static int mark_complete(const struct object_id *oid) |
745f7a8c | 504 | { |
109cd76d | 505 | struct object *o = parse_object(the_repository, oid); |
745f7a8c NTND |
506 | |
507 | while (o && o->type == OBJ_TAG) { | |
508 | struct tag *t = (struct tag *) o; | |
509 | if (!t->tagged) | |
510 | break; /* broken repository */ | |
511 | o->flags |= COMPLETE; | |
109cd76d | 512 | o = parse_object(the_repository, &t->tagged->oid); |
745f7a8c NTND |
513 | } |
514 | if (o && o->type == OBJ_COMMIT) { | |
515 | struct commit *commit = (struct commit *)o; | |
516 | if (!(commit->object.flags & COMPLETE)) { | |
517 | commit->object.flags |= COMPLETE; | |
16445242 | 518 | commit_list_insert(commit, &complete); |
745f7a8c NTND |
519 | } |
520 | } | |
521 | return 0; | |
522 | } | |
523 | ||
f8ee4d85 MH |
524 | static int mark_complete_oid(const char *refname, const struct object_id *oid, |
525 | int flag, void *cb_data) | |
526 | { | |
1b283377 | 527 | return mark_complete(oid); |
f8ee4d85 MH |
528 | } |
529 | ||
745f7a8c | 530 | static void mark_recent_complete_commits(struct fetch_pack_args *args, |
dddbad72 | 531 | timestamp_t cutoff) |
745f7a8c NTND |
532 | { |
533 | while (complete && cutoff <= complete->item->date) { | |
1dd73e20 | 534 | print_verbose(args, _("Marking %s as complete"), |
0d789a5b | 535 | oid_to_hex(&complete->item->object.oid)); |
745f7a8c NTND |
536 | pop_most_recent_commit(&complete, COMPLETE); |
537 | } | |
538 | } | |
539 | ||
fdb69d33 JT |
540 | static void add_refs_to_oidset(struct oidset *oids, struct ref *refs) |
541 | { | |
542 | for (; refs; refs = refs->next) | |
543 | oidset_insert(oids, &refs->old_oid); | |
544 | } | |
545 | ||
bf73282c RS |
546 | static int is_unmatched_ref(const struct ref *ref) |
547 | { | |
548 | struct object_id oid; | |
549 | const char *p; | |
550 | return ref->match_status == REF_NOT_MATCHED && | |
551 | !parse_oid_hex(ref->name, &oid, &p) && | |
552 | *p == '\0' && | |
553 | oideq(&oid, &ref->old_oid); | |
554 | } | |
555 | ||
745f7a8c | 556 | static void filter_refs(struct fetch_pack_args *args, |
f2db854d JH |
557 | struct ref **refs, |
558 | struct ref **sought, int nr_sought) | |
745f7a8c NTND |
559 | { |
560 | struct ref *newlist = NULL; | |
561 | struct ref **newtail = &newlist; | |
fdb69d33 | 562 | struct ref *unmatched = NULL; |
745f7a8c | 563 | struct ref *ref, *next; |
fdb69d33 | 564 | struct oidset tip_oids = OIDSET_INIT; |
f2db854d | 565 | int i; |
22a16465 RS |
566 | int strict = !(allow_unadvertised_object_request & |
567 | (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); | |
745f7a8c | 568 | |
f2db854d | 569 | i = 0; |
745f7a8c NTND |
570 | for (ref = *refs; ref; ref = next) { |
571 | int keep = 0; | |
572 | next = ref->next; | |
f2db854d | 573 | |
50e19a83 | 574 | if (starts_with(ref->name, "refs/") && |
34066f06 JK |
575 | check_refname_format(ref->name, 0)) { |
576 | /* | |
577 | * trash or a peeled value; do not even add it to | |
578 | * unmatched list | |
579 | */ | |
580 | free_one_ref(ref); | |
581 | continue; | |
582 | } else { | |
f2db854d JH |
583 | while (i < nr_sought) { |
584 | int cmp = strcmp(ref->name, sought[i]->name); | |
745f7a8c NTND |
585 | if (cmp < 0) |
586 | break; /* definitely do not have it */ | |
587 | else if (cmp == 0) { | |
588 | keep = 1; /* definitely have it */ | |
d56583de | 589 | sought[i]->match_status = REF_MATCHED; |
745f7a8c | 590 | } |
f2db854d | 591 | i++; |
745f7a8c | 592 | } |
745f7a8c | 593 | |
e9502c0a JK |
594 | if (!keep && args->fetch_all && |
595 | (!args->deepen || !starts_with(ref->name, "refs/tags/"))) | |
596 | keep = 1; | |
597 | } | |
745f7a8c NTND |
598 | |
599 | if (keep) { | |
600 | *newtail = ref; | |
601 | ref->next = NULL; | |
602 | newtail = &ref->next; | |
603 | } else { | |
fdb69d33 JT |
604 | ref->next = unmatched; |
605 | unmatched = ref; | |
745f7a8c NTND |
606 | } |
607 | } | |
608 | ||
22a16465 RS |
609 | if (strict) { |
610 | for (i = 0; i < nr_sought; i++) { | |
611 | ref = sought[i]; | |
612 | if (!is_unmatched_ref(ref)) | |
613 | continue; | |
614 | ||
615 | add_refs_to_oidset(&tip_oids, unmatched); | |
616 | add_refs_to_oidset(&tip_oids, newlist); | |
617 | break; | |
618 | } | |
619 | } | |
620 | ||
6e7b66ee | 621 | /* Append unmatched requests to the list */ |
d56583de | 622 | for (i = 0; i < nr_sought; i++) { |
d56583de | 623 | ref = sought[i]; |
bf73282c | 624 | if (!is_unmatched_ref(ref)) |
d56583de | 625 | continue; |
6e7b66ee | 626 | |
22a16465 | 627 | if (!strict || oidset_contains(&tip_oids, &ref->old_oid)) { |
d56583de | 628 | ref->match_status = REF_MATCHED; |
c3c17bf1 JK |
629 | *newtail = copy_ref(ref); |
630 | newtail = &(*newtail)->next; | |
d56583de MM |
631 | } else { |
632 | ref->match_status = REF_UNADVERTISED_NOT_ALLOWED; | |
6e7b66ee JH |
633 | } |
634 | } | |
fdb69d33 JT |
635 | |
636 | oidset_clear(&tip_oids); | |
259eddde | 637 | free_refs(unmatched); |
fdb69d33 | 638 | |
745f7a8c NTND |
639 | *refs = newlist; |
640 | } | |
641 | ||
ec062838 | 642 | static void mark_alternate_complete(struct fetch_negotiator *unused, |
d30fe89c | 643 | struct object *obj) |
745f7a8c | 644 | { |
1b283377 | 645 | mark_complete(&obj->oid); |
745f7a8c NTND |
646 | } |
647 | ||
024aa469 TI |
648 | struct loose_object_iter { |
649 | struct oidset *loose_object_set; | |
650 | struct ref *refs; | |
651 | }; | |
652 | ||
34c29034 JT |
653 | /* |
654 | * Mark recent commits available locally and reachable from a local ref as | |
655 | * COMPLETE. If args->no_dependents is false, also mark COMPLETE remote refs as | |
656 | * COMMON_REF (otherwise, we are not planning to participate in negotiation, and | |
657 | * thus do not need COMMON_REF marks). | |
658 | * | |
659 | * The cutoff time for recency is determined by this heuristic: it is the | |
660 | * earliest commit time of the objects in refs that are commits and that we know | |
661 | * the commit time of. | |
662 | */ | |
ec062838 | 663 | static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, |
d30fe89c | 664 | struct fetch_pack_args *args, |
34c29034 | 665 | struct ref **refs) |
745f7a8c NTND |
666 | { |
667 | struct ref *ref; | |
a1c6d7c1 | 668 | int old_save_commit_buffer = save_commit_buffer; |
dddbad72 | 669 | timestamp_t cutoff = 0; |
745f7a8c NTND |
670 | |
671 | save_commit_buffer = 0; | |
672 | ||
9e5afdf9 | 673 | trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); |
745f7a8c NTND |
674 | for (ref = *refs; ref; ref = ref->next) { |
675 | struct object *o; | |
676 | ||
97b2fa08 | 677 | if (!has_object_file_with_flags(&ref->old_oid, |
6462d5eb JT |
678 | OBJECT_INFO_QUICK | |
679 | OBJECT_INFO_SKIP_FETCH_OBJECT)) | |
024aa469 | 680 | continue; |
109cd76d | 681 | o = parse_object(the_repository, &ref->old_oid); |
745f7a8c NTND |
682 | if (!o) |
683 | continue; | |
684 | ||
9e5afdf9 EC |
685 | /* |
686 | * We already have it -- which may mean that we were | |
745f7a8c NTND |
687 | * in sync with the other side at some time after |
688 | * that (it is OK if we guess wrong here). | |
689 | */ | |
690 | if (o->type == OBJ_COMMIT) { | |
691 | struct commit *commit = (struct commit *)o; | |
692 | if (!cutoff || cutoff < commit->date) | |
693 | cutoff = commit->date; | |
694 | } | |
695 | } | |
9e5afdf9 | 696 | trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); |
745f7a8c | 697 | |
9e5afdf9 EC |
698 | /* |
699 | * This block marks all local refs as COMPLETE, and then recursively marks all | |
700 | * parents of those refs as COMPLETE. | |
701 | */ | |
702 | trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL); | |
12f19a98 JT |
703 | if (!args->deepen) { |
704 | for_each_ref(mark_complete_oid, NULL); | |
705 | for_each_cached_alternate(NULL, mark_alternate_complete); | |
706 | commit_list_sort_by_date(&complete); | |
707 | if (cutoff) | |
708 | mark_recent_complete_commits(args, cutoff); | |
709 | } | |
9e5afdf9 | 710 | trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL); |
745f7a8c | 711 | |
12f19a98 JT |
712 | /* |
713 | * Mark all complete remote refs as common refs. | |
714 | * Don't mark them common yet; the server has to be told so first. | |
715 | */ | |
9e5afdf9 | 716 | trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL); |
12f19a98 JT |
717 | for (ref = *refs; ref; ref = ref->next) { |
718 | struct object *o = deref_tag(the_repository, | |
719 | lookup_object(the_repository, | |
d0229abd | 720 | &ref->old_oid), |
12f19a98 | 721 | NULL, 0); |
745f7a8c | 722 | |
12f19a98 JT |
723 | if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) |
724 | continue; | |
745f7a8c | 725 | |
12f19a98 JT |
726 | negotiator->known_common(negotiator, |
727 | (struct commit *)o); | |
745f7a8c | 728 | } |
9e5afdf9 | 729 | trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL); |
745f7a8c | 730 | |
34c29034 JT |
731 | save_commit_buffer = old_save_commit_buffer; |
732 | } | |
733 | ||
734 | /* | |
735 | * Returns 1 if every object pointed to by the given remote refs is available | |
736 | * locally and reachable from a local ref, and 0 otherwise. | |
737 | */ | |
738 | static int everything_local(struct fetch_pack_args *args, | |
739 | struct ref **refs) | |
740 | { | |
741 | struct ref *ref; | |
742 | int retval; | |
745f7a8c NTND |
743 | |
744 | for (retval = 1, ref = *refs; ref ; ref = ref->next) { | |
1b283377 | 745 | const struct object_id *remote = &ref->old_oid; |
745f7a8c NTND |
746 | struct object *o; |
747 | ||
d0229abd | 748 | o = lookup_object(the_repository, remote); |
745f7a8c NTND |
749 | if (!o || !(o->flags & COMPLETE)) { |
750 | retval = 0; | |
1b283377 | 751 | print_verbose(args, "want %s (%s)", oid_to_hex(remote), |
0d789a5b | 752 | ref->name); |
745f7a8c NTND |
753 | continue; |
754 | } | |
1b283377 | 755 | print_verbose(args, _("already have %s (%s)"), oid_to_hex(remote), |
0d789a5b | 756 | ref->name); |
745f7a8c | 757 | } |
a1c6d7c1 | 758 | |
745f7a8c NTND |
759 | return retval; |
760 | } | |
761 | ||
762 | static int sideband_demux(int in, int out, void *data) | |
763 | { | |
764 | int *xd = data; | |
9ff18faf | 765 | int ret; |
745f7a8c | 766 | |
9ff18faf | 767 | ret = recv_sideband("fetch-pack", xd[0], out); |
745f7a8c NTND |
768 | close(out); |
769 | return ret; | |
770 | } | |
771 | ||
5374a290 JT |
772 | static void write_promisor_file(const char *keep_name, |
773 | struct ref **sought, int nr_sought) | |
774 | { | |
775 | struct strbuf promisor_name = STRBUF_INIT; | |
776 | int suffix_stripped; | |
777 | FILE *output; | |
778 | int i; | |
779 | ||
780 | strbuf_addstr(&promisor_name, keep_name); | |
781 | suffix_stripped = strbuf_strip_suffix(&promisor_name, ".keep"); | |
782 | if (!suffix_stripped) | |
783 | BUG("name of pack lockfile should end with .keep (was '%s')", | |
784 | keep_name); | |
785 | strbuf_addstr(&promisor_name, ".promisor"); | |
786 | ||
787 | output = xfopen(promisor_name.buf, "w"); | |
788 | for (i = 0; i < nr_sought; i++) | |
789 | fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid), | |
790 | sought[i]->name); | |
791 | fclose(output); | |
792 | ||
793 | strbuf_release(&promisor_name); | |
794 | } | |
795 | ||
745f7a8c | 796 | static int get_pack(struct fetch_pack_args *args, |
5374a290 JT |
797 | int xd[2], char **pack_lockfile, |
798 | struct ref **sought, int nr_sought) | |
745f7a8c NTND |
799 | { |
800 | struct async demux; | |
745f7a8c | 801 | int do_keep = args->keep_pack; |
984a43b9 JK |
802 | const char *cmd_name; |
803 | struct pack_header header; | |
804 | int pass_header = 0; | |
d3180279 | 805 | struct child_process cmd = CHILD_PROCESS_INIT; |
c6807a40 | 806 | int ret; |
745f7a8c NTND |
807 | |
808 | memset(&demux, 0, sizeof(demux)); | |
809 | if (use_sideband) { | |
810 | /* xd[] is talking with upload-pack; subprocess reads from | |
811 | * xd[0], spits out band#2 to stderr, and feeds us band#1 | |
812 | * through demux->out. | |
813 | */ | |
814 | demux.proc = sideband_demux; | |
815 | demux.data = xd; | |
816 | demux.out = -1; | |
df857572 | 817 | demux.isolate_sigpipe = 1; |
745f7a8c | 818 | if (start_async(&demux)) |
1dd73e20 | 819 | die(_("fetch-pack: unable to fork off sideband demultiplexer")); |
745f7a8c NTND |
820 | } |
821 | else | |
822 | demux.out = xd[0]; | |
823 | ||
745f7a8c | 824 | if (!args->keep_pack && unpack_limit) { |
745f7a8c NTND |
825 | |
826 | if (read_pack_header(demux.out, &header)) | |
1dd73e20 | 827 | die(_("protocol error: bad pack header")); |
984a43b9 | 828 | pass_header = 1; |
745f7a8c NTND |
829 | if (ntohl(header.hdr_entries) < unpack_limit) |
830 | do_keep = 0; | |
831 | else | |
832 | do_keep = 1; | |
833 | } | |
834 | ||
6035d6aa | 835 | if (alternate_shallow_file) { |
984a43b9 JK |
836 | argv_array_push(&cmd.args, "--shallow-file"); |
837 | argv_array_push(&cmd.args, alternate_shallow_file); | |
6035d6aa NTND |
838 | } |
839 | ||
88e2f9ed | 840 | if (do_keep || args->from_promisor) { |
745f7a8c NTND |
841 | if (pack_lockfile) |
842 | cmd.out = -1; | |
984a43b9 JK |
843 | cmd_name = "index-pack"; |
844 | argv_array_push(&cmd.args, cmd_name); | |
845 | argv_array_push(&cmd.args, "--stdin"); | |
745f7a8c | 846 | if (!args->quiet && !args->no_progress) |
984a43b9 | 847 | argv_array_push(&cmd.args, "-v"); |
745f7a8c | 848 | if (args->use_thin_pack) |
984a43b9 | 849 | argv_array_push(&cmd.args, "--fix-thin"); |
88e2f9ed | 850 | if (do_keep && (args->lock_pack || unpack_limit)) { |
da25bdb7 | 851 | char hostname[HOST_NAME_MAX + 1]; |
5781a9a2 | 852 | if (xgethostname(hostname, sizeof(hostname))) |
984a43b9 JK |
853 | xsnprintf(hostname, sizeof(hostname), "localhost"); |
854 | argv_array_pushf(&cmd.args, | |
855 | "--keep=fetch-pack %"PRIuMAX " on %s", | |
856 | (uintmax_t)getpid(), hostname); | |
745f7a8c | 857 | } |
c6807a40 | 858 | if (args->check_self_contained_and_connected) |
984a43b9 | 859 | argv_array_push(&cmd.args, "--check-self-contained-and-connected"); |
5374a290 JT |
860 | /* |
861 | * If we're obtaining the filename of a lockfile, we'll use | |
862 | * that filename to write a .promisor file with more | |
863 | * information below. If not, we need index-pack to do it for | |
864 | * us. | |
865 | */ | |
866 | if (!(do_keep && pack_lockfile) && args->from_promisor) | |
88e2f9ed | 867 | argv_array_push(&cmd.args, "--promisor"); |
745f7a8c NTND |
868 | } |
869 | else { | |
984a43b9 JK |
870 | cmd_name = "unpack-objects"; |
871 | argv_array_push(&cmd.args, cmd_name); | |
745f7a8c | 872 | if (args->quiet || args->no_progress) |
984a43b9 | 873 | argv_array_push(&cmd.args, "-q"); |
c6807a40 | 874 | args->check_self_contained_and_connected = 0; |
745f7a8c | 875 | } |
984a43b9 JK |
876 | |
877 | if (pass_header) | |
878 | argv_array_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32, | |
879 | ntohl(header.hdr_version), | |
880 | ntohl(header.hdr_entries)); | |
745f7a8c NTND |
881 | if (fetch_fsck_objects >= 0 |
882 | ? fetch_fsck_objects | |
883 | : transfer_fsck_objects >= 0 | |
884 | ? transfer_fsck_objects | |
98a2ea46 JT |
885 | : 0) { |
886 | if (args->from_promisor) | |
887 | /* | |
888 | * We cannot use --strict in index-pack because it | |
889 | * checks both broken objects and links, but we only | |
890 | * want to check for broken objects. | |
891 | */ | |
892 | argv_array_push(&cmd.args, "--fsck-objects"); | |
893 | else | |
1362df0d ÆAB |
894 | argv_array_pushf(&cmd.args, "--strict%s", |
895 | fsck_msg_types.buf); | |
98a2ea46 | 896 | } |
745f7a8c NTND |
897 | |
898 | cmd.in = demux.out; | |
899 | cmd.git_cmd = 1; | |
900 | if (start_command(&cmd)) | |
1dd73e20 | 901 | die(_("fetch-pack: unable to fork off %s"), cmd_name); |
745f7a8c NTND |
902 | if (do_keep && pack_lockfile) { |
903 | *pack_lockfile = index_pack_lockfile(cmd.out); | |
904 | close(cmd.out); | |
905 | } | |
906 | ||
37cb1dd6 JL |
907 | if (!use_sideband) |
908 | /* Closed by start_command() */ | |
909 | xd[0] = -1; | |
910 | ||
c6807a40 NTND |
911 | ret = finish_command(&cmd); |
912 | if (!ret || (args->check_self_contained_and_connected && ret == 1)) | |
913 | args->self_contained_and_connected = | |
914 | args->check_self_contained_and_connected && | |
915 | ret == 0; | |
916 | else | |
1dd73e20 | 917 | die(_("%s failed"), cmd_name); |
745f7a8c | 918 | if (use_sideband && finish_async(&demux)) |
1dd73e20 | 919 | die(_("error in sideband demultiplexer")); |
5374a290 JT |
920 | |
921 | /* | |
922 | * Now that index-pack has succeeded, write the promisor file using the | |
923 | * obtained .keep filename if necessary | |
924 | */ | |
925 | if (do_keep && pack_lockfile && args->from_promisor) | |
926 | write_promisor_file(*pack_lockfile, sought, nr_sought); | |
927 | ||
745f7a8c NTND |
928 | return 0; |
929 | } | |
930 | ||
f2db854d JH |
931 | static int cmp_ref_by_name(const void *a_, const void *b_) |
932 | { | |
933 | const struct ref *a = *((const struct ref **)a_); | |
934 | const struct ref *b = *((const struct ref **)b_); | |
935 | return strcmp(a->name, b->name); | |
936 | } | |
937 | ||
745f7a8c NTND |
938 | static struct ref *do_fetch_pack(struct fetch_pack_args *args, |
939 | int fd[2], | |
940 | const struct ref *orig_ref, | |
f2db854d | 941 | struct ref **sought, int nr_sought, |
beea4152 | 942 | struct shallow_info *si, |
745f7a8c NTND |
943 | char **pack_lockfile) |
944 | { | |
aaf633c2 | 945 | struct repository *r = the_repository; |
745f7a8c | 946 | struct ref *ref = copy_ref_list(orig_ref); |
1b283377 | 947 | struct object_id oid; |
745f7a8c NTND |
948 | const char *agent_feature; |
949 | int agent_len; | |
603960b5 JT |
950 | struct fetch_negotiator negotiator_alloc; |
951 | struct fetch_negotiator *negotiator; | |
952 | ||
953 | if (args->no_dependents) { | |
954 | negotiator = NULL; | |
955 | } else { | |
956 | negotiator = &negotiator_alloc; | |
957 | fetch_negotiator_init(r, negotiator); | |
958 | } | |
745f7a8c NTND |
959 | |
960 | sort_ref_list(&ref, ref_compare_name); | |
9ed0d8d6 | 961 | QSORT(sought, nr_sought, cmp_ref_by_name); |
745f7a8c | 962 | |
0e042971 NTND |
963 | if ((agent_feature = server_feature_value("agent", &agent_len))) { |
964 | agent_supported = 1; | |
965 | if (agent_len) | |
966 | print_verbose(args, _("Server version is %.*s"), | |
967 | agent_len, agent_feature); | |
968 | } | |
969 | ||
5a88583b NTND |
970 | if (server_supports("shallow")) |
971 | print_verbose(args, _("Server supports %s"), "shallow"); | |
aaf633c2 | 972 | else if (args->depth > 0 || is_repository_shallow(r)) |
1dd73e20 | 973 | die(_("Server does not support shallow clients")); |
a45a2600 | 974 | if (args->depth > 0 || args->deepen_since || args->deepen_not) |
79891cb9 | 975 | args->deepen = 1; |
745f7a8c | 976 | if (server_supports("multi_ack_detailed")) { |
0778b293 | 977 | print_verbose(args, _("Server supports %s"), "multi_ack_detailed"); |
745f7a8c NTND |
978 | multi_ack = 2; |
979 | if (server_supports("no-done")) { | |
0778b293 | 980 | print_verbose(args, _("Server supports %s"), "no-done"); |
745f7a8c NTND |
981 | if (args->stateless_rpc) |
982 | no_done = 1; | |
983 | } | |
984 | } | |
985 | else if (server_supports("multi_ack")) { | |
0778b293 | 986 | print_verbose(args, _("Server supports %s"), "multi_ack"); |
745f7a8c NTND |
987 | multi_ack = 1; |
988 | } | |
989 | if (server_supports("side-band-64k")) { | |
0778b293 | 990 | print_verbose(args, _("Server supports %s"), "side-band-64k"); |
745f7a8c NTND |
991 | use_sideband = 2; |
992 | } | |
993 | else if (server_supports("side-band")) { | |
0778b293 | 994 | print_verbose(args, _("Server supports %s"), "side-band"); |
745f7a8c NTND |
995 | use_sideband = 1; |
996 | } | |
6e7b66ee | 997 | if (server_supports("allow-tip-sha1-in-want")) { |
0778b293 | 998 | print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want"); |
7199c093 | 999 | allow_unadvertised_object_request |= ALLOW_TIP_SHA1; |
6e7b66ee | 1000 | } |
68ee6289 | 1001 | if (server_supports("allow-reachable-sha1-in-want")) { |
0778b293 | 1002 | print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want"); |
68ee6289 FM |
1003 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; |
1004 | } | |
5a88583b NTND |
1005 | if (server_supports("thin-pack")) |
1006 | print_verbose(args, _("Server supports %s"), "thin-pack"); | |
1007 | else | |
745f7a8c | 1008 | args->use_thin_pack = 0; |
5a88583b NTND |
1009 | if (server_supports("no-progress")) |
1010 | print_verbose(args, _("Server supports %s"), "no-progress"); | |
1011 | else | |
745f7a8c | 1012 | args->no_progress = 0; |
5a88583b NTND |
1013 | if (server_supports("include-tag")) |
1014 | print_verbose(args, _("Server supports %s"), "include-tag"); | |
1015 | else | |
745f7a8c | 1016 | args->include_tag = 0; |
0d789a5b | 1017 | if (server_supports("ofs-delta")) |
0778b293 | 1018 | print_verbose(args, _("Server supports %s"), "ofs-delta"); |
0d789a5b | 1019 | else |
745f7a8c NTND |
1020 | prefer_ofs_delta = 0; |
1021 | ||
640d8b72 JH |
1022 | if (server_supports("filter")) { |
1023 | server_supports_filtering = 1; | |
0778b293 | 1024 | print_verbose(args, _("Server supports %s"), "filter"); |
640d8b72 JH |
1025 | } else if (args->filter_options.choice) { |
1026 | warning("filtering not recognized by server, ignoring"); | |
1027 | } | |
1028 | ||
5a88583b NTND |
1029 | if (server_supports("deepen-since")) { |
1030 | print_verbose(args, _("Server supports %s"), "deepen-since"); | |
508ea882 | 1031 | deepen_since_ok = 1; |
5a88583b | 1032 | } else if (args->deepen_since) |
508ea882 | 1033 | die(_("Server does not support --shallow-since")); |
5a88583b NTND |
1034 | if (server_supports("deepen-not")) { |
1035 | print_verbose(args, _("Server supports %s"), "deepen-not"); | |
a45a2600 | 1036 | deepen_not_ok = 1; |
5a88583b | 1037 | } else if (args->deepen_not) |
a45a2600 | 1038 | die(_("Server does not support --shallow-exclude")); |
5a88583b NTND |
1039 | if (server_supports("deepen-relative")) |
1040 | print_verbose(args, _("Server supports %s"), "deepen-relative"); | |
1041 | else if (args->deepen_relative) | |
cccf74e2 | 1042 | die(_("Server does not support --deepen")); |
745f7a8c | 1043 | |
12f19a98 | 1044 | if (!args->no_dependents) { |
603960b5 | 1045 | mark_complete_and_common_ref(negotiator, args, &ref); |
12f19a98 JT |
1046 | filter_refs(args, &ref, sought, nr_sought); |
1047 | if (everything_local(args, &ref)) { | |
1048 | packet_flush(fd[1]); | |
1049 | goto all_done; | |
1050 | } | |
1051 | } else { | |
1052 | filter_refs(args, &ref, sought, nr_sought); | |
745f7a8c | 1053 | } |
603960b5 | 1054 | if (find_common(negotiator, args, fd, &oid, ref) < 0) |
745f7a8c NTND |
1055 | if (!args->keep_pack) |
1056 | /* When cloning, it is not unusual to have | |
1057 | * no common commit. | |
1058 | */ | |
1dd73e20 | 1059 | warning(_("no common commits")); |
745f7a8c NTND |
1060 | |
1061 | if (args->stateless_rpc) | |
1062 | packet_flush(fd[1]); | |
79891cb9 | 1063 | if (args->deepen) |
1a30f5a2 NTND |
1064 | setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, |
1065 | NULL); | |
4820a33b | 1066 | else if (si->nr_ours || si->nr_theirs) |
beea4152 | 1067 | alternate_shallow_file = setup_temporary_shallow(si->shallow); |
6da8bdcb NTND |
1068 | else |
1069 | alternate_shallow_file = NULL; | |
5374a290 | 1070 | if (get_pack(args, fd, pack_lockfile, sought, nr_sought)) |
1dd73e20 | 1071 | die(_("git fetch-pack: fetch failed.")); |
745f7a8c NTND |
1072 | |
1073 | all_done: | |
603960b5 JT |
1074 | if (negotiator) |
1075 | negotiator->release(negotiator); | |
745f7a8c NTND |
1076 | return ref; |
1077 | } | |
1078 | ||
f7e20501 BW |
1079 | static void add_shallow_requests(struct strbuf *req_buf, |
1080 | const struct fetch_pack_args *args) | |
1081 | { | |
00624d60 | 1082 | if (is_repository_shallow(the_repository)) |
f7e20501 BW |
1083 | write_shallow_commits(req_buf, 1, NULL); |
1084 | if (args->depth > 0) | |
1085 | packet_buf_write(req_buf, "deepen %d", args->depth); | |
1086 | if (args->deepen_since) { | |
1087 | timestamp_t max_age = approxidate(args->deepen_since); | |
1088 | packet_buf_write(req_buf, "deepen-since %"PRItime, max_age); | |
1089 | } | |
1090 | if (args->deepen_not) { | |
1091 | int i; | |
1092 | for (i = 0; i < args->deepen_not->nr; i++) { | |
1093 | struct string_list_item *s = args->deepen_not->items + i; | |
1094 | packet_buf_write(req_buf, "deepen-not %s", s->string); | |
1095 | } | |
1096 | } | |
5056cf4a JT |
1097 | if (args->deepen_relative) |
1098 | packet_buf_write(req_buf, "deepen-relative\n"); | |
f7e20501 BW |
1099 | } |
1100 | ||
12f19a98 | 1101 | static void add_wants(int no_dependents, const struct ref *wants, struct strbuf *req_buf) |
685fbd32 | 1102 | { |
73302051 BW |
1103 | int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0); |
1104 | ||
685fbd32 BW |
1105 | for ( ; wants ; wants = wants->next) { |
1106 | const struct object_id *remote = &wants->old_oid; | |
685fbd32 BW |
1107 | struct object *o; |
1108 | ||
1109 | /* | |
1110 | * If that object is complete (i.e. it is an ancestor of a | |
1111 | * local ref), we tell them we have it but do not have to | |
1112 | * tell them about its ancestors, which they already know | |
1113 | * about. | |
1114 | * | |
1115 | * We use lookup_object here because we are only | |
1116 | * interested in the case we *know* the object is | |
1117 | * reachable and we have already scanned it. | |
12f19a98 JT |
1118 | * |
1119 | * Do this only if args->no_dependents is false (if it is true, | |
1120 | * we cannot trust the object flags). | |
685fbd32 | 1121 | */ |
12f19a98 | 1122 | if (!no_dependents && |
d0229abd | 1123 | ((o = lookup_object(the_repository, remote)) != NULL) && |
685fbd32 BW |
1124 | (o->flags & COMPLETE)) { |
1125 | continue; | |
1126 | } | |
1127 | ||
73302051 BW |
1128 | if (!use_ref_in_want || wants->exact_oid) |
1129 | packet_buf_write(req_buf, "want %s\n", oid_to_hex(remote)); | |
1130 | else | |
1131 | packet_buf_write(req_buf, "want-ref %s\n", wants->name); | |
685fbd32 BW |
1132 | } |
1133 | } | |
1134 | ||
1135 | static void add_common(struct strbuf *req_buf, struct oidset *common) | |
1136 | { | |
1137 | struct oidset_iter iter; | |
1138 | const struct object_id *oid; | |
1139 | oidset_iter_init(common, &iter); | |
1140 | ||
1141 | while ((oid = oidset_iter_next(&iter))) { | |
1142 | packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid)); | |
1143 | } | |
1144 | } | |
1145 | ||
ec062838 | 1146 | static int add_haves(struct fetch_negotiator *negotiator, |
4fa3f00a | 1147 | int seen_ack, |
ec062838 | 1148 | struct strbuf *req_buf, |
d30fe89c | 1149 | int *haves_to_send, int *in_vain) |
685fbd32 BW |
1150 | { |
1151 | int ret = 0; | |
1152 | int haves_added = 0; | |
1153 | const struct object_id *oid; | |
1154 | ||
ec062838 | 1155 | while ((oid = negotiator->next(negotiator))) { |
685fbd32 BW |
1156 | packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid)); |
1157 | if (++haves_added >= *haves_to_send) | |
1158 | break; | |
1159 | } | |
1160 | ||
1161 | *in_vain += haves_added; | |
4fa3f00a | 1162 | if (!haves_added || (seen_ack && *in_vain >= MAX_IN_VAIN)) { |
685fbd32 BW |
1163 | /* Send Done */ |
1164 | packet_buf_write(req_buf, "done\n"); | |
1165 | ret = 1; | |
1166 | } | |
1167 | ||
1168 | /* Increase haves to send on next round */ | |
1169 | *haves_to_send = next_flush(1, *haves_to_send); | |
1170 | ||
1171 | return ret; | |
1172 | } | |
1173 | ||
ec062838 | 1174 | static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, |
cf9ceb5a | 1175 | struct fetch_pack_args *args, |
685fbd32 | 1176 | const struct ref *wants, struct oidset *common, |
0bbc0bc5 | 1177 | int *haves_to_send, int *in_vain, |
4fa3f00a | 1178 | int sideband_all, int seen_ack) |
685fbd32 BW |
1179 | { |
1180 | int ret = 0; | |
1181 | struct strbuf req_buf = STRBUF_INIT; | |
1182 | ||
1183 | if (server_supports_v2("fetch", 1)) | |
1184 | packet_buf_write(&req_buf, "command=fetch"); | |
1185 | if (server_supports_v2("agent", 0)) | |
1186 | packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized()); | |
5e3548ef BW |
1187 | if (args->server_options && args->server_options->nr && |
1188 | server_supports_v2("server-option", 1)) { | |
1189 | int i; | |
1190 | for (i = 0; i < args->server_options->nr; i++) | |
5b204b7d | 1191 | packet_buf_write(&req_buf, "server-option=%s", |
5e3548ef BW |
1192 | args->server_options->items[i].string); |
1193 | } | |
685fbd32 BW |
1194 | |
1195 | packet_buf_delim(&req_buf); | |
1196 | if (args->use_thin_pack) | |
1197 | packet_buf_write(&req_buf, "thin-pack"); | |
1198 | if (args->no_progress) | |
1199 | packet_buf_write(&req_buf, "no-progress"); | |
1200 | if (args->include_tag) | |
1201 | packet_buf_write(&req_buf, "include-tag"); | |
1202 | if (prefer_ofs_delta) | |
1203 | packet_buf_write(&req_buf, "ofs-delta"); | |
0bbc0bc5 JT |
1204 | if (sideband_all) |
1205 | packet_buf_write(&req_buf, "sideband-all"); | |
685fbd32 | 1206 | |
f7e20501 BW |
1207 | /* Add shallow-info and deepen request */ |
1208 | if (server_supports_feature("fetch", "shallow", 0)) | |
1209 | add_shallow_requests(&req_buf, args); | |
00624d60 | 1210 | else if (is_repository_shallow(the_repository) || args->deepen) |
f7e20501 BW |
1211 | die(_("Server does not support shallow requests")); |
1212 | ||
ba95710a JT |
1213 | /* Add filter */ |
1214 | if (server_supports_feature("fetch", "filter", 0) && | |
1215 | args->filter_options.choice) { | |
cf9ceb5a MD |
1216 | const char *spec = |
1217 | expand_list_objects_filter_spec(&args->filter_options); | |
ba95710a | 1218 | print_verbose(args, _("Server supports filter")); |
cf9ceb5a | 1219 | packet_buf_write(&req_buf, "filter %s", spec); |
ba95710a JT |
1220 | } else if (args->filter_options.choice) { |
1221 | warning("filtering not recognized by server, ignoring"); | |
1222 | } | |
1223 | ||
685fbd32 | 1224 | /* add wants */ |
12f19a98 | 1225 | add_wants(args->no_dependents, wants, &req_buf); |
685fbd32 | 1226 | |
ba95710a JT |
1227 | if (args->no_dependents) { |
1228 | packet_buf_write(&req_buf, "done"); | |
1229 | ret = 1; | |
1230 | } else { | |
1231 | /* Add all of the common commits we've found in previous rounds */ | |
1232 | add_common(&req_buf, common); | |
685fbd32 | 1233 | |
ba95710a | 1234 | /* Add initial haves */ |
4fa3f00a JT |
1235 | ret = add_haves(negotiator, seen_ack, &req_buf, |
1236 | haves_to_send, in_vain); | |
ba95710a | 1237 | } |
685fbd32 BW |
1238 | |
1239 | /* Send request */ | |
1240 | packet_buf_flush(&req_buf); | |
37c80012 JK |
1241 | if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0) |
1242 | die_errno(_("unable to write request to remote")); | |
685fbd32 BW |
1243 | |
1244 | strbuf_release(&req_buf); | |
1245 | return ret; | |
1246 | } | |
1247 | ||
1248 | /* | |
1249 | * Processes a section header in a server's response and checks if it matches | |
1250 | * `section`. If the value of `peek` is 1, the header line will be peeked (and | |
1251 | * not consumed); if 0, the line will be consumed and the function will die if | |
1252 | * the section header doesn't match what was expected. | |
1253 | */ | |
1254 | static int process_section_header(struct packet_reader *reader, | |
1255 | const char *section, int peek) | |
1256 | { | |
1257 | int ret; | |
1258 | ||
1259 | if (packet_reader_peek(reader) != PACKET_READ_NORMAL) | |
bbb19a8b | 1260 | die(_("error reading section header '%s'"), section); |
685fbd32 BW |
1261 | |
1262 | ret = !strcmp(reader->line, section); | |
1263 | ||
1264 | if (!peek) { | |
1265 | if (!ret) | |
bbb19a8b | 1266 | die(_("expected '%s', received '%s'"), |
685fbd32 BW |
1267 | section, reader->line); |
1268 | packet_reader_read(reader); | |
1269 | } | |
1270 | ||
1271 | return ret; | |
1272 | } | |
1273 | ||
d1185aa6 JT |
1274 | enum common_found { |
1275 | /* | |
1276 | * No commit was found to be possessed by both the client and the | |
1277 | * server, and "ready" was not received. | |
1278 | */ | |
1279 | NO_COMMON_FOUND, | |
1280 | ||
1281 | /* | |
1282 | * At least one commit was found to be possessed by both the client and | |
1283 | * the server, and "ready" was not received. | |
1284 | */ | |
1285 | COMMON_FOUND, | |
1286 | ||
1287 | /* | |
1288 | * "ready" was received, indicating that the server is ready to send | |
1289 | * the packfile without any further negotiation. | |
1290 | */ | |
1291 | READY | |
1292 | }; | |
1293 | ||
1294 | static enum common_found process_acks(struct fetch_negotiator *negotiator, | |
1295 | struct packet_reader *reader, | |
1296 | struct oidset *common) | |
685fbd32 BW |
1297 | { |
1298 | /* received */ | |
1299 | int received_ready = 0; | |
1300 | int received_ack = 0; | |
1301 | ||
1302 | process_section_header(reader, "acknowledgments", 0); | |
1303 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { | |
1304 | const char *arg; | |
1305 | ||
1306 | if (!strcmp(reader->line, "NAK")) | |
1307 | continue; | |
1308 | ||
1309 | if (skip_prefix(reader->line, "ACK ", &arg)) { | |
1310 | struct object_id oid; | |
2f0a093d | 1311 | received_ack = 1; |
685fbd32 BW |
1312 | if (!get_oid_hex(arg, &oid)) { |
1313 | struct commit *commit; | |
1314 | oidset_insert(common, &oid); | |
c1f5eb49 | 1315 | commit = lookup_commit(the_repository, &oid); |
603960b5 JT |
1316 | if (negotiator) |
1317 | negotiator->ack(negotiator, commit); | |
685fbd32 BW |
1318 | } |
1319 | continue; | |
1320 | } | |
1321 | ||
1322 | if (!strcmp(reader->line, "ready")) { | |
685fbd32 BW |
1323 | received_ready = 1; |
1324 | continue; | |
1325 | } | |
1326 | ||
bbb19a8b | 1327 | die(_("unexpected acknowledgment line: '%s'"), reader->line); |
685fbd32 BW |
1328 | } |
1329 | ||
1330 | if (reader->status != PACKET_READ_FLUSH && | |
1331 | reader->status != PACKET_READ_DELIM) | |
bbb19a8b | 1332 | die(_("error processing acks: %d"), reader->status); |
685fbd32 | 1333 | |
5400b2a2 JT |
1334 | /* |
1335 | * If an "acknowledgments" section is sent, a packfile is sent if and | |
1336 | * only if "ready" was sent in this section. The other sections | |
1337 | * ("shallow-info" and "wanted-refs") are sent only if a packfile is | |
1338 | * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH | |
1339 | * otherwise. | |
1340 | */ | |
1341 | if (received_ready && reader->status != PACKET_READ_DELIM) | |
1342 | die(_("expected packfile to be sent after 'ready'")); | |
1343 | if (!received_ready && reader->status != PACKET_READ_FLUSH) | |
1344 | die(_("expected no other sections to be sent after no 'ready'")); | |
1345 | ||
d1185aa6 JT |
1346 | return received_ready ? READY : |
1347 | (received_ack ? COMMON_FOUND : NO_COMMON_FOUND); | |
685fbd32 BW |
1348 | } |
1349 | ||
f7e20501 | 1350 | static void receive_shallow_info(struct fetch_pack_args *args, |
1339078f JT |
1351 | struct packet_reader *reader, |
1352 | struct oid_array *shallows, | |
1353 | struct shallow_info *si) | |
f7e20501 | 1354 | { |
1339078f | 1355 | int unshallow_received = 0; |
bd0b42ae | 1356 | |
f7e20501 BW |
1357 | process_section_header(reader, "shallow-info", 0); |
1358 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { | |
1359 | const char *arg; | |
1360 | struct object_id oid; | |
1361 | ||
1362 | if (skip_prefix(reader->line, "shallow ", &arg)) { | |
1363 | if (get_oid_hex(arg, &oid)) | |
1364 | die(_("invalid shallow line: %s"), reader->line); | |
1339078f | 1365 | oid_array_append(shallows, &oid); |
f7e20501 BW |
1366 | continue; |
1367 | } | |
1368 | if (skip_prefix(reader->line, "unshallow ", &arg)) { | |
1369 | if (get_oid_hex(arg, &oid)) | |
1370 | die(_("invalid unshallow line: %s"), reader->line); | |
d0229abd | 1371 | if (!lookup_object(the_repository, &oid)) |
f7e20501 BW |
1372 | die(_("object not found: %s"), reader->line); |
1373 | /* make sure that it is parsed as shallow */ | |
109cd76d | 1374 | if (!parse_object(the_repository, &oid)) |
f7e20501 BW |
1375 | die(_("error in object: %s"), reader->line); |
1376 | if (unregister_shallow(&oid)) | |
1377 | die(_("no shallow found: %s"), reader->line); | |
1339078f | 1378 | unshallow_received = 1; |
f7e20501 BW |
1379 | continue; |
1380 | } | |
1381 | die(_("expected shallow/unshallow, got %s"), reader->line); | |
1382 | } | |
1383 | ||
1384 | if (reader->status != PACKET_READ_FLUSH && | |
1385 | reader->status != PACKET_READ_DELIM) | |
bbb19a8b | 1386 | die(_("error processing shallow info: %d"), reader->status); |
f7e20501 | 1387 | |
1339078f JT |
1388 | if (args->deepen || unshallow_received) { |
1389 | /* | |
1390 | * Treat these as shallow lines caused by our depth settings. | |
1391 | * In v0, these lines cannot cause refs to be rejected; do the | |
1392 | * same. | |
1393 | */ | |
1394 | int i; | |
1395 | ||
1396 | for (i = 0; i < shallows->nr; i++) | |
1397 | register_shallow(the_repository, &shallows->oid[i]); | |
bd0b42ae JT |
1398 | setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, |
1399 | NULL); | |
1400 | args->deepen = 1; | |
1339078f JT |
1401 | } else if (shallows->nr) { |
1402 | /* | |
1403 | * Treat these as shallow lines caused by the remote being | |
1404 | * shallow. In v0, remote refs that reach these objects are | |
1405 | * rejected (unless --update-shallow is set); do the same. | |
1406 | */ | |
1407 | prepare_shallow_info(si, shallows); | |
1408 | if (si->nr_ours || si->nr_theirs) | |
1409 | alternate_shallow_file = | |
1410 | setup_temporary_shallow(si->shallow); | |
1411 | else | |
1412 | alternate_shallow_file = NULL; | |
380ebab2 | 1413 | } else { |
1414 | alternate_shallow_file = NULL; | |
bd0b42ae | 1415 | } |
f7e20501 BW |
1416 | } |
1417 | ||
b7643009 JT |
1418 | static int cmp_name_ref(const void *name, const void *ref) |
1419 | { | |
1420 | return strcmp(name, (*(struct ref **)ref)->name); | |
1421 | } | |
1422 | ||
e2842b39 JT |
1423 | static void receive_wanted_refs(struct packet_reader *reader, |
1424 | struct ref **sought, int nr_sought) | |
73302051 BW |
1425 | { |
1426 | process_section_header(reader, "wanted-refs", 0); | |
1427 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { | |
1428 | struct object_id oid; | |
1429 | const char *end; | |
b7643009 | 1430 | struct ref **found; |
73302051 BW |
1431 | |
1432 | if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ') | |
bbb19a8b | 1433 | die(_("expected wanted-ref, got '%s'"), reader->line); |
73302051 | 1434 | |
b7643009 JT |
1435 | found = bsearch(end, sought, nr_sought, sizeof(*sought), |
1436 | cmp_name_ref); | |
1437 | if (!found) | |
bbb19a8b | 1438 | die(_("unexpected wanted-ref: '%s'"), reader->line); |
b7643009 | 1439 | oidcpy(&(*found)->old_oid, &oid); |
73302051 BW |
1440 | } |
1441 | ||
1442 | if (reader->status != PACKET_READ_DELIM) | |
bbb19a8b | 1443 | die(_("error processing wanted refs: %d"), reader->status); |
73302051 BW |
1444 | } |
1445 | ||
685fbd32 BW |
1446 | enum fetch_state { |
1447 | FETCH_CHECK_LOCAL = 0, | |
1448 | FETCH_SEND_REQUEST, | |
1449 | FETCH_PROCESS_ACKS, | |
1450 | FETCH_GET_PACK, | |
1451 | FETCH_DONE, | |
1452 | }; | |
1453 | ||
1454 | static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, | |
1455 | int fd[2], | |
1456 | const struct ref *orig_ref, | |
1457 | struct ref **sought, int nr_sought, | |
1339078f JT |
1458 | struct oid_array *shallows, |
1459 | struct shallow_info *si, | |
685fbd32 BW |
1460 | char **pack_lockfile) |
1461 | { | |
aaf633c2 | 1462 | struct repository *r = the_repository; |
685fbd32 BW |
1463 | struct ref *ref = copy_ref_list(orig_ref); |
1464 | enum fetch_state state = FETCH_CHECK_LOCAL; | |
1465 | struct oidset common = OIDSET_INIT; | |
1466 | struct packet_reader reader; | |
5fc31180 | 1467 | int in_vain = 0, negotiation_started = 0; |
685fbd32 | 1468 | int haves_to_send = INITIAL_FLUSH; |
603960b5 JT |
1469 | struct fetch_negotiator negotiator_alloc; |
1470 | struct fetch_negotiator *negotiator; | |
4fa3f00a | 1471 | int seen_ack = 0; |
603960b5 JT |
1472 | |
1473 | if (args->no_dependents) { | |
1474 | negotiator = NULL; | |
1475 | } else { | |
1476 | negotiator = &negotiator_alloc; | |
1477 | fetch_negotiator_init(r, negotiator); | |
1478 | } | |
1479 | ||
685fbd32 | 1480 | packet_reader_init(&reader, fd[0], NULL, 0, |
2d103c31 MS |
1481 | PACKET_READ_CHOMP_NEWLINE | |
1482 | PACKET_READ_DIE_ON_ERR_PACKET); | |
07c3c2aa JT |
1483 | if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) && |
1484 | server_supports_feature("fetch", "sideband-all", 0)) { | |
0bbc0bc5 JT |
1485 | reader.use_sideband = 1; |
1486 | reader.me = "fetch-pack"; | |
1487 | } | |
685fbd32 BW |
1488 | |
1489 | while (state != FETCH_DONE) { | |
1490 | switch (state) { | |
1491 | case FETCH_CHECK_LOCAL: | |
1492 | sort_ref_list(&ref, ref_compare_name); | |
1493 | QSORT(sought, nr_sought, cmp_ref_by_name); | |
1494 | ||
1495 | /* v2 supports these by default */ | |
1496 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; | |
1497 | use_sideband = 2; | |
f7e20501 BW |
1498 | if (args->depth > 0 || args->deepen_since || args->deepen_not) |
1499 | args->deepen = 1; | |
685fbd32 | 1500 | |
685fbd32 | 1501 | /* Filter 'ref' by 'sought' and those that aren't local */ |
12f19a98 | 1502 | if (!args->no_dependents) { |
603960b5 | 1503 | mark_complete_and_common_ref(negotiator, args, &ref); |
12f19a98 JT |
1504 | filter_refs(args, &ref, sought, nr_sought); |
1505 | if (everything_local(args, &ref)) | |
1506 | state = FETCH_DONE; | |
1507 | else | |
1508 | state = FETCH_SEND_REQUEST; | |
1509 | ||
603960b5 JT |
1510 | mark_tips(negotiator, args->negotiation_tips); |
1511 | for_each_cached_alternate(negotiator, | |
12f19a98 JT |
1512 | insert_one_alternate_object); |
1513 | } else { | |
1514 | filter_refs(args, &ref, sought, nr_sought); | |
685fbd32 | 1515 | state = FETCH_SEND_REQUEST; |
12f19a98 | 1516 | } |
685fbd32 BW |
1517 | break; |
1518 | case FETCH_SEND_REQUEST: | |
5fc31180 JS |
1519 | if (!negotiation_started) { |
1520 | negotiation_started = 1; | |
1521 | trace2_region_enter("fetch-pack", | |
1522 | "negotiation_v2", | |
1523 | the_repository); | |
1524 | } | |
603960b5 | 1525 | if (send_fetch_request(negotiator, fd[1], args, ref, |
ec062838 | 1526 | &common, |
0bbc0bc5 | 1527 | &haves_to_send, &in_vain, |
4fa3f00a JT |
1528 | reader.use_sideband, |
1529 | seen_ack)) | |
685fbd32 BW |
1530 | state = FETCH_GET_PACK; |
1531 | else | |
1532 | state = FETCH_PROCESS_ACKS; | |
1533 | break; | |
1534 | case FETCH_PROCESS_ACKS: | |
1535 | /* Process ACKs/NAKs */ | |
603960b5 | 1536 | switch (process_acks(negotiator, &reader, &common)) { |
d1185aa6 | 1537 | case READY: |
685fbd32 BW |
1538 | state = FETCH_GET_PACK; |
1539 | break; | |
d1185aa6 | 1540 | case COMMON_FOUND: |
685fbd32 | 1541 | in_vain = 0; |
4fa3f00a | 1542 | seen_ack = 1; |
685fbd32 | 1543 | /* fallthrough */ |
d1185aa6 | 1544 | case NO_COMMON_FOUND: |
685fbd32 BW |
1545 | state = FETCH_SEND_REQUEST; |
1546 | break; | |
1547 | } | |
1548 | break; | |
1549 | case FETCH_GET_PACK: | |
5fc31180 JS |
1550 | trace2_region_leave("fetch-pack", |
1551 | "negotiation_v2", | |
1552 | the_repository); | |
f7e20501 BW |
1553 | /* Check for shallow-info section */ |
1554 | if (process_section_header(&reader, "shallow-info", 1)) | |
1339078f | 1555 | receive_shallow_info(args, &reader, shallows, si); |
f7e20501 | 1556 | |
73302051 | 1557 | if (process_section_header(&reader, "wanted-refs", 1)) |
e2842b39 | 1558 | receive_wanted_refs(&reader, sought, nr_sought); |
73302051 | 1559 | |
685fbd32 BW |
1560 | /* get the pack */ |
1561 | process_section_header(&reader, "packfile", 0); | |
5374a290 | 1562 | if (get_pack(args, fd, pack_lockfile, sought, nr_sought)) |
685fbd32 BW |
1563 | die(_("git fetch-pack: fetch failed.")); |
1564 | ||
1565 | state = FETCH_DONE; | |
1566 | break; | |
1567 | case FETCH_DONE: | |
1568 | continue; | |
1569 | } | |
1570 | } | |
1571 | ||
603960b5 JT |
1572 | if (negotiator) |
1573 | negotiator->release(negotiator); | |
685fbd32 BW |
1574 | oidset_clear(&common); |
1575 | return ref; | |
1576 | } | |
1577 | ||
1362df0d ÆAB |
1578 | static int fetch_pack_config_cb(const char *var, const char *value, void *cb) |
1579 | { | |
1580 | if (strcmp(var, "fetch.fsck.skiplist") == 0) { | |
1581 | const char *path; | |
1582 | ||
1583 | if (git_config_pathname(&path, var, value)) | |
1584 | return 1; | |
1585 | strbuf_addf(&fsck_msg_types, "%cskiplist=%s", | |
1586 | fsck_msg_types.len ? ',' : '=', path); | |
1587 | free((char *)path); | |
1588 | return 0; | |
1589 | } | |
1590 | ||
1591 | if (skip_prefix(var, "fetch.fsck.", &var)) { | |
1592 | if (is_valid_msg_type(var, value)) | |
1593 | strbuf_addf(&fsck_msg_types, "%c%s=%s", | |
1594 | fsck_msg_types.len ? ',' : '=', var, value); | |
1595 | else | |
1596 | warning("Skipping unknown msg id '%s'", var); | |
1597 | return 0; | |
1598 | } | |
1599 | ||
1600 | return git_default_config(var, value, cb); | |
1601 | } | |
1602 | ||
f44af51d | 1603 | static void fetch_pack_config(void) |
745f7a8c | 1604 | { |
f44af51d TA |
1605 | git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit); |
1606 | git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit); | |
1607 | git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta); | |
1608 | git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects); | |
1609 | git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects); | |
745f7a8c | 1610 | |
1362df0d | 1611 | git_config(fetch_pack_config_cb, NULL); |
745f7a8c NTND |
1612 | } |
1613 | ||
745f7a8c NTND |
1614 | static void fetch_pack_setup(void) |
1615 | { | |
1616 | static int did_setup; | |
1617 | if (did_setup) | |
1618 | return; | |
f44af51d | 1619 | fetch_pack_config(); |
745f7a8c NTND |
1620 | if (0 <= transfer_unpack_limit) |
1621 | unpack_limit = transfer_unpack_limit; | |
1622 | else if (0 <= fetch_unpack_limit) | |
1623 | unpack_limit = fetch_unpack_limit; | |
1624 | did_setup = 1; | |
1625 | } | |
1626 | ||
f2db854d JH |
1627 | static int remove_duplicates_in_refs(struct ref **ref, int nr) |
1628 | { | |
1629 | struct string_list names = STRING_LIST_INIT_NODUP; | |
1630 | int src, dst; | |
1631 | ||
1632 | for (src = dst = 0; src < nr; src++) { | |
1633 | struct string_list_item *item; | |
1634 | item = string_list_insert(&names, ref[src]->name); | |
1635 | if (item->util) | |
1636 | continue; /* already have it */ | |
1637 | item->util = ref[src]; | |
1638 | if (src != dst) | |
1639 | ref[dst] = ref[src]; | |
1640 | dst++; | |
1641 | } | |
1642 | for (src = dst; src < nr; src++) | |
1643 | ref[src] = NULL; | |
1644 | string_list_clear(&names, 0); | |
1645 | return dst; | |
1646 | } | |
1647 | ||
beea4152 | 1648 | static void update_shallow(struct fetch_pack_args *args, |
e2842b39 | 1649 | struct ref **sought, int nr_sought, |
beea4152 | 1650 | struct shallow_info *si) |
a796ccee | 1651 | { |
910650d2 | 1652 | struct oid_array ref = OID_ARRAY_INIT; |
4820a33b | 1653 | int *status; |
beea4152 NTND |
1654 | int i; |
1655 | ||
79891cb9 | 1656 | if (args->deepen && alternate_shallow_file) { |
a796ccee | 1657 | if (*alternate_shallow_file == '\0') { /* --unshallow */ |
102de880 | 1658 | unlink_or_warn(git_path_shallow(the_repository)); |
37b9dcab | 1659 | rollback_shallow_file(the_repository, &shallow_lock); |
a796ccee | 1660 | } else |
37b9dcab | 1661 | commit_shallow_file(the_repository, &shallow_lock); |
23311f35 | 1662 | alternate_shallow_file = NULL; |
a796ccee NTND |
1663 | return; |
1664 | } | |
beea4152 NTND |
1665 | |
1666 | if (!si->shallow || !si->shallow->nr) | |
1667 | return; | |
1668 | ||
beea4152 NTND |
1669 | if (args->cloning) { |
1670 | /* | |
1671 | * remote is shallow, but this is a clone, there are | |
1672 | * no objects in repo to worry about. Accept any | |
1673 | * shallow points that exist in the pack (iow in repo | |
1674 | * after get_pack() and reprepare_packed_git()) | |
1675 | */ | |
910650d2 | 1676 | struct oid_array extra = OID_ARRAY_INIT; |
ee3051bd | 1677 | struct object_id *oid = si->shallow->oid; |
beea4152 | 1678 | for (i = 0; i < si->shallow->nr; i++) |
ee3051bd | 1679 | if (has_object_file(&oid[i])) |
910650d2 | 1680 | oid_array_append(&extra, &oid[i]); |
beea4152 NTND |
1681 | if (extra.nr) { |
1682 | setup_alternate_shallow(&shallow_lock, | |
1683 | &alternate_shallow_file, | |
1684 | &extra); | |
37b9dcab | 1685 | commit_shallow_file(the_repository, &shallow_lock); |
23311f35 | 1686 | alternate_shallow_file = NULL; |
beea4152 | 1687 | } |
910650d2 | 1688 | oid_array_clear(&extra); |
beea4152 NTND |
1689 | return; |
1690 | } | |
4820a33b NTND |
1691 | |
1692 | if (!si->nr_ours && !si->nr_theirs) | |
1693 | return; | |
1694 | ||
1695 | remove_nonexistent_theirs_shallow(si); | |
4820a33b NTND |
1696 | if (!si->nr_ours && !si->nr_theirs) |
1697 | return; | |
e2842b39 JT |
1698 | for (i = 0; i < nr_sought; i++) |
1699 | oid_array_append(&ref, &sought[i]->old_oid); | |
4820a33b NTND |
1700 | si->ref = &ref; |
1701 | ||
48d25cae NTND |
1702 | if (args->update_shallow) { |
1703 | /* | |
1704 | * remote is also shallow, .git/shallow may be updated | |
1705 | * so all refs can be accepted. Make sure we only add | |
1706 | * shallow roots that are actually reachable from new | |
1707 | * refs. | |
1708 | */ | |
910650d2 | 1709 | struct oid_array extra = OID_ARRAY_INIT; |
ee3051bd | 1710 | struct object_id *oid = si->shallow->oid; |
48d25cae NTND |
1711 | assign_shallow_commits_to_refs(si, NULL, NULL); |
1712 | if (!si->nr_ours && !si->nr_theirs) { | |
910650d2 | 1713 | oid_array_clear(&ref); |
48d25cae NTND |
1714 | return; |
1715 | } | |
1716 | for (i = 0; i < si->nr_ours; i++) | |
910650d2 | 1717 | oid_array_append(&extra, &oid[si->ours[i]]); |
48d25cae | 1718 | for (i = 0; i < si->nr_theirs; i++) |
910650d2 | 1719 | oid_array_append(&extra, &oid[si->theirs[i]]); |
48d25cae NTND |
1720 | setup_alternate_shallow(&shallow_lock, |
1721 | &alternate_shallow_file, | |
1722 | &extra); | |
37b9dcab | 1723 | commit_shallow_file(the_repository, &shallow_lock); |
910650d2 | 1724 | oid_array_clear(&extra); |
1725 | oid_array_clear(&ref); | |
23311f35 | 1726 | alternate_shallow_file = NULL; |
48d25cae NTND |
1727 | return; |
1728 | } | |
1729 | ||
4820a33b NTND |
1730 | /* |
1731 | * remote is also shallow, check what ref is safe to update | |
1732 | * without updating .git/shallow | |
1733 | */ | |
e2842b39 | 1734 | status = xcalloc(nr_sought, sizeof(*status)); |
4820a33b NTND |
1735 | assign_shallow_commits_to_refs(si, NULL, status); |
1736 | if (si->nr_ours || si->nr_theirs) { | |
e2842b39 | 1737 | for (i = 0; i < nr_sought; i++) |
4820a33b | 1738 | if (status[i]) |
e2842b39 | 1739 | sought[i]->status = REF_STATUS_REJECT_SHALLOW; |
4820a33b NTND |
1740 | } |
1741 | free(status); | |
910650d2 | 1742 | oid_array_clear(&ref); |
a796ccee NTND |
1743 | } |
1744 | ||
cf1e7c07 JT |
1745 | static int iterate_ref_map(void *cb_data, struct object_id *oid) |
1746 | { | |
1747 | struct ref **rm = cb_data; | |
1748 | struct ref *ref = *rm; | |
1749 | ||
1750 | if (!ref) | |
1751 | return -1; /* end of the list */ | |
1752 | *rm = ref->next; | |
1753 | oidcpy(oid, &ref->old_oid); | |
1754 | return 0; | |
1755 | } | |
1756 | ||
745f7a8c | 1757 | struct ref *fetch_pack(struct fetch_pack_args *args, |
0f804b0b | 1758 | int fd[], |
745f7a8c | 1759 | const struct ref *ref, |
f2db854d | 1760 | struct ref **sought, int nr_sought, |
910650d2 | 1761 | struct oid_array *shallow, |
685fbd32 BW |
1762 | char **pack_lockfile, |
1763 | enum protocol_version version) | |
745f7a8c | 1764 | { |
745f7a8c | 1765 | struct ref *ref_cpy; |
beea4152 | 1766 | struct shallow_info si; |
1339078f | 1767 | struct oid_array shallows_scratch = OID_ARRAY_INIT; |
745f7a8c NTND |
1768 | |
1769 | fetch_pack_setup(); | |
f2db854d JH |
1770 | if (nr_sought) |
1771 | nr_sought = remove_duplicates_in_refs(sought, nr_sought); | |
745f7a8c | 1772 | |
4c7f9567 JT |
1773 | if (args->no_dependents && !args->filter_options.choice) { |
1774 | /* | |
1775 | * The protocol does not support requesting that only the | |
1776 | * wanted objects be sent, so approximate this by setting a | |
1777 | * "blob:none" filter if no filter is already set. This works | |
1778 | * for all object types: note that wanted blobs will still be | |
1779 | * sent because they are directly specified as a "want". | |
1780 | * | |
1781 | * NEEDSWORK: Add an option in the protocol to request that | |
1782 | * only the wanted objects be sent, and implement it. | |
1783 | */ | |
1784 | parse_list_objects_filter(&args->filter_options, "blob:none"); | |
1785 | } | |
1786 | ||
01775651 | 1787 | if (version != protocol_v2 && !ref) { |
745f7a8c | 1788 | packet_flush(fd[1]); |
1dd73e20 | 1789 | die(_("no matching remote head")); |
745f7a8c | 1790 | } |
1e7d440b JT |
1791 | if (version == protocol_v2) { |
1792 | if (shallow->nr) | |
1793 | BUG("Protocol V2 does not provide shallows at this point in the fetch"); | |
1794 | memset(&si, 0, sizeof(si)); | |
685fbd32 | 1795 | ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought, |
1339078f | 1796 | &shallows_scratch, &si, |
685fbd32 | 1797 | pack_lockfile); |
1e7d440b JT |
1798 | } else { |
1799 | prepare_shallow_info(&si, shallow); | |
685fbd32 BW |
1800 | ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, |
1801 | &si, pack_lockfile); | |
1e7d440b | 1802 | } |
a49d2834 | 1803 | reprepare_packed_git(the_repository); |
cf1e7c07 JT |
1804 | |
1805 | if (!args->cloning && args->deepen) { | |
1806 | struct check_connected_options opt = CHECK_CONNECTED_INIT; | |
1807 | struct ref *iterator = ref_cpy; | |
1808 | opt.shallow_file = alternate_shallow_file; | |
1809 | if (args->deepen) | |
1810 | opt.is_deepening_fetch = 1; | |
1811 | if (check_connected(iterate_ref_map, &iterator, &opt)) { | |
1812 | error(_("remote did not send all necessary objects")); | |
1813 | free_refs(ref_cpy); | |
1814 | ref_cpy = NULL; | |
37b9dcab | 1815 | rollback_shallow_file(the_repository, &shallow_lock); |
cf1e7c07 JT |
1816 | goto cleanup; |
1817 | } | |
1818 | args->connectivity_checked = 1; | |
1819 | } | |
1820 | ||
e2842b39 | 1821 | update_shallow(args, sought, nr_sought, &si); |
cf1e7c07 | 1822 | cleanup: |
beea4152 | 1823 | clear_shallow_info(&si); |
1339078f | 1824 | oid_array_clear(&shallows_scratch); |
745f7a8c NTND |
1825 | return ref_cpy; |
1826 | } | |
e860d96b MM |
1827 | |
1828 | int report_unmatched_refs(struct ref **sought, int nr_sought) | |
1829 | { | |
1830 | int i, ret = 0; | |
1831 | ||
1832 | for (i = 0; i < nr_sought; i++) { | |
d56583de | 1833 | if (!sought[i]) |
e860d96b | 1834 | continue; |
d56583de MM |
1835 | switch (sought[i]->match_status) { |
1836 | case REF_MATCHED: | |
1837 | continue; | |
1838 | case REF_NOT_MATCHED: | |
1839 | error(_("no such remote ref %s"), sought[i]->name); | |
1840 | break; | |
1841 | case REF_UNADVERTISED_NOT_ALLOWED: | |
1842 | error(_("Server does not allow request for unadvertised object %s"), | |
1843 | sought[i]->name); | |
1844 | break; | |
1845 | } | |
e860d96b MM |
1846 | ret = 1; |
1847 | } | |
1848 | return ret; | |
1849 | } |