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