test smart http fetch and push
[git/jnareb-git.git] / upload-pack.c
blob70badcf6f7345a83b6d92172a0814b1c0627ada1
1 #include "cache.h"
2 #include "refs.h"
3 #include "pkt-line.h"
4 #include "sideband.h"
5 #include "tag.h"
6 #include "object.h"
7 #include "commit.h"
8 #include "exec_cmd.h"
9 #include "diff.h"
10 #include "revision.h"
11 #include "list-objects.h"
12 #include "run-command.h"
14 static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>";
16 /* bits #0..7 in revision.h, #8..10 in commit.c */
17 #define THEY_HAVE (1u << 11)
18 #define OUR_REF (1u << 12)
19 #define WANTED (1u << 13)
20 #define COMMON_KNOWN (1u << 14)
21 #define REACHABLE (1u << 15)
23 #define SHALLOW (1u << 16)
24 #define NOT_SHALLOW (1u << 17)
25 #define CLIENT_SHALLOW (1u << 18)
27 static unsigned long oldest_have;
29 static int multi_ack, nr_our_refs;
30 static int use_thin_pack, use_ofs_delta, use_include_tag;
31 static int no_progress, daemon_mode;
32 static int shallow_nr;
33 static struct object_array have_obj;
34 static struct object_array want_obj;
35 static struct object_array extra_edge_obj;
36 static unsigned int timeout;
37 /* 0 for no sideband,
38 * otherwise maximum packet size (up to 65520 bytes).
40 static int use_sideband;
41 static int debug_fd;
42 static int advertise_refs;
43 static int stateless_rpc;
45 static void reset_timeout(void)
47 alarm(timeout);
50 static int strip(char *line, int len)
52 if (len && line[len-1] == '\n')
53 line[--len] = 0;
54 return len;
57 static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
59 if (use_sideband)
60 return send_sideband(1, fd, data, sz, use_sideband);
61 if (fd == 3)
62 /* emergency quit */
63 fd = 2;
64 if (fd == 2) {
65 /* XXX: are we happy to lose stuff here? */
66 xwrite(fd, data, sz);
67 return sz;
69 return safe_write(fd, data, sz);
72 static FILE *pack_pipe = NULL;
73 static void show_commit(struct commit *commit, void *data)
75 if (commit->object.flags & BOUNDARY)
76 fputc('-', pack_pipe);
77 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
78 die("broken output pipe");
79 fputc('\n', pack_pipe);
80 fflush(pack_pipe);
81 free(commit->buffer);
82 commit->buffer = NULL;
85 static void show_object(struct object *obj, const struct name_path *path, const char *component)
87 /* An object with name "foo\n0000000..." can be used to
88 * confuse downstream git-pack-objects very badly.
90 const char *name = path_name(path, component);
91 const char *ep = strchr(name, '\n');
92 if (ep) {
93 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
94 (int) (ep - name),
95 name);
97 else
98 fprintf(pack_pipe, "%s %s\n",
99 sha1_to_hex(obj->sha1), name);
100 free((char *)name);
103 static void show_edge(struct commit *commit)
105 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
108 static int do_rev_list(int fd, void *create_full_pack)
110 int i;
111 struct rev_info revs;
113 pack_pipe = xfdopen(fd, "w");
114 init_revisions(&revs, NULL);
115 revs.tag_objects = 1;
116 revs.tree_objects = 1;
117 revs.blob_objects = 1;
118 if (use_thin_pack)
119 revs.edge_hint = 1;
121 if (create_full_pack) {
122 const char *args[] = {"rev-list", "--all", NULL};
123 setup_revisions(2, args, &revs, NULL);
124 } else {
125 for (i = 0; i < want_obj.nr; i++) {
126 struct object *o = want_obj.objects[i].item;
127 /* why??? */
128 o->flags &= ~UNINTERESTING;
129 add_pending_object(&revs, o, NULL);
131 for (i = 0; i < have_obj.nr; i++) {
132 struct object *o = have_obj.objects[i].item;
133 o->flags |= UNINTERESTING;
134 add_pending_object(&revs, o, NULL);
136 setup_revisions(0, NULL, &revs, NULL);
138 if (prepare_revision_walk(&revs))
139 die("revision walk setup failed");
140 mark_edges_uninteresting(revs.commits, &revs, show_edge);
141 if (use_thin_pack)
142 for (i = 0; i < extra_edge_obj.nr; i++)
143 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
144 extra_edge_obj.objects[i].item->sha1));
145 traverse_commit_list(&revs, show_commit, show_object, NULL);
146 fflush(pack_pipe);
147 fclose(pack_pipe);
148 return 0;
151 static int feed_msg_to_hook(int fd, const char *fmt, ...)
153 int cnt;
154 char buf[1024];
155 va_list params;
157 va_start(params, fmt);
158 cnt = vsprintf(buf, fmt, params);
159 va_end(params);
160 return write_in_full(fd, buf, cnt) != cnt;
163 static int feed_obj_to_hook(const char *label, struct object_array *oa, int i, int fd)
165 return feed_msg_to_hook(fd, "%s %s\n", label,
166 sha1_to_hex(oa->objects[i].item->sha1));
169 static int run_post_upload_pack_hook(size_t total, struct timeval *tv)
171 const char *argv[2];
172 struct child_process proc;
173 int err, i;
175 argv[0] = "hooks/post-upload-pack";
176 argv[1] = NULL;
178 if (access(argv[0], X_OK) < 0)
179 return 0;
181 memset(&proc, 0, sizeof(proc));
182 proc.argv = argv;
183 proc.in = -1;
184 proc.stdout_to_stderr = 1;
185 err = start_command(&proc);
186 if (err)
187 return err;
188 for (i = 0; !err && i < want_obj.nr; i++)
189 err |= feed_obj_to_hook("want", &want_obj, i, proc.in);
190 for (i = 0; !err && i < have_obj.nr; i++)
191 err |= feed_obj_to_hook("have", &have_obj, i, proc.in);
192 if (!err)
193 err |= feed_msg_to_hook(proc.in, "time %ld.%06ld\n",
194 (long)tv->tv_sec, (long)tv->tv_usec);
195 if (!err)
196 err |= feed_msg_to_hook(proc.in, "size %ld\n", (long)total);
197 if (!err)
198 err |= feed_msg_to_hook(proc.in, "kind %s\n",
199 (nr_our_refs == want_obj.nr && !have_obj.nr)
200 ? "clone" : "fetch");
201 if (close(proc.in))
202 err = 1;
203 if (finish_command(&proc))
204 err = 1;
205 return err;
208 static void create_pack_file(void)
210 struct timeval start_tv, tv;
211 struct async rev_list;
212 struct child_process pack_objects;
213 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
214 char data[8193], progress[128];
215 char abort_msg[] = "aborting due to possible repository "
216 "corruption on the remote side.";
217 int buffered = -1;
218 ssize_t sz, total_sz;
219 const char *argv[10];
220 int arg = 0;
222 gettimeofday(&start_tv, NULL);
223 total_sz = 0;
224 if (shallow_nr) {
225 rev_list.proc = do_rev_list;
226 rev_list.data = 0;
227 if (start_async(&rev_list))
228 die("git upload-pack: unable to fork git-rev-list");
229 argv[arg++] = "pack-objects";
230 } else {
231 argv[arg++] = "pack-objects";
232 argv[arg++] = "--revs";
233 if (create_full_pack)
234 argv[arg++] = "--all";
235 else if (use_thin_pack)
236 argv[arg++] = "--thin";
239 argv[arg++] = "--stdout";
240 if (!no_progress)
241 argv[arg++] = "--progress";
242 if (use_ofs_delta)
243 argv[arg++] = "--delta-base-offset";
244 if (use_include_tag)
245 argv[arg++] = "--include-tag";
246 argv[arg++] = NULL;
248 memset(&pack_objects, 0, sizeof(pack_objects));
249 pack_objects.in = shallow_nr ? rev_list.out : -1;
250 pack_objects.out = -1;
251 pack_objects.err = -1;
252 pack_objects.git_cmd = 1;
253 pack_objects.argv = argv;
255 if (start_command(&pack_objects))
256 die("git upload-pack: unable to fork git-pack-objects");
258 /* pass on revisions we (don't) want */
259 if (!shallow_nr) {
260 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
261 if (!create_full_pack) {
262 int i;
263 for (i = 0; i < want_obj.nr; i++)
264 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
265 fprintf(pipe_fd, "--not\n");
266 for (i = 0; i < have_obj.nr; i++)
267 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
270 fprintf(pipe_fd, "\n");
271 fflush(pipe_fd);
272 fclose(pipe_fd);
276 /* We read from pack_objects.err to capture stderr output for
277 * progress bar, and pack_objects.out to capture the pack data.
280 while (1) {
281 struct pollfd pfd[2];
282 int pe, pu, pollsize;
284 reset_timeout();
286 pollsize = 0;
287 pe = pu = -1;
289 if (0 <= pack_objects.out) {
290 pfd[pollsize].fd = pack_objects.out;
291 pfd[pollsize].events = POLLIN;
292 pu = pollsize;
293 pollsize++;
295 if (0 <= pack_objects.err) {
296 pfd[pollsize].fd = pack_objects.err;
297 pfd[pollsize].events = POLLIN;
298 pe = pollsize;
299 pollsize++;
302 if (!pollsize)
303 break;
305 if (poll(pfd, pollsize, -1) < 0) {
306 if (errno != EINTR) {
307 error("poll failed, resuming: %s",
308 strerror(errno));
309 sleep(1);
311 continue;
313 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
314 /* Data ready; we keep the last byte to ourselves
315 * in case we detect broken rev-list, so that we
316 * can leave the stream corrupted. This is
317 * unfortunate -- unpack-objects would happily
318 * accept a valid packdata with trailing garbage,
319 * so appending garbage after we pass all the
320 * pack data is not good enough to signal
321 * breakage to downstream.
323 char *cp = data;
324 ssize_t outsz = 0;
325 if (0 <= buffered) {
326 *cp++ = buffered;
327 outsz++;
329 sz = xread(pack_objects.out, cp,
330 sizeof(data) - outsz);
331 if (0 < sz)
332 total_sz += sz;
333 else if (sz == 0) {
334 close(pack_objects.out);
335 pack_objects.out = -1;
337 else
338 goto fail;
339 sz += outsz;
340 if (1 < sz) {
341 buffered = data[sz-1] & 0xFF;
342 sz--;
344 else
345 buffered = -1;
346 sz = send_client_data(1, data, sz);
347 if (sz < 0)
348 goto fail;
350 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
351 /* Status ready; we ship that in the side-band
352 * or dump to the standard error.
354 sz = xread(pack_objects.err, progress,
355 sizeof(progress));
356 if (0 < sz)
357 send_client_data(2, progress, sz);
358 else if (sz == 0) {
359 close(pack_objects.err);
360 pack_objects.err = -1;
362 else
363 goto fail;
367 if (finish_command(&pack_objects)) {
368 error("git upload-pack: git-pack-objects died with error.");
369 goto fail;
371 if (shallow_nr && finish_async(&rev_list))
372 goto fail; /* error was already reported */
374 /* flush the data */
375 if (0 <= buffered) {
376 data[0] = buffered;
377 sz = send_client_data(1, data, 1);
378 if (sz < 0)
379 goto fail;
380 fprintf(stderr, "flushed.\n");
382 if (use_sideband)
383 packet_flush(1);
385 gettimeofday(&tv, NULL);
386 tv.tv_sec -= start_tv.tv_sec;
387 if (tv.tv_usec < start_tv.tv_usec) {
388 tv.tv_sec--;
389 tv.tv_usec += 1000000;
391 tv.tv_usec -= start_tv.tv_usec;
392 if (run_post_upload_pack_hook(total_sz, &tv))
393 warning("post-upload-hook failed");
394 return;
396 fail:
397 send_client_data(3, abort_msg, sizeof(abort_msg));
398 die("git upload-pack: %s", abort_msg);
401 static int got_sha1(char *hex, unsigned char *sha1)
403 struct object *o;
404 int we_knew_they_have = 0;
406 if (get_sha1_hex(hex, sha1))
407 die("git upload-pack: expected SHA1 object, got '%s'", hex);
408 if (!has_sha1_file(sha1))
409 return -1;
411 o = lookup_object(sha1);
412 if (!(o && o->parsed))
413 o = parse_object(sha1);
414 if (!o)
415 die("oops (%s)", sha1_to_hex(sha1));
416 if (o->type == OBJ_COMMIT) {
417 struct commit_list *parents;
418 struct commit *commit = (struct commit *)o;
419 if (o->flags & THEY_HAVE)
420 we_knew_they_have = 1;
421 else
422 o->flags |= THEY_HAVE;
423 if (!oldest_have || (commit->date < oldest_have))
424 oldest_have = commit->date;
425 for (parents = commit->parents;
426 parents;
427 parents = parents->next)
428 parents->item->object.flags |= THEY_HAVE;
430 if (!we_knew_they_have) {
431 add_object_array(o, NULL, &have_obj);
432 return 1;
434 return 0;
437 static int reachable(struct commit *want)
439 struct commit_list *work = NULL;
441 insert_by_date(want, &work);
442 while (work) {
443 struct commit_list *list = work->next;
444 struct commit *commit = work->item;
445 free(work);
446 work = list;
448 if (commit->object.flags & THEY_HAVE) {
449 want->object.flags |= COMMON_KNOWN;
450 break;
452 if (!commit->object.parsed)
453 parse_object(commit->object.sha1);
454 if (commit->object.flags & REACHABLE)
455 continue;
456 commit->object.flags |= REACHABLE;
457 if (commit->date < oldest_have)
458 continue;
459 for (list = commit->parents; list; list = list->next) {
460 struct commit *parent = list->item;
461 if (!(parent->object.flags & REACHABLE))
462 insert_by_date(parent, &work);
465 want->object.flags |= REACHABLE;
466 clear_commit_marks(want, REACHABLE);
467 free_commit_list(work);
468 return (want->object.flags & COMMON_KNOWN);
471 static int ok_to_give_up(void)
473 int i;
475 if (!have_obj.nr)
476 return 0;
478 for (i = 0; i < want_obj.nr; i++) {
479 struct object *want = want_obj.objects[i].item;
481 if (want->flags & COMMON_KNOWN)
482 continue;
483 want = deref_tag(want, "a want line", 0);
484 if (!want || want->type != OBJ_COMMIT) {
485 /* no way to tell if this is reachable by
486 * looking at the ancestry chain alone, so
487 * leave a note to ourselves not to worry about
488 * this object anymore.
490 want_obj.objects[i].item->flags |= COMMON_KNOWN;
491 continue;
493 if (!reachable((struct commit *)want))
494 return 0;
496 return 1;
499 static int get_common_commits(void)
501 static char line[1000];
502 unsigned char sha1[20];
503 char last_hex[41];
505 save_commit_buffer = 0;
507 for (;;) {
508 int len = packet_read_line(0, line, sizeof(line));
509 reset_timeout();
511 if (!len) {
512 if (have_obj.nr == 0 || multi_ack)
513 packet_write(1, "NAK\n");
514 if (stateless_rpc)
515 exit(0);
516 continue;
518 strip(line, len);
519 if (!prefixcmp(line, "have ")) {
520 switch (got_sha1(line+5, sha1)) {
521 case -1: /* they have what we do not */
522 if (multi_ack && ok_to_give_up()) {
523 const char *hex = sha1_to_hex(sha1);
524 if (multi_ack == 2)
525 packet_write(1, "ACK %s ready\n", hex);
526 else
527 packet_write(1, "ACK %s continue\n", hex);
529 break;
530 default:
531 memcpy(last_hex, sha1_to_hex(sha1), 41);
532 if (multi_ack == 2)
533 packet_write(1, "ACK %s common\n", last_hex);
534 else if (multi_ack)
535 packet_write(1, "ACK %s continue\n", last_hex);
536 else if (have_obj.nr == 1)
537 packet_write(1, "ACK %s\n", last_hex);
538 break;
540 continue;
542 if (!strcmp(line, "done")) {
543 if (have_obj.nr > 0) {
544 if (multi_ack)
545 packet_write(1, "ACK %s\n", last_hex);
546 return 0;
548 packet_write(1, "NAK\n");
549 return -1;
551 die("git upload-pack: expected SHA1 list, got '%s'", line);
555 static void receive_needs(void)
557 struct object_array shallows = {0, 0, NULL};
558 static char line[1000];
559 int len, depth = 0;
561 shallow_nr = 0;
562 if (debug_fd)
563 write_str_in_full(debug_fd, "#S\n");
564 for (;;) {
565 struct object *o;
566 unsigned char sha1_buf[20];
567 len = packet_read_line(0, line, sizeof(line));
568 reset_timeout();
569 if (!len)
570 break;
571 if (debug_fd)
572 write_in_full(debug_fd, line, len);
574 if (!prefixcmp(line, "shallow ")) {
575 unsigned char sha1[20];
576 struct object *object;
577 if (get_sha1(line + 8, sha1))
578 die("invalid shallow line: %s", line);
579 object = parse_object(sha1);
580 if (!object)
581 die("did not find object for %s", line);
582 object->flags |= CLIENT_SHALLOW;
583 add_object_array(object, NULL, &shallows);
584 continue;
586 if (!prefixcmp(line, "deepen ")) {
587 char *end;
588 depth = strtol(line + 7, &end, 0);
589 if (end == line + 7 || depth <= 0)
590 die("Invalid deepen: %s", line);
591 continue;
593 if (prefixcmp(line, "want ") ||
594 get_sha1_hex(line+5, sha1_buf))
595 die("git upload-pack: protocol error, "
596 "expected to get sha, not '%s'", line);
597 if (strstr(line+45, "multi_ack_detailed"))
598 multi_ack = 2;
599 else if (strstr(line+45, "multi_ack"))
600 multi_ack = 1;
601 if (strstr(line+45, "thin-pack"))
602 use_thin_pack = 1;
603 if (strstr(line+45, "ofs-delta"))
604 use_ofs_delta = 1;
605 if (strstr(line+45, "side-band-64k"))
606 use_sideband = LARGE_PACKET_MAX;
607 else if (strstr(line+45, "side-band"))
608 use_sideband = DEFAULT_PACKET_MAX;
609 if (strstr(line+45, "no-progress"))
610 no_progress = 1;
611 if (strstr(line+45, "include-tag"))
612 use_include_tag = 1;
614 /* We have sent all our refs already, and the other end
615 * should have chosen out of them; otherwise they are
616 * asking for nonsense.
618 * Hmph. We may later want to allow "want" line that
619 * asks for something like "master~10" (symbolic)...
620 * would it make sense? I don't know.
622 o = lookup_object(sha1_buf);
623 if (!o || !(o->flags & OUR_REF))
624 die("git upload-pack: not our ref %s", line+5);
625 if (!(o->flags & WANTED)) {
626 o->flags |= WANTED;
627 add_object_array(o, NULL, &want_obj);
630 if (debug_fd)
631 write_str_in_full(debug_fd, "#E\n");
633 if (!use_sideband && daemon_mode)
634 no_progress = 1;
636 if (depth == 0 && shallows.nr == 0)
637 return;
638 if (depth > 0) {
639 struct commit_list *result, *backup;
640 int i;
641 backup = result = get_shallow_commits(&want_obj, depth,
642 SHALLOW, NOT_SHALLOW);
643 while (result) {
644 struct object *object = &result->item->object;
645 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
646 packet_write(1, "shallow %s",
647 sha1_to_hex(object->sha1));
648 register_shallow(object->sha1);
649 shallow_nr++;
651 result = result->next;
653 free_commit_list(backup);
654 for (i = 0; i < shallows.nr; i++) {
655 struct object *object = shallows.objects[i].item;
656 if (object->flags & NOT_SHALLOW) {
657 struct commit_list *parents;
658 packet_write(1, "unshallow %s",
659 sha1_to_hex(object->sha1));
660 object->flags &= ~CLIENT_SHALLOW;
661 /* make sure the real parents are parsed */
662 unregister_shallow(object->sha1);
663 object->parsed = 0;
664 if (parse_commit((struct commit *)object))
665 die("invalid commit");
666 parents = ((struct commit *)object)->parents;
667 while (parents) {
668 add_object_array(&parents->item->object,
669 NULL, &want_obj);
670 parents = parents->next;
672 add_object_array(object, NULL, &extra_edge_obj);
674 /* make sure commit traversal conforms to client */
675 register_shallow(object->sha1);
677 packet_flush(1);
678 } else
679 if (shallows.nr > 0) {
680 int i;
681 for (i = 0; i < shallows.nr; i++)
682 register_shallow(shallows.objects[i].item->sha1);
685 shallow_nr += shallows.nr;
686 free(shallows.objects);
689 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
691 static const char *capabilities = "multi_ack thin-pack side-band"
692 " side-band-64k ofs-delta shallow no-progress"
693 " include-tag multi_ack_detailed";
694 struct object *o = parse_object(sha1);
696 if (!o)
697 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
699 if (capabilities)
700 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
701 0, capabilities);
702 else
703 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
704 capabilities = NULL;
705 if (!(o->flags & OUR_REF)) {
706 o->flags |= OUR_REF;
707 nr_our_refs++;
709 if (o->type == OBJ_TAG) {
710 o = deref_tag(o, refname, 0);
711 if (o)
712 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
714 return 0;
717 static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
719 struct object *o = parse_object(sha1);
720 if (!o)
721 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
722 if (!(o->flags & OUR_REF)) {
723 o->flags |= OUR_REF;
724 nr_our_refs++;
726 return 0;
729 static void upload_pack(void)
731 if (advertise_refs || !stateless_rpc) {
732 reset_timeout();
733 head_ref(send_ref, NULL);
734 for_each_ref(send_ref, NULL);
735 packet_flush(1);
736 } else {
737 head_ref(mark_our_ref, NULL);
738 for_each_ref(mark_our_ref, NULL);
740 if (advertise_refs)
741 return;
743 receive_needs();
744 if (want_obj.nr) {
745 get_common_commits();
746 create_pack_file();
750 int main(int argc, char **argv)
752 char *dir;
753 int i;
754 int strict = 0;
756 git_extract_argv0_path(argv[0]);
757 read_replace_refs = 0;
759 for (i = 1; i < argc; i++) {
760 char *arg = argv[i];
762 if (arg[0] != '-')
763 break;
764 if (!strcmp(arg, "--advertise-refs")) {
765 advertise_refs = 1;
766 continue;
768 if (!strcmp(arg, "--stateless-rpc")) {
769 stateless_rpc = 1;
770 continue;
772 if (!strcmp(arg, "--strict")) {
773 strict = 1;
774 continue;
776 if (!prefixcmp(arg, "--timeout=")) {
777 timeout = atoi(arg+10);
778 daemon_mode = 1;
779 continue;
781 if (!strcmp(arg, "--")) {
782 i++;
783 break;
787 if (i != argc-1)
788 usage(upload_pack_usage);
790 setup_path();
792 dir = argv[i];
794 if (!enter_repo(dir, strict))
795 die("'%s' does not appear to be a git repository", dir);
796 if (is_repository_shallow())
797 die("attempt to fetch/clone from a shallow repository");
798 if (getenv("GIT_DEBUG_SEND_PACK"))
799 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
800 upload_pack();
801 return 0;