fetch: plug two leaks on error exit in store_updated_refs
[git/raj.git] / upload-pack.c
blob6be625995df74df0865853a1bc4dbc1c1bbf4505
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=<n>] <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 no_done;
31 static int use_thin_pack, use_ofs_delta, use_include_tag;
32 static int no_progress, daemon_mode;
33 static int shallow_nr;
34 static struct object_array have_obj;
35 static struct object_array want_obj;
36 static struct object_array extra_edge_obj;
37 static unsigned int timeout;
38 /* 0 for no sideband,
39 * otherwise maximum packet size (up to 65520 bytes).
41 static int use_sideband;
42 static int debug_fd;
43 static int advertise_refs;
44 static int stateless_rpc;
46 static void reset_timeout(void)
48 alarm(timeout);
51 static int strip(char *line, int len)
53 if (len && line[len-1] == '\n')
54 line[--len] = 0;
55 return len;
58 static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
60 if (use_sideband)
61 return send_sideband(1, fd, data, sz, use_sideband);
62 if (fd == 3)
63 /* emergency quit */
64 fd = 2;
65 if (fd == 2) {
66 /* XXX: are we happy to lose stuff here? */
67 xwrite(fd, data, sz);
68 return sz;
70 return safe_write(fd, data, sz);
73 static FILE *pack_pipe = NULL;
74 static void show_commit(struct commit *commit, void *data)
76 if (commit->object.flags & BOUNDARY)
77 fputc('-', pack_pipe);
78 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
79 die("broken output pipe");
80 fputc('\n', pack_pipe);
81 fflush(pack_pipe);
82 free(commit->buffer);
83 commit->buffer = NULL;
86 static void show_object(struct object *obj,
87 const struct name_path *path, const char *component,
88 void *cb_data)
90 show_object_with_name(pack_pipe, obj, path, component);
93 static void show_edge(struct commit *commit)
95 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
98 static int do_rev_list(int in, int out, void *user_data)
100 int i;
101 struct rev_info revs;
103 pack_pipe = xfdopen(out, "w");
104 init_revisions(&revs, NULL);
105 revs.tag_objects = 1;
106 revs.tree_objects = 1;
107 revs.blob_objects = 1;
108 if (use_thin_pack)
109 revs.edge_hint = 1;
111 for (i = 0; i < want_obj.nr; i++) {
112 struct object *o = want_obj.objects[i].item;
113 /* why??? */
114 o->flags &= ~UNINTERESTING;
115 add_pending_object(&revs, o, NULL);
117 for (i = 0; i < have_obj.nr; i++) {
118 struct object *o = have_obj.objects[i].item;
119 o->flags |= UNINTERESTING;
120 add_pending_object(&revs, o, NULL);
122 setup_revisions(0, NULL, &revs, NULL);
123 if (prepare_revision_walk(&revs))
124 die("revision walk setup failed");
125 mark_edges_uninteresting(revs.commits, &revs, show_edge);
126 if (use_thin_pack)
127 for (i = 0; i < extra_edge_obj.nr; i++)
128 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
129 extra_edge_obj.objects[i].item->sha1));
130 traverse_commit_list(&revs, show_commit, show_object, NULL);
131 fflush(pack_pipe);
132 fclose(pack_pipe);
133 return 0;
136 static void create_pack_file(void)
138 struct async rev_list;
139 struct child_process pack_objects;
140 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
141 char data[8193], progress[128];
142 char abort_msg[] = "aborting due to possible repository "
143 "corruption on the remote side.";
144 int buffered = -1;
145 ssize_t sz;
146 const char *argv[10];
147 int arg = 0;
149 argv[arg++] = "pack-objects";
150 if (!shallow_nr) {
151 argv[arg++] = "--revs";
152 if (create_full_pack)
153 argv[arg++] = "--all";
154 else if (use_thin_pack)
155 argv[arg++] = "--thin";
158 argv[arg++] = "--stdout";
159 if (!no_progress)
160 argv[arg++] = "--progress";
161 if (use_ofs_delta)
162 argv[arg++] = "--delta-base-offset";
163 if (use_include_tag)
164 argv[arg++] = "--include-tag";
165 argv[arg++] = NULL;
167 memset(&pack_objects, 0, sizeof(pack_objects));
168 pack_objects.in = -1;
169 pack_objects.out = -1;
170 pack_objects.err = -1;
171 pack_objects.git_cmd = 1;
172 pack_objects.argv = argv;
174 if (start_command(&pack_objects))
175 die("git upload-pack: unable to fork git-pack-objects");
177 if (shallow_nr) {
178 memset(&rev_list, 0, sizeof(rev_list));
179 rev_list.proc = do_rev_list;
180 rev_list.out = pack_objects.in;
181 if (start_async(&rev_list))
182 die("git upload-pack: unable to fork git-rev-list");
184 else {
185 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
186 if (!create_full_pack) {
187 int i;
188 for (i = 0; i < want_obj.nr; i++)
189 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
190 fprintf(pipe_fd, "--not\n");
191 for (i = 0; i < have_obj.nr; i++)
192 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
195 fprintf(pipe_fd, "\n");
196 fflush(pipe_fd);
197 fclose(pipe_fd);
201 /* We read from pack_objects.err to capture stderr output for
202 * progress bar, and pack_objects.out to capture the pack data.
205 while (1) {
206 struct pollfd pfd[2];
207 int pe, pu, pollsize;
209 reset_timeout();
211 pollsize = 0;
212 pe = pu = -1;
214 if (0 <= pack_objects.out) {
215 pfd[pollsize].fd = pack_objects.out;
216 pfd[pollsize].events = POLLIN;
217 pu = pollsize;
218 pollsize++;
220 if (0 <= pack_objects.err) {
221 pfd[pollsize].fd = pack_objects.err;
222 pfd[pollsize].events = POLLIN;
223 pe = pollsize;
224 pollsize++;
227 if (!pollsize)
228 break;
230 if (poll(pfd, pollsize, -1) < 0) {
231 if (errno != EINTR) {
232 error("poll failed, resuming: %s",
233 strerror(errno));
234 sleep(1);
236 continue;
238 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
239 /* Status ready; we ship that in the side-band
240 * or dump to the standard error.
242 sz = xread(pack_objects.err, progress,
243 sizeof(progress));
244 if (0 < sz)
245 send_client_data(2, progress, sz);
246 else if (sz == 0) {
247 close(pack_objects.err);
248 pack_objects.err = -1;
250 else
251 goto fail;
252 /* give priority to status messages */
253 continue;
255 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
256 /* Data ready; we keep the last byte to ourselves
257 * in case we detect broken rev-list, so that we
258 * can leave the stream corrupted. This is
259 * unfortunate -- unpack-objects would happily
260 * accept a valid packdata with trailing garbage,
261 * so appending garbage after we pass all the
262 * pack data is not good enough to signal
263 * breakage to downstream.
265 char *cp = data;
266 ssize_t outsz = 0;
267 if (0 <= buffered) {
268 *cp++ = buffered;
269 outsz++;
271 sz = xread(pack_objects.out, cp,
272 sizeof(data) - outsz);
273 if (0 < sz)
275 else if (sz == 0) {
276 close(pack_objects.out);
277 pack_objects.out = -1;
279 else
280 goto fail;
281 sz += outsz;
282 if (1 < sz) {
283 buffered = data[sz-1] & 0xFF;
284 sz--;
286 else
287 buffered = -1;
288 sz = send_client_data(1, data, sz);
289 if (sz < 0)
290 goto fail;
294 if (finish_command(&pack_objects)) {
295 error("git upload-pack: git-pack-objects died with error.");
296 goto fail;
298 if (shallow_nr && finish_async(&rev_list))
299 goto fail; /* error was already reported */
301 /* flush the data */
302 if (0 <= buffered) {
303 data[0] = buffered;
304 sz = send_client_data(1, data, 1);
305 if (sz < 0)
306 goto fail;
307 fprintf(stderr, "flushed.\n");
309 if (use_sideband)
310 packet_flush(1);
311 return;
313 fail:
314 send_client_data(3, abort_msg, sizeof(abort_msg));
315 die("git upload-pack: %s", abort_msg);
318 static int got_sha1(char *hex, unsigned char *sha1)
320 struct object *o;
321 int we_knew_they_have = 0;
323 if (get_sha1_hex(hex, sha1))
324 die("git upload-pack: expected SHA1 object, got '%s'", hex);
325 if (!has_sha1_file(sha1))
326 return -1;
328 o = lookup_object(sha1);
329 if (!(o && o->parsed))
330 o = parse_object(sha1);
331 if (!o)
332 die("oops (%s)", sha1_to_hex(sha1));
333 if (o->type == OBJ_COMMIT) {
334 struct commit_list *parents;
335 struct commit *commit = (struct commit *)o;
336 if (o->flags & THEY_HAVE)
337 we_knew_they_have = 1;
338 else
339 o->flags |= THEY_HAVE;
340 if (!oldest_have || (commit->date < oldest_have))
341 oldest_have = commit->date;
342 for (parents = commit->parents;
343 parents;
344 parents = parents->next)
345 parents->item->object.flags |= THEY_HAVE;
347 if (!we_knew_they_have) {
348 add_object_array(o, NULL, &have_obj);
349 return 1;
351 return 0;
354 static int reachable(struct commit *want)
356 struct commit_list *work = NULL;
358 commit_list_insert_by_date(want, &work);
359 while (work) {
360 struct commit_list *list = work->next;
361 struct commit *commit = work->item;
362 free(work);
363 work = list;
365 if (commit->object.flags & THEY_HAVE) {
366 want->object.flags |= COMMON_KNOWN;
367 break;
369 if (!commit->object.parsed)
370 parse_object(commit->object.sha1);
371 if (commit->object.flags & REACHABLE)
372 continue;
373 commit->object.flags |= REACHABLE;
374 if (commit->date < oldest_have)
375 continue;
376 for (list = commit->parents; list; list = list->next) {
377 struct commit *parent = list->item;
378 if (!(parent->object.flags & REACHABLE))
379 commit_list_insert_by_date(parent, &work);
382 want->object.flags |= REACHABLE;
383 clear_commit_marks(want, REACHABLE);
384 free_commit_list(work);
385 return (want->object.flags & COMMON_KNOWN);
388 static int ok_to_give_up(void)
390 int i;
392 if (!have_obj.nr)
393 return 0;
395 for (i = 0; i < want_obj.nr; i++) {
396 struct object *want = want_obj.objects[i].item;
398 if (want->flags & COMMON_KNOWN)
399 continue;
400 want = deref_tag(want, "a want line", 0);
401 if (!want || want->type != OBJ_COMMIT) {
402 /* no way to tell if this is reachable by
403 * looking at the ancestry chain alone, so
404 * leave a note to ourselves not to worry about
405 * this object anymore.
407 want_obj.objects[i].item->flags |= COMMON_KNOWN;
408 continue;
410 if (!reachable((struct commit *)want))
411 return 0;
413 return 1;
416 static int get_common_commits(void)
418 static char line[1000];
419 unsigned char sha1[20];
420 char last_hex[41];
421 int got_common = 0;
422 int got_other = 0;
423 int sent_ready = 0;
425 save_commit_buffer = 0;
427 for (;;) {
428 int len = packet_read_line(0, line, sizeof(line));
429 reset_timeout();
431 if (!len) {
432 if (multi_ack == 2 && got_common
433 && !got_other && ok_to_give_up()) {
434 sent_ready = 1;
435 packet_write(1, "ACK %s ready\n", last_hex);
437 if (have_obj.nr == 0 || multi_ack)
438 packet_write(1, "NAK\n");
440 if (no_done && sent_ready) {
441 packet_write(1, "ACK %s\n", last_hex);
442 return 0;
444 if (stateless_rpc)
445 exit(0);
446 got_common = 0;
447 got_other = 0;
448 continue;
450 strip(line, len);
451 if (!prefixcmp(line, "have ")) {
452 switch (got_sha1(line+5, sha1)) {
453 case -1: /* they have what we do not */
454 got_other = 1;
455 if (multi_ack && ok_to_give_up()) {
456 const char *hex = sha1_to_hex(sha1);
457 if (multi_ack == 2) {
458 sent_ready = 1;
459 packet_write(1, "ACK %s ready\n", hex);
460 } else
461 packet_write(1, "ACK %s continue\n", hex);
463 break;
464 default:
465 got_common = 1;
466 memcpy(last_hex, sha1_to_hex(sha1), 41);
467 if (multi_ack == 2)
468 packet_write(1, "ACK %s common\n", last_hex);
469 else if (multi_ack)
470 packet_write(1, "ACK %s continue\n", last_hex);
471 else if (have_obj.nr == 1)
472 packet_write(1, "ACK %s\n", last_hex);
473 break;
475 continue;
477 if (!strcmp(line, "done")) {
478 if (have_obj.nr > 0) {
479 if (multi_ack)
480 packet_write(1, "ACK %s\n", last_hex);
481 return 0;
483 packet_write(1, "NAK\n");
484 return -1;
486 die("git upload-pack: expected SHA1 list, got '%s'", line);
490 static void receive_needs(void)
492 struct object_array shallows = OBJECT_ARRAY_INIT;
493 static char line[1000];
494 int len, depth = 0;
496 shallow_nr = 0;
497 if (debug_fd)
498 write_str_in_full(debug_fd, "#S\n");
499 for (;;) {
500 struct object *o;
501 unsigned char sha1_buf[20];
502 len = packet_read_line(0, line, sizeof(line));
503 reset_timeout();
504 if (!len)
505 break;
506 if (debug_fd)
507 write_in_full(debug_fd, line, len);
509 if (!prefixcmp(line, "shallow ")) {
510 unsigned char sha1[20];
511 struct object *object;
512 if (get_sha1(line + 8, sha1))
513 die("invalid shallow line: %s", line);
514 object = parse_object(sha1);
515 if (!object)
516 die("did not find object for %s", line);
517 object->flags |= CLIENT_SHALLOW;
518 add_object_array(object, NULL, &shallows);
519 continue;
521 if (!prefixcmp(line, "deepen ")) {
522 char *end;
523 depth = strtol(line + 7, &end, 0);
524 if (end == line + 7 || depth <= 0)
525 die("Invalid deepen: %s", line);
526 continue;
528 if (prefixcmp(line, "want ") ||
529 get_sha1_hex(line+5, sha1_buf))
530 die("git upload-pack: protocol error, "
531 "expected to get sha, not '%s'", line);
532 if (strstr(line+45, "multi_ack_detailed"))
533 multi_ack = 2;
534 else if (strstr(line+45, "multi_ack"))
535 multi_ack = 1;
536 if (strstr(line+45, "no-done"))
537 no_done = 1;
538 if (strstr(line+45, "thin-pack"))
539 use_thin_pack = 1;
540 if (strstr(line+45, "ofs-delta"))
541 use_ofs_delta = 1;
542 if (strstr(line+45, "side-band-64k"))
543 use_sideband = LARGE_PACKET_MAX;
544 else if (strstr(line+45, "side-band"))
545 use_sideband = DEFAULT_PACKET_MAX;
546 if (strstr(line+45, "no-progress"))
547 no_progress = 1;
548 if (strstr(line+45, "include-tag"))
549 use_include_tag = 1;
551 /* We have sent all our refs already, and the other end
552 * should have chosen out of them; otherwise they are
553 * asking for nonsense.
555 * Hmph. We may later want to allow "want" line that
556 * asks for something like "master~10" (symbolic)...
557 * would it make sense? I don't know.
559 o = lookup_object(sha1_buf);
560 if (!o || !(o->flags & OUR_REF))
561 die("git upload-pack: not our ref %s",
562 sha1_to_hex(sha1_buf));
563 if (!(o->flags & WANTED)) {
564 o->flags |= WANTED;
565 add_object_array(o, NULL, &want_obj);
568 if (debug_fd)
569 write_str_in_full(debug_fd, "#E\n");
571 if (!use_sideband && daemon_mode)
572 no_progress = 1;
574 if (depth == 0 && shallows.nr == 0)
575 return;
576 if (depth > 0) {
577 struct commit_list *result, *backup;
578 int i;
579 backup = result = get_shallow_commits(&want_obj, depth,
580 SHALLOW, NOT_SHALLOW);
581 while (result) {
582 struct object *object = &result->item->object;
583 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
584 packet_write(1, "shallow %s",
585 sha1_to_hex(object->sha1));
586 register_shallow(object->sha1);
587 shallow_nr++;
589 result = result->next;
591 free_commit_list(backup);
592 for (i = 0; i < shallows.nr; i++) {
593 struct object *object = shallows.objects[i].item;
594 if (object->flags & NOT_SHALLOW) {
595 struct commit_list *parents;
596 packet_write(1, "unshallow %s",
597 sha1_to_hex(object->sha1));
598 object->flags &= ~CLIENT_SHALLOW;
599 /* make sure the real parents are parsed */
600 unregister_shallow(object->sha1);
601 object->parsed = 0;
602 if (parse_commit((struct commit *)object))
603 die("invalid commit");
604 parents = ((struct commit *)object)->parents;
605 while (parents) {
606 add_object_array(&parents->item->object,
607 NULL, &want_obj);
608 parents = parents->next;
610 add_object_array(object, NULL, &extra_edge_obj);
612 /* make sure commit traversal conforms to client */
613 register_shallow(object->sha1);
615 packet_flush(1);
616 } else
617 if (shallows.nr > 0) {
618 int i;
619 for (i = 0; i < shallows.nr; i++)
620 register_shallow(shallows.objects[i].item->sha1);
623 shallow_nr += shallows.nr;
624 free(shallows.objects);
627 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
629 static const char *capabilities = "multi_ack thin-pack side-band"
630 " side-band-64k ofs-delta shallow no-progress"
631 " include-tag multi_ack_detailed";
632 struct object *o = parse_object(sha1);
634 if (!o)
635 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
637 if (capabilities)
638 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname,
639 0, capabilities,
640 stateless_rpc ? " no-done" : "");
641 else
642 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
643 capabilities = NULL;
644 if (!(o->flags & OUR_REF)) {
645 o->flags |= OUR_REF;
646 nr_our_refs++;
648 if (o->type == OBJ_TAG) {
649 o = deref_tag(o, refname, 0);
650 if (o)
651 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
653 return 0;
656 static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
658 struct object *o = parse_object(sha1);
659 if (!o)
660 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
661 if (!(o->flags & OUR_REF)) {
662 o->flags |= OUR_REF;
663 nr_our_refs++;
665 return 0;
668 static void upload_pack(void)
670 if (advertise_refs || !stateless_rpc) {
671 reset_timeout();
672 head_ref(send_ref, NULL);
673 for_each_ref(send_ref, NULL);
674 packet_flush(1);
675 } else {
676 head_ref(mark_our_ref, NULL);
677 for_each_ref(mark_our_ref, NULL);
679 if (advertise_refs)
680 return;
682 receive_needs();
683 if (want_obj.nr) {
684 get_common_commits();
685 create_pack_file();
689 int main(int argc, char **argv)
691 char *dir;
692 int i;
693 int strict = 0;
695 packet_trace_identity("upload-pack");
696 git_extract_argv0_path(argv[0]);
697 read_replace_refs = 0;
699 for (i = 1; i < argc; i++) {
700 char *arg = argv[i];
702 if (arg[0] != '-')
703 break;
704 if (!strcmp(arg, "--advertise-refs")) {
705 advertise_refs = 1;
706 continue;
708 if (!strcmp(arg, "--stateless-rpc")) {
709 stateless_rpc = 1;
710 continue;
712 if (!strcmp(arg, "--strict")) {
713 strict = 1;
714 continue;
716 if (!prefixcmp(arg, "--timeout=")) {
717 timeout = atoi(arg+10);
718 daemon_mode = 1;
719 continue;
721 if (!strcmp(arg, "--")) {
722 i++;
723 break;
727 if (i != argc-1)
728 usage(upload_pack_usage);
730 setup_path();
732 dir = argv[i];
734 if (!enter_repo(dir, strict))
735 die("'%s' does not appear to be a git repository", dir);
736 if (is_repository_shallow())
737 die("attempt to fetch/clone from a shallow repository");
738 if (getenv("GIT_DEBUG_SEND_PACK"))
739 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
740 upload_pack();
741 return 0;