Merge with git://repo.or.cz/git.git#master
[git/mingw.git] / upload-pack.c
blob914a80095ffae6a443a9156effdb2e5d28344220
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"
13 static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
15 /* bits #0..7 in revision.h, #8..10 in commit.c */
16 #define THEY_HAVE (1u << 11)
17 #define OUR_REF (1u << 12)
18 #define WANTED (1u << 13)
19 #define COMMON_KNOWN (1u << 14)
20 #define REACHABLE (1u << 15)
22 #define SHALLOW (1u << 16)
23 #define NOT_SHALLOW (1u << 17)
24 #define CLIENT_SHALLOW (1u << 18)
26 static unsigned long oldest_have;
28 static int multi_ack, nr_our_refs;
29 static int use_thin_pack, use_ofs_delta;
30 static struct object_array have_obj;
31 static struct object_array want_obj;
32 static unsigned int timeout;
33 /* 0 for no sideband,
34 * otherwise maximum packet size (up to 65520 bytes).
36 static int use_sideband;
38 static void reset_timeout(void)
40 alarm(timeout);
43 static int strip(char *line, int len)
45 if (len && line[len-1] == '\n')
46 line[--len] = 0;
47 return len;
50 static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
52 if (use_sideband)
53 return send_sideband(1, fd, data, sz, use_sideband);
54 if (fd == 3)
55 /* emergency quit */
56 fd = 2;
57 if (fd == 2) {
58 /* XXX: are we happy to lose stuff here? */
59 xwrite(fd, data, sz);
60 return sz;
62 return safe_write(fd, data, sz);
65 FILE *pack_pipe = NULL;
66 static void show_commit(struct commit *commit)
68 if (commit->object.flags & BOUNDARY)
69 fputc('-', pack_pipe);
70 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
71 die("broken output pipe");
72 fputc('\n', pack_pipe);
73 fflush(pack_pipe);
74 free(commit->buffer);
75 commit->buffer = NULL;
78 static void show_object(struct object_array_entry *p)
80 /* An object with name "foo\n0000000..." can be used to
81 * confuse downstream git-pack-objects very badly.
83 const char *ep = strchr(p->name, '\n');
84 if (ep) {
85 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(p->item->sha1),
86 (int) (ep - p->name),
87 p->name);
89 else
90 fprintf(pack_pipe, "%s %s\n",
91 sha1_to_hex(p->item->sha1), p->name);
94 static void show_edge(struct commit *commit)
96 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
99 static void do_rev_list(void *create_full_pack)
101 int i;
102 struct rev_info revs;
104 if (create_full_pack)
105 use_thin_pack = 0; /* no point doing it */
106 init_revisions(&revs, NULL);
107 revs.tag_objects = 1;
108 revs.tree_objects = 1;
109 revs.blob_objects = 1;
110 if (use_thin_pack)
111 revs.edge_hint = 1;
113 if (create_full_pack) {
114 const char *args[] = {"rev-list", "--all", NULL};
115 setup_revisions(2, args, &revs, NULL);
116 } else {
117 for (i = 0; i < want_obj.nr; i++) {
118 struct object *o = want_obj.objects[i].item;
119 /* why??? */
120 o->flags &= ~UNINTERESTING;
121 add_pending_object(&revs, o, NULL);
123 for (i = 0; i < have_obj.nr; i++) {
124 struct object *o = have_obj.objects[i].item;
125 o->flags |= UNINTERESTING;
126 add_pending_object(&revs, o, NULL);
128 setup_revisions(0, NULL, &revs, NULL);
130 prepare_revision_walk(&revs);
131 mark_edges_uninteresting(revs.commits, &revs, show_edge);
132 traverse_commit_list(&revs, show_commit, show_object);
133 fflush(pack_pipe);
134 fclose(pack_pipe);
137 static void create_pack_file(void)
139 #ifndef __MINGW32__
140 /* Pipes between rev-list to pack-objects, pack-objects to us
141 * and pack-objects error stream for progress bar.
143 int lp_pipe[2], pu_pipe[2], pe_pipe[2];
144 pid_t pid_rev_list, pid_pack_objects;
145 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
146 char data[8193], progress[128];
147 char abort_msg[] = "aborting due to possible repository "
148 "corruption on the remote side.";
149 int buffered = -1;
151 if (pipe(lp_pipe) < 0)
152 die("git-upload-pack: unable to create pipe");
153 pid_rev_list = fork();
154 if (pid_rev_list < 0)
155 die("git-upload-pack: unable to fork git-rev-list");
157 if (!pid_rev_list) {
158 pack_pipe = fdopen(lp_pipe[1], "w");
159 do_rev_list(create_full_pack);
160 exit(0);
163 if (pipe(pu_pipe) < 0)
164 die("git-upload-pack: unable to create pipe");
165 if (pipe(pe_pipe) < 0)
166 die("git-upload-pack: unable to create pipe");
167 pid_pack_objects = fork();
168 if (pid_pack_objects < 0) {
169 /* daemon sets things up to ignore TERM */
170 kill(pid_rev_list, SIGKILL);
171 die("git-upload-pack: unable to fork git-pack-objects");
173 if (!pid_pack_objects) {
174 dup2(lp_pipe[0], 0);
175 dup2(pu_pipe[1], 1);
176 dup2(pe_pipe[1], 2);
178 close(lp_pipe[0]);
179 close(lp_pipe[1]);
180 close(pu_pipe[0]);
181 close(pu_pipe[1]);
182 close(pe_pipe[0]);
183 close(pe_pipe[1]);
184 execl_git_cmd("pack-objects", "--stdout", "--progress",
185 use_ofs_delta ? "--delta-base-offset" : NULL,
186 NULL);
187 kill(pid_rev_list, SIGKILL);
188 die("git-upload-pack: unable to exec git-pack-objects");
191 close(lp_pipe[0]);
192 close(lp_pipe[1]);
194 /* We read from pe_pipe[0] to capture stderr output for
195 * progress bar, and pu_pipe[0] to capture the pack data.
197 close(pe_pipe[1]);
198 close(pu_pipe[1]);
200 while (1) {
201 const char *who;
202 struct pollfd pfd[2];
203 pid_t pid;
204 int status;
205 ssize_t sz;
206 int pe, pu, pollsize;
208 reset_timeout();
210 pollsize = 0;
211 pe = pu = -1;
213 if (0 <= pu_pipe[0]) {
214 pfd[pollsize].fd = pu_pipe[0];
215 pfd[pollsize].events = POLLIN;
216 pu = pollsize;
217 pollsize++;
219 if (0 <= pe_pipe[0]) {
220 pfd[pollsize].fd = pe_pipe[0];
221 pfd[pollsize].events = POLLIN;
222 pe = pollsize;
223 pollsize++;
226 if (pollsize) {
227 if (poll(pfd, pollsize, -1) < 0) {
228 if (errno != EINTR) {
229 error("poll failed, resuming: %s",
230 strerror(errno));
231 sleep(1);
233 continue;
235 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
236 /* Data ready; we keep the last byte
237 * to ourselves in case we detect
238 * broken rev-list, so that we can
239 * leave the stream corrupted. This
240 * is unfortunate -- unpack-objects
241 * would happily accept a valid pack
242 * data with trailing garbage, so
243 * appending garbage after we pass all
244 * the pack data is not good enough to
245 * signal breakage to downstream.
247 char *cp = data;
248 ssize_t outsz = 0;
249 if (0 <= buffered) {
250 *cp++ = buffered;
251 outsz++;
253 sz = xread(pu_pipe[0], cp,
254 sizeof(data) - outsz);
255 if (0 < sz)
257 else if (sz == 0) {
258 close(pu_pipe[0]);
259 pu_pipe[0] = -1;
261 else
262 goto fail;
263 sz += outsz;
264 if (1 < sz) {
265 buffered = data[sz-1] & 0xFF;
266 sz--;
268 else
269 buffered = -1;
270 sz = send_client_data(1, data, sz);
271 if (sz < 0)
272 goto fail;
274 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
275 /* Status ready; we ship that in the side-band
276 * or dump to the standard error.
278 sz = xread(pe_pipe[0], progress,
279 sizeof(progress));
280 if (0 < sz)
281 send_client_data(2, progress, sz);
282 else if (sz == 0) {
283 close(pe_pipe[0]);
284 pe_pipe[0] = -1;
286 else
287 goto fail;
291 /* See if the children are still there */
292 if (pid_rev_list || pid_pack_objects) {
293 pid = waitpid(-1, &status, WNOHANG);
294 if (!pid)
295 continue;
296 who = ((pid == pid_rev_list) ? "git-rev-list" :
297 (pid == pid_pack_objects) ? "git-pack-objects" :
298 NULL);
299 if (!who) {
300 if (pid < 0) {
301 error("git-upload-pack: %s",
302 strerror(errno));
303 goto fail;
305 error("git-upload-pack: we weren't "
306 "waiting for %d", pid);
307 continue;
309 if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) {
310 error("git-upload-pack: %s died with error.",
311 who);
312 goto fail;
314 if (pid == pid_rev_list)
315 pid_rev_list = 0;
316 if (pid == pid_pack_objects)
317 pid_pack_objects = 0;
318 if (pid_rev_list || pid_pack_objects)
319 continue;
322 /* both died happily */
323 if (pollsize)
324 continue;
326 /* flush the data */
327 if (0 <= buffered) {
328 data[0] = buffered;
329 sz = send_client_data(1, data, 1);
330 if (sz < 0)
331 goto fail;
332 fprintf(stderr, "flushed.\n");
334 if (use_sideband)
335 packet_flush(1);
336 return;
338 fail:
339 if (pid_pack_objects)
340 kill(pid_pack_objects, SIGKILL);
341 if (pid_rev_list)
342 kill(pid_rev_list, SIGKILL);
343 send_client_data(3, abort_msg, sizeof(abort_msg));
344 die("git-upload-pack: %s", abort_msg);
345 #else
346 /* Pipes between rev-list to pack-objects, pack-objects to us. */
347 int lp_pipe[2], pu_pipe[2];
348 pid_t pid_pack_objects;
349 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
350 char data[8193];
351 char abort_msg[] = "aborting due to possible repository "
352 "corruption on the remote side.";
353 int buffered = -1;
354 ssize_t sz;
355 char *cp;
356 const char* argv[] = { "pack-objects", "--stdout", "-q",
357 use_ofs_delta ? "--delta-base-offset" : NULL,
358 NULL };
360 if (pipe(lp_pipe) < 0)
361 die("git-upload-pack: unable to create pipe");
362 pack_pipe = fdopen(lp_pipe[1], "w");
363 if (_beginthread(do_rev_list, 0, create_full_pack ? &create_full_pack : NULL) < 0)
364 die("git-upload-pack: unable to run rev-list: %s", strerror(errno));
366 if (pipe(pu_pipe) < 0)
367 die("git-upload-pack: unable to create pipe");
369 pid_pack_objects = spawnv_git_cmd(argv, lp_pipe, pu_pipe);
370 if (pid_pack_objects < 0)
371 die("git-upload-pack: unable to run git-pack-objects");
373 /* We read from pu_pipe[0] to capture the pack data. */
375 while ((sz = xread(pu_pipe[0], data+1, sizeof(data)-1)) > 0) {
376 cp = data+1;
377 /* Data ready; we keep the last byte to ourselves in case we
378 * detect broken rev-list, so that we can leave the stream
379 * corrupted. This is unfortunate -- unpack-objects would
380 * happily accept a valid pack data with trailing garbage, so
381 * appending garbage after we pass all the pack data is not
382 * good enough to signal breakage to downstream.
384 if (0 <= buffered) {
385 *--cp = buffered;
386 sz++;
388 if (1 < sz) {
389 buffered = cp[sz-1] & 0xFF;
390 sz--;
392 else
393 buffered = -1;
394 sz = send_client_data(1, cp, sz);
395 if (sz < 0)
396 goto fail;
398 if (sz == 0) {
399 close(pu_pipe[0]);
400 pu_pipe[0] = -1;
402 else
403 goto fail;
405 /* flush the data */
406 if (0 <= buffered) {
407 data[0] = buffered;
408 sz = send_client_data(1, data, 1);
409 if (sz < 0)
410 goto fail;
411 fprintf(stderr, "flushed.\n");
413 if (use_sideband)
414 packet_flush(1);
415 if (waitpid(pid_pack_objects, NULL, 0) < 0)
416 die("git-upload-pack: waiting for pack-objects: %s",
417 strerror(errno));
418 return;
420 fail:
421 kill(pid_pack_objects, SIGKILL);
422 send_client_data(3, abort_msg, sizeof(abort_msg));
423 die("git-upload-pack: %s", abort_msg);
424 #endif
427 static int got_sha1(char *hex, unsigned char *sha1)
429 struct object *o;
430 int we_knew_they_have = 0;
432 if (get_sha1_hex(hex, sha1))
433 die("git-upload-pack: expected SHA1 object, got '%s'", hex);
434 if (!has_sha1_file(sha1))
435 return -1;
437 o = lookup_object(sha1);
438 if (!(o && o->parsed))
439 o = parse_object(sha1);
440 if (!o)
441 die("oops (%s)", sha1_to_hex(sha1));
442 if (o->type == OBJ_COMMIT) {
443 struct commit_list *parents;
444 struct commit *commit = (struct commit *)o;
445 if (o->flags & THEY_HAVE)
446 we_knew_they_have = 1;
447 else
448 o->flags |= THEY_HAVE;
449 if (!oldest_have || (commit->date < oldest_have))
450 oldest_have = commit->date;
451 for (parents = commit->parents;
452 parents;
453 parents = parents->next)
454 parents->item->object.flags |= THEY_HAVE;
456 if (!we_knew_they_have) {
457 add_object_array(o, NULL, &have_obj);
458 return 1;
460 return 0;
463 static int reachable(struct commit *want)
465 struct commit_list *work = NULL;
467 insert_by_date(want, &work);
468 while (work) {
469 struct commit_list *list = work->next;
470 struct commit *commit = work->item;
471 free(work);
472 work = list;
474 if (commit->object.flags & THEY_HAVE) {
475 want->object.flags |= COMMON_KNOWN;
476 break;
478 if (!commit->object.parsed)
479 parse_object(commit->object.sha1);
480 if (commit->object.flags & REACHABLE)
481 continue;
482 commit->object.flags |= REACHABLE;
483 if (commit->date < oldest_have)
484 continue;
485 for (list = commit->parents; list; list = list->next) {
486 struct commit *parent = list->item;
487 if (!(parent->object.flags & REACHABLE))
488 insert_by_date(parent, &work);
491 want->object.flags |= REACHABLE;
492 clear_commit_marks(want, REACHABLE);
493 free_commit_list(work);
494 return (want->object.flags & COMMON_KNOWN);
497 static int ok_to_give_up(void)
499 int i;
501 if (!have_obj.nr)
502 return 0;
504 for (i = 0; i < want_obj.nr; i++) {
505 struct object *want = want_obj.objects[i].item;
507 if (want->flags & COMMON_KNOWN)
508 continue;
509 want = deref_tag(want, "a want line", 0);
510 if (!want || want->type != OBJ_COMMIT) {
511 /* no way to tell if this is reachable by
512 * looking at the ancestry chain alone, so
513 * leave a note to ourselves not to worry about
514 * this object anymore.
516 want_obj.objects[i].item->flags |= COMMON_KNOWN;
517 continue;
519 if (!reachable((struct commit *)want))
520 return 0;
522 return 1;
525 static int get_common_commits(void)
527 static char line[1000];
528 unsigned char sha1[20];
529 char hex[41], last_hex[41];
530 int len;
532 track_object_refs = 0;
533 save_commit_buffer = 0;
535 for(;;) {
536 len = packet_read_line(0, line, sizeof(line));
537 reset_timeout();
539 if (!len) {
540 if (have_obj.nr == 0 || multi_ack)
541 packet_write(1, "NAK\n");
542 continue;
544 len = strip(line, len);
545 if (!prefixcmp(line, "have ")) {
546 switch (got_sha1(line+5, sha1)) {
547 case -1: /* they have what we do not */
548 if (multi_ack && ok_to_give_up())
549 packet_write(1, "ACK %s continue\n",
550 sha1_to_hex(sha1));
551 break;
552 default:
553 memcpy(hex, sha1_to_hex(sha1), 41);
554 if (multi_ack) {
555 const char *msg = "ACK %s continue\n";
556 packet_write(1, msg, hex);
557 memcpy(last_hex, hex, 41);
559 else if (have_obj.nr == 1)
560 packet_write(1, "ACK %s\n", hex);
561 break;
563 continue;
565 if (!strcmp(line, "done")) {
566 if (have_obj.nr > 0) {
567 if (multi_ack)
568 packet_write(1, "ACK %s\n", last_hex);
569 return 0;
571 packet_write(1, "NAK\n");
572 return -1;
574 die("git-upload-pack: expected SHA1 list, got '%s'", line);
578 static void receive_needs(void)
580 struct object_array shallows = {0, 0, NULL};
581 static char line[1000];
582 int len, depth = 0;
584 for (;;) {
585 struct object *o;
586 unsigned char sha1_buf[20];
587 len = packet_read_line(0, line, sizeof(line));
588 reset_timeout();
589 if (!len)
590 break;
592 if (!prefixcmp(line, "shallow ")) {
593 unsigned char sha1[20];
594 struct object *object;
595 use_thin_pack = 0;
596 if (get_sha1(line + 8, sha1))
597 die("invalid shallow line: %s", line);
598 object = parse_object(sha1);
599 if (!object)
600 die("did not find object for %s", line);
601 object->flags |= CLIENT_SHALLOW;
602 add_object_array(object, NULL, &shallows);
603 continue;
605 if (!prefixcmp(line, "deepen ")) {
606 char *end;
607 use_thin_pack = 0;
608 depth = strtol(line + 7, &end, 0);
609 if (end == line + 7 || depth <= 0)
610 die("Invalid deepen: %s", line);
611 continue;
613 if (prefixcmp(line, "want ") ||
614 get_sha1_hex(line+5, sha1_buf))
615 die("git-upload-pack: protocol error, "
616 "expected to get sha, not '%s'", line);
617 if (strstr(line+45, "multi_ack"))
618 multi_ack = 1;
619 if (strstr(line+45, "thin-pack"))
620 use_thin_pack = 1;
621 if (strstr(line+45, "ofs-delta"))
622 use_ofs_delta = 1;
623 #ifndef __MINGW32__
624 if (strstr(line+45, "side-band-64k"))
625 use_sideband = LARGE_PACKET_MAX;
626 else if (strstr(line+45, "side-band"))
627 use_sideband = DEFAULT_PACKET_MAX;
628 #endif
630 /* We have sent all our refs already, and the other end
631 * should have chosen out of them; otherwise they are
632 * asking for nonsense.
634 * Hmph. We may later want to allow "want" line that
635 * asks for something like "master~10" (symbolic)...
636 * would it make sense? I don't know.
638 o = lookup_object(sha1_buf);
639 if (!o || !(o->flags & OUR_REF))
640 die("git-upload-pack: not our ref %s", line+5);
641 if (!(o->flags & WANTED)) {
642 o->flags |= WANTED;
643 add_object_array(o, NULL, &want_obj);
646 if (depth == 0 && shallows.nr == 0)
647 return;
648 if (depth > 0) {
649 struct commit_list *result, *backup;
650 int i;
651 backup = result = get_shallow_commits(&want_obj, depth,
652 SHALLOW, NOT_SHALLOW);
653 while (result) {
654 struct object *object = &result->item->object;
655 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
656 packet_write(1, "shallow %s",
657 sha1_to_hex(object->sha1));
658 register_shallow(object->sha1);
660 result = result->next;
662 free_commit_list(backup);
663 for (i = 0; i < shallows.nr; i++) {
664 struct object *object = shallows.objects[i].item;
665 if (object->flags & NOT_SHALLOW) {
666 struct commit_list *parents;
667 packet_write(1, "unshallow %s",
668 sha1_to_hex(object->sha1));
669 object->flags &= ~CLIENT_SHALLOW;
670 /* make sure the real parents are parsed */
671 unregister_shallow(object->sha1);
672 object->parsed = 0;
673 parse_commit((struct commit *)object);
674 parents = ((struct commit *)object)->parents;
675 while (parents) {
676 add_object_array(&parents->item->object,
677 NULL, &want_obj);
678 parents = parents->next;
681 /* make sure commit traversal conforms to client */
682 register_shallow(object->sha1);
684 packet_flush(1);
685 } else
686 if (shallows.nr > 0) {
687 int i;
688 for (i = 0; i < shallows.nr; i++)
689 register_shallow(shallows.objects[i].item->sha1);
691 free(shallows.objects);
694 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
696 static const char *capabilities = "multi_ack thin-pack side-band"
697 " side-band-64k ofs-delta shallow";
698 struct object *o = parse_object(sha1);
700 if (!o)
701 die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
703 if (capabilities)
704 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
705 0, capabilities);
706 else
707 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
708 capabilities = NULL;
709 if (!(o->flags & OUR_REF)) {
710 o->flags |= OUR_REF;
711 nr_our_refs++;
713 if (o->type == OBJ_TAG) {
714 o = deref_tag(o, refname, 0);
715 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
717 return 0;
720 static void upload_pack(void)
722 reset_timeout();
723 head_ref(send_ref, NULL);
724 for_each_ref(send_ref, NULL);
725 packet_flush(1);
726 receive_needs();
727 if (want_obj.nr) {
728 get_common_commits();
729 create_pack_file();
733 int main(int argc, char **argv)
735 char *dir;
736 int i;
737 int strict = 0;
739 for (i = 1; i < argc; i++) {
740 char *arg = argv[i];
742 if (arg[0] != '-')
743 break;
744 if (!strcmp(arg, "--strict")) {
745 strict = 1;
746 continue;
748 if (!prefixcmp(arg, "--timeout=")) {
749 timeout = atoi(arg+10);
750 continue;
752 if (!strcmp(arg, "--")) {
753 i++;
754 break;
758 if (i != argc-1)
759 usage(upload_pack_usage);
760 dir = argv[i];
762 if (!enter_repo(dir, strict))
763 die("'%s': unable to chdir or not a git archive", dir);
764 if (is_repository_shallow())
765 die("attempt to fetch/clone from a shallow repository");
766 upload_pack();
767 return 0;