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