Merge branch 'tr/reset-checkout-patch' into next
[git/dscho.git] / upload-pack.c
blobf73e3c9720fa631b1278b3375612ce00999f1a18
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 unsigned int timeout;
36 /* 0 for no sideband,
37 * otherwise maximum packet size (up to 65520 bytes).
39 static int use_sideband;
40 static int debug_fd;
42 static void reset_timeout(void)
44 alarm(timeout);
47 static int strip(char *line, int len)
49 if (len && line[len-1] == '\n')
50 line[--len] = 0;
51 return len;
54 static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
56 if (use_sideband)
57 return send_sideband(1, fd, data, sz, use_sideband);
58 if (fd == 3)
59 /* emergency quit */
60 fd = 2;
61 if (fd == 2) {
62 /* XXX: are we happy to lose stuff here? */
63 xwrite(fd, data, sz);
64 return sz;
66 return safe_write(fd, data, sz);
69 static FILE *pack_pipe = NULL;
70 static void show_commit(struct commit *commit, void *data)
72 if (commit->object.flags & BOUNDARY)
73 fputc('-', pack_pipe);
74 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
75 die("broken output pipe");
76 fputc('\n', pack_pipe);
77 fflush(pack_pipe);
78 free(commit->buffer);
79 commit->buffer = NULL;
82 static void show_object(struct object *obj, const struct name_path *path, const char *component)
84 /* An object with name "foo\n0000000..." can be used to
85 * confuse downstream git-pack-objects very badly.
87 const char *name = path_name(path, component);
88 const char *ep = strchr(name, '\n');
89 if (ep) {
90 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
91 (int) (ep - name),
92 name);
94 else
95 fprintf(pack_pipe, "%s %s\n",
96 sha1_to_hex(obj->sha1), name);
97 free((char *)name);
100 static void show_edge(struct commit *commit)
102 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
105 static int do_rev_list(int fd, void *create_full_pack)
107 int i;
108 struct rev_info revs;
110 pack_pipe = fdopen(fd, "w");
111 init_revisions(&revs, NULL);
112 revs.tag_objects = 1;
113 revs.tree_objects = 1;
114 revs.blob_objects = 1;
115 if (use_thin_pack)
116 revs.edge_hint = 1;
118 if (create_full_pack) {
119 const char *args[] = {"rev-list", "--all", NULL};
120 setup_revisions(2, args, &revs, NULL);
121 } else {
122 for (i = 0; i < want_obj.nr; i++) {
123 struct object *o = want_obj.objects[i].item;
124 /* why??? */
125 o->flags &= ~UNINTERESTING;
126 add_pending_object(&revs, o, NULL);
128 for (i = 0; i < have_obj.nr; i++) {
129 struct object *o = have_obj.objects[i].item;
130 o->flags |= UNINTERESTING;
131 add_pending_object(&revs, o, NULL);
133 setup_revisions(0, NULL, &revs, NULL);
135 if (prepare_revision_walk(&revs))
136 die("revision walk setup failed");
137 mark_edges_uninteresting(revs.commits, &revs, show_edge);
138 traverse_commit_list(&revs, show_commit, show_object, NULL);
139 fflush(pack_pipe);
140 fclose(pack_pipe);
141 return 0;
144 static int feed_msg_to_hook(int fd, const char *fmt, ...)
146 int cnt;
147 char buf[1024];
148 va_list params;
150 va_start(params, fmt);
151 cnt = vsprintf(buf, fmt, params);
152 va_end(params);
153 return write_in_full(fd, buf, cnt) != cnt;
156 static int feed_obj_to_hook(const char *label, struct object_array *oa, int i, int fd)
158 return feed_msg_to_hook(fd, "%s %s\n", label,
159 sha1_to_hex(oa->objects[i].item->sha1));
162 static int run_post_upload_pack_hook(size_t total, struct timeval *tv)
164 const char *argv[2];
165 struct child_process proc;
166 int err, i;
168 argv[0] = "hooks/post-upload-pack";
169 argv[1] = NULL;
171 if (access(argv[0], X_OK) < 0)
172 return 0;
174 memset(&proc, 0, sizeof(proc));
175 proc.argv = argv;
176 proc.in = -1;
177 proc.stdout_to_stderr = 1;
178 err = start_command(&proc);
179 if (err)
180 return err;
181 for (i = 0; !err && i < want_obj.nr; i++)
182 err |= feed_obj_to_hook("want", &want_obj, i, proc.in);
183 for (i = 0; !err && i < have_obj.nr; i++)
184 err |= feed_obj_to_hook("have", &have_obj, i, proc.in);
185 if (!err)
186 err |= feed_msg_to_hook(proc.in, "time %ld.%06ld\n",
187 (long)tv->tv_sec, (long)tv->tv_usec);
188 if (!err)
189 err |= feed_msg_to_hook(proc.in, "size %ld\n", (long)total);
190 if (!err)
191 err |= feed_msg_to_hook(proc.in, "kind %s\n",
192 (nr_our_refs == want_obj.nr && !have_obj.nr)
193 ? "clone" : "fetch");
194 if (close(proc.in))
195 err = 1;
196 if (finish_command(&proc))
197 err = 1;
198 return err;
201 static void create_pack_file(void)
203 struct timeval start_tv, tv;
204 struct async rev_list;
205 struct child_process pack_objects;
206 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
207 char data[8193], progress[128];
208 char abort_msg[] = "aborting due to possible repository "
209 "corruption on the remote side.";
210 int buffered = -1;
211 ssize_t sz, total_sz;
212 const char *argv[10];
213 int arg = 0;
215 gettimeofday(&start_tv, NULL);
216 total_sz = 0;
217 if (shallow_nr) {
218 rev_list.proc = do_rev_list;
219 rev_list.data = 0;
220 if (start_async(&rev_list))
221 die("git upload-pack: unable to fork git-rev-list");
222 argv[arg++] = "pack-objects";
223 } else {
224 argv[arg++] = "pack-objects";
225 argv[arg++] = "--revs";
226 if (create_full_pack)
227 argv[arg++] = "--all";
228 else if (use_thin_pack)
229 argv[arg++] = "--thin";
232 argv[arg++] = "--stdout";
233 if (!no_progress)
234 argv[arg++] = "--progress";
235 if (use_ofs_delta)
236 argv[arg++] = "--delta-base-offset";
237 if (use_include_tag)
238 argv[arg++] = "--include-tag";
239 argv[arg++] = NULL;
241 memset(&pack_objects, 0, sizeof(pack_objects));
242 pack_objects.in = shallow_nr ? rev_list.out : -1;
243 pack_objects.out = -1;
244 pack_objects.err = -1;
245 pack_objects.git_cmd = 1;
246 pack_objects.argv = argv;
248 if (start_command(&pack_objects))
249 die("git upload-pack: unable to fork git-pack-objects");
251 /* pass on revisions we (don't) want */
252 if (!shallow_nr) {
253 FILE *pipe_fd = fdopen(pack_objects.in, "w");
254 if (!create_full_pack) {
255 int i;
256 for (i = 0; i < want_obj.nr; i++)
257 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
258 fprintf(pipe_fd, "--not\n");
259 for (i = 0; i < have_obj.nr; i++)
260 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
263 fprintf(pipe_fd, "\n");
264 fflush(pipe_fd);
265 fclose(pipe_fd);
269 /* We read from pack_objects.err to capture stderr output for
270 * progress bar, and pack_objects.out to capture the pack data.
273 while (1) {
274 struct pollfd pfd[2];
275 int pe, pu, pollsize;
277 reset_timeout();
279 pollsize = 0;
280 pe = pu = -1;
282 if (0 <= pack_objects.out) {
283 pfd[pollsize].fd = pack_objects.out;
284 pfd[pollsize].events = POLLIN;
285 pu = pollsize;
286 pollsize++;
288 if (0 <= pack_objects.err) {
289 pfd[pollsize].fd = pack_objects.err;
290 pfd[pollsize].events = POLLIN;
291 pe = pollsize;
292 pollsize++;
295 if (!pollsize)
296 break;
298 if (poll(pfd, pollsize, -1) < 0) {
299 if (errno != EINTR) {
300 error("poll failed, resuming: %s",
301 strerror(errno));
302 sleep(1);
304 continue;
306 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
307 /* Data ready; we keep the last byte to ourselves
308 * in case we detect broken rev-list, so that we
309 * can leave the stream corrupted. This is
310 * unfortunate -- unpack-objects would happily
311 * accept a valid packdata with trailing garbage,
312 * so appending garbage after we pass all the
313 * pack data is not good enough to signal
314 * breakage to downstream.
316 char *cp = data;
317 ssize_t outsz = 0;
318 if (0 <= buffered) {
319 *cp++ = buffered;
320 outsz++;
322 sz = xread(pack_objects.out, cp,
323 sizeof(data) - outsz);
324 if (0 < sz)
325 total_sz += sz;
326 else if (sz == 0) {
327 close(pack_objects.out);
328 pack_objects.out = -1;
330 else
331 goto fail;
332 sz += outsz;
333 if (1 < sz) {
334 buffered = data[sz-1] & 0xFF;
335 sz--;
337 else
338 buffered = -1;
339 sz = send_client_data(1, data, sz);
340 if (sz < 0)
341 goto fail;
343 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
344 /* Status ready; we ship that in the side-band
345 * or dump to the standard error.
347 sz = xread(pack_objects.err, progress,
348 sizeof(progress));
349 if (0 < sz)
350 send_client_data(2, progress, sz);
351 else if (sz == 0) {
352 close(pack_objects.err);
353 pack_objects.err = -1;
355 else
356 goto fail;
360 if (finish_command(&pack_objects)) {
361 error("git upload-pack: git-pack-objects died with error.");
362 goto fail;
364 if (shallow_nr && finish_async(&rev_list))
365 goto fail; /* error was already reported */
367 /* flush the data */
368 if (0 <= buffered) {
369 data[0] = buffered;
370 sz = send_client_data(1, data, 1);
371 if (sz < 0)
372 goto fail;
373 fprintf(stderr, "flushed.\n");
375 if (use_sideband)
376 packet_flush(1);
378 gettimeofday(&tv, NULL);
379 tv.tv_sec -= start_tv.tv_sec;
380 if (tv.tv_usec < start_tv.tv_usec) {
381 tv.tv_sec--;
382 tv.tv_usec += 1000000;
384 tv.tv_usec -= start_tv.tv_usec;
385 if (run_post_upload_pack_hook(total_sz, &tv))
386 warning("post-upload-hook failed");
387 return;
389 fail:
390 send_client_data(3, abort_msg, sizeof(abort_msg));
391 die("git upload-pack: %s", abort_msg);
394 static int got_sha1(char *hex, unsigned char *sha1)
396 struct object *o;
397 int we_knew_they_have = 0;
399 if (get_sha1_hex(hex, sha1))
400 die("git upload-pack: expected SHA1 object, got '%s'", hex);
401 if (!has_sha1_file(sha1))
402 return -1;
404 o = lookup_object(sha1);
405 if (!(o && o->parsed))
406 o = parse_object(sha1);
407 if (!o)
408 die("oops (%s)", sha1_to_hex(sha1));
409 if (o->type == OBJ_COMMIT) {
410 struct commit_list *parents;
411 struct commit *commit = (struct commit *)o;
412 if (o->flags & THEY_HAVE)
413 we_knew_they_have = 1;
414 else
415 o->flags |= THEY_HAVE;
416 if (!oldest_have || (commit->date < oldest_have))
417 oldest_have = commit->date;
418 for (parents = commit->parents;
419 parents;
420 parents = parents->next)
421 parents->item->object.flags |= THEY_HAVE;
423 if (!we_knew_they_have) {
424 add_object_array(o, NULL, &have_obj);
425 return 1;
427 return 0;
430 static int reachable(struct commit *want)
432 struct commit_list *work = NULL;
434 insert_by_date(want, &work);
435 while (work) {
436 struct commit_list *list = work->next;
437 struct commit *commit = work->item;
438 free(work);
439 work = list;
441 if (commit->object.flags & THEY_HAVE) {
442 want->object.flags |= COMMON_KNOWN;
443 break;
445 if (!commit->object.parsed)
446 parse_object(commit->object.sha1);
447 if (commit->object.flags & REACHABLE)
448 continue;
449 commit->object.flags |= REACHABLE;
450 if (commit->date < oldest_have)
451 continue;
452 for (list = commit->parents; list; list = list->next) {
453 struct commit *parent = list->item;
454 if (!(parent->object.flags & REACHABLE))
455 insert_by_date(parent, &work);
458 want->object.flags |= REACHABLE;
459 clear_commit_marks(want, REACHABLE);
460 free_commit_list(work);
461 return (want->object.flags & COMMON_KNOWN);
464 static int ok_to_give_up(void)
466 int i;
468 if (!have_obj.nr)
469 return 0;
471 for (i = 0; i < want_obj.nr; i++) {
472 struct object *want = want_obj.objects[i].item;
474 if (want->flags & COMMON_KNOWN)
475 continue;
476 want = deref_tag(want, "a want line", 0);
477 if (!want || want->type != OBJ_COMMIT) {
478 /* no way to tell if this is reachable by
479 * looking at the ancestry chain alone, so
480 * leave a note to ourselves not to worry about
481 * this object anymore.
483 want_obj.objects[i].item->flags |= COMMON_KNOWN;
484 continue;
486 if (!reachable((struct commit *)want))
487 return 0;
489 return 1;
492 static int get_common_commits(void)
494 static char line[1000];
495 unsigned char sha1[20];
496 char hex[41], last_hex[41];
498 save_commit_buffer = 0;
500 for (;;) {
501 int len = packet_read_line(0, line, sizeof(line));
502 reset_timeout();
504 if (!len) {
505 if (have_obj.nr == 0 || multi_ack)
506 packet_write(1, "NAK\n");
507 continue;
509 strip(line, len);
510 if (!prefixcmp(line, "have ")) {
511 switch (got_sha1(line+5, sha1)) {
512 case -1: /* they have what we do not */
513 if (multi_ack && ok_to_give_up())
514 packet_write(1, "ACK %s continue\n",
515 sha1_to_hex(sha1));
516 break;
517 default:
518 memcpy(hex, sha1_to_hex(sha1), 41);
519 if (multi_ack) {
520 const char *msg = "ACK %s continue\n";
521 packet_write(1, msg, hex);
522 memcpy(last_hex, hex, 41);
524 else if (have_obj.nr == 1)
525 packet_write(1, "ACK %s\n", hex);
526 break;
528 continue;
530 if (!strcmp(line, "done")) {
531 if (have_obj.nr > 0) {
532 if (multi_ack)
533 packet_write(1, "ACK %s\n", last_hex);
534 return 0;
536 packet_write(1, "NAK\n");
537 return -1;
539 die("git upload-pack: expected SHA1 list, got '%s'", line);
543 static void receive_needs(void)
545 struct object_array shallows = {0, 0, NULL};
546 static char line[1000];
547 int len, depth = 0;
549 shallow_nr = 0;
550 if (debug_fd)
551 write_in_full(debug_fd, "#S\n", 3);
552 for (;;) {
553 struct object *o;
554 unsigned char sha1_buf[20];
555 len = packet_read_line(0, line, sizeof(line));
556 reset_timeout();
557 if (!len)
558 break;
559 if (debug_fd)
560 write_in_full(debug_fd, line, len);
562 if (!prefixcmp(line, "shallow ")) {
563 unsigned char sha1[20];
564 struct object *object;
565 use_thin_pack = 0;
566 if (get_sha1(line + 8, sha1))
567 die("invalid shallow line: %s", line);
568 object = parse_object(sha1);
569 if (!object)
570 die("did not find object for %s", line);
571 object->flags |= CLIENT_SHALLOW;
572 add_object_array(object, NULL, &shallows);
573 continue;
575 if (!prefixcmp(line, "deepen ")) {
576 char *end;
577 use_thin_pack = 0;
578 depth = strtol(line + 7, &end, 0);
579 if (end == line + 7 || depth <= 0)
580 die("Invalid deepen: %s", line);
581 continue;
583 if (prefixcmp(line, "want ") ||
584 get_sha1_hex(line+5, sha1_buf))
585 die("git upload-pack: protocol error, "
586 "expected to get sha, not '%s'", line);
587 if (strstr(line+45, "multi_ack"))
588 multi_ack = 1;
589 if (strstr(line+45, "thin-pack"))
590 use_thin_pack = 1;
591 if (strstr(line+45, "ofs-delta"))
592 use_ofs_delta = 1;
593 if (strstr(line+45, "side-band-64k"))
594 use_sideband = LARGE_PACKET_MAX;
595 else if (strstr(line+45, "side-band"))
596 use_sideband = DEFAULT_PACKET_MAX;
597 if (strstr(line+45, "no-progress"))
598 no_progress = 1;
599 if (strstr(line+45, "include-tag"))
600 use_include_tag = 1;
602 /* We have sent all our refs already, and the other end
603 * should have chosen out of them; otherwise they are
604 * asking for nonsense.
606 * Hmph. We may later want to allow "want" line that
607 * asks for something like "master~10" (symbolic)...
608 * would it make sense? I don't know.
610 o = lookup_object(sha1_buf);
611 if (!o || !(o->flags & OUR_REF))
612 die("git upload-pack: not our ref %s", line+5);
613 if (!(o->flags & WANTED)) {
614 o->flags |= WANTED;
615 add_object_array(o, NULL, &want_obj);
618 if (debug_fd)
619 write_in_full(debug_fd, "#E\n", 3);
621 if (!use_sideband && daemon_mode)
622 no_progress = 1;
624 if (depth == 0 && shallows.nr == 0)
625 return;
626 if (depth > 0) {
627 struct commit_list *result, *backup;
628 int i;
629 backup = result = get_shallow_commits(&want_obj, depth,
630 SHALLOW, NOT_SHALLOW);
631 while (result) {
632 struct object *object = &result->item->object;
633 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
634 packet_write(1, "shallow %s",
635 sha1_to_hex(object->sha1));
636 register_shallow(object->sha1);
637 shallow_nr++;
639 result = result->next;
641 free_commit_list(backup);
642 for (i = 0; i < shallows.nr; i++) {
643 struct object *object = shallows.objects[i].item;
644 if (object->flags & NOT_SHALLOW) {
645 struct commit_list *parents;
646 packet_write(1, "unshallow %s",
647 sha1_to_hex(object->sha1));
648 object->flags &= ~CLIENT_SHALLOW;
649 /* make sure the real parents are parsed */
650 unregister_shallow(object->sha1);
651 object->parsed = 0;
652 if (parse_commit((struct commit *)object))
653 die("invalid commit");
654 parents = ((struct commit *)object)->parents;
655 while (parents) {
656 add_object_array(&parents->item->object,
657 NULL, &want_obj);
658 parents = parents->next;
661 /* make sure commit traversal conforms to client */
662 register_shallow(object->sha1);
664 packet_flush(1);
665 } else
666 if (shallows.nr > 0) {
667 int i;
668 for (i = 0; i < shallows.nr; i++)
669 register_shallow(shallows.objects[i].item->sha1);
672 shallow_nr += shallows.nr;
673 free(shallows.objects);
676 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
678 static const char *capabilities = "multi_ack thin-pack side-band"
679 " side-band-64k ofs-delta shallow no-progress"
680 " include-tag";
681 struct object *o = parse_object(sha1);
683 if (!o)
684 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
686 if (capabilities)
687 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
688 0, capabilities);
689 else
690 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
691 capabilities = NULL;
692 if (!(o->flags & OUR_REF)) {
693 o->flags |= OUR_REF;
694 nr_our_refs++;
696 if (o->type == OBJ_TAG) {
697 o = deref_tag(o, refname, 0);
698 if (o)
699 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
701 return 0;
704 static void upload_pack(void)
706 reset_timeout();
707 head_ref(send_ref, NULL);
708 for_each_ref(send_ref, NULL);
709 packet_flush(1);
710 receive_needs();
711 if (want_obj.nr) {
712 get_common_commits();
713 create_pack_file();
717 int main(int argc, char **argv)
719 char *dir;
720 int i;
721 int strict = 0;
723 git_extract_argv0_path(argv[0]);
724 read_replace_refs = 0;
726 for (i = 1; i < argc; i++) {
727 char *arg = argv[i];
729 if (arg[0] != '-')
730 break;
731 if (!strcmp(arg, "--strict")) {
732 strict = 1;
733 continue;
735 if (!prefixcmp(arg, "--timeout=")) {
736 timeout = atoi(arg+10);
737 daemon_mode = 1;
738 continue;
740 if (!strcmp(arg, "--")) {
741 i++;
742 break;
746 if (i != argc-1)
747 usage(upload_pack_usage);
749 setup_path();
751 dir = argv[i];
753 if (!enter_repo(dir, strict))
754 die("'%s' does not appear to be a git repository", dir);
755 if (is_repository_shallow())
756 die("attempt to fetch/clone from a shallow repository");
757 if (getenv("GIT_DEBUG_SEND_PACK"))
758 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
759 upload_pack();
760 return 0;