revisions.txt: language improvements
[git.git] / upload-pack.c
blobbba053f0aac8eef982d6779983dc6fd979d69d69
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, const struct name_path *path, const char *component)
88 /* An object with name "foo\n0000000..." can be used to
89 * confuse downstream git-pack-objects very badly.
91 const char *name = path_name(path, component);
92 const char *ep = strchr(name, '\n');
93 if (ep) {
94 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
95 (int) (ep - name),
96 name);
98 else
99 fprintf(pack_pipe, "%s %s\n",
100 sha1_to_hex(obj->sha1), name);
101 free((char *)name);
104 static void show_edge(struct commit *commit)
106 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
109 static int do_rev_list(int in, int out, void *user_data)
111 int i;
112 struct rev_info revs;
114 pack_pipe = xfdopen(out, "w");
115 init_revisions(&revs, NULL);
116 revs.tag_objects = 1;
117 revs.tree_objects = 1;
118 revs.blob_objects = 1;
119 if (use_thin_pack)
120 revs.edge_hint = 1;
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);
134 if (prepare_revision_walk(&revs))
135 die("revision walk setup failed");
136 mark_edges_uninteresting(revs.commits, &revs, show_edge);
137 if (use_thin_pack)
138 for (i = 0; i < extra_edge_obj.nr; i++)
139 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
140 extra_edge_obj.objects[i].item->sha1));
141 traverse_commit_list(&revs, show_commit, show_object, NULL);
142 fflush(pack_pipe);
143 fclose(pack_pipe);
144 return 0;
147 static void create_pack_file(void)
149 struct async rev_list;
150 struct child_process pack_objects;
151 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
152 char data[8193], progress[128];
153 char abort_msg[] = "aborting due to possible repository "
154 "corruption on the remote side.";
155 int buffered = -1;
156 ssize_t sz;
157 const char *argv[10];
158 int arg = 0;
160 if (shallow_nr) {
161 memset(&rev_list, 0, sizeof(rev_list));
162 rev_list.proc = do_rev_list;
163 rev_list.out = -1;
164 if (start_async(&rev_list))
165 die("git upload-pack: unable to fork git-rev-list");
166 argv[arg++] = "pack-objects";
167 } else {
168 argv[arg++] = "pack-objects";
169 argv[arg++] = "--revs";
170 if (create_full_pack)
171 argv[arg++] = "--all";
172 else if (use_thin_pack)
173 argv[arg++] = "--thin";
176 argv[arg++] = "--stdout";
177 if (!no_progress)
178 argv[arg++] = "--progress";
179 if (use_ofs_delta)
180 argv[arg++] = "--delta-base-offset";
181 if (use_include_tag)
182 argv[arg++] = "--include-tag";
183 argv[arg++] = NULL;
185 memset(&pack_objects, 0, sizeof(pack_objects));
186 pack_objects.in = shallow_nr ? rev_list.out : -1;
187 pack_objects.out = -1;
188 pack_objects.err = -1;
189 pack_objects.git_cmd = 1;
190 pack_objects.argv = argv;
192 if (start_command(&pack_objects))
193 die("git upload-pack: unable to fork git-pack-objects");
195 /* pass on revisions we (don't) want */
196 if (!shallow_nr) {
197 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
198 if (!create_full_pack) {
199 int i;
200 for (i = 0; i < want_obj.nr; i++)
201 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
202 fprintf(pipe_fd, "--not\n");
203 for (i = 0; i < have_obj.nr; i++)
204 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
207 fprintf(pipe_fd, "\n");
208 fflush(pipe_fd);
209 fclose(pipe_fd);
213 /* We read from pack_objects.err to capture stderr output for
214 * progress bar, and pack_objects.out to capture the pack data.
217 while (1) {
218 struct pollfd pfd[2];
219 int pe, pu, pollsize;
221 reset_timeout();
223 pollsize = 0;
224 pe = pu = -1;
226 if (0 <= pack_objects.out) {
227 pfd[pollsize].fd = pack_objects.out;
228 pfd[pollsize].events = POLLIN;
229 pu = pollsize;
230 pollsize++;
232 if (0 <= pack_objects.err) {
233 pfd[pollsize].fd = pack_objects.err;
234 pfd[pollsize].events = POLLIN;
235 pe = pollsize;
236 pollsize++;
239 if (!pollsize)
240 break;
242 if (poll(pfd, pollsize, -1) < 0) {
243 if (errno != EINTR) {
244 error("poll failed, resuming: %s",
245 strerror(errno));
246 sleep(1);
248 continue;
250 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
251 /* Status ready; we ship that in the side-band
252 * or dump to the standard error.
254 sz = xread(pack_objects.err, progress,
255 sizeof(progress));
256 if (0 < sz)
257 send_client_data(2, progress, sz);
258 else if (sz == 0) {
259 close(pack_objects.err);
260 pack_objects.err = -1;
262 else
263 goto fail;
264 /* give priority to status messages */
265 continue;
267 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
268 /* Data ready; we keep the last byte to ourselves
269 * in case we detect broken rev-list, so that we
270 * can leave the stream corrupted. This is
271 * unfortunate -- unpack-objects would happily
272 * accept a valid packdata with trailing garbage,
273 * so appending garbage after we pass all the
274 * pack data is not good enough to signal
275 * breakage to downstream.
277 char *cp = data;
278 ssize_t outsz = 0;
279 if (0 <= buffered) {
280 *cp++ = buffered;
281 outsz++;
283 sz = xread(pack_objects.out, cp,
284 sizeof(data) - outsz);
285 if (0 < sz)
287 else if (sz == 0) {
288 close(pack_objects.out);
289 pack_objects.out = -1;
291 else
292 goto fail;
293 sz += outsz;
294 if (1 < sz) {
295 buffered = data[sz-1] & 0xFF;
296 sz--;
298 else
299 buffered = -1;
300 sz = send_client_data(1, data, sz);
301 if (sz < 0)
302 goto fail;
306 if (finish_command(&pack_objects)) {
307 error("git upload-pack: git-pack-objects died with error.");
308 goto fail;
310 if (shallow_nr && finish_async(&rev_list))
311 goto fail; /* error was already reported */
313 /* flush the data */
314 if (0 <= buffered) {
315 data[0] = buffered;
316 sz = send_client_data(1, data, 1);
317 if (sz < 0)
318 goto fail;
319 fprintf(stderr, "flushed.\n");
321 if (use_sideband)
322 packet_flush(1);
323 return;
325 fail:
326 send_client_data(3, abort_msg, sizeof(abort_msg));
327 die("git upload-pack: %s", abort_msg);
330 static int got_sha1(char *hex, unsigned char *sha1)
332 struct object *o;
333 int we_knew_they_have = 0;
335 if (get_sha1_hex(hex, sha1))
336 die("git upload-pack: expected SHA1 object, got '%s'", hex);
337 if (!has_sha1_file(sha1))
338 return -1;
340 o = lookup_object(sha1);
341 if (!(o && o->parsed))
342 o = parse_object(sha1);
343 if (!o)
344 die("oops (%s)", sha1_to_hex(sha1));
345 if (o->type == OBJ_COMMIT) {
346 struct commit_list *parents;
347 struct commit *commit = (struct commit *)o;
348 if (o->flags & THEY_HAVE)
349 we_knew_they_have = 1;
350 else
351 o->flags |= THEY_HAVE;
352 if (!oldest_have || (commit->date < oldest_have))
353 oldest_have = commit->date;
354 for (parents = commit->parents;
355 parents;
356 parents = parents->next)
357 parents->item->object.flags |= THEY_HAVE;
359 if (!we_knew_they_have) {
360 add_object_array(o, NULL, &have_obj);
361 return 1;
363 return 0;
366 static int reachable(struct commit *want)
368 struct commit_list *work = NULL;
370 commit_list_insert_by_date(want, &work);
371 while (work) {
372 struct commit_list *list = work->next;
373 struct commit *commit = work->item;
374 free(work);
375 work = list;
377 if (commit->object.flags & THEY_HAVE) {
378 want->object.flags |= COMMON_KNOWN;
379 break;
381 if (!commit->object.parsed)
382 parse_object(commit->object.sha1);
383 if (commit->object.flags & REACHABLE)
384 continue;
385 commit->object.flags |= REACHABLE;
386 if (commit->date < oldest_have)
387 continue;
388 for (list = commit->parents; list; list = list->next) {
389 struct commit *parent = list->item;
390 if (!(parent->object.flags & REACHABLE))
391 commit_list_insert_by_date(parent, &work);
394 want->object.flags |= REACHABLE;
395 clear_commit_marks(want, REACHABLE);
396 free_commit_list(work);
397 return (want->object.flags & COMMON_KNOWN);
400 static int ok_to_give_up(void)
402 int i;
404 if (!have_obj.nr)
405 return 0;
407 for (i = 0; i < want_obj.nr; i++) {
408 struct object *want = want_obj.objects[i].item;
410 if (want->flags & COMMON_KNOWN)
411 continue;
412 want = deref_tag(want, "a want line", 0);
413 if (!want || want->type != OBJ_COMMIT) {
414 /* no way to tell if this is reachable by
415 * looking at the ancestry chain alone, so
416 * leave a note to ourselves not to worry about
417 * this object anymore.
419 want_obj.objects[i].item->flags |= COMMON_KNOWN;
420 continue;
422 if (!reachable((struct commit *)want))
423 return 0;
425 return 1;
428 static int get_common_commits(void)
430 static char line[1000];
431 unsigned char sha1[20];
432 char last_hex[41];
433 int got_common = 0;
434 int got_other = 0;
435 int sent_ready = 0;
437 save_commit_buffer = 0;
439 for (;;) {
440 int len = packet_read_line(0, line, sizeof(line));
441 reset_timeout();
443 if (!len) {
444 if (multi_ack == 2 && got_common
445 && !got_other && ok_to_give_up()) {
446 sent_ready = 1;
447 packet_write(1, "ACK %s ready\n", last_hex);
449 if (have_obj.nr == 0 || multi_ack)
450 packet_write(1, "NAK\n");
452 if (no_done && sent_ready) {
453 packet_write(1, "ACK %s\n", last_hex);
454 return 0;
456 if (stateless_rpc)
457 exit(0);
458 got_common = 0;
459 got_other = 0;
460 continue;
462 strip(line, len);
463 if (!prefixcmp(line, "have ")) {
464 switch (got_sha1(line+5, sha1)) {
465 case -1: /* they have what we do not */
466 got_other = 1;
467 if (multi_ack && ok_to_give_up()) {
468 const char *hex = sha1_to_hex(sha1);
469 if (multi_ack == 2) {
470 sent_ready = 1;
471 packet_write(1, "ACK %s ready\n", hex);
472 } else
473 packet_write(1, "ACK %s continue\n", hex);
475 break;
476 default:
477 got_common = 1;
478 memcpy(last_hex, sha1_to_hex(sha1), 41);
479 if (multi_ack == 2)
480 packet_write(1, "ACK %s common\n", last_hex);
481 else if (multi_ack)
482 packet_write(1, "ACK %s continue\n", last_hex);
483 else if (have_obj.nr == 1)
484 packet_write(1, "ACK %s\n", last_hex);
485 break;
487 continue;
489 if (!strcmp(line, "done")) {
490 if (have_obj.nr > 0) {
491 if (multi_ack)
492 packet_write(1, "ACK %s\n", last_hex);
493 return 0;
495 packet_write(1, "NAK\n");
496 return -1;
498 die("git upload-pack: expected SHA1 list, got '%s'", line);
502 static void receive_needs(void)
504 struct object_array shallows = OBJECT_ARRAY_INIT;
505 static char line[1000];
506 int len, depth = 0;
508 shallow_nr = 0;
509 if (debug_fd)
510 write_str_in_full(debug_fd, "#S\n");
511 for (;;) {
512 struct object *o;
513 unsigned char sha1_buf[20];
514 len = packet_read_line(0, line, sizeof(line));
515 reset_timeout();
516 if (!len)
517 break;
518 if (debug_fd)
519 write_in_full(debug_fd, line, len);
521 if (!prefixcmp(line, "shallow ")) {
522 unsigned char sha1[20];
523 struct object *object;
524 if (get_sha1(line + 8, sha1))
525 die("invalid shallow line: %s", line);
526 object = parse_object(sha1);
527 if (!object)
528 die("did not find object for %s", line);
529 object->flags |= CLIENT_SHALLOW;
530 add_object_array(object, NULL, &shallows);
531 continue;
533 if (!prefixcmp(line, "deepen ")) {
534 char *end;
535 depth = strtol(line + 7, &end, 0);
536 if (end == line + 7 || depth <= 0)
537 die("Invalid deepen: %s", line);
538 continue;
540 if (prefixcmp(line, "want ") ||
541 get_sha1_hex(line+5, sha1_buf))
542 die("git upload-pack: protocol error, "
543 "expected to get sha, not '%s'", line);
544 if (strstr(line+45, "multi_ack_detailed"))
545 multi_ack = 2;
546 else if (strstr(line+45, "multi_ack"))
547 multi_ack = 1;
548 if (strstr(line+45, "no-done"))
549 no_done = 1;
550 if (strstr(line+45, "thin-pack"))
551 use_thin_pack = 1;
552 if (strstr(line+45, "ofs-delta"))
553 use_ofs_delta = 1;
554 if (strstr(line+45, "side-band-64k"))
555 use_sideband = LARGE_PACKET_MAX;
556 else if (strstr(line+45, "side-band"))
557 use_sideband = DEFAULT_PACKET_MAX;
558 if (strstr(line+45, "no-progress"))
559 no_progress = 1;
560 if (strstr(line+45, "include-tag"))
561 use_include_tag = 1;
563 /* We have sent all our refs already, and the other end
564 * should have chosen out of them; otherwise they are
565 * asking for nonsense.
567 * Hmph. We may later want to allow "want" line that
568 * asks for something like "master~10" (symbolic)...
569 * would it make sense? I don't know.
571 o = lookup_object(sha1_buf);
572 if (!o || !(o->flags & OUR_REF))
573 die("git upload-pack: not our ref %s",
574 sha1_to_hex(sha1_buf));
575 if (!(o->flags & WANTED)) {
576 o->flags |= WANTED;
577 add_object_array(o, NULL, &want_obj);
580 if (debug_fd)
581 write_str_in_full(debug_fd, "#E\n");
583 if (!use_sideband && daemon_mode)
584 no_progress = 1;
586 if (depth == 0 && shallows.nr == 0)
587 return;
588 if (depth > 0) {
589 struct commit_list *result, *backup;
590 int i;
591 backup = result = get_shallow_commits(&want_obj, depth,
592 SHALLOW, NOT_SHALLOW);
593 while (result) {
594 struct object *object = &result->item->object;
595 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
596 packet_write(1, "shallow %s",
597 sha1_to_hex(object->sha1));
598 register_shallow(object->sha1);
599 shallow_nr++;
601 result = result->next;
603 free_commit_list(backup);
604 for (i = 0; i < shallows.nr; i++) {
605 struct object *object = shallows.objects[i].item;
606 if (object->flags & NOT_SHALLOW) {
607 struct commit_list *parents;
608 packet_write(1, "unshallow %s",
609 sha1_to_hex(object->sha1));
610 object->flags &= ~CLIENT_SHALLOW;
611 /* make sure the real parents are parsed */
612 unregister_shallow(object->sha1);
613 object->parsed = 0;
614 if (parse_commit((struct commit *)object))
615 die("invalid commit");
616 parents = ((struct commit *)object)->parents;
617 while (parents) {
618 add_object_array(&parents->item->object,
619 NULL, &want_obj);
620 parents = parents->next;
622 add_object_array(object, NULL, &extra_edge_obj);
624 /* make sure commit traversal conforms to client */
625 register_shallow(object->sha1);
627 packet_flush(1);
628 } else
629 if (shallows.nr > 0) {
630 int i;
631 for (i = 0; i < shallows.nr; i++)
632 register_shallow(shallows.objects[i].item->sha1);
635 shallow_nr += shallows.nr;
636 free(shallows.objects);
639 static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
641 static const char *capabilities = "multi_ack thin-pack side-band"
642 " side-band-64k ofs-delta shallow no-progress"
643 " include-tag multi_ack_detailed";
644 struct object *o = parse_object(sha1);
646 if (!o)
647 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
649 if (capabilities)
650 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname,
651 0, capabilities,
652 stateless_rpc ? " no-done" : "");
653 else
654 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
655 capabilities = NULL;
656 if (!(o->flags & OUR_REF)) {
657 o->flags |= OUR_REF;
658 nr_our_refs++;
660 if (o->type == OBJ_TAG) {
661 o = deref_tag(o, refname, 0);
662 if (o)
663 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
665 return 0;
668 static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
670 struct object *o = parse_object(sha1);
671 if (!o)
672 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
673 if (!(o->flags & OUR_REF)) {
674 o->flags |= OUR_REF;
675 nr_our_refs++;
677 return 0;
680 static void upload_pack(void)
682 if (advertise_refs || !stateless_rpc) {
683 reset_timeout();
684 head_ref(send_ref, NULL);
685 for_each_ref(send_ref, NULL);
686 packet_flush(1);
687 } else {
688 head_ref(mark_our_ref, NULL);
689 for_each_ref(mark_our_ref, NULL);
691 if (advertise_refs)
692 return;
694 receive_needs();
695 if (want_obj.nr) {
696 get_common_commits();
697 create_pack_file();
701 int main(int argc, char **argv)
703 char *dir;
704 int i;
705 int strict = 0;
707 packet_trace_identity("upload-pack");
708 git_extract_argv0_path(argv[0]);
709 read_replace_refs = 0;
711 for (i = 1; i < argc; i++) {
712 char *arg = argv[i];
714 if (arg[0] != '-')
715 break;
716 if (!strcmp(arg, "--advertise-refs")) {
717 advertise_refs = 1;
718 continue;
720 if (!strcmp(arg, "--stateless-rpc")) {
721 stateless_rpc = 1;
722 continue;
724 if (!strcmp(arg, "--strict")) {
725 strict = 1;
726 continue;
728 if (!prefixcmp(arg, "--timeout=")) {
729 timeout = atoi(arg+10);
730 daemon_mode = 1;
731 continue;
733 if (!strcmp(arg, "--")) {
734 i++;
735 break;
739 if (i != argc-1)
740 usage(upload_pack_usage);
742 setup_path();
744 dir = argv[i];
746 if (!enter_repo(dir, strict))
747 die("'%s' does not appear to be a git repository", dir);
748 if (is_repository_shallow())
749 die("attempt to fetch/clone from a shallow repository");
750 if (getenv("GIT_DEBUG_SEND_PACK"))
751 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
752 upload_pack();
753 return 0;