git-gui: actually show the choose repository dialog
[git/mingw/4msysgit/wingit-dll.git] / upload-pack.c
blobd082dcf7a7d818dc755c64fb2ee667c35a2cc026
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, no_progress;
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 static 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 close(lp_pipe[0]);
159 pack_pipe = fdopen(lp_pipe[1], "w");
160 do_rev_list(create_full_pack);
161 exit(0);
164 if (pipe(pu_pipe) < 0)
165 die("git-upload-pack: unable to create pipe");
166 if (pipe(pe_pipe) < 0)
167 die("git-upload-pack: unable to create pipe");
168 pid_pack_objects = fork();
169 if (pid_pack_objects < 0) {
170 /* daemon sets things up to ignore TERM */
171 kill(pid_rev_list, SIGKILL);
172 die("git-upload-pack: unable to fork git-pack-objects");
174 if (!pid_pack_objects) {
175 const char *argv[10];
176 int i = 0;
178 dup2(lp_pipe[0], 0);
179 dup2(pu_pipe[1], 1);
180 dup2(pe_pipe[1], 2);
182 close(lp_pipe[0]);
183 close(lp_pipe[1]);
184 close(pu_pipe[0]);
185 close(pu_pipe[1]);
186 close(pe_pipe[0]);
187 close(pe_pipe[1]);
189 argv[i++] = "pack-objects";
190 argv[i++] = "--stdout";
191 if (!no_progress)
192 argv[i++] = "--progress";
193 if (use_ofs_delta)
194 argv[i++] = "--delta-base-offset";
195 argv[i++] = NULL;
197 execv_git_cmd(argv);
198 kill(pid_rev_list, SIGKILL);
199 die("git-upload-pack: unable to exec git-pack-objects");
202 close(lp_pipe[0]);
203 close(lp_pipe[1]);
205 /* We read from pe_pipe[0] to capture stderr output for
206 * progress bar, and pu_pipe[0] to capture the pack data.
208 close(pe_pipe[1]);
209 close(pu_pipe[1]);
211 while (1) {
212 const char *who;
213 struct pollfd pfd[2];
214 pid_t pid;
215 int status;
216 ssize_t sz;
217 int pe, pu, pollsize;
219 reset_timeout();
221 pollsize = 0;
222 pe = pu = -1;
224 if (0 <= pu_pipe[0]) {
225 pfd[pollsize].fd = pu_pipe[0];
226 pfd[pollsize].events = POLLIN;
227 pu = pollsize;
228 pollsize++;
230 if (0 <= pe_pipe[0]) {
231 pfd[pollsize].fd = pe_pipe[0];
232 pfd[pollsize].events = POLLIN;
233 pe = pollsize;
234 pollsize++;
237 if (pollsize) {
238 if (poll(pfd, pollsize, -1) < 0) {
239 if (errno != EINTR) {
240 error("poll failed, resuming: %s",
241 strerror(errno));
242 sleep(1);
244 continue;
246 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
247 /* Data ready; we keep the last byte
248 * to ourselves in case we detect
249 * broken rev-list, so that we can
250 * leave the stream corrupted. This
251 * is unfortunate -- unpack-objects
252 * would happily accept a valid pack
253 * data with trailing garbage, so
254 * appending garbage after we pass all
255 * the pack data is not good enough to
256 * signal breakage to downstream.
258 char *cp = data;
259 ssize_t outsz = 0;
260 if (0 <= buffered) {
261 *cp++ = buffered;
262 outsz++;
264 sz = xread(pu_pipe[0], cp,
265 sizeof(data) - outsz);
266 if (0 < sz)
268 else if (sz == 0) {
269 close(pu_pipe[0]);
270 pu_pipe[0] = -1;
272 else
273 goto fail;
274 sz += outsz;
275 if (1 < sz) {
276 buffered = data[sz-1] & 0xFF;
277 sz--;
279 else
280 buffered = -1;
281 sz = send_client_data(1, data, sz);
282 if (sz < 0)
283 goto fail;
285 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
286 /* Status ready; we ship that in the side-band
287 * or dump to the standard error.
289 sz = xread(pe_pipe[0], progress,
290 sizeof(progress));
291 if (0 < sz)
292 send_client_data(2, progress, sz);
293 else if (sz == 0) {
294 close(pe_pipe[0]);
295 pe_pipe[0] = -1;
297 else
298 goto fail;
302 /* See if the children are still there */
303 if (pid_rev_list || pid_pack_objects) {
304 pid = waitpid(-1, &status, WNOHANG);
305 if (!pid)
306 continue;
307 who = ((pid == pid_rev_list) ? "git-rev-list" :
308 (pid == pid_pack_objects) ? "git-pack-objects" :
309 NULL);
310 if (!who) {
311 if (pid < 0) {
312 error("git-upload-pack: %s",
313 strerror(errno));
314 goto fail;
316 error("git-upload-pack: we weren't "
317 "waiting for %d", pid);
318 continue;
320 if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) {
321 error("git-upload-pack: %s died with error.",
322 who);
323 goto fail;
325 if (pid == pid_rev_list)
326 pid_rev_list = 0;
327 if (pid == pid_pack_objects)
328 pid_pack_objects = 0;
329 if (pid_rev_list || pid_pack_objects)
330 continue;
333 /* both died happily */
334 if (pollsize)
335 continue;
337 /* flush the data */
338 if (0 <= buffered) {
339 data[0] = buffered;
340 sz = send_client_data(1, data, 1);
341 if (sz < 0)
342 goto fail;
343 fprintf(stderr, "flushed.\n");
345 if (use_sideband)
346 packet_flush(1);
347 return;
349 fail:
350 if (pid_pack_objects)
351 kill(pid_pack_objects, SIGKILL);
352 if (pid_rev_list)
353 kill(pid_rev_list, SIGKILL);
354 send_client_data(3, abort_msg, sizeof(abort_msg));
355 die("git-upload-pack: %s", abort_msg);
356 #else
357 /* Pipes between rev-list to pack-objects, pack-objects to us. */
358 int lp_pipe[2], pu_pipe[2];
359 pid_t pid_pack_objects;
360 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
361 char data[8193];
362 char abort_msg[] = "aborting due to possible repository "
363 "corruption on the remote side.";
364 int buffered = -1;
365 ssize_t sz;
366 char *cp;
367 const char *argv[10];
368 int i = 0;
370 if (pipe(lp_pipe) < 0)
371 die("git-upload-pack: unable to create pipe");
372 pack_pipe = fdopen(lp_pipe[1], "w");
373 if (_beginthread(do_rev_list, 0, create_full_pack ? &create_full_pack : NULL) < 0)
374 die("git-upload-pack: unable to run rev-list: %s", strerror(errno));
376 if (pipe(pu_pipe) < 0)
377 die("git-upload-pack: unable to create pipe");
379 argv[i++] = "pack-objects";
380 argv[i++] = "--stdout";
381 argv[i++] = "-q";
382 if (!no_progress)
383 argv[i++] = "--progress";
384 if (use_ofs_delta)
385 argv[i++] = "--delta-base-offset";
386 argv[i++] = NULL;
388 pid_pack_objects = spawnv_git_cmd(argv, lp_pipe, pu_pipe);
389 if (pid_pack_objects < 0)
390 die("git-upload-pack: unable to run git-pack-objects");
392 /* We read from pu_pipe[0] to capture the pack data. */
394 while ((sz = xread(pu_pipe[0], data+1, sizeof(data)-1)) > 0) {
395 cp = data+1;
396 /* Data ready; we keep the last byte to ourselves in case we
397 * detect broken rev-list, so that we can leave the stream
398 * corrupted. This is unfortunate -- unpack-objects would
399 * happily accept a valid pack data with trailing garbage, so
400 * appending garbage after we pass all the pack data is not
401 * good enough to signal breakage to downstream.
403 if (0 <= buffered) {
404 *--cp = buffered;
405 sz++;
407 if (1 < sz) {
408 buffered = cp[sz-1] & 0xFF;
409 sz--;
411 else
412 buffered = -1;
413 sz = send_client_data(1, cp, sz);
414 if (sz < 0)
415 goto fail;
417 if (sz == 0) {
418 close(pu_pipe[0]);
419 pu_pipe[0] = -1;
421 else
422 goto fail;
424 /* flush the data */
425 if (0 <= buffered) {
426 data[0] = buffered;
427 sz = send_client_data(1, data, 1);
428 if (sz < 0)
429 goto fail;
430 fprintf(stderr, "flushed.\n");
432 if (use_sideband)
433 packet_flush(1);
434 if (waitpid(pid_pack_objects, NULL, 0) < 0)
435 die("git-upload-pack: waiting for pack-objects: %s",
436 strerror(errno));
437 return;
439 fail:
440 kill(pid_pack_objects, SIGKILL);
441 send_client_data(3, abort_msg, sizeof(abort_msg));
442 die("git-upload-pack: %s", abort_msg);
443 #endif
446 static int got_sha1(char *hex, unsigned char *sha1)
448 struct object *o;
449 int we_knew_they_have = 0;
451 if (get_sha1_hex(hex, sha1))
452 die("git-upload-pack: expected SHA1 object, got '%s'", hex);
453 if (!has_sha1_file(sha1))
454 return -1;
456 o = lookup_object(sha1);
457 if (!(o && o->parsed))
458 o = parse_object(sha1);
459 if (!o)
460 die("oops (%s)", sha1_to_hex(sha1));
461 if (o->type == OBJ_COMMIT) {
462 struct commit_list *parents;
463 struct commit *commit = (struct commit *)o;
464 if (o->flags & THEY_HAVE)
465 we_knew_they_have = 1;
466 else
467 o->flags |= THEY_HAVE;
468 if (!oldest_have || (commit->date < oldest_have))
469 oldest_have = commit->date;
470 for (parents = commit->parents;
471 parents;
472 parents = parents->next)
473 parents->item->object.flags |= THEY_HAVE;
475 if (!we_knew_they_have) {
476 add_object_array(o, NULL, &have_obj);
477 return 1;
479 return 0;
482 static int reachable(struct commit *want)
484 struct commit_list *work = NULL;
486 insert_by_date(want, &work);
487 while (work) {
488 struct commit_list *list = work->next;
489 struct commit *commit = work->item;
490 free(work);
491 work = list;
493 if (commit->object.flags & THEY_HAVE) {
494 want->object.flags |= COMMON_KNOWN;
495 break;
497 if (!commit->object.parsed)
498 parse_object(commit->object.sha1);
499 if (commit->object.flags & REACHABLE)
500 continue;
501 commit->object.flags |= REACHABLE;
502 if (commit->date < oldest_have)
503 continue;
504 for (list = commit->parents; list; list = list->next) {
505 struct commit *parent = list->item;
506 if (!(parent->object.flags & REACHABLE))
507 insert_by_date(parent, &work);
510 want->object.flags |= REACHABLE;
511 clear_commit_marks(want, REACHABLE);
512 free_commit_list(work);
513 return (want->object.flags & COMMON_KNOWN);
516 static int ok_to_give_up(void)
518 int i;
520 if (!have_obj.nr)
521 return 0;
523 for (i = 0; i < want_obj.nr; i++) {
524 struct object *want = want_obj.objects[i].item;
526 if (want->flags & COMMON_KNOWN)
527 continue;
528 want = deref_tag(want, "a want line", 0);
529 if (!want || want->type != OBJ_COMMIT) {
530 /* no way to tell if this is reachable by
531 * looking at the ancestry chain alone, so
532 * leave a note to ourselves not to worry about
533 * this object anymore.
535 want_obj.objects[i].item->flags |= COMMON_KNOWN;
536 continue;
538 if (!reachable((struct commit *)want))
539 return 0;
541 return 1;
544 static int get_common_commits(void)
546 static char line[1000];
547 unsigned char sha1[20];
548 char hex[41], last_hex[41];
549 int len;
551 track_object_refs = 0;
552 save_commit_buffer = 0;
554 for(;;) {
555 len = packet_read_line(0, line, sizeof(line));
556 reset_timeout();
558 if (!len) {
559 if (have_obj.nr == 0 || multi_ack)
560 packet_write(1, "NAK\n");
561 continue;
563 len = strip(line, len);
564 if (!prefixcmp(line, "have ")) {
565 switch (got_sha1(line+5, sha1)) {
566 case -1: /* they have what we do not */
567 if (multi_ack && ok_to_give_up())
568 packet_write(1, "ACK %s continue\n",
569 sha1_to_hex(sha1));
570 break;
571 default:
572 memcpy(hex, sha1_to_hex(sha1), 41);
573 if (multi_ack) {
574 const char *msg = "ACK %s continue\n";
575 packet_write(1, msg, hex);
576 memcpy(last_hex, hex, 41);
578 else if (have_obj.nr == 1)
579 packet_write(1, "ACK %s\n", hex);
580 break;
582 continue;
584 if (!strcmp(line, "done")) {
585 if (have_obj.nr > 0) {
586 if (multi_ack)
587 packet_write(1, "ACK %s\n", last_hex);
588 return 0;
590 packet_write(1, "NAK\n");
591 return -1;
593 die("git-upload-pack: expected SHA1 list, got '%s'", line);
597 static void receive_needs(void)
599 struct object_array shallows = {0, 0, NULL};
600 static char line[1000];
601 int len, depth = 0;
603 for (;;) {
604 struct object *o;
605 unsigned char sha1_buf[20];
606 len = packet_read_line(0, line, sizeof(line));
607 reset_timeout();
608 if (!len)
609 break;
611 if (!prefixcmp(line, "shallow ")) {
612 unsigned char sha1[20];
613 struct object *object;
614 use_thin_pack = 0;
615 if (get_sha1(line + 8, sha1))
616 die("invalid shallow line: %s", line);
617 object = parse_object(sha1);
618 if (!object)
619 die("did not find object for %s", line);
620 object->flags |= CLIENT_SHALLOW;
621 add_object_array(object, NULL, &shallows);
622 continue;
624 if (!prefixcmp(line, "deepen ")) {
625 char *end;
626 use_thin_pack = 0;
627 depth = strtol(line + 7, &end, 0);
628 if (end == line + 7 || depth <= 0)
629 die("Invalid deepen: %s", line);
630 continue;
632 if (prefixcmp(line, "want ") ||
633 get_sha1_hex(line+5, sha1_buf))
634 die("git-upload-pack: protocol error, "
635 "expected to get sha, not '%s'", line);
636 if (strstr(line+45, "multi_ack"))
637 multi_ack = 1;
638 if (strstr(line+45, "thin-pack"))
639 use_thin_pack = 1;
640 if (strstr(line+45, "ofs-delta"))
641 use_ofs_delta = 1;
642 #ifndef __MINGW32__
643 if (strstr(line+45, "side-band-64k"))
644 use_sideband = LARGE_PACKET_MAX;
645 else if (strstr(line+45, "side-band"))
646 use_sideband = DEFAULT_PACKET_MAX;
647 #endif
648 if (strstr(line+45, "no-progress"))
649 no_progress = 1;
651 /* We have sent all our refs already, and the other end
652 * should have chosen out of them; otherwise they are
653 * asking for nonsense.
655 * Hmph. We may later want to allow "want" line that
656 * asks for something like "master~10" (symbolic)...
657 * would it make sense? I don't know.
659 o = lookup_object(sha1_buf);
660 if (!o || !(o->flags & OUR_REF))
661 die("git-upload-pack: not our ref %s", line+5);
662 if (!(o->flags & WANTED)) {
663 o->flags |= WANTED;
664 add_object_array(o, NULL, &want_obj);
667 if (depth == 0 && shallows.nr == 0)
668 return;
669 if (depth > 0) {
670 struct commit_list *result, *backup;
671 int i;
672 backup = result = get_shallow_commits(&want_obj, depth,
673 SHALLOW, NOT_SHALLOW);
674 while (result) {
675 struct object *object = &result->item->object;
676 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
677 packet_write(1, "shallow %s",
678 sha1_to_hex(object->sha1));
679 register_shallow(object->sha1);
681 result = result->next;
683 free_commit_list(backup);
684 for (i = 0; i < shallows.nr; i++) {
685 struct object *object = shallows.objects[i].item;
686 if (object->flags & NOT_SHALLOW) {
687 struct commit_list *parents;
688 packet_write(1, "unshallow %s",
689 sha1_to_hex(object->sha1));
690 object->flags &= ~CLIENT_SHALLOW;
691 /* make sure the real parents are parsed */
692 unregister_shallow(object->sha1);
693 object->parsed = 0;
694 parse_commit((struct commit *)object);
695 parents = ((struct commit *)object)->parents;
696 while (parents) {
697 add_object_array(&parents->item->object,
698 NULL, &want_obj);
699 parents = parents->next;
702 /* make sure commit traversal conforms to client */
703 register_shallow(object->sha1);
705 packet_flush(1);
706 } else
707 if (shallows.nr > 0) {
708 int i;
709 for (i = 0; i < shallows.nr; i++)
710 register_shallow(shallows.objects[i].item->sha1);
712 free(shallows.objects);
715 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
717 static const char *capabilities = "multi_ack thin-pack side-band"
718 " side-band-64k ofs-delta shallow no-progress";
719 struct object *o = parse_object(sha1);
721 if (!o)
722 die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
724 if (capabilities)
725 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
726 0, capabilities);
727 else
728 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
729 capabilities = NULL;
730 if (!(o->flags & OUR_REF)) {
731 o->flags |= OUR_REF;
732 nr_our_refs++;
734 if (o->type == OBJ_TAG) {
735 o = deref_tag(o, refname, 0);
736 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
738 return 0;
741 static void upload_pack(void)
743 reset_timeout();
744 head_ref(send_ref, NULL);
745 for_each_ref(send_ref, NULL);
746 packet_flush(1);
747 receive_needs();
748 if (want_obj.nr) {
749 get_common_commits();
750 create_pack_file();
754 int main(int argc, char **argv)
756 char *dir;
757 int i;
758 int strict = 0;
760 for (i = 1; i < argc; i++) {
761 char *arg = argv[i];
763 if (arg[0] != '-')
764 break;
765 if (!strcmp(arg, "--strict")) {
766 strict = 1;
767 continue;
769 if (!prefixcmp(arg, "--timeout=")) {
770 timeout = atoi(arg+10);
771 continue;
773 if (!strcmp(arg, "--")) {
774 i++;
775 break;
779 if (i != argc-1)
780 usage(upload_pack_usage);
781 dir = argv[i];
783 if (!enter_repo(dir, strict))
784 die("'%s': unable to chdir or not a git archive", dir);
785 if (is_repository_shallow())
786 die("attempt to fetch/clone from a shallow repository");
787 upload_pack();
788 return 0;