format-patch: add --interdiff option to embed diff in cover letter
[git.git] / upload-pack.c
blob936acabbdd1b171e5183e3f25a3624d0ca74049e
1 #include "cache.h"
2 #include "config.h"
3 #include "refs.h"
4 #include "pkt-line.h"
5 #include "sideband.h"
6 #include "object-store.h"
7 #include "tag.h"
8 #include "object.h"
9 #include "commit.h"
10 #include "diff.h"
11 #include "revision.h"
12 #include "list-objects.h"
13 #include "list-objects-filter.h"
14 #include "list-objects-filter-options.h"
15 #include "run-command.h"
16 #include "connect.h"
17 #include "sigchain.h"
18 #include "version.h"
19 #include "string-list.h"
20 #include "argv-array.h"
21 #include "prio-queue.h"
22 #include "protocol.h"
23 #include "quote.h"
24 #include "upload-pack.h"
25 #include "serve.h"
27 /* Remember to update object flag allocation in object.h */
28 #define THEY_HAVE (1u << 11)
29 #define OUR_REF (1u << 12)
30 #define WANTED (1u << 13)
31 #define COMMON_KNOWN (1u << 14)
32 #define REACHABLE (1u << 15)
34 #define SHALLOW (1u << 16)
35 #define NOT_SHALLOW (1u << 17)
36 #define CLIENT_SHALLOW (1u << 18)
37 #define HIDDEN_REF (1u << 19)
39 static timestamp_t oldest_have;
41 static int deepen_relative;
42 static int multi_ack;
43 static int no_done;
44 static int use_thin_pack, use_ofs_delta, use_include_tag;
45 static int no_progress, daemon_mode;
46 /* Allow specifying sha1 if it is a ref tip. */
47 #define ALLOW_TIP_SHA1 01
48 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
49 #define ALLOW_REACHABLE_SHA1 02
50 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
51 #define ALLOW_ANY_SHA1 07
52 static unsigned int allow_unadvertised_object_request;
53 static int shallow_nr;
54 static struct object_array have_obj;
55 static struct object_array want_obj;
56 static struct object_array extra_edge_obj;
57 static unsigned int timeout;
58 static int keepalive = 5;
59 /* 0 for no sideband,
60 * otherwise maximum packet size (up to 65520 bytes).
62 static int use_sideband;
63 static int stateless_rpc;
64 static const char *pack_objects_hook;
66 static int filter_capability_requested;
67 static int allow_filter;
68 static struct list_objects_filter_options filter_options;
70 static void reset_timeout(void)
72 alarm(timeout);
75 static void send_client_data(int fd, const char *data, ssize_t sz)
77 if (use_sideband) {
78 send_sideband(1, fd, data, sz, use_sideband);
79 return;
81 if (fd == 3)
82 /* emergency quit */
83 fd = 2;
84 if (fd == 2) {
85 /* XXX: are we happy to lose stuff here? */
86 xwrite(fd, data, sz);
87 return;
89 write_or_die(fd, data, sz);
92 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
94 FILE *fp = cb_data;
95 if (graft->nr_parent == -1)
96 fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));
97 return 0;
100 static void create_pack_file(void)
102 struct child_process pack_objects = CHILD_PROCESS_INIT;
103 char data[8193], progress[128];
104 char abort_msg[] = "aborting due to possible repository "
105 "corruption on the remote side.";
106 int buffered = -1;
107 ssize_t sz;
108 int i;
109 FILE *pipe_fd;
111 if (!pack_objects_hook)
112 pack_objects.git_cmd = 1;
113 else {
114 argv_array_push(&pack_objects.args, pack_objects_hook);
115 argv_array_push(&pack_objects.args, "git");
116 pack_objects.use_shell = 1;
119 if (shallow_nr) {
120 argv_array_push(&pack_objects.args, "--shallow-file");
121 argv_array_push(&pack_objects.args, "");
123 argv_array_push(&pack_objects.args, "pack-objects");
124 argv_array_push(&pack_objects.args, "--revs");
125 if (use_thin_pack)
126 argv_array_push(&pack_objects.args, "--thin");
128 argv_array_push(&pack_objects.args, "--stdout");
129 if (shallow_nr)
130 argv_array_push(&pack_objects.args, "--shallow");
131 if (!no_progress)
132 argv_array_push(&pack_objects.args, "--progress");
133 if (use_ofs_delta)
134 argv_array_push(&pack_objects.args, "--delta-base-offset");
135 if (use_include_tag)
136 argv_array_push(&pack_objects.args, "--include-tag");
137 if (filter_options.filter_spec) {
138 if (pack_objects.use_shell) {
139 struct strbuf buf = STRBUF_INIT;
140 sq_quote_buf(&buf, filter_options.filter_spec);
141 argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
142 strbuf_release(&buf);
143 } else {
144 argv_array_pushf(&pack_objects.args, "--filter=%s",
145 filter_options.filter_spec);
149 pack_objects.in = -1;
150 pack_objects.out = -1;
151 pack_objects.err = -1;
153 if (start_command(&pack_objects))
154 die("git upload-pack: unable to fork git-pack-objects");
156 pipe_fd = xfdopen(pack_objects.in, "w");
158 if (shallow_nr)
159 for_each_commit_graft(write_one_shallow, pipe_fd);
161 for (i = 0; i < want_obj.nr; i++)
162 fprintf(pipe_fd, "%s\n",
163 oid_to_hex(&want_obj.objects[i].item->oid));
164 fprintf(pipe_fd, "--not\n");
165 for (i = 0; i < have_obj.nr; i++)
166 fprintf(pipe_fd, "%s\n",
167 oid_to_hex(&have_obj.objects[i].item->oid));
168 for (i = 0; i < extra_edge_obj.nr; i++)
169 fprintf(pipe_fd, "%s\n",
170 oid_to_hex(&extra_edge_obj.objects[i].item->oid));
171 fprintf(pipe_fd, "\n");
172 fflush(pipe_fd);
173 fclose(pipe_fd);
175 /* We read from pack_objects.err to capture stderr output for
176 * progress bar, and pack_objects.out to capture the pack data.
179 while (1) {
180 struct pollfd pfd[2];
181 int pe, pu, pollsize;
182 int ret;
184 reset_timeout();
186 pollsize = 0;
187 pe = pu = -1;
189 if (0 <= pack_objects.out) {
190 pfd[pollsize].fd = pack_objects.out;
191 pfd[pollsize].events = POLLIN;
192 pu = pollsize;
193 pollsize++;
195 if (0 <= pack_objects.err) {
196 pfd[pollsize].fd = pack_objects.err;
197 pfd[pollsize].events = POLLIN;
198 pe = pollsize;
199 pollsize++;
202 if (!pollsize)
203 break;
205 ret = poll(pfd, pollsize,
206 keepalive < 0 ? -1 : 1000 * keepalive);
208 if (ret < 0) {
209 if (errno != EINTR) {
210 error_errno("poll failed, resuming");
211 sleep(1);
213 continue;
215 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
216 /* Status ready; we ship that in the side-band
217 * or dump to the standard error.
219 sz = xread(pack_objects.err, progress,
220 sizeof(progress));
221 if (0 < sz)
222 send_client_data(2, progress, sz);
223 else if (sz == 0) {
224 close(pack_objects.err);
225 pack_objects.err = -1;
227 else
228 goto fail;
229 /* give priority to status messages */
230 continue;
232 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
233 /* Data ready; we keep the last byte to ourselves
234 * in case we detect broken rev-list, so that we
235 * can leave the stream corrupted. This is
236 * unfortunate -- unpack-objects would happily
237 * accept a valid packdata with trailing garbage,
238 * so appending garbage after we pass all the
239 * pack data is not good enough to signal
240 * breakage to downstream.
242 char *cp = data;
243 ssize_t outsz = 0;
244 if (0 <= buffered) {
245 *cp++ = buffered;
246 outsz++;
248 sz = xread(pack_objects.out, cp,
249 sizeof(data) - outsz);
250 if (0 < sz)
252 else if (sz == 0) {
253 close(pack_objects.out);
254 pack_objects.out = -1;
256 else
257 goto fail;
258 sz += outsz;
259 if (1 < sz) {
260 buffered = data[sz-1] & 0xFF;
261 sz--;
263 else
264 buffered = -1;
265 send_client_data(1, data, sz);
269 * We hit the keepalive timeout without saying anything; send
270 * an empty message on the data sideband just to let the other
271 * side know we're still working on it, but don't have any data
272 * yet.
274 * If we don't have a sideband channel, there's no room in the
275 * protocol to say anything, so those clients are just out of
276 * luck.
278 if (!ret && use_sideband) {
279 static const char buf[] = "0005\1";
280 write_or_die(1, buf, 5);
284 if (finish_command(&pack_objects)) {
285 error("git upload-pack: git-pack-objects died with error.");
286 goto fail;
289 /* flush the data */
290 if (0 <= buffered) {
291 data[0] = buffered;
292 send_client_data(1, data, 1);
293 fprintf(stderr, "flushed.\n");
295 if (use_sideband)
296 packet_flush(1);
297 return;
299 fail:
300 send_client_data(3, abort_msg, sizeof(abort_msg));
301 die("git upload-pack: %s", abort_msg);
304 static int got_oid(const char *hex, struct object_id *oid)
306 struct object *o;
307 int we_knew_they_have = 0;
309 if (get_oid_hex(hex, oid))
310 die("git upload-pack: expected SHA1 object, got '%s'", hex);
311 if (!has_object_file(oid))
312 return -1;
314 o = parse_object(oid);
315 if (!o)
316 die("oops (%s)", oid_to_hex(oid));
317 if (o->type == OBJ_COMMIT) {
318 struct commit_list *parents;
319 struct commit *commit = (struct commit *)o;
320 if (o->flags & THEY_HAVE)
321 we_knew_they_have = 1;
322 else
323 o->flags |= THEY_HAVE;
324 if (!oldest_have || (commit->date < oldest_have))
325 oldest_have = commit->date;
326 for (parents = commit->parents;
327 parents;
328 parents = parents->next)
329 parents->item->object.flags |= THEY_HAVE;
331 if (!we_knew_they_have) {
332 add_object_array(o, NULL, &have_obj);
333 return 1;
335 return 0;
338 static int reachable(struct commit *want)
340 struct prio_queue work = { compare_commits_by_commit_date };
342 prio_queue_put(&work, want);
343 while (work.nr) {
344 struct commit_list *list;
345 struct commit *commit = prio_queue_get(&work);
347 if (commit->object.flags & THEY_HAVE) {
348 want->object.flags |= COMMON_KNOWN;
349 break;
351 if (!commit->object.parsed)
352 parse_object(&commit->object.oid);
353 if (commit->object.flags & REACHABLE)
354 continue;
355 commit->object.flags |= REACHABLE;
356 if (commit->date < oldest_have)
357 continue;
358 for (list = commit->parents; list; list = list->next) {
359 struct commit *parent = list->item;
360 if (!(parent->object.flags & REACHABLE))
361 prio_queue_put(&work, parent);
364 want->object.flags |= REACHABLE;
365 clear_commit_marks(want, REACHABLE);
366 clear_prio_queue(&work);
367 return (want->object.flags & COMMON_KNOWN);
370 static int ok_to_give_up(void)
372 int i;
374 if (!have_obj.nr)
375 return 0;
377 for (i = 0; i < want_obj.nr; i++) {
378 struct object *want = want_obj.objects[i].item;
380 if (want->flags & COMMON_KNOWN)
381 continue;
382 want = deref_tag(want, "a want line", 0);
383 if (!want || want->type != OBJ_COMMIT) {
384 /* no way to tell if this is reachable by
385 * looking at the ancestry chain alone, so
386 * leave a note to ourselves not to worry about
387 * this object anymore.
389 want_obj.objects[i].item->flags |= COMMON_KNOWN;
390 continue;
392 if (!reachable((struct commit *)want))
393 return 0;
395 return 1;
398 static int get_common_commits(void)
400 struct object_id oid;
401 char last_hex[GIT_MAX_HEXSZ + 1];
402 int got_common = 0;
403 int got_other = 0;
404 int sent_ready = 0;
406 save_commit_buffer = 0;
408 for (;;) {
409 char *line = packet_read_line(0, NULL);
410 const char *arg;
412 reset_timeout();
414 if (!line) {
415 if (multi_ack == 2 && got_common
416 && !got_other && ok_to_give_up()) {
417 sent_ready = 1;
418 packet_write_fmt(1, "ACK %s ready\n", last_hex);
420 if (have_obj.nr == 0 || multi_ack)
421 packet_write_fmt(1, "NAK\n");
423 if (no_done && sent_ready) {
424 packet_write_fmt(1, "ACK %s\n", last_hex);
425 return 0;
427 if (stateless_rpc)
428 exit(0);
429 got_common = 0;
430 got_other = 0;
431 continue;
433 if (skip_prefix(line, "have ", &arg)) {
434 switch (got_oid(arg, &oid)) {
435 case -1: /* they have what we do not */
436 got_other = 1;
437 if (multi_ack && ok_to_give_up()) {
438 const char *hex = oid_to_hex(&oid);
439 if (multi_ack == 2) {
440 sent_ready = 1;
441 packet_write_fmt(1, "ACK %s ready\n", hex);
442 } else
443 packet_write_fmt(1, "ACK %s continue\n", hex);
445 break;
446 default:
447 got_common = 1;
448 oid_to_hex_r(last_hex, &oid);
449 if (multi_ack == 2)
450 packet_write_fmt(1, "ACK %s common\n", last_hex);
451 else if (multi_ack)
452 packet_write_fmt(1, "ACK %s continue\n", last_hex);
453 else if (have_obj.nr == 1)
454 packet_write_fmt(1, "ACK %s\n", last_hex);
455 break;
457 continue;
459 if (!strcmp(line, "done")) {
460 if (have_obj.nr > 0) {
461 if (multi_ack)
462 packet_write_fmt(1, "ACK %s\n", last_hex);
463 return 0;
465 packet_write_fmt(1, "NAK\n");
466 return -1;
468 die("git upload-pack: expected SHA1 list, got '%s'", line);
472 static int is_our_ref(struct object *o)
474 int allow_hidden_ref = (allow_unadvertised_object_request &
475 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
476 return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
480 * on successful case, it's up to the caller to close cmd->out
482 static int do_reachable_revlist(struct child_process *cmd,
483 struct object_array *src,
484 struct object_array *reachable)
486 static const char *argv[] = {
487 "rev-list", "--stdin", NULL,
489 struct object *o;
490 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
491 int i;
493 cmd->argv = argv;
494 cmd->git_cmd = 1;
495 cmd->no_stderr = 1;
496 cmd->in = -1;
497 cmd->out = -1;
500 * If the next rev-list --stdin encounters an unknown commit,
501 * it terminates, which will cause SIGPIPE in the write loop
502 * below.
504 sigchain_push(SIGPIPE, SIG_IGN);
506 if (start_command(cmd))
507 goto error;
509 namebuf[0] = '^';
510 namebuf[GIT_SHA1_HEXSZ + 1] = '\n';
511 for (i = get_max_object_index(); 0 < i; ) {
512 o = get_indexed_object(--i);
513 if (!o)
514 continue;
515 if (reachable && o->type == OBJ_COMMIT)
516 o->flags &= ~TMP_MARK;
517 if (!is_our_ref(o))
518 continue;
519 memcpy(namebuf + 1, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
520 if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 2) < 0)
521 goto error;
523 namebuf[GIT_SHA1_HEXSZ] = '\n';
524 for (i = 0; i < src->nr; i++) {
525 o = src->objects[i].item;
526 if (is_our_ref(o)) {
527 if (reachable)
528 add_object_array(o, NULL, reachable);
529 continue;
531 if (reachable && o->type == OBJ_COMMIT)
532 o->flags |= TMP_MARK;
533 memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
534 if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 1) < 0)
535 goto error;
537 close(cmd->in);
538 cmd->in = -1;
539 sigchain_pop(SIGPIPE);
541 return 0;
543 error:
544 sigchain_pop(SIGPIPE);
546 if (cmd->in >= 0)
547 close(cmd->in);
548 if (cmd->out >= 0)
549 close(cmd->out);
550 return -1;
553 static int get_reachable_list(struct object_array *src,
554 struct object_array *reachable)
556 struct child_process cmd = CHILD_PROCESS_INIT;
557 int i;
558 struct object *o;
559 char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
560 const unsigned hexsz = the_hash_algo->hexsz;
562 if (do_reachable_revlist(&cmd, src, reachable) < 0)
563 return -1;
565 while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
566 struct object_id sha1;
567 const char *p;
569 if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
570 break;
572 o = lookup_object(sha1.hash);
573 if (o && o->type == OBJ_COMMIT) {
574 o->flags &= ~TMP_MARK;
577 for (i = get_max_object_index(); 0 < i; i--) {
578 o = get_indexed_object(i - 1);
579 if (o && o->type == OBJ_COMMIT &&
580 (o->flags & TMP_MARK)) {
581 add_object_array(o, NULL, reachable);
582 o->flags &= ~TMP_MARK;
585 close(cmd.out);
587 if (finish_command(&cmd))
588 return -1;
590 return 0;
593 static int has_unreachable(struct object_array *src)
595 struct child_process cmd = CHILD_PROCESS_INIT;
596 char buf[1];
597 int i;
599 if (do_reachable_revlist(&cmd, src, NULL) < 0)
600 return 1;
603 * The commits out of the rev-list are not ancestors of
604 * our ref.
606 i = read_in_full(cmd.out, buf, 1);
607 if (i)
608 goto error;
609 close(cmd.out);
610 cmd.out = -1;
613 * rev-list may have died by encountering a bad commit
614 * in the history, in which case we do want to bail out
615 * even when it showed no commit.
617 if (finish_command(&cmd))
618 goto error;
620 /* All the non-tip ones are ancestors of what we advertised */
621 return 0;
623 error:
624 sigchain_pop(SIGPIPE);
625 if (cmd.out >= 0)
626 close(cmd.out);
627 return 1;
630 static void check_non_tip(void)
632 int i;
635 * In the normal in-process case without
636 * uploadpack.allowReachableSHA1InWant,
637 * non-tip requests can never happen.
639 if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
640 goto error;
641 if (!has_unreachable(&want_obj))
642 /* All the non-tip ones are ancestors of what we advertised */
643 return;
645 error:
646 /* Pick one of them (we know there at least is one) */
647 for (i = 0; i < want_obj.nr; i++) {
648 struct object *o = want_obj.objects[i].item;
649 if (!is_our_ref(o))
650 die("git upload-pack: not our ref %s",
651 oid_to_hex(&o->oid));
655 static void send_shallow(struct commit_list *result)
657 while (result) {
658 struct object *object = &result->item->object;
659 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
660 packet_write_fmt(1, "shallow %s",
661 oid_to_hex(&object->oid));
662 register_shallow(the_repository, &object->oid);
663 shallow_nr++;
665 result = result->next;
669 static void send_unshallow(const struct object_array *shallows)
671 int i;
673 for (i = 0; i < shallows->nr; i++) {
674 struct object *object = shallows->objects[i].item;
675 if (object->flags & NOT_SHALLOW) {
676 struct commit_list *parents;
677 packet_write_fmt(1, "unshallow %s",
678 oid_to_hex(&object->oid));
679 object->flags &= ~CLIENT_SHALLOW;
681 * We want to _register_ "object" as shallow, but we
682 * also need to traverse object's parents to deepen a
683 * shallow clone. Unregister it for now so we can
684 * parse and add the parents to the want list, then
685 * re-register it.
687 unregister_shallow(&object->oid);
688 object->parsed = 0;
689 parse_commit_or_die((struct commit *)object);
690 parents = ((struct commit *)object)->parents;
691 while (parents) {
692 add_object_array(&parents->item->object,
693 NULL, &want_obj);
694 parents = parents->next;
696 add_object_array(object, NULL, &extra_edge_obj);
698 /* make sure commit traversal conforms to client */
699 register_shallow(the_repository, &object->oid);
703 static void deepen(int depth, int deepen_relative,
704 struct object_array *shallows)
706 if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
707 int i;
709 for (i = 0; i < shallows->nr; i++) {
710 struct object *object = shallows->objects[i].item;
711 object->flags |= NOT_SHALLOW;
713 } else if (deepen_relative) {
714 struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
715 struct commit_list *result;
717 get_reachable_list(shallows, &reachable_shallows);
718 result = get_shallow_commits(&reachable_shallows,
719 depth + 1,
720 SHALLOW, NOT_SHALLOW);
721 send_shallow(result);
722 free_commit_list(result);
723 object_array_clear(&reachable_shallows);
724 } else {
725 struct commit_list *result;
727 result = get_shallow_commits(&want_obj, depth,
728 SHALLOW, NOT_SHALLOW);
729 send_shallow(result);
730 free_commit_list(result);
733 send_unshallow(shallows);
736 static void deepen_by_rev_list(int ac, const char **av,
737 struct object_array *shallows)
739 struct commit_list *result;
741 result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
742 send_shallow(result);
743 free_commit_list(result);
744 send_unshallow(shallows);
747 /* Returns 1 if a shallow list is sent or 0 otherwise */
748 static int send_shallow_list(int depth, int deepen_rev_list,
749 timestamp_t deepen_since,
750 struct string_list *deepen_not,
751 struct object_array *shallows)
753 int ret = 0;
755 if (depth > 0 && deepen_rev_list)
756 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
757 if (depth > 0) {
758 deepen(depth, deepen_relative, shallows);
759 ret = 1;
760 } else if (deepen_rev_list) {
761 struct argv_array av = ARGV_ARRAY_INIT;
762 int i;
764 argv_array_push(&av, "rev-list");
765 if (deepen_since)
766 argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
767 if (deepen_not->nr) {
768 argv_array_push(&av, "--not");
769 for (i = 0; i < deepen_not->nr; i++) {
770 struct string_list_item *s = deepen_not->items + i;
771 argv_array_push(&av, s->string);
773 argv_array_push(&av, "--not");
775 for (i = 0; i < want_obj.nr; i++) {
776 struct object *o = want_obj.objects[i].item;
777 argv_array_push(&av, oid_to_hex(&o->oid));
779 deepen_by_rev_list(av.argc, av.argv, shallows);
780 argv_array_clear(&av);
781 ret = 1;
782 } else {
783 if (shallows->nr > 0) {
784 int i;
785 for (i = 0; i < shallows->nr; i++)
786 register_shallow(the_repository,
787 &shallows->objects[i].item->oid);
791 shallow_nr += shallows->nr;
792 return ret;
795 static int process_shallow(const char *line, struct object_array *shallows)
797 const char *arg;
798 if (skip_prefix(line, "shallow ", &arg)) {
799 struct object_id oid;
800 struct object *object;
801 if (get_oid_hex(arg, &oid))
802 die("invalid shallow line: %s", line);
803 object = parse_object(&oid);
804 if (!object)
805 return 1;
806 if (object->type != OBJ_COMMIT)
807 die("invalid shallow object %s", oid_to_hex(&oid));
808 if (!(object->flags & CLIENT_SHALLOW)) {
809 object->flags |= CLIENT_SHALLOW;
810 add_object_array(object, NULL, shallows);
812 return 1;
815 return 0;
818 static int process_deepen(const char *line, int *depth)
820 const char *arg;
821 if (skip_prefix(line, "deepen ", &arg)) {
822 char *end = NULL;
823 *depth = (int)strtol(arg, &end, 0);
824 if (!end || *end || *depth <= 0)
825 die("Invalid deepen: %s", line);
826 return 1;
829 return 0;
832 static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list)
834 const char *arg;
835 if (skip_prefix(line, "deepen-since ", &arg)) {
836 char *end = NULL;
837 *deepen_since = parse_timestamp(arg, &end, 0);
838 if (!end || *end || !deepen_since ||
839 /* revisions.c's max_age -1 is special */
840 *deepen_since == -1)
841 die("Invalid deepen-since: %s", line);
842 *deepen_rev_list = 1;
843 return 1;
845 return 0;
848 static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list)
850 const char *arg;
851 if (skip_prefix(line, "deepen-not ", &arg)) {
852 char *ref = NULL;
853 struct object_id oid;
854 if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
855 die("git upload-pack: ambiguous deepen-not: %s", line);
856 string_list_append(deepen_not, ref);
857 free(ref);
858 *deepen_rev_list = 1;
859 return 1;
861 return 0;
864 static void receive_needs(void)
866 struct object_array shallows = OBJECT_ARRAY_INIT;
867 struct string_list deepen_not = STRING_LIST_INIT_DUP;
868 int depth = 0;
869 int has_non_tip = 0;
870 timestamp_t deepen_since = 0;
871 int deepen_rev_list = 0;
873 shallow_nr = 0;
874 for (;;) {
875 struct object *o;
876 const char *features;
877 struct object_id oid_buf;
878 char *line = packet_read_line(0, NULL);
879 const char *arg;
881 reset_timeout();
882 if (!line)
883 break;
885 if (process_shallow(line, &shallows))
886 continue;
887 if (process_deepen(line, &depth))
888 continue;
889 if (process_deepen_since(line, &deepen_since, &deepen_rev_list))
890 continue;
891 if (process_deepen_not(line, &deepen_not, &deepen_rev_list))
892 continue;
894 if (skip_prefix(line, "filter ", &arg)) {
895 if (!filter_capability_requested)
896 die("git upload-pack: filtering capability not negotiated");
897 parse_list_objects_filter(&filter_options, arg);
898 continue;
901 if (!skip_prefix(line, "want ", &arg) ||
902 parse_oid_hex(arg, &oid_buf, &features))
903 die("git upload-pack: protocol error, "
904 "expected to get object ID, not '%s'", line);
906 if (parse_feature_request(features, "deepen-relative"))
907 deepen_relative = 1;
908 if (parse_feature_request(features, "multi_ack_detailed"))
909 multi_ack = 2;
910 else if (parse_feature_request(features, "multi_ack"))
911 multi_ack = 1;
912 if (parse_feature_request(features, "no-done"))
913 no_done = 1;
914 if (parse_feature_request(features, "thin-pack"))
915 use_thin_pack = 1;
916 if (parse_feature_request(features, "ofs-delta"))
917 use_ofs_delta = 1;
918 if (parse_feature_request(features, "side-band-64k"))
919 use_sideband = LARGE_PACKET_MAX;
920 else if (parse_feature_request(features, "side-band"))
921 use_sideband = DEFAULT_PACKET_MAX;
922 if (parse_feature_request(features, "no-progress"))
923 no_progress = 1;
924 if (parse_feature_request(features, "include-tag"))
925 use_include_tag = 1;
926 if (allow_filter && parse_feature_request(features, "filter"))
927 filter_capability_requested = 1;
929 o = parse_object(&oid_buf);
930 if (!o) {
931 packet_write_fmt(1,
932 "ERR upload-pack: not our ref %s",
933 oid_to_hex(&oid_buf));
934 die("git upload-pack: not our ref %s",
935 oid_to_hex(&oid_buf));
937 if (!(o->flags & WANTED)) {
938 o->flags |= WANTED;
939 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
940 || is_our_ref(o)))
941 has_non_tip = 1;
942 add_object_array(o, NULL, &want_obj);
947 * We have sent all our refs already, and the other end
948 * should have chosen out of them. When we are operating
949 * in the stateless RPC mode, however, their choice may
950 * have been based on the set of older refs advertised
951 * by another process that handled the initial request.
953 if (has_non_tip)
954 check_non_tip();
956 if (!use_sideband && daemon_mode)
957 no_progress = 1;
959 if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
960 return;
962 if (send_shallow_list(depth, deepen_rev_list, deepen_since,
963 &deepen_not, &shallows))
964 packet_flush(1);
965 object_array_clear(&shallows);
968 /* return non-zero if the ref is hidden, otherwise 0 */
969 static int mark_our_ref(const char *refname, const char *refname_full,
970 const struct object_id *oid)
972 struct object *o = lookup_unknown_object(oid->hash);
974 if (ref_is_hidden(refname, refname_full)) {
975 o->flags |= HIDDEN_REF;
976 return 1;
978 o->flags |= OUR_REF;
979 return 0;
982 static int check_ref(const char *refname_full, const struct object_id *oid,
983 int flag, void *cb_data)
985 const char *refname = strip_namespace(refname_full);
987 mark_our_ref(refname, refname_full, oid);
988 return 0;
991 static void format_symref_info(struct strbuf *buf, struct string_list *symref)
993 struct string_list_item *item;
995 if (!symref->nr)
996 return;
997 for_each_string_list_item(item, symref)
998 strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
1001 static int send_ref(const char *refname, const struct object_id *oid,
1002 int flag, void *cb_data)
1004 static const char *capabilities = "multi_ack thin-pack side-band"
1005 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1006 " deepen-relative no-progress include-tag multi_ack_detailed";
1007 const char *refname_nons = strip_namespace(refname);
1008 struct object_id peeled;
1010 if (mark_our_ref(refname_nons, refname, oid))
1011 return 0;
1013 if (capabilities) {
1014 struct strbuf symref_info = STRBUF_INIT;
1016 format_symref_info(&symref_info, cb_data);
1017 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1018 oid_to_hex(oid), refname_nons,
1019 0, capabilities,
1020 (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
1021 " allow-tip-sha1-in-want" : "",
1022 (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
1023 " allow-reachable-sha1-in-want" : "",
1024 stateless_rpc ? " no-done" : "",
1025 symref_info.buf,
1026 allow_filter ? " filter" : "",
1027 git_user_agent_sanitized());
1028 strbuf_release(&symref_info);
1029 } else {
1030 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
1032 capabilities = NULL;
1033 if (!peel_ref(refname, &peeled))
1034 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
1035 return 0;
1038 static int find_symref(const char *refname, const struct object_id *oid,
1039 int flag, void *cb_data)
1041 const char *symref_target;
1042 struct string_list_item *item;
1044 if ((flag & REF_ISSYMREF) == 0)
1045 return 0;
1046 symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
1047 if (!symref_target || (flag & REF_ISSYMREF) == 0)
1048 die("'%s' is a symref but it is not?", refname);
1049 item = string_list_append(cb_data, refname);
1050 item->util = xstrdup(symref_target);
1051 return 0;
1054 static int upload_pack_config(const char *var, const char *value, void *unused)
1056 if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
1057 if (git_config_bool(var, value))
1058 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
1059 else
1060 allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
1061 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
1062 if (git_config_bool(var, value))
1063 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1064 else
1065 allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
1066 } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
1067 if (git_config_bool(var, value))
1068 allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
1069 else
1070 allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
1071 } else if (!strcmp("uploadpack.keepalive", var)) {
1072 keepalive = git_config_int(var, value);
1073 if (!keepalive)
1074 keepalive = -1;
1075 } else if (current_config_scope() != CONFIG_SCOPE_REPO) {
1076 if (!strcmp("uploadpack.packobjectshook", var))
1077 return git_config_string(&pack_objects_hook, var, value);
1078 } else if (!strcmp("uploadpack.allowfilter", var)) {
1079 allow_filter = git_config_bool(var, value);
1081 return parse_hide_refs_config(var, value, "uploadpack");
1084 void upload_pack(struct upload_pack_options *options)
1086 struct string_list symref = STRING_LIST_INIT_DUP;
1088 stateless_rpc = options->stateless_rpc;
1089 timeout = options->timeout;
1090 daemon_mode = options->daemon_mode;
1092 git_config(upload_pack_config, NULL);
1094 head_ref_namespaced(find_symref, &symref);
1096 if (options->advertise_refs || !stateless_rpc) {
1097 reset_timeout();
1098 head_ref_namespaced(send_ref, &symref);
1099 for_each_namespaced_ref(send_ref, &symref);
1100 advertise_shallow_grafts(1);
1101 packet_flush(1);
1102 } else {
1103 head_ref_namespaced(check_ref, NULL);
1104 for_each_namespaced_ref(check_ref, NULL);
1106 string_list_clear(&symref, 1);
1107 if (options->advertise_refs)
1108 return;
1110 receive_needs();
1111 if (want_obj.nr) {
1112 get_common_commits();
1113 create_pack_file();
1117 struct upload_pack_data {
1118 struct object_array wants;
1119 struct oid_array haves;
1121 struct object_array shallows;
1122 struct string_list deepen_not;
1123 int depth;
1124 timestamp_t deepen_since;
1125 int deepen_rev_list;
1126 int deepen_relative;
1128 unsigned stateless_rpc : 1;
1130 unsigned use_thin_pack : 1;
1131 unsigned use_ofs_delta : 1;
1132 unsigned no_progress : 1;
1133 unsigned use_include_tag : 1;
1134 unsigned done : 1;
1137 static void upload_pack_data_init(struct upload_pack_data *data)
1139 struct object_array wants = OBJECT_ARRAY_INIT;
1140 struct oid_array haves = OID_ARRAY_INIT;
1141 struct object_array shallows = OBJECT_ARRAY_INIT;
1142 struct string_list deepen_not = STRING_LIST_INIT_DUP;
1144 memset(data, 0, sizeof(*data));
1145 data->wants = wants;
1146 data->haves = haves;
1147 data->shallows = shallows;
1148 data->deepen_not = deepen_not;
1151 static void upload_pack_data_clear(struct upload_pack_data *data)
1153 object_array_clear(&data->wants);
1154 oid_array_clear(&data->haves);
1155 object_array_clear(&data->shallows);
1156 string_list_clear(&data->deepen_not, 0);
1159 static int parse_want(const char *line)
1161 const char *arg;
1162 if (skip_prefix(line, "want ", &arg)) {
1163 struct object_id oid;
1164 struct object *o;
1166 if (get_oid_hex(arg, &oid))
1167 die("git upload-pack: protocol error, "
1168 "expected to get oid, not '%s'", line);
1170 o = parse_object(&oid);
1171 if (!o) {
1172 packet_write_fmt(1,
1173 "ERR upload-pack: not our ref %s",
1174 oid_to_hex(&oid));
1175 die("git upload-pack: not our ref %s",
1176 oid_to_hex(&oid));
1179 if (!(o->flags & WANTED)) {
1180 o->flags |= WANTED;
1181 add_object_array(o, NULL, &want_obj);
1184 return 1;
1187 return 0;
1190 static int parse_have(const char *line, struct oid_array *haves)
1192 const char *arg;
1193 if (skip_prefix(line, "have ", &arg)) {
1194 struct object_id oid;
1196 if (get_oid_hex(arg, &oid))
1197 die("git upload-pack: expected SHA1 object, got '%s'", arg);
1198 oid_array_append(haves, &oid);
1199 return 1;
1202 return 0;
1205 static void process_args(struct packet_reader *request,
1206 struct upload_pack_data *data)
1208 while (packet_reader_read(request) != PACKET_READ_FLUSH) {
1209 const char *arg = request->line;
1210 const char *p;
1212 /* process want */
1213 if (parse_want(arg))
1214 continue;
1215 /* process have line */
1216 if (parse_have(arg, &data->haves))
1217 continue;
1219 /* process args like thin-pack */
1220 if (!strcmp(arg, "thin-pack")) {
1221 use_thin_pack = 1;
1222 continue;
1224 if (!strcmp(arg, "ofs-delta")) {
1225 use_ofs_delta = 1;
1226 continue;
1228 if (!strcmp(arg, "no-progress")) {
1229 no_progress = 1;
1230 continue;
1232 if (!strcmp(arg, "include-tag")) {
1233 use_include_tag = 1;
1234 continue;
1236 if (!strcmp(arg, "done")) {
1237 data->done = 1;
1238 continue;
1241 /* Shallow related arguments */
1242 if (process_shallow(arg, &data->shallows))
1243 continue;
1244 if (process_deepen(arg, &data->depth))
1245 continue;
1246 if (process_deepen_since(arg, &data->deepen_since,
1247 &data->deepen_rev_list))
1248 continue;
1249 if (process_deepen_not(arg, &data->deepen_not,
1250 &data->deepen_rev_list))
1251 continue;
1252 if (!strcmp(arg, "deepen-relative")) {
1253 data->deepen_relative = 1;
1254 continue;
1257 if (allow_filter && skip_prefix(arg, "filter ", &p)) {
1258 parse_list_objects_filter(&filter_options, p);
1259 continue;
1262 /* ignore unknown lines maybe? */
1263 die("unexpected line: '%s'", arg);
1267 static int process_haves(struct oid_array *haves, struct oid_array *common)
1269 int i;
1271 /* Process haves */
1272 for (i = 0; i < haves->nr; i++) {
1273 const struct object_id *oid = &haves->oid[i];
1274 struct object *o;
1275 int we_knew_they_have = 0;
1277 if (!has_object_file(oid))
1278 continue;
1280 oid_array_append(common, oid);
1282 o = parse_object(oid);
1283 if (!o)
1284 die("oops (%s)", oid_to_hex(oid));
1285 if (o->type == OBJ_COMMIT) {
1286 struct commit_list *parents;
1287 struct commit *commit = (struct commit *)o;
1288 if (o->flags & THEY_HAVE)
1289 we_knew_they_have = 1;
1290 else
1291 o->flags |= THEY_HAVE;
1292 if (!oldest_have || (commit->date < oldest_have))
1293 oldest_have = commit->date;
1294 for (parents = commit->parents;
1295 parents;
1296 parents = parents->next)
1297 parents->item->object.flags |= THEY_HAVE;
1299 if (!we_knew_they_have)
1300 add_object_array(o, NULL, &have_obj);
1303 return 0;
1306 static int send_acks(struct oid_array *acks, struct strbuf *response)
1308 int i;
1310 packet_buf_write(response, "acknowledgments\n");
1312 /* Send Acks */
1313 if (!acks->nr)
1314 packet_buf_write(response, "NAK\n");
1316 for (i = 0; i < acks->nr; i++) {
1317 packet_buf_write(response, "ACK %s\n",
1318 oid_to_hex(&acks->oid[i]));
1321 if (ok_to_give_up()) {
1322 /* Send Ready */
1323 packet_buf_write(response, "ready\n");
1324 return 1;
1327 return 0;
1330 static int process_haves_and_send_acks(struct upload_pack_data *data)
1332 struct oid_array common = OID_ARRAY_INIT;
1333 struct strbuf response = STRBUF_INIT;
1334 int ret = 0;
1336 process_haves(&data->haves, &common);
1337 if (data->done) {
1338 ret = 1;
1339 } else if (send_acks(&common, &response)) {
1340 packet_buf_delim(&response);
1341 ret = 1;
1342 } else {
1343 /* Add Flush */
1344 packet_buf_flush(&response);
1345 ret = 0;
1348 /* Send response */
1349 write_or_die(1, response.buf, response.len);
1350 strbuf_release(&response);
1352 oid_array_clear(&data->haves);
1353 oid_array_clear(&common);
1354 return ret;
1357 static void send_shallow_info(struct upload_pack_data *data)
1359 /* No shallow info needs to be sent */
1360 if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
1361 !is_repository_shallow(the_repository))
1362 return;
1364 packet_write_fmt(1, "shallow-info\n");
1366 if (!send_shallow_list(data->depth, data->deepen_rev_list,
1367 data->deepen_since, &data->deepen_not,
1368 &data->shallows) &&
1369 is_repository_shallow(the_repository))
1370 deepen(INFINITE_DEPTH, data->deepen_relative, &data->shallows);
1372 packet_delim(1);
1375 enum fetch_state {
1376 FETCH_PROCESS_ARGS = 0,
1377 FETCH_SEND_ACKS,
1378 FETCH_SEND_PACK,
1379 FETCH_DONE,
1382 int upload_pack_v2(struct repository *r, struct argv_array *keys,
1383 struct packet_reader *request)
1385 enum fetch_state state = FETCH_PROCESS_ARGS;
1386 struct upload_pack_data data;
1388 git_config(upload_pack_config, NULL);
1390 upload_pack_data_init(&data);
1391 use_sideband = LARGE_PACKET_MAX;
1393 while (state != FETCH_DONE) {
1394 switch (state) {
1395 case FETCH_PROCESS_ARGS:
1396 process_args(request, &data);
1398 if (!want_obj.nr) {
1400 * Request didn't contain any 'want' lines,
1401 * guess they didn't want anything.
1403 state = FETCH_DONE;
1404 } else if (data.haves.nr) {
1406 * Request had 'have' lines, so lets ACK them.
1408 state = FETCH_SEND_ACKS;
1409 } else {
1411 * Request had 'want's but no 'have's so we can
1412 * immedietly go to construct and send a pack.
1414 state = FETCH_SEND_PACK;
1416 break;
1417 case FETCH_SEND_ACKS:
1418 if (process_haves_and_send_acks(&data))
1419 state = FETCH_SEND_PACK;
1420 else
1421 state = FETCH_DONE;
1422 break;
1423 case FETCH_SEND_PACK:
1424 send_shallow_info(&data);
1426 packet_write_fmt(1, "packfile\n");
1427 create_pack_file();
1428 state = FETCH_DONE;
1429 break;
1430 case FETCH_DONE:
1431 continue;
1435 upload_pack_data_clear(&data);
1436 return 0;
1439 int upload_pack_advertise(struct repository *r,
1440 struct strbuf *value)
1442 if (value) {
1443 int allow_filter_value;
1444 strbuf_addstr(value, "shallow");
1445 if (!repo_config_get_bool(the_repository,
1446 "uploadpack.allowfilter",
1447 &allow_filter_value) &&
1448 allow_filter_value)
1449 strbuf_addstr(value, " filter");
1451 return 1;