]>
Commit | Line | Data |
---|---|---|
1 | #include "cache.h" | |
2 | #include "config.h" | |
3 | #include "refs.h" | |
4 | #include "pkt-line.h" | |
5 | #include "sideband.h" | |
6 | #include "repository.h" | |
7 | #include "object-store.h" | |
8 | #include "tag.h" | |
9 | #include "object.h" | |
10 | #include "commit.h" | |
11 | #include "diff.h" | |
12 | #include "revision.h" | |
13 | #include "list-objects.h" | |
14 | #include "list-objects-filter.h" | |
15 | #include "list-objects-filter-options.h" | |
16 | #include "run-command.h" | |
17 | #include "connect.h" | |
18 | #include "sigchain.h" | |
19 | #include "version.h" | |
20 | #include "string-list.h" | |
21 | #include "argv-array.h" | |
22 | #include "prio-queue.h" | |
23 | #include "protocol.h" | |
24 | #include "quote.h" | |
25 | #include "upload-pack.h" | |
26 | #include "serve.h" | |
27 | #include "commit-graph.h" | |
28 | #include "commit-reach.h" | |
29 | ||
30 | /* Remember to update object flag allocation in object.h */ | |
31 | #define THEY_HAVE (1u << 11) | |
32 | #define OUR_REF (1u << 12) | |
33 | #define WANTED (1u << 13) | |
34 | #define COMMON_KNOWN (1u << 14) | |
35 | ||
36 | #define SHALLOW (1u << 16) | |
37 | #define NOT_SHALLOW (1u << 17) | |
38 | #define CLIENT_SHALLOW (1u << 18) | |
39 | #define HIDDEN_REF (1u << 19) | |
40 | ||
41 | #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \ | |
42 | NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF) | |
43 | ||
44 | static timestamp_t oldest_have; | |
45 | ||
46 | static int deepen_relative; | |
47 | static int multi_ack; | |
48 | static int no_done; | |
49 | static int use_thin_pack, use_ofs_delta, use_include_tag; | |
50 | static int no_progress, daemon_mode; | |
51 | /* Allow specifying sha1 if it is a ref tip. */ | |
52 | #define ALLOW_TIP_SHA1 01 | |
53 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ | |
54 | #define ALLOW_REACHABLE_SHA1 02 | |
55 | /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */ | |
56 | #define ALLOW_ANY_SHA1 07 | |
57 | static unsigned int allow_unadvertised_object_request; | |
58 | static int shallow_nr; | |
59 | static struct object_array extra_edge_obj; | |
60 | static unsigned int timeout; | |
61 | static int keepalive = 5; | |
62 | /* 0 for no sideband, | |
63 | * otherwise maximum packet size (up to 65520 bytes). | |
64 | */ | |
65 | static int use_sideband; | |
66 | static int stateless_rpc; | |
67 | static const char *pack_objects_hook; | |
68 | ||
69 | static int filter_capability_requested; | |
70 | static int allow_filter; | |
71 | static int allow_ref_in_want; | |
72 | static struct list_objects_filter_options filter_options; | |
73 | ||
74 | static void reset_timeout(void) | |
75 | { | |
76 | alarm(timeout); | |
77 | } | |
78 | ||
79 | static void send_client_data(int fd, const char *data, ssize_t sz) | |
80 | { | |
81 | if (use_sideband) { | |
82 | send_sideband(1, fd, data, sz, use_sideband); | |
83 | return; | |
84 | } | |
85 | if (fd == 3) | |
86 | /* emergency quit */ | |
87 | fd = 2; | |
88 | if (fd == 2) { | |
89 | /* XXX: are we happy to lose stuff here? */ | |
90 | xwrite(fd, data, sz); | |
91 | return; | |
92 | } | |
93 | write_or_die(fd, data, sz); | |
94 | } | |
95 | ||
96 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) | |
97 | { | |
98 | FILE *fp = cb_data; | |
99 | if (graft->nr_parent == -1) | |
100 | fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid)); | |
101 | return 0; | |
102 | } | |
103 | ||
104 | static void create_pack_file(const struct object_array *have_obj, | |
105 | const struct object_array *want_obj) | |
106 | { | |
107 | struct child_process pack_objects = CHILD_PROCESS_INIT; | |
108 | char data[8193], progress[128]; | |
109 | char abort_msg[] = "aborting due to possible repository " | |
110 | "corruption on the remote side."; | |
111 | int buffered = -1; | |
112 | ssize_t sz; | |
113 | int i; | |
114 | FILE *pipe_fd; | |
115 | ||
116 | if (!pack_objects_hook) | |
117 | pack_objects.git_cmd = 1; | |
118 | else { | |
119 | argv_array_push(&pack_objects.args, pack_objects_hook); | |
120 | argv_array_push(&pack_objects.args, "git"); | |
121 | pack_objects.use_shell = 1; | |
122 | } | |
123 | ||
124 | if (shallow_nr) { | |
125 | argv_array_push(&pack_objects.args, "--shallow-file"); | |
126 | argv_array_push(&pack_objects.args, ""); | |
127 | } | |
128 | argv_array_push(&pack_objects.args, "pack-objects"); | |
129 | argv_array_push(&pack_objects.args, "--revs"); | |
130 | if (use_thin_pack) | |
131 | argv_array_push(&pack_objects.args, "--thin"); | |
132 | ||
133 | argv_array_push(&pack_objects.args, "--stdout"); | |
134 | if (shallow_nr) | |
135 | argv_array_push(&pack_objects.args, "--shallow"); | |
136 | if (!no_progress) | |
137 | argv_array_push(&pack_objects.args, "--progress"); | |
138 | if (use_ofs_delta) | |
139 | argv_array_push(&pack_objects.args, "--delta-base-offset"); | |
140 | if (use_include_tag) | |
141 | argv_array_push(&pack_objects.args, "--include-tag"); | |
142 | if (filter_options.filter_spec) { | |
143 | if (pack_objects.use_shell) { | |
144 | struct strbuf buf = STRBUF_INIT; | |
145 | sq_quote_buf(&buf, filter_options.filter_spec); | |
146 | argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf); | |
147 | strbuf_release(&buf); | |
148 | } else { | |
149 | argv_array_pushf(&pack_objects.args, "--filter=%s", | |
150 | filter_options.filter_spec); | |
151 | } | |
152 | } | |
153 | ||
154 | pack_objects.in = -1; | |
155 | pack_objects.out = -1; | |
156 | pack_objects.err = -1; | |
157 | ||
158 | if (start_command(&pack_objects)) | |
159 | die("git upload-pack: unable to fork git-pack-objects"); | |
160 | ||
161 | pipe_fd = xfdopen(pack_objects.in, "w"); | |
162 | ||
163 | if (shallow_nr) | |
164 | for_each_commit_graft(write_one_shallow, pipe_fd); | |
165 | ||
166 | for (i = 0; i < want_obj->nr; i++) | |
167 | fprintf(pipe_fd, "%s\n", | |
168 | oid_to_hex(&want_obj->objects[i].item->oid)); | |
169 | fprintf(pipe_fd, "--not\n"); | |
170 | for (i = 0; i < have_obj->nr; i++) | |
171 | fprintf(pipe_fd, "%s\n", | |
172 | oid_to_hex(&have_obj->objects[i].item->oid)); | |
173 | for (i = 0; i < extra_edge_obj.nr; i++) | |
174 | fprintf(pipe_fd, "%s\n", | |
175 | oid_to_hex(&extra_edge_obj.objects[i].item->oid)); | |
176 | fprintf(pipe_fd, "\n"); | |
177 | fflush(pipe_fd); | |
178 | fclose(pipe_fd); | |
179 | ||
180 | /* We read from pack_objects.err to capture stderr output for | |
181 | * progress bar, and pack_objects.out to capture the pack data. | |
182 | */ | |
183 | ||
184 | while (1) { | |
185 | struct pollfd pfd[2]; | |
186 | int pe, pu, pollsize; | |
187 | int ret; | |
188 | ||
189 | reset_timeout(); | |
190 | ||
191 | pollsize = 0; | |
192 | pe = pu = -1; | |
193 | ||
194 | if (0 <= pack_objects.out) { | |
195 | pfd[pollsize].fd = pack_objects.out; | |
196 | pfd[pollsize].events = POLLIN; | |
197 | pu = pollsize; | |
198 | pollsize++; | |
199 | } | |
200 | if (0 <= pack_objects.err) { | |
201 | pfd[pollsize].fd = pack_objects.err; | |
202 | pfd[pollsize].events = POLLIN; | |
203 | pe = pollsize; | |
204 | pollsize++; | |
205 | } | |
206 | ||
207 | if (!pollsize) | |
208 | break; | |
209 | ||
210 | ret = poll(pfd, pollsize, | |
211 | keepalive < 0 ? -1 : 1000 * keepalive); | |
212 | ||
213 | if (ret < 0) { | |
214 | if (errno != EINTR) { | |
215 | error_errno("poll failed, resuming"); | |
216 | sleep(1); | |
217 | } | |
218 | continue; | |
219 | } | |
220 | if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) { | |
221 | /* Status ready; we ship that in the side-band | |
222 | * or dump to the standard error. | |
223 | */ | |
224 | sz = xread(pack_objects.err, progress, | |
225 | sizeof(progress)); | |
226 | if (0 < sz) | |
227 | send_client_data(2, progress, sz); | |
228 | else if (sz == 0) { | |
229 | close(pack_objects.err); | |
230 | pack_objects.err = -1; | |
231 | } | |
232 | else | |
233 | goto fail; | |
234 | /* give priority to status messages */ | |
235 | continue; | |
236 | } | |
237 | if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { | |
238 | /* Data ready; we keep the last byte to ourselves | |
239 | * in case we detect broken rev-list, so that we | |
240 | * can leave the stream corrupted. This is | |
241 | * unfortunate -- unpack-objects would happily | |
242 | * accept a valid packdata with trailing garbage, | |
243 | * so appending garbage after we pass all the | |
244 | * pack data is not good enough to signal | |
245 | * breakage to downstream. | |
246 | */ | |
247 | char *cp = data; | |
248 | ssize_t outsz = 0; | |
249 | if (0 <= buffered) { | |
250 | *cp++ = buffered; | |
251 | outsz++; | |
252 | } | |
253 | sz = xread(pack_objects.out, cp, | |
254 | sizeof(data) - outsz); | |
255 | if (0 < sz) | |
256 | ; | |
257 | else if (sz == 0) { | |
258 | close(pack_objects.out); | |
259 | pack_objects.out = -1; | |
260 | } | |
261 | else | |
262 | goto fail; | |
263 | sz += outsz; | |
264 | if (1 < sz) { | |
265 | buffered = data[sz-1] & 0xFF; | |
266 | sz--; | |
267 | } | |
268 | else | |
269 | buffered = -1; | |
270 | send_client_data(1, data, sz); | |
271 | } | |
272 | ||
273 | /* | |
274 | * We hit the keepalive timeout without saying anything; send | |
275 | * an empty message on the data sideband just to let the other | |
276 | * side know we're still working on it, but don't have any data | |
277 | * yet. | |
278 | * | |
279 | * If we don't have a sideband channel, there's no room in the | |
280 | * protocol to say anything, so those clients are just out of | |
281 | * luck. | |
282 | */ | |
283 | if (!ret && use_sideband) { | |
284 | static const char buf[] = "0005\1"; | |
285 | write_or_die(1, buf, 5); | |
286 | } | |
287 | } | |
288 | ||
289 | if (finish_command(&pack_objects)) { | |
290 | error("git upload-pack: git-pack-objects died with error."); | |
291 | goto fail; | |
292 | } | |
293 | ||
294 | /* flush the data */ | |
295 | if (0 <= buffered) { | |
296 | data[0] = buffered; | |
297 | send_client_data(1, data, 1); | |
298 | fprintf(stderr, "flushed.\n"); | |
299 | } | |
300 | if (use_sideband) | |
301 | packet_flush(1); | |
302 | return; | |
303 | ||
304 | fail: | |
305 | send_client_data(3, abort_msg, sizeof(abort_msg)); | |
306 | die("git upload-pack: %s", abort_msg); | |
307 | } | |
308 | ||
309 | static int got_oid(const char *hex, struct object_id *oid, | |
310 | struct object_array *have_obj) | |
311 | { | |
312 | struct object *o; | |
313 | int we_knew_they_have = 0; | |
314 | ||
315 | if (get_oid_hex(hex, oid)) | |
316 | die("git upload-pack: expected SHA1 object, got '%s'", hex); | |
317 | if (!has_object_file(oid)) | |
318 | return -1; | |
319 | ||
320 | o = parse_object(the_repository, oid); | |
321 | if (!o) | |
322 | die("oops (%s)", oid_to_hex(oid)); | |
323 | if (o->type == OBJ_COMMIT) { | |
324 | struct commit_list *parents; | |
325 | struct commit *commit = (struct commit *)o; | |
326 | if (o->flags & THEY_HAVE) | |
327 | we_knew_they_have = 1; | |
328 | else | |
329 | o->flags |= THEY_HAVE; | |
330 | if (!oldest_have || (commit->date < oldest_have)) | |
331 | oldest_have = commit->date; | |
332 | for (parents = commit->parents; | |
333 | parents; | |
334 | parents = parents->next) | |
335 | parents->item->object.flags |= THEY_HAVE; | |
336 | } | |
337 | if (!we_knew_they_have) { | |
338 | add_object_array(o, NULL, have_obj); | |
339 | return 1; | |
340 | } | |
341 | return 0; | |
342 | } | |
343 | ||
344 | static int ok_to_give_up(const struct object_array *have_obj, | |
345 | struct object_array *want_obj) | |
346 | { | |
347 | uint32_t min_generation = GENERATION_NUMBER_ZERO; | |
348 | ||
349 | if (!have_obj->nr) | |
350 | return 0; | |
351 | ||
352 | return can_all_from_reach_with_flag(want_obj, THEY_HAVE, | |
353 | COMMON_KNOWN, oldest_have, | |
354 | min_generation); | |
355 | } | |
356 | ||
357 | static int get_common_commits(struct packet_reader *reader, | |
358 | struct object_array *have_obj, | |
359 | struct object_array *want_obj) | |
360 | { | |
361 | struct object_id oid; | |
362 | char last_hex[GIT_MAX_HEXSZ + 1]; | |
363 | int got_common = 0; | |
364 | int got_other = 0; | |
365 | int sent_ready = 0; | |
366 | ||
367 | save_commit_buffer = 0; | |
368 | ||
369 | for (;;) { | |
370 | const char *arg; | |
371 | ||
372 | reset_timeout(); | |
373 | ||
374 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) { | |
375 | if (multi_ack == 2 && got_common | |
376 | && !got_other && ok_to_give_up(have_obj, want_obj)) { | |
377 | sent_ready = 1; | |
378 | packet_write_fmt(1, "ACK %s ready\n", last_hex); | |
379 | } | |
380 | if (have_obj->nr == 0 || multi_ack) | |
381 | packet_write_fmt(1, "NAK\n"); | |
382 | ||
383 | if (no_done && sent_ready) { | |
384 | packet_write_fmt(1, "ACK %s\n", last_hex); | |
385 | return 0; | |
386 | } | |
387 | if (stateless_rpc) | |
388 | exit(0); | |
389 | got_common = 0; | |
390 | got_other = 0; | |
391 | continue; | |
392 | } | |
393 | if (skip_prefix(reader->line, "have ", &arg)) { | |
394 | switch (got_oid(arg, &oid, have_obj)) { | |
395 | case -1: /* they have what we do not */ | |
396 | got_other = 1; | |
397 | if (multi_ack && ok_to_give_up(have_obj, want_obj)) { | |
398 | const char *hex = oid_to_hex(&oid); | |
399 | if (multi_ack == 2) { | |
400 | sent_ready = 1; | |
401 | packet_write_fmt(1, "ACK %s ready\n", hex); | |
402 | } else | |
403 | packet_write_fmt(1, "ACK %s continue\n", hex); | |
404 | } | |
405 | break; | |
406 | default: | |
407 | got_common = 1; | |
408 | oid_to_hex_r(last_hex, &oid); | |
409 | if (multi_ack == 2) | |
410 | packet_write_fmt(1, "ACK %s common\n", last_hex); | |
411 | else if (multi_ack) | |
412 | packet_write_fmt(1, "ACK %s continue\n", last_hex); | |
413 | else if (have_obj->nr == 1) | |
414 | packet_write_fmt(1, "ACK %s\n", last_hex); | |
415 | break; | |
416 | } | |
417 | continue; | |
418 | } | |
419 | if (!strcmp(reader->line, "done")) { | |
420 | if (have_obj->nr > 0) { | |
421 | if (multi_ack) | |
422 | packet_write_fmt(1, "ACK %s\n", last_hex); | |
423 | return 0; | |
424 | } | |
425 | packet_write_fmt(1, "NAK\n"); | |
426 | return -1; | |
427 | } | |
428 | die("git upload-pack: expected SHA1 list, got '%s'", reader->line); | |
429 | } | |
430 | } | |
431 | ||
432 | static int is_our_ref(struct object *o) | |
433 | { | |
434 | int allow_hidden_ref = (allow_unadvertised_object_request & | |
435 | (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); | |
436 | return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF); | |
437 | } | |
438 | ||
439 | /* | |
440 | * on successful case, it's up to the caller to close cmd->out | |
441 | */ | |
442 | static int do_reachable_revlist(struct child_process *cmd, | |
443 | struct object_array *src, | |
444 | struct object_array *reachable) | |
445 | { | |
446 | static const char *argv[] = { | |
447 | "rev-list", "--stdin", NULL, | |
448 | }; | |
449 | struct object *o; | |
450 | char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ | |
451 | int i; | |
452 | const unsigned hexsz = the_hash_algo->hexsz; | |
453 | ||
454 | cmd->argv = argv; | |
455 | cmd->git_cmd = 1; | |
456 | cmd->no_stderr = 1; | |
457 | cmd->in = -1; | |
458 | cmd->out = -1; | |
459 | ||
460 | /* | |
461 | * If the next rev-list --stdin encounters an unknown commit, | |
462 | * it terminates, which will cause SIGPIPE in the write loop | |
463 | * below. | |
464 | */ | |
465 | sigchain_push(SIGPIPE, SIG_IGN); | |
466 | ||
467 | if (start_command(cmd)) | |
468 | goto error; | |
469 | ||
470 | namebuf[0] = '^'; | |
471 | namebuf[hexsz + 1] = '\n'; | |
472 | for (i = get_max_object_index(); 0 < i; ) { | |
473 | o = get_indexed_object(--i); | |
474 | if (!o) | |
475 | continue; | |
476 | if (reachable && o->type == OBJ_COMMIT) | |
477 | o->flags &= ~TMP_MARK; | |
478 | if (!is_our_ref(o)) | |
479 | continue; | |
480 | memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz); | |
481 | if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0) | |
482 | goto error; | |
483 | } | |
484 | namebuf[hexsz] = '\n'; | |
485 | for (i = 0; i < src->nr; i++) { | |
486 | o = src->objects[i].item; | |
487 | if (is_our_ref(o)) { | |
488 | if (reachable) | |
489 | add_object_array(o, NULL, reachable); | |
490 | continue; | |
491 | } | |
492 | if (reachable && o->type == OBJ_COMMIT) | |
493 | o->flags |= TMP_MARK; | |
494 | memcpy(namebuf, oid_to_hex(&o->oid), hexsz); | |
495 | if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0) | |
496 | goto error; | |
497 | } | |
498 | close(cmd->in); | |
499 | cmd->in = -1; | |
500 | sigchain_pop(SIGPIPE); | |
501 | ||
502 | return 0; | |
503 | ||
504 | error: | |
505 | sigchain_pop(SIGPIPE); | |
506 | ||
507 | if (cmd->in >= 0) | |
508 | close(cmd->in); | |
509 | if (cmd->out >= 0) | |
510 | close(cmd->out); | |
511 | return -1; | |
512 | } | |
513 | ||
514 | static int get_reachable_list(struct object_array *src, | |
515 | struct object_array *reachable) | |
516 | { | |
517 | struct child_process cmd = CHILD_PROCESS_INIT; | |
518 | int i; | |
519 | struct object *o; | |
520 | char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ | |
521 | const unsigned hexsz = the_hash_algo->hexsz; | |
522 | ||
523 | if (do_reachable_revlist(&cmd, src, reachable) < 0) | |
524 | return -1; | |
525 | ||
526 | while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) { | |
527 | struct object_id sha1; | |
528 | const char *p; | |
529 | ||
530 | if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n') | |
531 | break; | |
532 | ||
533 | o = lookup_object(the_repository, sha1.hash); | |
534 | if (o && o->type == OBJ_COMMIT) { | |
535 | o->flags &= ~TMP_MARK; | |
536 | } | |
537 | } | |
538 | for (i = get_max_object_index(); 0 < i; i--) { | |
539 | o = get_indexed_object(i - 1); | |
540 | if (o && o->type == OBJ_COMMIT && | |
541 | (o->flags & TMP_MARK)) { | |
542 | add_object_array(o, NULL, reachable); | |
543 | o->flags &= ~TMP_MARK; | |
544 | } | |
545 | } | |
546 | close(cmd.out); | |
547 | ||
548 | if (finish_command(&cmd)) | |
549 | return -1; | |
550 | ||
551 | return 0; | |
552 | } | |
553 | ||
554 | static int has_unreachable(struct object_array *src) | |
555 | { | |
556 | struct child_process cmd = CHILD_PROCESS_INIT; | |
557 | char buf[1]; | |
558 | int i; | |
559 | ||
560 | if (do_reachable_revlist(&cmd, src, NULL) < 0) | |
561 | return 1; | |
562 | ||
563 | /* | |
564 | * The commits out of the rev-list are not ancestors of | |
565 | * our ref. | |
566 | */ | |
567 | i = read_in_full(cmd.out, buf, 1); | |
568 | if (i) | |
569 | goto error; | |
570 | close(cmd.out); | |
571 | cmd.out = -1; | |
572 | ||
573 | /* | |
574 | * rev-list may have died by encountering a bad commit | |
575 | * in the history, in which case we do want to bail out | |
576 | * even when it showed no commit. | |
577 | */ | |
578 | if (finish_command(&cmd)) | |
579 | goto error; | |
580 | ||
581 | /* All the non-tip ones are ancestors of what we advertised */ | |
582 | return 0; | |
583 | ||
584 | error: | |
585 | sigchain_pop(SIGPIPE); | |
586 | if (cmd.out >= 0) | |
587 | close(cmd.out); | |
588 | return 1; | |
589 | } | |
590 | ||
591 | static void check_non_tip(struct object_array *want_obj) | |
592 | { | |
593 | int i; | |
594 | ||
595 | /* | |
596 | * In the normal in-process case without | |
597 | * uploadpack.allowReachableSHA1InWant, | |
598 | * non-tip requests can never happen. | |
599 | */ | |
600 | if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1)) | |
601 | goto error; | |
602 | if (!has_unreachable(want_obj)) | |
603 | /* All the non-tip ones are ancestors of what we advertised */ | |
604 | return; | |
605 | ||
606 | error: | |
607 | /* Pick one of them (we know there at least is one) */ | |
608 | for (i = 0; i < want_obj->nr; i++) { | |
609 | struct object *o = want_obj->objects[i].item; | |
610 | if (!is_our_ref(o)) | |
611 | die("git upload-pack: not our ref %s", | |
612 | oid_to_hex(&o->oid)); | |
613 | } | |
614 | } | |
615 | ||
616 | static void send_shallow(struct commit_list *result) | |
617 | { | |
618 | while (result) { | |
619 | struct object *object = &result->item->object; | |
620 | if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { | |
621 | packet_write_fmt(1, "shallow %s", | |
622 | oid_to_hex(&object->oid)); | |
623 | register_shallow(the_repository, &object->oid); | |
624 | shallow_nr++; | |
625 | } | |
626 | result = result->next; | |
627 | } | |
628 | } | |
629 | ||
630 | static void send_unshallow(const struct object_array *shallows, | |
631 | struct object_array *want_obj) | |
632 | { | |
633 | int i; | |
634 | ||
635 | for (i = 0; i < shallows->nr; i++) { | |
636 | struct object *object = shallows->objects[i].item; | |
637 | if (object->flags & NOT_SHALLOW) { | |
638 | struct commit_list *parents; | |
639 | packet_write_fmt(1, "unshallow %s", | |
640 | oid_to_hex(&object->oid)); | |
641 | object->flags &= ~CLIENT_SHALLOW; | |
642 | /* | |
643 | * We want to _register_ "object" as shallow, but we | |
644 | * also need to traverse object's parents to deepen a | |
645 | * shallow clone. Unregister it for now so we can | |
646 | * parse and add the parents to the want list, then | |
647 | * re-register it. | |
648 | */ | |
649 | unregister_shallow(&object->oid); | |
650 | object->parsed = 0; | |
651 | parse_commit_or_die((struct commit *)object); | |
652 | parents = ((struct commit *)object)->parents; | |
653 | while (parents) { | |
654 | add_object_array(&parents->item->object, | |
655 | NULL, want_obj); | |
656 | parents = parents->next; | |
657 | } | |
658 | add_object_array(object, NULL, &extra_edge_obj); | |
659 | } | |
660 | /* make sure commit traversal conforms to client */ | |
661 | register_shallow(the_repository, &object->oid); | |
662 | } | |
663 | } | |
664 | ||
665 | static void deepen(int depth, int deepen_relative, | |
666 | struct object_array *shallows, struct object_array *want_obj) | |
667 | { | |
668 | if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) { | |
669 | int i; | |
670 | ||
671 | for (i = 0; i < shallows->nr; i++) { | |
672 | struct object *object = shallows->objects[i].item; | |
673 | object->flags |= NOT_SHALLOW; | |
674 | } | |
675 | } else if (deepen_relative) { | |
676 | struct object_array reachable_shallows = OBJECT_ARRAY_INIT; | |
677 | struct commit_list *result; | |
678 | ||
679 | get_reachable_list(shallows, &reachable_shallows); | |
680 | result = get_shallow_commits(&reachable_shallows, | |
681 | depth + 1, | |
682 | SHALLOW, NOT_SHALLOW); | |
683 | send_shallow(result); | |
684 | free_commit_list(result); | |
685 | object_array_clear(&reachable_shallows); | |
686 | } else { | |
687 | struct commit_list *result; | |
688 | ||
689 | result = get_shallow_commits(want_obj, depth, | |
690 | SHALLOW, NOT_SHALLOW); | |
691 | send_shallow(result); | |
692 | free_commit_list(result); | |
693 | } | |
694 | ||
695 | send_unshallow(shallows, want_obj); | |
696 | } | |
697 | ||
698 | static void deepen_by_rev_list(int ac, const char **av, | |
699 | struct object_array *shallows, | |
700 | struct object_array *want_obj) | |
701 | { | |
702 | struct commit_list *result; | |
703 | ||
704 | close_commit_graph(the_repository); | |
705 | result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); | |
706 | send_shallow(result); | |
707 | free_commit_list(result); | |
708 | send_unshallow(shallows, want_obj); | |
709 | } | |
710 | ||
711 | /* Returns 1 if a shallow list is sent or 0 otherwise */ | |
712 | static int send_shallow_list(int depth, int deepen_rev_list, | |
713 | timestamp_t deepen_since, | |
714 | struct string_list *deepen_not, | |
715 | struct object_array *shallows, | |
716 | struct object_array *want_obj) | |
717 | { | |
718 | int ret = 0; | |
719 | ||
720 | if (depth > 0 && deepen_rev_list) | |
721 | die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together"); | |
722 | if (depth > 0) { | |
723 | deepen(depth, deepen_relative, shallows, want_obj); | |
724 | ret = 1; | |
725 | } else if (deepen_rev_list) { | |
726 | struct argv_array av = ARGV_ARRAY_INIT; | |
727 | int i; | |
728 | ||
729 | argv_array_push(&av, "rev-list"); | |
730 | if (deepen_since) | |
731 | argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since); | |
732 | if (deepen_not->nr) { | |
733 | argv_array_push(&av, "--not"); | |
734 | for (i = 0; i < deepen_not->nr; i++) { | |
735 | struct string_list_item *s = deepen_not->items + i; | |
736 | argv_array_push(&av, s->string); | |
737 | } | |
738 | argv_array_push(&av, "--not"); | |
739 | } | |
740 | for (i = 0; i < want_obj->nr; i++) { | |
741 | struct object *o = want_obj->objects[i].item; | |
742 | argv_array_push(&av, oid_to_hex(&o->oid)); | |
743 | } | |
744 | deepen_by_rev_list(av.argc, av.argv, shallows, want_obj); | |
745 | argv_array_clear(&av); | |
746 | ret = 1; | |
747 | } else { | |
748 | if (shallows->nr > 0) { | |
749 | int i; | |
750 | for (i = 0; i < shallows->nr; i++) | |
751 | register_shallow(the_repository, | |
752 | &shallows->objects[i].item->oid); | |
753 | } | |
754 | } | |
755 | ||
756 | shallow_nr += shallows->nr; | |
757 | return ret; | |
758 | } | |
759 | ||
760 | static int process_shallow(const char *line, struct object_array *shallows) | |
761 | { | |
762 | const char *arg; | |
763 | if (skip_prefix(line, "shallow ", &arg)) { | |
764 | struct object_id oid; | |
765 | struct object *object; | |
766 | if (get_oid_hex(arg, &oid)) | |
767 | die("invalid shallow line: %s", line); | |
768 | object = parse_object(the_repository, &oid); | |
769 | if (!object) | |
770 | return 1; | |
771 | if (object->type != OBJ_COMMIT) | |
772 | die("invalid shallow object %s", oid_to_hex(&oid)); | |
773 | if (!(object->flags & CLIENT_SHALLOW)) { | |
774 | object->flags |= CLIENT_SHALLOW; | |
775 | add_object_array(object, NULL, shallows); | |
776 | } | |
777 | return 1; | |
778 | } | |
779 | ||
780 | return 0; | |
781 | } | |
782 | ||
783 | static int process_deepen(const char *line, int *depth) | |
784 | { | |
785 | const char *arg; | |
786 | if (skip_prefix(line, "deepen ", &arg)) { | |
787 | char *end = NULL; | |
788 | *depth = (int)strtol(arg, &end, 0); | |
789 | if (!end || *end || *depth <= 0) | |
790 | die("Invalid deepen: %s", line); | |
791 | return 1; | |
792 | } | |
793 | ||
794 | return 0; | |
795 | } | |
796 | ||
797 | static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list) | |
798 | { | |
799 | const char *arg; | |
800 | if (skip_prefix(line, "deepen-since ", &arg)) { | |
801 | char *end = NULL; | |
802 | *deepen_since = parse_timestamp(arg, &end, 0); | |
803 | if (!end || *end || !deepen_since || | |
804 | /* revisions.c's max_age -1 is special */ | |
805 | *deepen_since == -1) | |
806 | die("Invalid deepen-since: %s", line); | |
807 | *deepen_rev_list = 1; | |
808 | return 1; | |
809 | } | |
810 | return 0; | |
811 | } | |
812 | ||
813 | static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list) | |
814 | { | |
815 | const char *arg; | |
816 | if (skip_prefix(line, "deepen-not ", &arg)) { | |
817 | char *ref = NULL; | |
818 | struct object_id oid; | |
819 | if (expand_ref(arg, strlen(arg), &oid, &ref) != 1) | |
820 | die("git upload-pack: ambiguous deepen-not: %s", line); | |
821 | string_list_append(deepen_not, ref); | |
822 | free(ref); | |
823 | *deepen_rev_list = 1; | |
824 | return 1; | |
825 | } | |
826 | return 0; | |
827 | } | |
828 | ||
829 | static void receive_needs(struct packet_reader *reader, struct object_array *want_obj) | |
830 | { | |
831 | struct object_array shallows = OBJECT_ARRAY_INIT; | |
832 | struct string_list deepen_not = STRING_LIST_INIT_DUP; | |
833 | int depth = 0; | |
834 | int has_non_tip = 0; | |
835 | timestamp_t deepen_since = 0; | |
836 | int deepen_rev_list = 0; | |
837 | ||
838 | shallow_nr = 0; | |
839 | for (;;) { | |
840 | struct object *o; | |
841 | const char *features; | |
842 | struct object_id oid_buf; | |
843 | const char *arg; | |
844 | ||
845 | reset_timeout(); | |
846 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) | |
847 | break; | |
848 | ||
849 | if (process_shallow(reader->line, &shallows)) | |
850 | continue; | |
851 | if (process_deepen(reader->line, &depth)) | |
852 | continue; | |
853 | if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list)) | |
854 | continue; | |
855 | if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list)) | |
856 | continue; | |
857 | ||
858 | if (skip_prefix(reader->line, "filter ", &arg)) { | |
859 | if (!filter_capability_requested) | |
860 | die("git upload-pack: filtering capability not negotiated"); | |
861 | parse_list_objects_filter(&filter_options, arg); | |
862 | continue; | |
863 | } | |
864 | ||
865 | if (!skip_prefix(reader->line, "want ", &arg) || | |
866 | parse_oid_hex(arg, &oid_buf, &features)) | |
867 | die("git upload-pack: protocol error, " | |
868 | "expected to get object ID, not '%s'", reader->line); | |
869 | ||
870 | if (parse_feature_request(features, "deepen-relative")) | |
871 | deepen_relative = 1; | |
872 | if (parse_feature_request(features, "multi_ack_detailed")) | |
873 | multi_ack = 2; | |
874 | else if (parse_feature_request(features, "multi_ack")) | |
875 | multi_ack = 1; | |
876 | if (parse_feature_request(features, "no-done")) | |
877 | no_done = 1; | |
878 | if (parse_feature_request(features, "thin-pack")) | |
879 | use_thin_pack = 1; | |
880 | if (parse_feature_request(features, "ofs-delta")) | |
881 | use_ofs_delta = 1; | |
882 | if (parse_feature_request(features, "side-band-64k")) | |
883 | use_sideband = LARGE_PACKET_MAX; | |
884 | else if (parse_feature_request(features, "side-band")) | |
885 | use_sideband = DEFAULT_PACKET_MAX; | |
886 | if (parse_feature_request(features, "no-progress")) | |
887 | no_progress = 1; | |
888 | if (parse_feature_request(features, "include-tag")) | |
889 | use_include_tag = 1; | |
890 | if (allow_filter && parse_feature_request(features, "filter")) | |
891 | filter_capability_requested = 1; | |
892 | ||
893 | o = parse_object(the_repository, &oid_buf); | |
894 | if (!o) { | |
895 | packet_write_fmt(1, | |
896 | "ERR upload-pack: not our ref %s", | |
897 | oid_to_hex(&oid_buf)); | |
898 | die("git upload-pack: not our ref %s", | |
899 | oid_to_hex(&oid_buf)); | |
900 | } | |
901 | if (!(o->flags & WANTED)) { | |
902 | o->flags |= WANTED; | |
903 | if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 | |
904 | || is_our_ref(o))) | |
905 | has_non_tip = 1; | |
906 | add_object_array(o, NULL, want_obj); | |
907 | } | |
908 | } | |
909 | ||
910 | /* | |
911 | * We have sent all our refs already, and the other end | |
912 | * should have chosen out of them. When we are operating | |
913 | * in the stateless RPC mode, however, their choice may | |
914 | * have been based on the set of older refs advertised | |
915 | * by another process that handled the initial request. | |
916 | */ | |
917 | if (has_non_tip) | |
918 | check_non_tip(want_obj); | |
919 | ||
920 | if (!use_sideband && daemon_mode) | |
921 | no_progress = 1; | |
922 | ||
923 | if (depth == 0 && !deepen_rev_list && shallows.nr == 0) | |
924 | return; | |
925 | ||
926 | if (send_shallow_list(depth, deepen_rev_list, deepen_since, | |
927 | &deepen_not, &shallows, want_obj)) | |
928 | packet_flush(1); | |
929 | object_array_clear(&shallows); | |
930 | } | |
931 | ||
932 | /* return non-zero if the ref is hidden, otherwise 0 */ | |
933 | static int mark_our_ref(const char *refname, const char *refname_full, | |
934 | const struct object_id *oid) | |
935 | { | |
936 | struct object *o = lookup_unknown_object(oid->hash); | |
937 | ||
938 | if (ref_is_hidden(refname, refname_full)) { | |
939 | o->flags |= HIDDEN_REF; | |
940 | return 1; | |
941 | } | |
942 | o->flags |= OUR_REF; | |
943 | return 0; | |
944 | } | |
945 | ||
946 | static int check_ref(const char *refname_full, const struct object_id *oid, | |
947 | int flag, void *cb_data) | |
948 | { | |
949 | const char *refname = strip_namespace(refname_full); | |
950 | ||
951 | mark_our_ref(refname, refname_full, oid); | |
952 | return 0; | |
953 | } | |
954 | ||
955 | static void format_symref_info(struct strbuf *buf, struct string_list *symref) | |
956 | { | |
957 | struct string_list_item *item; | |
958 | ||
959 | if (!symref->nr) | |
960 | return; | |
961 | for_each_string_list_item(item, symref) | |
962 | strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util); | |
963 | } | |
964 | ||
965 | static int send_ref(const char *refname, const struct object_id *oid, | |
966 | int flag, void *cb_data) | |
967 | { | |
968 | static const char *capabilities = "multi_ack thin-pack side-band" | |
969 | " side-band-64k ofs-delta shallow deepen-since deepen-not" | |
970 | " deepen-relative no-progress include-tag multi_ack_detailed"; | |
971 | const char *refname_nons = strip_namespace(refname); | |
972 | struct object_id peeled; | |
973 | ||
974 | if (mark_our_ref(refname_nons, refname, oid)) | |
975 | return 0; | |
976 | ||
977 | if (capabilities) { | |
978 | struct strbuf symref_info = STRBUF_INIT; | |
979 | ||
980 | format_symref_info(&symref_info, cb_data); | |
981 | packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n", | |
982 | oid_to_hex(oid), refname_nons, | |
983 | 0, capabilities, | |
984 | (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ? | |
985 | " allow-tip-sha1-in-want" : "", | |
986 | (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ? | |
987 | " allow-reachable-sha1-in-want" : "", | |
988 | stateless_rpc ? " no-done" : "", | |
989 | symref_info.buf, | |
990 | allow_filter ? " filter" : "", | |
991 | git_user_agent_sanitized()); | |
992 | strbuf_release(&symref_info); | |
993 | } else { | |
994 | packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons); | |
995 | } | |
996 | capabilities = NULL; | |
997 | if (!peel_ref(refname, &peeled)) | |
998 | packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); | |
999 | return 0; | |
1000 | } | |
1001 | ||
1002 | static int find_symref(const char *refname, const struct object_id *oid, | |
1003 | int flag, void *cb_data) | |
1004 | { | |
1005 | const char *symref_target; | |
1006 | struct string_list_item *item; | |
1007 | ||
1008 | if ((flag & REF_ISSYMREF) == 0) | |
1009 | return 0; | |
1010 | symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag); | |
1011 | if (!symref_target || (flag & REF_ISSYMREF) == 0) | |
1012 | die("'%s' is a symref but it is not?", refname); | |
1013 | item = string_list_append(cb_data, refname); | |
1014 | item->util = xstrdup(symref_target); | |
1015 | return 0; | |
1016 | } | |
1017 | ||
1018 | static int upload_pack_config(const char *var, const char *value, void *unused) | |
1019 | { | |
1020 | if (!strcmp("uploadpack.allowtipsha1inwant", var)) { | |
1021 | if (git_config_bool(var, value)) | |
1022 | allow_unadvertised_object_request |= ALLOW_TIP_SHA1; | |
1023 | else | |
1024 | allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1; | |
1025 | } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) { | |
1026 | if (git_config_bool(var, value)) | |
1027 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; | |
1028 | else | |
1029 | allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1; | |
1030 | } else if (!strcmp("uploadpack.allowanysha1inwant", var)) { | |
1031 | if (git_config_bool(var, value)) | |
1032 | allow_unadvertised_object_request |= ALLOW_ANY_SHA1; | |
1033 | else | |
1034 | allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1; | |
1035 | } else if (!strcmp("uploadpack.keepalive", var)) { | |
1036 | keepalive = git_config_int(var, value); | |
1037 | if (!keepalive) | |
1038 | keepalive = -1; | |
1039 | } else if (!strcmp("uploadpack.allowfilter", var)) { | |
1040 | allow_filter = git_config_bool(var, value); | |
1041 | } else if (!strcmp("uploadpack.allowrefinwant", var)) { | |
1042 | allow_ref_in_want = git_config_bool(var, value); | |
1043 | } | |
1044 | ||
1045 | if (current_config_scope() != CONFIG_SCOPE_REPO) { | |
1046 | if (!strcmp("uploadpack.packobjectshook", var)) | |
1047 | return git_config_string(&pack_objects_hook, var, value); | |
1048 | } | |
1049 | ||
1050 | return parse_hide_refs_config(var, value, "uploadpack"); | |
1051 | } | |
1052 | ||
1053 | void upload_pack(struct upload_pack_options *options) | |
1054 | { | |
1055 | struct string_list symref = STRING_LIST_INIT_DUP; | |
1056 | struct object_array want_obj = OBJECT_ARRAY_INIT; | |
1057 | struct packet_reader reader; | |
1058 | ||
1059 | stateless_rpc = options->stateless_rpc; | |
1060 | timeout = options->timeout; | |
1061 | daemon_mode = options->daemon_mode; | |
1062 | ||
1063 | git_config(upload_pack_config, NULL); | |
1064 | ||
1065 | head_ref_namespaced(find_symref, &symref); | |
1066 | ||
1067 | if (options->advertise_refs || !stateless_rpc) { | |
1068 | reset_timeout(); | |
1069 | head_ref_namespaced(send_ref, &symref); | |
1070 | for_each_namespaced_ref(send_ref, &symref); | |
1071 | advertise_shallow_grafts(1); | |
1072 | packet_flush(1); | |
1073 | } else { | |
1074 | head_ref_namespaced(check_ref, NULL); | |
1075 | for_each_namespaced_ref(check_ref, NULL); | |
1076 | } | |
1077 | string_list_clear(&symref, 1); | |
1078 | if (options->advertise_refs) | |
1079 | return; | |
1080 | ||
1081 | packet_reader_init(&reader, 0, NULL, 0, | |
1082 | PACKET_READ_CHOMP_NEWLINE | | |
1083 | PACKET_READ_DIE_ON_ERR_PACKET); | |
1084 | ||
1085 | receive_needs(&reader, &want_obj); | |
1086 | if (want_obj.nr) { | |
1087 | struct object_array have_obj = OBJECT_ARRAY_INIT; | |
1088 | get_common_commits(&reader, &have_obj, &want_obj); | |
1089 | create_pack_file(&have_obj, &want_obj); | |
1090 | } | |
1091 | } | |
1092 | ||
1093 | struct upload_pack_data { | |
1094 | struct object_array wants; | |
1095 | struct string_list wanted_refs; | |
1096 | struct oid_array haves; | |
1097 | ||
1098 | struct object_array shallows; | |
1099 | struct string_list deepen_not; | |
1100 | int depth; | |
1101 | timestamp_t deepen_since; | |
1102 | int deepen_rev_list; | |
1103 | int deepen_relative; | |
1104 | ||
1105 | unsigned stateless_rpc : 1; | |
1106 | ||
1107 | unsigned use_thin_pack : 1; | |
1108 | unsigned use_ofs_delta : 1; | |
1109 | unsigned no_progress : 1; | |
1110 | unsigned use_include_tag : 1; | |
1111 | unsigned done : 1; | |
1112 | }; | |
1113 | ||
1114 | static void upload_pack_data_init(struct upload_pack_data *data) | |
1115 | { | |
1116 | struct object_array wants = OBJECT_ARRAY_INIT; | |
1117 | struct string_list wanted_refs = STRING_LIST_INIT_DUP; | |
1118 | struct oid_array haves = OID_ARRAY_INIT; | |
1119 | struct object_array shallows = OBJECT_ARRAY_INIT; | |
1120 | struct string_list deepen_not = STRING_LIST_INIT_DUP; | |
1121 | ||
1122 | memset(data, 0, sizeof(*data)); | |
1123 | data->wants = wants; | |
1124 | data->wanted_refs = wanted_refs; | |
1125 | data->haves = haves; | |
1126 | data->shallows = shallows; | |
1127 | data->deepen_not = deepen_not; | |
1128 | } | |
1129 | ||
1130 | static void upload_pack_data_clear(struct upload_pack_data *data) | |
1131 | { | |
1132 | object_array_clear(&data->wants); | |
1133 | string_list_clear(&data->wanted_refs, 1); | |
1134 | oid_array_clear(&data->haves); | |
1135 | object_array_clear(&data->shallows); | |
1136 | string_list_clear(&data->deepen_not, 0); | |
1137 | } | |
1138 | ||
1139 | static int parse_want(const char *line, struct object_array *want_obj) | |
1140 | { | |
1141 | const char *arg; | |
1142 | if (skip_prefix(line, "want ", &arg)) { | |
1143 | struct object_id oid; | |
1144 | struct object *o; | |
1145 | ||
1146 | if (get_oid_hex(arg, &oid)) | |
1147 | die("git upload-pack: protocol error, " | |
1148 | "expected to get oid, not '%s'", line); | |
1149 | ||
1150 | o = parse_object(the_repository, &oid); | |
1151 | if (!o) { | |
1152 | packet_write_fmt(1, | |
1153 | "ERR upload-pack: not our ref %s", | |
1154 | oid_to_hex(&oid)); | |
1155 | die("git upload-pack: not our ref %s", | |
1156 | oid_to_hex(&oid)); | |
1157 | } | |
1158 | ||
1159 | if (!(o->flags & WANTED)) { | |
1160 | o->flags |= WANTED; | |
1161 | add_object_array(o, NULL, want_obj); | |
1162 | } | |
1163 | ||
1164 | return 1; | |
1165 | } | |
1166 | ||
1167 | return 0; | |
1168 | } | |
1169 | ||
1170 | static int parse_want_ref(const char *line, struct string_list *wanted_refs, | |
1171 | struct object_array *want_obj) | |
1172 | { | |
1173 | const char *arg; | |
1174 | if (skip_prefix(line, "want-ref ", &arg)) { | |
1175 | struct object_id oid; | |
1176 | struct string_list_item *item; | |
1177 | struct object *o; | |
1178 | ||
1179 | if (read_ref(arg, &oid)) { | |
1180 | packet_write_fmt(1, "ERR unknown ref %s", arg); | |
1181 | die("unknown ref %s", arg); | |
1182 | } | |
1183 | ||
1184 | item = string_list_append(wanted_refs, arg); | |
1185 | item->util = oiddup(&oid); | |
1186 | ||
1187 | o = parse_object_or_die(&oid, arg); | |
1188 | if (!(o->flags & WANTED)) { | |
1189 | o->flags |= WANTED; | |
1190 | add_object_array(o, NULL, want_obj); | |
1191 | } | |
1192 | ||
1193 | return 1; | |
1194 | } | |
1195 | ||
1196 | return 0; | |
1197 | } | |
1198 | ||
1199 | static int parse_have(const char *line, struct oid_array *haves) | |
1200 | { | |
1201 | const char *arg; | |
1202 | if (skip_prefix(line, "have ", &arg)) { | |
1203 | struct object_id oid; | |
1204 | ||
1205 | if (get_oid_hex(arg, &oid)) | |
1206 | die("git upload-pack: expected SHA1 object, got '%s'", arg); | |
1207 | oid_array_append(haves, &oid); | |
1208 | return 1; | |
1209 | } | |
1210 | ||
1211 | return 0; | |
1212 | } | |
1213 | ||
1214 | static void process_args(struct packet_reader *request, | |
1215 | struct upload_pack_data *data, | |
1216 | struct object_array *want_obj) | |
1217 | { | |
1218 | while (packet_reader_read(request) != PACKET_READ_FLUSH) { | |
1219 | const char *arg = request->line; | |
1220 | const char *p; | |
1221 | ||
1222 | /* process want */ | |
1223 | if (parse_want(arg, want_obj)) | |
1224 | continue; | |
1225 | if (allow_ref_in_want && | |
1226 | parse_want_ref(arg, &data->wanted_refs, want_obj)) | |
1227 | continue; | |
1228 | /* process have line */ | |
1229 | if (parse_have(arg, &data->haves)) | |
1230 | continue; | |
1231 | ||
1232 | /* process args like thin-pack */ | |
1233 | if (!strcmp(arg, "thin-pack")) { | |
1234 | use_thin_pack = 1; | |
1235 | continue; | |
1236 | } | |
1237 | if (!strcmp(arg, "ofs-delta")) { | |
1238 | use_ofs_delta = 1; | |
1239 | continue; | |
1240 | } | |
1241 | if (!strcmp(arg, "no-progress")) { | |
1242 | no_progress = 1; | |
1243 | continue; | |
1244 | } | |
1245 | if (!strcmp(arg, "include-tag")) { | |
1246 | use_include_tag = 1; | |
1247 | continue; | |
1248 | } | |
1249 | if (!strcmp(arg, "done")) { | |
1250 | data->done = 1; | |
1251 | continue; | |
1252 | } | |
1253 | ||
1254 | /* Shallow related arguments */ | |
1255 | if (process_shallow(arg, &data->shallows)) | |
1256 | continue; | |
1257 | if (process_deepen(arg, &data->depth)) | |
1258 | continue; | |
1259 | if (process_deepen_since(arg, &data->deepen_since, | |
1260 | &data->deepen_rev_list)) | |
1261 | continue; | |
1262 | if (process_deepen_not(arg, &data->deepen_not, | |
1263 | &data->deepen_rev_list)) | |
1264 | continue; | |
1265 | if (!strcmp(arg, "deepen-relative")) { | |
1266 | data->deepen_relative = 1; | |
1267 | continue; | |
1268 | } | |
1269 | ||
1270 | if (allow_filter && skip_prefix(arg, "filter ", &p)) { | |
1271 | parse_list_objects_filter(&filter_options, p); | |
1272 | continue; | |
1273 | } | |
1274 | ||
1275 | /* ignore unknown lines maybe? */ | |
1276 | die("unexpected line: '%s'", arg); | |
1277 | } | |
1278 | } | |
1279 | ||
1280 | static int process_haves(struct oid_array *haves, struct oid_array *common, | |
1281 | struct object_array *have_obj) | |
1282 | { | |
1283 | int i; | |
1284 | ||
1285 | /* Process haves */ | |
1286 | for (i = 0; i < haves->nr; i++) { | |
1287 | const struct object_id *oid = &haves->oid[i]; | |
1288 | struct object *o; | |
1289 | int we_knew_they_have = 0; | |
1290 | ||
1291 | if (!has_object_file(oid)) | |
1292 | continue; | |
1293 | ||
1294 | oid_array_append(common, oid); | |
1295 | ||
1296 | o = parse_object(the_repository, oid); | |
1297 | if (!o) | |
1298 | die("oops (%s)", oid_to_hex(oid)); | |
1299 | if (o->type == OBJ_COMMIT) { | |
1300 | struct commit_list *parents; | |
1301 | struct commit *commit = (struct commit *)o; | |
1302 | if (o->flags & THEY_HAVE) | |
1303 | we_knew_they_have = 1; | |
1304 | else | |
1305 | o->flags |= THEY_HAVE; | |
1306 | if (!oldest_have || (commit->date < oldest_have)) | |
1307 | oldest_have = commit->date; | |
1308 | for (parents = commit->parents; | |
1309 | parents; | |
1310 | parents = parents->next) | |
1311 | parents->item->object.flags |= THEY_HAVE; | |
1312 | } | |
1313 | if (!we_knew_they_have) | |
1314 | add_object_array(o, NULL, have_obj); | |
1315 | } | |
1316 | ||
1317 | return 0; | |
1318 | } | |
1319 | ||
1320 | static int send_acks(struct oid_array *acks, struct strbuf *response, | |
1321 | const struct object_array *have_obj, | |
1322 | struct object_array *want_obj) | |
1323 | { | |
1324 | int i; | |
1325 | ||
1326 | packet_buf_write(response, "acknowledgments\n"); | |
1327 | ||
1328 | /* Send Acks */ | |
1329 | if (!acks->nr) | |
1330 | packet_buf_write(response, "NAK\n"); | |
1331 | ||
1332 | for (i = 0; i < acks->nr; i++) { | |
1333 | packet_buf_write(response, "ACK %s\n", | |
1334 | oid_to_hex(&acks->oid[i])); | |
1335 | } | |
1336 | ||
1337 | if (ok_to_give_up(have_obj, want_obj)) { | |
1338 | /* Send Ready */ | |
1339 | packet_buf_write(response, "ready\n"); | |
1340 | return 1; | |
1341 | } | |
1342 | ||
1343 | return 0; | |
1344 | } | |
1345 | ||
1346 | static int process_haves_and_send_acks(struct upload_pack_data *data, | |
1347 | struct object_array *have_obj, | |
1348 | struct object_array *want_obj) | |
1349 | { | |
1350 | struct oid_array common = OID_ARRAY_INIT; | |
1351 | struct strbuf response = STRBUF_INIT; | |
1352 | int ret = 0; | |
1353 | ||
1354 | process_haves(&data->haves, &common, have_obj); | |
1355 | if (data->done) { | |
1356 | ret = 1; | |
1357 | } else if (send_acks(&common, &response, have_obj, want_obj)) { | |
1358 | packet_buf_delim(&response); | |
1359 | ret = 1; | |
1360 | } else { | |
1361 | /* Add Flush */ | |
1362 | packet_buf_flush(&response); | |
1363 | ret = 0; | |
1364 | } | |
1365 | ||
1366 | /* Send response */ | |
1367 | write_or_die(1, response.buf, response.len); | |
1368 | strbuf_release(&response); | |
1369 | ||
1370 | oid_array_clear(&data->haves); | |
1371 | oid_array_clear(&common); | |
1372 | return ret; | |
1373 | } | |
1374 | ||
1375 | static void send_wanted_ref_info(struct upload_pack_data *data) | |
1376 | { | |
1377 | const struct string_list_item *item; | |
1378 | ||
1379 | if (!data->wanted_refs.nr) | |
1380 | return; | |
1381 | ||
1382 | packet_write_fmt(1, "wanted-refs\n"); | |
1383 | ||
1384 | for_each_string_list_item(item, &data->wanted_refs) { | |
1385 | packet_write_fmt(1, "%s %s\n", | |
1386 | oid_to_hex(item->util), | |
1387 | item->string); | |
1388 | } | |
1389 | ||
1390 | packet_delim(1); | |
1391 | } | |
1392 | ||
1393 | static void send_shallow_info(struct upload_pack_data *data, | |
1394 | struct object_array *want_obj) | |
1395 | { | |
1396 | /* No shallow info needs to be sent */ | |
1397 | if (!data->depth && !data->deepen_rev_list && !data->shallows.nr && | |
1398 | !is_repository_shallow(the_repository)) | |
1399 | return; | |
1400 | ||
1401 | packet_write_fmt(1, "shallow-info\n"); | |
1402 | ||
1403 | if (!send_shallow_list(data->depth, data->deepen_rev_list, | |
1404 | data->deepen_since, &data->deepen_not, | |
1405 | &data->shallows, want_obj) && | |
1406 | is_repository_shallow(the_repository)) | |
1407 | deepen(INFINITE_DEPTH, data->deepen_relative, &data->shallows, | |
1408 | want_obj); | |
1409 | ||
1410 | packet_delim(1); | |
1411 | } | |
1412 | ||
1413 | enum fetch_state { | |
1414 | FETCH_PROCESS_ARGS = 0, | |
1415 | FETCH_SEND_ACKS, | |
1416 | FETCH_SEND_PACK, | |
1417 | FETCH_DONE, | |
1418 | }; | |
1419 | ||
1420 | int upload_pack_v2(struct repository *r, struct argv_array *keys, | |
1421 | struct packet_reader *request) | |
1422 | { | |
1423 | enum fetch_state state = FETCH_PROCESS_ARGS; | |
1424 | struct upload_pack_data data; | |
1425 | struct object_array have_obj = OBJECT_ARRAY_INIT; | |
1426 | struct object_array want_obj = OBJECT_ARRAY_INIT; | |
1427 | ||
1428 | clear_object_flags(ALL_FLAGS); | |
1429 | ||
1430 | git_config(upload_pack_config, NULL); | |
1431 | ||
1432 | upload_pack_data_init(&data); | |
1433 | use_sideband = LARGE_PACKET_MAX; | |
1434 | ||
1435 | while (state != FETCH_DONE) { | |
1436 | switch (state) { | |
1437 | case FETCH_PROCESS_ARGS: | |
1438 | process_args(request, &data, &want_obj); | |
1439 | ||
1440 | if (!want_obj.nr) { | |
1441 | /* | |
1442 | * Request didn't contain any 'want' lines, | |
1443 | * guess they didn't want anything. | |
1444 | */ | |
1445 | state = FETCH_DONE; | |
1446 | } else if (data.haves.nr) { | |
1447 | /* | |
1448 | * Request had 'have' lines, so lets ACK them. | |
1449 | */ | |
1450 | state = FETCH_SEND_ACKS; | |
1451 | } else { | |
1452 | /* | |
1453 | * Request had 'want's but no 'have's so we can | |
1454 | * immedietly go to construct and send a pack. | |
1455 | */ | |
1456 | state = FETCH_SEND_PACK; | |
1457 | } | |
1458 | break; | |
1459 | case FETCH_SEND_ACKS: | |
1460 | if (process_haves_and_send_acks(&data, &have_obj, | |
1461 | &want_obj)) | |
1462 | state = FETCH_SEND_PACK; | |
1463 | else | |
1464 | state = FETCH_DONE; | |
1465 | break; | |
1466 | case FETCH_SEND_PACK: | |
1467 | send_wanted_ref_info(&data); | |
1468 | send_shallow_info(&data, &want_obj); | |
1469 | ||
1470 | packet_write_fmt(1, "packfile\n"); | |
1471 | create_pack_file(&have_obj, &want_obj); | |
1472 | state = FETCH_DONE; | |
1473 | break; | |
1474 | case FETCH_DONE: | |
1475 | continue; | |
1476 | } | |
1477 | } | |
1478 | ||
1479 | upload_pack_data_clear(&data); | |
1480 | object_array_clear(&have_obj); | |
1481 | object_array_clear(&want_obj); | |
1482 | return 0; | |
1483 | } | |
1484 | ||
1485 | int upload_pack_advertise(struct repository *r, | |
1486 | struct strbuf *value) | |
1487 | { | |
1488 | if (value) { | |
1489 | int allow_filter_value; | |
1490 | int allow_ref_in_want; | |
1491 | ||
1492 | strbuf_addstr(value, "shallow"); | |
1493 | ||
1494 | if (!repo_config_get_bool(the_repository, | |
1495 | "uploadpack.allowfilter", | |
1496 | &allow_filter_value) && | |
1497 | allow_filter_value) | |
1498 | strbuf_addstr(value, " filter"); | |
1499 | ||
1500 | if (!repo_config_get_bool(the_repository, | |
1501 | "uploadpack.allowrefinwant", | |
1502 | &allow_ref_in_want) && | |
1503 | allow_ref_in_want) | |
1504 | strbuf_addstr(value, " ref-in-want"); | |
1505 | } | |
1506 | ||
1507 | return 1; | |
1508 | } |