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