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
, no_progress
;
31 static struct object_array have_obj
;
32 static struct object_array want_obj
;
33 static unsigned int timeout
;
35 * otherwise maximum packet size (up to 65520 bytes).
37 static int use_sideband
;
39 static void reset_timeout(void)
44 static int strip(char *line
, int len
)
46 if (len
&& line
[len
-1] == '\n')
51 static ssize_t
send_client_data(int fd
, const char *data
, ssize_t sz
)
54 return send_sideband(1, fd
, data
, sz
, use_sideband
);
59 /* XXX: are we happy to lose stuff here? */
63 return safe_write(fd
, data
, sz
);
66 static FILE *pack_pipe
= NULL
;
67 static void show_commit(struct commit
*commit
)
69 if (commit
->object
.flags
& BOUNDARY
)
70 fputc('-', pack_pipe
);
71 if (fputs(sha1_to_hex(commit
->object
.sha1
), pack_pipe
) < 0)
72 die("broken output pipe");
73 fputc('\n', pack_pipe
);
76 commit
->buffer
= NULL
;
79 static void show_object(struct object_array_entry
*p
)
81 /* An object with name "foo\n0000000..." can be used to
82 * confuse downstream git-pack-objects very badly.
84 const char *ep
= strchr(p
->name
, '\n');
86 fprintf(pack_pipe
, "%s %.*s\n", sha1_to_hex(p
->item
->sha1
),
91 fprintf(pack_pipe
, "%s %s\n",
92 sha1_to_hex(p
->item
->sha1
), p
->name
);
95 static void show_edge(struct commit
*commit
)
97 fprintf(pack_pipe
, "-%s\n", sha1_to_hex(commit
->object
.sha1
));
100 static int do_rev_list(int fd
, void *create_full_pack
)
103 struct rev_info revs
;
105 pack_pipe
= fdopen(fd
, "w");
106 if (create_full_pack
)
107 use_thin_pack
= 0; /* no point doing it */
108 init_revisions(&revs
, NULL
);
109 revs
.tag_objects
= 1;
110 revs
.tree_objects
= 1;
111 revs
.blob_objects
= 1;
115 if (create_full_pack
) {
116 const char *args
[] = {"rev-list", "--all", NULL
};
117 setup_revisions(2, args
, &revs
, NULL
);
119 for (i
= 0; i
< want_obj
.nr
; i
++) {
120 struct object
*o
= want_obj
.objects
[i
].item
;
122 o
->flags
&= ~UNINTERESTING
;
123 add_pending_object(&revs
, o
, NULL
);
125 for (i
= 0; i
< have_obj
.nr
; i
++) {
126 struct object
*o
= have_obj
.objects
[i
].item
;
127 o
->flags
|= UNINTERESTING
;
128 add_pending_object(&revs
, o
, NULL
);
130 setup_revisions(0, NULL
, &revs
, NULL
);
132 prepare_revision_walk(&revs
);
133 mark_edges_uninteresting(revs
.commits
, &revs
, show_edge
);
134 traverse_commit_list(&revs
, show_commit
, show_object
);
140 static void create_pack_file(void)
142 struct async rev_list
;
143 struct child_process pack_objects
;
144 int create_full_pack
= (nr_our_refs
== want_obj
.nr
&& !have_obj
.nr
);
145 char data
[8193], progress
[128];
146 char abort_msg
[] = "aborting due to possible repository "
147 "corruption on the remote side.";
149 const char *argv
[10];
152 rev_list
.proc
= do_rev_list
;
153 /* .data is just a boolean: any non-NULL value will do */
154 rev_list
.data
= create_full_pack
? &rev_list
: NULL
;
155 if (start_async(&rev_list
))
156 die("git-upload-pack: unable to fork git-rev-list");
158 argv
[arg
++] = "pack-objects";
159 argv
[arg
++] = "--stdout";
161 argv
[arg
++] = "--progress";
163 argv
[arg
++] = "--delta-base-offset";
166 memset(&pack_objects
, 0, sizeof(pack_objects
));
167 pack_objects
.in
= rev_list
.out
; /* start_command closes it */
168 pack_objects
.out
= -1;
169 pack_objects
.err
= -1;
170 pack_objects
.git_cmd
= 1;
171 pack_objects
.argv
= argv
;
173 if (start_command(&pack_objects
))
174 die("git-upload-pack: unable to fork git-pack-objects");
177 /* We read from pack_objects.err to capture stderr output for
178 * progress bar, and pack_objects.out to capture the pack data.
183 struct pollfd pfd
[2];
187 int pe
, pu
, pollsize
;
194 if (0 <= pack_objects
.out
) {
195 pfd
[pollsize
].fd
= pack_objects
.out
;
196 pfd
[pollsize
].events
= POLLIN
;
200 if (0 <= pack_objects
.err
) {
201 pfd
[pollsize
].fd
= pack_objects
.err
;
202 pfd
[pollsize
].events
= POLLIN
;
208 if (poll(pfd
, pollsize
, -1) < 0) {
209 if (errno
!= EINTR
) {
210 error("poll failed, resuming: %s",
216 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
217 /* Data ready; we keep the last byte
218 * to ourselves in case we detect
219 * broken rev-list, so that we can
220 * leave the stream corrupted. This
221 * is unfortunate -- unpack-objects
222 * would happily accept a valid pack
223 * data with trailing garbage, so
224 * appending garbage after we pass all
225 * the pack data is not good enough to
226 * signal breakage to downstream.
234 sz
= xread(pack_objects
.out
, cp
,
235 sizeof(data
) - outsz
);
239 close(pack_objects
.out
);
240 pack_objects
.out
= -1;
246 buffered
= data
[sz
-1] & 0xFF;
251 sz
= send_client_data(1, data
, sz
);
255 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
256 /* Status ready; we ship that in the side-band
257 * or dump to the standard error.
259 sz
= xread(pack_objects
.err
, progress
,
262 send_client_data(2, progress
, sz
);
264 close(pack_objects
.err
);
265 pack_objects
.err
= -1;
272 /* See if the children are still there */
273 if (rev_list
.pid
|| pack_objects
.pid
) {
274 pid
= waitpid(-1, &status
, WNOHANG
);
277 who
= ((pid
== rev_list
.pid
) ? "git-rev-list" :
278 (pid
== pack_objects
.pid
) ? "git-pack-objects" :
282 error("git-upload-pack: %s",
286 error("git-upload-pack: we weren't "
287 "waiting for %d", pid
);
290 if (!WIFEXITED(status
) || WEXITSTATUS(status
) > 0) {
291 error("git-upload-pack: %s died with error.",
295 if (pid
== rev_list
.pid
)
297 if (pid
== pack_objects
.pid
)
298 pack_objects
.pid
= 0;
299 if (rev_list
.pid
|| pack_objects
.pid
)
303 /* both died happily */
310 sz
= send_client_data(1, data
, 1);
313 fprintf(stderr
, "flushed.\n");
320 if (pack_objects
.pid
)
321 kill(pack_objects
.pid
, SIGKILL
);
323 kill(rev_list
.pid
, SIGKILL
);
324 send_client_data(3, abort_msg
, sizeof(abort_msg
));
325 die("git-upload-pack: %s", abort_msg
);
330 /* We read from pack_objects.out to capture the pack data. */
332 while ((sz
= xread(pack_objects
.out
, data
+1, sizeof(data
)-1)) > 0) {
334 /* Data ready; we keep the last byte to ourselves in case we
335 * detect broken rev-list, so that we can leave the stream
336 * corrupted. This is unfortunate -- unpack-objects would
337 * happily accept a valid pack data with trailing garbage, so
338 * appending garbage after we pass all the pack data is not
339 * good enough to signal breakage to downstream.
346 buffered
= cp
[sz
-1] & 0xFF;
351 sz
= send_client_data(1, cp
, sz
);
356 close(pack_objects
.out
);
357 pack_objects
.out
= -1;
365 sz
= send_client_data(1, data
, 1);
368 fprintf(stderr
, "flushed.\n");
372 if (waitpid(pack_objects
.pid
, NULL
, 0) < 0)
373 die("git-upload-pack: waiting for pack-objects: %s",
378 kill(pack_objects
.pid
, SIGKILL
);
379 send_client_data(3, abort_msg
, sizeof(abort_msg
));
380 die("git-upload-pack: %s", abort_msg
);
384 static int got_sha1(char *hex
, unsigned char *sha1
)
387 int we_knew_they_have
= 0;
389 if (get_sha1_hex(hex
, sha1
))
390 die("git-upload-pack: expected SHA1 object, got '%s'", hex
);
391 if (!has_sha1_file(sha1
))
394 o
= lookup_object(sha1
);
395 if (!(o
&& o
->parsed
))
396 o
= parse_object(sha1
);
398 die("oops (%s)", sha1_to_hex(sha1
));
399 if (o
->type
== OBJ_COMMIT
) {
400 struct commit_list
*parents
;
401 struct commit
*commit
= (struct commit
*)o
;
402 if (o
->flags
& THEY_HAVE
)
403 we_knew_they_have
= 1;
405 o
->flags
|= THEY_HAVE
;
406 if (!oldest_have
|| (commit
->date
< oldest_have
))
407 oldest_have
= commit
->date
;
408 for (parents
= commit
->parents
;
410 parents
= parents
->next
)
411 parents
->item
->object
.flags
|= THEY_HAVE
;
413 if (!we_knew_they_have
) {
414 add_object_array(o
, NULL
, &have_obj
);
420 static int reachable(struct commit
*want
)
422 struct commit_list
*work
= NULL
;
424 insert_by_date(want
, &work
);
426 struct commit_list
*list
= work
->next
;
427 struct commit
*commit
= work
->item
;
431 if (commit
->object
.flags
& THEY_HAVE
) {
432 want
->object
.flags
|= COMMON_KNOWN
;
435 if (!commit
->object
.parsed
)
436 parse_object(commit
->object
.sha1
);
437 if (commit
->object
.flags
& REACHABLE
)
439 commit
->object
.flags
|= REACHABLE
;
440 if (commit
->date
< oldest_have
)
442 for (list
= commit
->parents
; list
; list
= list
->next
) {
443 struct commit
*parent
= list
->item
;
444 if (!(parent
->object
.flags
& REACHABLE
))
445 insert_by_date(parent
, &work
);
448 want
->object
.flags
|= REACHABLE
;
449 clear_commit_marks(want
, REACHABLE
);
450 free_commit_list(work
);
451 return (want
->object
.flags
& COMMON_KNOWN
);
454 static int ok_to_give_up(void)
461 for (i
= 0; i
< want_obj
.nr
; i
++) {
462 struct object
*want
= want_obj
.objects
[i
].item
;
464 if (want
->flags
& COMMON_KNOWN
)
466 want
= deref_tag(want
, "a want line", 0);
467 if (!want
|| want
->type
!= OBJ_COMMIT
) {
468 /* no way to tell if this is reachable by
469 * looking at the ancestry chain alone, so
470 * leave a note to ourselves not to worry about
471 * this object anymore.
473 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
476 if (!reachable((struct commit
*)want
))
482 static int get_common_commits(void)
484 static char line
[1000];
485 unsigned char sha1
[20];
486 char hex
[41], last_hex
[41];
489 track_object_refs
= 0;
490 save_commit_buffer
= 0;
493 len
= packet_read_line(0, line
, sizeof(line
));
497 if (have_obj
.nr
== 0 || multi_ack
)
498 packet_write(1, "NAK\n");
501 len
= strip(line
, len
);
502 if (!prefixcmp(line
, "have ")) {
503 switch (got_sha1(line
+5, sha1
)) {
504 case -1: /* they have what we do not */
505 if (multi_ack
&& ok_to_give_up())
506 packet_write(1, "ACK %s continue\n",
510 memcpy(hex
, sha1_to_hex(sha1
), 41);
512 const char *msg
= "ACK %s continue\n";
513 packet_write(1, msg
, hex
);
514 memcpy(last_hex
, hex
, 41);
516 else if (have_obj
.nr
== 1)
517 packet_write(1, "ACK %s\n", hex
);
522 if (!strcmp(line
, "done")) {
523 if (have_obj
.nr
> 0) {
525 packet_write(1, "ACK %s\n", last_hex
);
528 packet_write(1, "NAK\n");
531 die("git-upload-pack: expected SHA1 list, got '%s'", line
);
535 static void receive_needs(void)
537 struct object_array shallows
= {0, 0, NULL
};
538 static char line
[1000];
543 unsigned char sha1_buf
[20];
544 len
= packet_read_line(0, line
, sizeof(line
));
549 if (!prefixcmp(line
, "shallow ")) {
550 unsigned char sha1
[20];
551 struct object
*object
;
553 if (get_sha1(line
+ 8, sha1
))
554 die("invalid shallow line: %s", line
);
555 object
= parse_object(sha1
);
557 die("did not find object for %s", line
);
558 object
->flags
|= CLIENT_SHALLOW
;
559 add_object_array(object
, NULL
, &shallows
);
562 if (!prefixcmp(line
, "deepen ")) {
565 depth
= strtol(line
+ 7, &end
, 0);
566 if (end
== line
+ 7 || depth
<= 0)
567 die("Invalid deepen: %s", line
);
570 if (prefixcmp(line
, "want ") ||
571 get_sha1_hex(line
+5, sha1_buf
))
572 die("git-upload-pack: protocol error, "
573 "expected to get sha, not '%s'", line
);
574 if (strstr(line
+45, "multi_ack"))
576 if (strstr(line
+45, "thin-pack"))
578 if (strstr(line
+45, "ofs-delta"))
581 if (strstr(line
+45, "side-band-64k"))
582 use_sideband
= LARGE_PACKET_MAX
;
583 else if (strstr(line
+45, "side-band"))
584 use_sideband
= DEFAULT_PACKET_MAX
;
586 if (strstr(line
+45, "no-progress"))
589 /* We have sent all our refs already, and the other end
590 * should have chosen out of them; otherwise they are
591 * asking for nonsense.
593 * Hmph. We may later want to allow "want" line that
594 * asks for something like "master~10" (symbolic)...
595 * would it make sense? I don't know.
597 o
= lookup_object(sha1_buf
);
598 if (!o
|| !(o
->flags
& OUR_REF
))
599 die("git-upload-pack: not our ref %s", line
+5);
600 if (!(o
->flags
& WANTED
)) {
602 add_object_array(o
, NULL
, &want_obj
);
605 if (depth
== 0 && shallows
.nr
== 0)
608 struct commit_list
*result
, *backup
;
610 backup
= result
= get_shallow_commits(&want_obj
, depth
,
611 SHALLOW
, NOT_SHALLOW
);
613 struct object
*object
= &result
->item
->object
;
614 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
615 packet_write(1, "shallow %s",
616 sha1_to_hex(object
->sha1
));
617 register_shallow(object
->sha1
);
619 result
= result
->next
;
621 free_commit_list(backup
);
622 for (i
= 0; i
< shallows
.nr
; i
++) {
623 struct object
*object
= shallows
.objects
[i
].item
;
624 if (object
->flags
& NOT_SHALLOW
) {
625 struct commit_list
*parents
;
626 packet_write(1, "unshallow %s",
627 sha1_to_hex(object
->sha1
));
628 object
->flags
&= ~CLIENT_SHALLOW
;
629 /* make sure the real parents are parsed */
630 unregister_shallow(object
->sha1
);
632 parse_commit((struct commit
*)object
);
633 parents
= ((struct commit
*)object
)->parents
;
635 add_object_array(&parents
->item
->object
,
637 parents
= parents
->next
;
640 /* make sure commit traversal conforms to client */
641 register_shallow(object
->sha1
);
645 if (shallows
.nr
> 0) {
647 for (i
= 0; i
< shallows
.nr
; i
++)
648 register_shallow(shallows
.objects
[i
].item
->sha1
);
650 free(shallows
.objects
);
653 static int send_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
655 static const char *capabilities
= "multi_ack thin-pack side-band"
656 " side-band-64k ofs-delta shallow no-progress";
657 struct object
*o
= parse_object(sha1
);
660 die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1
));
663 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1
), refname
,
666 packet_write(1, "%s %s\n", sha1_to_hex(sha1
), refname
);
668 if (!(o
->flags
& OUR_REF
)) {
672 if (o
->type
== OBJ_TAG
) {
673 o
= deref_tag(o
, refname
, 0);
674 packet_write(1, "%s %s^{}\n", sha1_to_hex(o
->sha1
), refname
);
679 static void upload_pack(void)
682 head_ref(send_ref
, NULL
);
683 for_each_ref(send_ref
, NULL
);
687 get_common_commits();
692 int main(int argc
, char **argv
)
698 for (i
= 1; i
< argc
; i
++) {
703 if (!strcmp(arg
, "--strict")) {
707 if (!prefixcmp(arg
, "--timeout=")) {
708 timeout
= atoi(arg
+10);
711 if (!strcmp(arg
, "--")) {
718 usage(upload_pack_usage
);
721 if (!enter_repo(dir
, strict
))
722 die("'%s': unable to chdir or not a git archive", dir
);
723 if (is_repository_shallow())
724 die("attempt to fetch/clone from a shallow repository");