11 #include "list-objects.h"
12 #include "list-objects-filter.h"
13 #include "list-objects-filter-options.h"
14 #include "run-command.h"
18 #include "string-list.h"
19 #include "argv-array.h"
20 #include "prio-queue.h"
23 #include "upload-pack.h"
26 /* Remember to update object flag allocation in object.h */
27 #define THEY_HAVE (1u << 11)
28 #define OUR_REF (1u << 12)
29 #define WANTED (1u << 13)
30 #define COMMON_KNOWN (1u << 14)
31 #define REACHABLE (1u << 15)
33 #define SHALLOW (1u << 16)
34 #define NOT_SHALLOW (1u << 17)
35 #define CLIENT_SHALLOW (1u << 18)
36 #define HIDDEN_REF (1u << 19)
38 static timestamp_t oldest_have
;
40 static int deepen_relative
;
43 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
44 static int no_progress
, daemon_mode
;
45 /* Allow specifying sha1 if it is a ref tip. */
46 #define ALLOW_TIP_SHA1 01
47 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
48 #define ALLOW_REACHABLE_SHA1 02
49 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
50 #define ALLOW_ANY_SHA1 07
51 static unsigned int allow_unadvertised_object_request
;
52 static int shallow_nr
;
53 static struct object_array have_obj
;
54 static struct object_array want_obj
;
55 static struct object_array extra_edge_obj
;
56 static unsigned int timeout
;
57 static int keepalive
= 5;
59 * otherwise maximum packet size (up to 65520 bytes).
61 static int use_sideband
;
62 static int stateless_rpc
;
63 static const char *pack_objects_hook
;
65 static int filter_capability_requested
;
66 static int allow_filter
;
67 static int allow_ref_in_want
;
68 static struct list_objects_filter_options filter_options
;
70 static void reset_timeout(void)
75 static void send_client_data(int fd
, const char *data
, ssize_t sz
)
78 send_sideband(1, fd
, data
, sz
, use_sideband
);
85 /* XXX: are we happy to lose stuff here? */
89 write_or_die(fd
, data
, sz
);
92 static int write_one_shallow(const struct commit_graft
*graft
, void *cb_data
)
95 if (graft
->nr_parent
== -1)
96 fprintf(fp
, "--shallow %s\n", oid_to_hex(&graft
->oid
));
100 static void create_pack_file(void)
102 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
103 char data
[8193], progress
[128];
104 char abort_msg
[] = "aborting due to possible repository "
105 "corruption on the remote side.";
111 if (!pack_objects_hook
)
112 pack_objects
.git_cmd
= 1;
114 argv_array_push(&pack_objects
.args
, pack_objects_hook
);
115 argv_array_push(&pack_objects
.args
, "git");
116 pack_objects
.use_shell
= 1;
120 argv_array_push(&pack_objects
.args
, "--shallow-file");
121 argv_array_push(&pack_objects
.args
, "");
123 argv_array_push(&pack_objects
.args
, "pack-objects");
124 argv_array_push(&pack_objects
.args
, "--revs");
126 argv_array_push(&pack_objects
.args
, "--thin");
128 argv_array_push(&pack_objects
.args
, "--stdout");
130 argv_array_push(&pack_objects
.args
, "--shallow");
132 argv_array_push(&pack_objects
.args
, "--progress");
134 argv_array_push(&pack_objects
.args
, "--delta-base-offset");
136 argv_array_push(&pack_objects
.args
, "--include-tag");
137 if (filter_options
.filter_spec
) {
138 if (pack_objects
.use_shell
) {
139 struct strbuf buf
= STRBUF_INIT
;
140 sq_quote_buf(&buf
, filter_options
.filter_spec
);
141 argv_array_pushf(&pack_objects
.args
, "--filter=%s", buf
.buf
);
142 strbuf_release(&buf
);
144 argv_array_pushf(&pack_objects
.args
, "--filter=%s",
145 filter_options
.filter_spec
);
149 pack_objects
.in
= -1;
150 pack_objects
.out
= -1;
151 pack_objects
.err
= -1;
153 if (start_command(&pack_objects
))
154 die("git upload-pack: unable to fork git-pack-objects");
156 pipe_fd
= xfdopen(pack_objects
.in
, "w");
159 for_each_commit_graft(write_one_shallow
, pipe_fd
);
161 for (i
= 0; i
< want_obj
.nr
; i
++)
162 fprintf(pipe_fd
, "%s\n",
163 oid_to_hex(&want_obj
.objects
[i
].item
->oid
));
164 fprintf(pipe_fd
, "--not\n");
165 for (i
= 0; i
< have_obj
.nr
; i
++)
166 fprintf(pipe_fd
, "%s\n",
167 oid_to_hex(&have_obj
.objects
[i
].item
->oid
));
168 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
169 fprintf(pipe_fd
, "%s\n",
170 oid_to_hex(&extra_edge_obj
.objects
[i
].item
->oid
));
171 fprintf(pipe_fd
, "\n");
175 /* We read from pack_objects.err to capture stderr output for
176 * progress bar, and pack_objects.out to capture the pack data.
180 struct pollfd pfd
[2];
181 int pe
, pu
, pollsize
;
189 if (0 <= pack_objects
.out
) {
190 pfd
[pollsize
].fd
= pack_objects
.out
;
191 pfd
[pollsize
].events
= POLLIN
;
195 if (0 <= pack_objects
.err
) {
196 pfd
[pollsize
].fd
= pack_objects
.err
;
197 pfd
[pollsize
].events
= POLLIN
;
205 ret
= poll(pfd
, pollsize
,
206 keepalive
< 0 ? -1 : 1000 * keepalive
);
209 if (errno
!= EINTR
) {
210 error_errno("poll failed, resuming");
215 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
216 /* Status ready; we ship that in the side-band
217 * or dump to the standard error.
219 sz
= xread(pack_objects
.err
, progress
,
222 send_client_data(2, progress
, sz
);
224 close(pack_objects
.err
);
225 pack_objects
.err
= -1;
229 /* give priority to status messages */
232 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
233 /* Data ready; we keep the last byte to ourselves
234 * in case we detect broken rev-list, so that we
235 * can leave the stream corrupted. This is
236 * unfortunate -- unpack-objects would happily
237 * accept a valid packdata with trailing garbage,
238 * so appending garbage after we pass all the
239 * pack data is not good enough to signal
240 * breakage to downstream.
248 sz
= xread(pack_objects
.out
, cp
,
249 sizeof(data
) - outsz
);
253 close(pack_objects
.out
);
254 pack_objects
.out
= -1;
260 buffered
= data
[sz
-1] & 0xFF;
265 send_client_data(1, data
, sz
);
269 * We hit the keepalive timeout without saying anything; send
270 * an empty message on the data sideband just to let the other
271 * side know we're still working on it, but don't have any data
274 * If we don't have a sideband channel, there's no room in the
275 * protocol to say anything, so those clients are just out of
278 if (!ret
&& use_sideband
) {
279 static const char buf
[] = "0005\1";
280 write_or_die(1, buf
, 5);
284 if (finish_command(&pack_objects
)) {
285 error("git upload-pack: git-pack-objects died with error.");
292 send_client_data(1, data
, 1);
293 fprintf(stderr
, "flushed.\n");
300 send_client_data(3, abort_msg
, sizeof(abort_msg
));
301 die("git upload-pack: %s", abort_msg
);
304 static int got_oid(const char *hex
, struct object_id
*oid
)
307 int we_knew_they_have
= 0;
309 if (get_oid_hex(hex
, oid
))
310 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
311 if (!has_object_file(oid
))
314 o
= parse_object(oid
);
316 die("oops (%s)", oid_to_hex(oid
));
317 if (o
->type
== OBJ_COMMIT
) {
318 struct commit_list
*parents
;
319 struct commit
*commit
= (struct commit
*)o
;
320 if (o
->flags
& THEY_HAVE
)
321 we_knew_they_have
= 1;
323 o
->flags
|= THEY_HAVE
;
324 if (!oldest_have
|| (commit
->date
< oldest_have
))
325 oldest_have
= commit
->date
;
326 for (parents
= commit
->parents
;
328 parents
= parents
->next
)
329 parents
->item
->object
.flags
|= THEY_HAVE
;
331 if (!we_knew_they_have
) {
332 add_object_array(o
, NULL
, &have_obj
);
338 static int reachable(struct commit
*want
)
340 struct prio_queue work
= { compare_commits_by_commit_date
};
342 prio_queue_put(&work
, want
);
344 struct commit_list
*list
;
345 struct commit
*commit
= prio_queue_get(&work
);
347 if (commit
->object
.flags
& THEY_HAVE
) {
348 want
->object
.flags
|= COMMON_KNOWN
;
351 if (!commit
->object
.parsed
)
352 parse_object(&commit
->object
.oid
);
353 if (commit
->object
.flags
& REACHABLE
)
355 commit
->object
.flags
|= REACHABLE
;
356 if (commit
->date
< oldest_have
)
358 for (list
= commit
->parents
; list
; list
= list
->next
) {
359 struct commit
*parent
= list
->item
;
360 if (!(parent
->object
.flags
& REACHABLE
))
361 prio_queue_put(&work
, parent
);
364 want
->object
.flags
|= REACHABLE
;
365 clear_commit_marks(want
, REACHABLE
);
366 clear_prio_queue(&work
);
367 return (want
->object
.flags
& COMMON_KNOWN
);
370 static int ok_to_give_up(void)
377 for (i
= 0; i
< want_obj
.nr
; i
++) {
378 struct object
*want
= want_obj
.objects
[i
].item
;
380 if (want
->flags
& COMMON_KNOWN
)
382 want
= deref_tag(want
, "a want line", 0);
383 if (!want
|| want
->type
!= OBJ_COMMIT
) {
384 /* no way to tell if this is reachable by
385 * looking at the ancestry chain alone, so
386 * leave a note to ourselves not to worry about
387 * this object anymore.
389 want_obj
.objects
[i
].item
->flags
|= COMMON_KNOWN
;
392 if (!reachable((struct commit
*)want
))
398 static int get_common_commits(void)
400 struct object_id oid
;
401 char last_hex
[GIT_MAX_HEXSZ
+ 1];
406 save_commit_buffer
= 0;
409 char *line
= packet_read_line(0, NULL
);
415 if (multi_ack
== 2 && got_common
416 && !got_other
&& ok_to_give_up()) {
418 packet_write_fmt(1, "ACK %s ready\n", last_hex
);
420 if (have_obj
.nr
== 0 || multi_ack
)
421 packet_write_fmt(1, "NAK\n");
423 if (no_done
&& sent_ready
) {
424 packet_write_fmt(1, "ACK %s\n", last_hex
);
433 if (skip_prefix(line
, "have ", &arg
)) {
434 switch (got_oid(arg
, &oid
)) {
435 case -1: /* they have what we do not */
437 if (multi_ack
&& ok_to_give_up()) {
438 const char *hex
= oid_to_hex(&oid
);
439 if (multi_ack
== 2) {
441 packet_write_fmt(1, "ACK %s ready\n", hex
);
443 packet_write_fmt(1, "ACK %s continue\n", hex
);
448 oid_to_hex_r(last_hex
, &oid
);
450 packet_write_fmt(1, "ACK %s common\n", last_hex
);
452 packet_write_fmt(1, "ACK %s continue\n", last_hex
);
453 else if (have_obj
.nr
== 1)
454 packet_write_fmt(1, "ACK %s\n", last_hex
);
459 if (!strcmp(line
, "done")) {
460 if (have_obj
.nr
> 0) {
462 packet_write_fmt(1, "ACK %s\n", last_hex
);
465 packet_write_fmt(1, "NAK\n");
468 die("git upload-pack: expected SHA1 list, got '%s'", line
);
472 static int is_our_ref(struct object
*o
)
474 int allow_hidden_ref
= (allow_unadvertised_object_request
&
475 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
476 return o
->flags
& ((allow_hidden_ref
? HIDDEN_REF
: 0) | OUR_REF
);
480 * on successful case, it's up to the caller to close cmd->out
482 static int do_reachable_revlist(struct child_process
*cmd
,
483 struct object_array
*src
,
484 struct object_array
*reachable
)
486 static const char *argv
[] = {
487 "rev-list", "--stdin", NULL
,
490 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
500 * If the next rev-list --stdin encounters an unknown commit,
501 * it terminates, which will cause SIGPIPE in the write loop
504 sigchain_push(SIGPIPE
, SIG_IGN
);
506 if (start_command(cmd
))
510 namebuf
[GIT_SHA1_HEXSZ
+ 1] = '\n';
511 for (i
= get_max_object_index(); 0 < i
; ) {
512 o
= get_indexed_object(--i
);
515 if (reachable
&& o
->type
== OBJ_COMMIT
)
516 o
->flags
&= ~TMP_MARK
;
519 memcpy(namebuf
+ 1, oid_to_hex(&o
->oid
), GIT_SHA1_HEXSZ
);
520 if (write_in_full(cmd
->in
, namebuf
, GIT_SHA1_HEXSZ
+ 2) < 0)
523 namebuf
[GIT_SHA1_HEXSZ
] = '\n';
524 for (i
= 0; i
< src
->nr
; i
++) {
525 o
= src
->objects
[i
].item
;
528 add_object_array(o
, NULL
, reachable
);
531 if (reachable
&& o
->type
== OBJ_COMMIT
)
532 o
->flags
|= TMP_MARK
;
533 memcpy(namebuf
, oid_to_hex(&o
->oid
), GIT_SHA1_HEXSZ
);
534 if (write_in_full(cmd
->in
, namebuf
, GIT_SHA1_HEXSZ
+ 1) < 0)
539 sigchain_pop(SIGPIPE
);
544 sigchain_pop(SIGPIPE
);
553 static int get_reachable_list(struct object_array
*src
,
554 struct object_array
*reachable
)
556 struct child_process cmd
= CHILD_PROCESS_INIT
;
559 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
560 const unsigned hexsz
= the_hash_algo
->hexsz
;
562 if (do_reachable_revlist(&cmd
, src
, reachable
) < 0)
565 while ((i
= read_in_full(cmd
.out
, namebuf
, hexsz
+ 1)) == hexsz
+ 1) {
566 struct object_id sha1
;
569 if (parse_oid_hex(namebuf
, &sha1
, &p
) || *p
!= '\n')
572 o
= lookup_object(sha1
.hash
);
573 if (o
&& o
->type
== OBJ_COMMIT
) {
574 o
->flags
&= ~TMP_MARK
;
577 for (i
= get_max_object_index(); 0 < i
; i
--) {
578 o
= get_indexed_object(i
- 1);
579 if (o
&& o
->type
== OBJ_COMMIT
&&
580 (o
->flags
& TMP_MARK
)) {
581 add_object_array(o
, NULL
, reachable
);
582 o
->flags
&= ~TMP_MARK
;
587 if (finish_command(&cmd
))
593 static int has_unreachable(struct object_array
*src
)
595 struct child_process cmd
= CHILD_PROCESS_INIT
;
599 if (do_reachable_revlist(&cmd
, src
, NULL
) < 0)
603 * The commits out of the rev-list are not ancestors of
606 i
= read_in_full(cmd
.out
, buf
, 1);
613 * rev-list may have died by encountering a bad commit
614 * in the history, in which case we do want to bail out
615 * even when it showed no commit.
617 if (finish_command(&cmd
))
620 /* All the non-tip ones are ancestors of what we advertised */
624 sigchain_pop(SIGPIPE
);
630 static void check_non_tip(void)
635 * In the normal in-process case without
636 * uploadpack.allowReachableSHA1InWant,
637 * non-tip requests can never happen.
639 if (!stateless_rpc
&& !(allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
))
641 if (!has_unreachable(&want_obj
))
642 /* All the non-tip ones are ancestors of what we advertised */
646 /* Pick one of them (we know there at least is one) */
647 for (i
= 0; i
< want_obj
.nr
; i
++) {
648 struct object
*o
= want_obj
.objects
[i
].item
;
650 die("git upload-pack: not our ref %s",
651 oid_to_hex(&o
->oid
));
655 static void send_shallow(struct commit_list
*result
)
658 struct object
*object
= &result
->item
->object
;
659 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
660 packet_write_fmt(1, "shallow %s",
661 oid_to_hex(&object
->oid
));
662 register_shallow(&object
->oid
);
665 result
= result
->next
;
669 static void send_unshallow(const struct object_array
*shallows
)
673 for (i
= 0; i
< shallows
->nr
; i
++) {
674 struct object
*object
= shallows
->objects
[i
].item
;
675 if (object
->flags
& NOT_SHALLOW
) {
676 struct commit_list
*parents
;
677 packet_write_fmt(1, "unshallow %s",
678 oid_to_hex(&object
->oid
));
679 object
->flags
&= ~CLIENT_SHALLOW
;
681 * We want to _register_ "object" as shallow, but we
682 * also need to traverse object's parents to deepen a
683 * shallow clone. Unregister it for now so we can
684 * parse and add the parents to the want list, then
687 unregister_shallow(&object
->oid
);
689 parse_commit_or_die((struct commit
*)object
);
690 parents
= ((struct commit
*)object
)->parents
;
692 add_object_array(&parents
->item
->object
,
694 parents
= parents
->next
;
696 add_object_array(object
, NULL
, &extra_edge_obj
);
698 /* make sure commit traversal conforms to client */
699 register_shallow(&object
->oid
);
703 static void deepen(int depth
, int deepen_relative
,
704 struct object_array
*shallows
)
706 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow()) {
709 for (i
= 0; i
< shallows
->nr
; i
++) {
710 struct object
*object
= shallows
->objects
[i
].item
;
711 object
->flags
|= NOT_SHALLOW
;
713 } else if (deepen_relative
) {
714 struct object_array reachable_shallows
= OBJECT_ARRAY_INIT
;
715 struct commit_list
*result
;
717 get_reachable_list(shallows
, &reachable_shallows
);
718 result
= get_shallow_commits(&reachable_shallows
,
720 SHALLOW
, NOT_SHALLOW
);
721 send_shallow(result
);
722 free_commit_list(result
);
723 object_array_clear(&reachable_shallows
);
725 struct commit_list
*result
;
727 result
= get_shallow_commits(&want_obj
, depth
,
728 SHALLOW
, NOT_SHALLOW
);
729 send_shallow(result
);
730 free_commit_list(result
);
733 send_unshallow(shallows
);
736 static void deepen_by_rev_list(int ac
, const char **av
,
737 struct object_array
*shallows
)
739 struct commit_list
*result
;
741 result
= get_shallow_commits_by_rev_list(ac
, av
, SHALLOW
, NOT_SHALLOW
);
742 send_shallow(result
);
743 free_commit_list(result
);
744 send_unshallow(shallows
);
747 /* Returns 1 if a shallow list is sent or 0 otherwise */
748 static int send_shallow_list(int depth
, int deepen_rev_list
,
749 timestamp_t deepen_since
,
750 struct string_list
*deepen_not
,
751 struct object_array
*shallows
)
755 if (depth
> 0 && deepen_rev_list
)
756 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
758 deepen(depth
, deepen_relative
, shallows
);
760 } else if (deepen_rev_list
) {
761 struct argv_array av
= ARGV_ARRAY_INIT
;
764 argv_array_push(&av
, "rev-list");
766 argv_array_pushf(&av
, "--max-age=%"PRItime
, deepen_since
);
767 if (deepen_not
->nr
) {
768 argv_array_push(&av
, "--not");
769 for (i
= 0; i
< deepen_not
->nr
; i
++) {
770 struct string_list_item
*s
= deepen_not
->items
+ i
;
771 argv_array_push(&av
, s
->string
);
773 argv_array_push(&av
, "--not");
775 for (i
= 0; i
< want_obj
.nr
; i
++) {
776 struct object
*o
= want_obj
.objects
[i
].item
;
777 argv_array_push(&av
, oid_to_hex(&o
->oid
));
779 deepen_by_rev_list(av
.argc
, av
.argv
, shallows
);
780 argv_array_clear(&av
);
783 if (shallows
->nr
> 0) {
785 for (i
= 0; i
< shallows
->nr
; i
++)
786 register_shallow(&shallows
->objects
[i
].item
->oid
);
790 shallow_nr
+= shallows
->nr
;
794 static int process_shallow(const char *line
, struct object_array
*shallows
)
797 if (skip_prefix(line
, "shallow ", &arg
)) {
798 struct object_id oid
;
799 struct object
*object
;
800 if (get_oid_hex(arg
, &oid
))
801 die("invalid shallow line: %s", line
);
802 object
= parse_object(&oid
);
805 if (object
->type
!= OBJ_COMMIT
)
806 die("invalid shallow object %s", oid_to_hex(&oid
));
807 if (!(object
->flags
& CLIENT_SHALLOW
)) {
808 object
->flags
|= CLIENT_SHALLOW
;
809 add_object_array(object
, NULL
, shallows
);
817 static int process_deepen(const char *line
, int *depth
)
820 if (skip_prefix(line
, "deepen ", &arg
)) {
822 *depth
= (int)strtol(arg
, &end
, 0);
823 if (!end
|| *end
|| *depth
<= 0)
824 die("Invalid deepen: %s", line
);
831 static int process_deepen_since(const char *line
, timestamp_t
*deepen_since
, int *deepen_rev_list
)
834 if (skip_prefix(line
, "deepen-since ", &arg
)) {
836 *deepen_since
= parse_timestamp(arg
, &end
, 0);
837 if (!end
|| *end
|| !deepen_since
||
838 /* revisions.c's max_age -1 is special */
840 die("Invalid deepen-since: %s", line
);
841 *deepen_rev_list
= 1;
847 static int process_deepen_not(const char *line
, struct string_list
*deepen_not
, int *deepen_rev_list
)
850 if (skip_prefix(line
, "deepen-not ", &arg
)) {
852 struct object_id oid
;
853 if (expand_ref(arg
, strlen(arg
), &oid
, &ref
) != 1)
854 die("git upload-pack: ambiguous deepen-not: %s", line
);
855 string_list_append(deepen_not
, ref
);
857 *deepen_rev_list
= 1;
863 static void receive_needs(void)
865 struct object_array shallows
= OBJECT_ARRAY_INIT
;
866 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
869 timestamp_t deepen_since
= 0;
870 int deepen_rev_list
= 0;
875 const char *features
;
876 struct object_id oid_buf
;
877 char *line
= packet_read_line(0, NULL
);
884 if (process_shallow(line
, &shallows
))
886 if (process_deepen(line
, &depth
))
888 if (process_deepen_since(line
, &deepen_since
, &deepen_rev_list
))
890 if (process_deepen_not(line
, &deepen_not
, &deepen_rev_list
))
893 if (skip_prefix(line
, "filter ", &arg
)) {
894 if (!filter_capability_requested
)
895 die("git upload-pack: filtering capability not negotiated");
896 parse_list_objects_filter(&filter_options
, arg
);
900 if (!skip_prefix(line
, "want ", &arg
) ||
901 parse_oid_hex(arg
, &oid_buf
, &features
))
902 die("git upload-pack: protocol error, "
903 "expected to get object ID, not '%s'", line
);
905 if (parse_feature_request(features
, "deepen-relative"))
907 if (parse_feature_request(features
, "multi_ack_detailed"))
909 else if (parse_feature_request(features
, "multi_ack"))
911 if (parse_feature_request(features
, "no-done"))
913 if (parse_feature_request(features
, "thin-pack"))
915 if (parse_feature_request(features
, "ofs-delta"))
917 if (parse_feature_request(features
, "side-band-64k"))
918 use_sideband
= LARGE_PACKET_MAX
;
919 else if (parse_feature_request(features
, "side-band"))
920 use_sideband
= DEFAULT_PACKET_MAX
;
921 if (parse_feature_request(features
, "no-progress"))
923 if (parse_feature_request(features
, "include-tag"))
925 if (allow_filter
&& parse_feature_request(features
, "filter"))
926 filter_capability_requested
= 1;
928 o
= parse_object(&oid_buf
);
931 "ERR upload-pack: not our ref %s",
932 oid_to_hex(&oid_buf
));
933 die("git upload-pack: not our ref %s",
934 oid_to_hex(&oid_buf
));
936 if (!(o
->flags
& WANTED
)) {
938 if (!((allow_unadvertised_object_request
& ALLOW_ANY_SHA1
) == ALLOW_ANY_SHA1
941 add_object_array(o
, NULL
, &want_obj
);
946 * We have sent all our refs already, and the other end
947 * should have chosen out of them. When we are operating
948 * in the stateless RPC mode, however, their choice may
949 * have been based on the set of older refs advertised
950 * by another process that handled the initial request.
955 if (!use_sideband
&& daemon_mode
)
958 if (depth
== 0 && !deepen_rev_list
&& shallows
.nr
== 0)
961 if (send_shallow_list(depth
, deepen_rev_list
, deepen_since
,
962 &deepen_not
, &shallows
))
964 object_array_clear(&shallows
);
967 /* return non-zero if the ref is hidden, otherwise 0 */
968 static int mark_our_ref(const char *refname
, const char *refname_full
,
969 const struct object_id
*oid
)
971 struct object
*o
= lookup_unknown_object(oid
->hash
);
973 if (ref_is_hidden(refname
, refname_full
)) {
974 o
->flags
|= HIDDEN_REF
;
981 static int check_ref(const char *refname_full
, const struct object_id
*oid
,
982 int flag
, void *cb_data
)
984 const char *refname
= strip_namespace(refname_full
);
986 mark_our_ref(refname
, refname_full
, oid
);
990 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
992 struct string_list_item
*item
;
996 for_each_string_list_item(item
, symref
)
997 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
1000 static int send_ref(const char *refname
, const struct object_id
*oid
,
1001 int flag
, void *cb_data
)
1003 static const char *capabilities
= "multi_ack thin-pack side-band"
1004 " side-band-64k ofs-delta shallow deepen-since deepen-not"
1005 " deepen-relative no-progress include-tag multi_ack_detailed";
1006 const char *refname_nons
= strip_namespace(refname
);
1007 struct object_id peeled
;
1009 if (mark_our_ref(refname_nons
, refname
, oid
))
1013 struct strbuf symref_info
= STRBUF_INIT
;
1015 format_symref_info(&symref_info
, cb_data
);
1016 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
1017 oid_to_hex(oid
), refname_nons
,
1019 (allow_unadvertised_object_request
& ALLOW_TIP_SHA1
) ?
1020 " allow-tip-sha1-in-want" : "",
1021 (allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
) ?
1022 " allow-reachable-sha1-in-want" : "",
1023 stateless_rpc
? " no-done" : "",
1025 allow_filter
? " filter" : "",
1026 git_user_agent_sanitized());
1027 strbuf_release(&symref_info
);
1029 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid
), refname_nons
);
1031 capabilities
= NULL
;
1032 if (!peel_ref(refname
, &peeled
))
1033 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled
), refname_nons
);
1037 static int find_symref(const char *refname
, const struct object_id
*oid
,
1038 int flag
, void *cb_data
)
1040 const char *symref_target
;
1041 struct string_list_item
*item
;
1043 if ((flag
& REF_ISSYMREF
) == 0)
1045 symref_target
= resolve_ref_unsafe(refname
, 0, NULL
, &flag
);
1046 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
1047 die("'%s' is a symref but it is not?", refname
);
1048 item
= string_list_append(cb_data
, refname
);
1049 item
->util
= xstrdup(symref_target
);
1053 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
1055 if (!strcmp("uploadpack.allowtipsha1inwant", var
)) {
1056 if (git_config_bool(var
, value
))
1057 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1059 allow_unadvertised_object_request
&= ~ALLOW_TIP_SHA1
;
1060 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var
)) {
1061 if (git_config_bool(var
, value
))
1062 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1064 allow_unadvertised_object_request
&= ~ALLOW_REACHABLE_SHA1
;
1065 } else if (!strcmp("uploadpack.allowanysha1inwant", var
)) {
1066 if (git_config_bool(var
, value
))
1067 allow_unadvertised_object_request
|= ALLOW_ANY_SHA1
;
1069 allow_unadvertised_object_request
&= ~ALLOW_ANY_SHA1
;
1070 } else if (!strcmp("uploadpack.keepalive", var
)) {
1071 keepalive
= git_config_int(var
, value
);
1074 } else if (current_config_scope() != CONFIG_SCOPE_REPO
) {
1075 if (!strcmp("uploadpack.packobjectshook", var
))
1076 return git_config_string(&pack_objects_hook
, var
, value
);
1077 } else if (!strcmp("uploadpack.allowfilter", var
)) {
1078 allow_filter
= git_config_bool(var
, value
);
1079 } else if (!strcmp("uploadpack.allowrefinwant", var
)) {
1080 allow_ref_in_want
= git_config_bool(var
, value
);
1082 return parse_hide_refs_config(var
, value
, "uploadpack");
1085 void upload_pack(struct upload_pack_options
*options
)
1087 struct string_list symref
= STRING_LIST_INIT_DUP
;
1089 stateless_rpc
= options
->stateless_rpc
;
1090 timeout
= options
->timeout
;
1091 daemon_mode
= options
->daemon_mode
;
1093 git_config(upload_pack_config
, NULL
);
1095 head_ref_namespaced(find_symref
, &symref
);
1097 if (options
->advertise_refs
|| !stateless_rpc
) {
1099 head_ref_namespaced(send_ref
, &symref
);
1100 for_each_namespaced_ref(send_ref
, &symref
);
1101 advertise_shallow_grafts(1);
1104 head_ref_namespaced(check_ref
, NULL
);
1105 for_each_namespaced_ref(check_ref
, NULL
);
1107 string_list_clear(&symref
, 1);
1108 if (options
->advertise_refs
)
1113 get_common_commits();
1118 struct upload_pack_data
{
1119 struct object_array wants
;
1120 struct string_list wanted_refs
;
1121 struct oid_array haves
;
1123 struct object_array shallows
;
1124 struct string_list deepen_not
;
1126 timestamp_t deepen_since
;
1127 int deepen_rev_list
;
1128 int deepen_relative
;
1130 unsigned stateless_rpc
: 1;
1132 unsigned use_thin_pack
: 1;
1133 unsigned use_ofs_delta
: 1;
1134 unsigned no_progress
: 1;
1135 unsigned use_include_tag
: 1;
1139 static void upload_pack_data_init(struct upload_pack_data
*data
)
1141 struct object_array wants
= OBJECT_ARRAY_INIT
;
1142 struct string_list wanted_refs
= STRING_LIST_INIT_DUP
;
1143 struct oid_array haves
= OID_ARRAY_INIT
;
1144 struct object_array shallows
= OBJECT_ARRAY_INIT
;
1145 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
1147 memset(data
, 0, sizeof(*data
));
1148 data
->wants
= wants
;
1149 data
->wanted_refs
= wanted_refs
;
1150 data
->haves
= haves
;
1151 data
->shallows
= shallows
;
1152 data
->deepen_not
= deepen_not
;
1155 static void upload_pack_data_clear(struct upload_pack_data
*data
)
1157 object_array_clear(&data
->wants
);
1158 string_list_clear(&data
->wanted_refs
, 1);
1159 oid_array_clear(&data
->haves
);
1160 object_array_clear(&data
->shallows
);
1161 string_list_clear(&data
->deepen_not
, 0);
1164 static int parse_want(const char *line
)
1167 if (skip_prefix(line
, "want ", &arg
)) {
1168 struct object_id oid
;
1171 if (get_oid_hex(arg
, &oid
))
1172 die("git upload-pack: protocol error, "
1173 "expected to get oid, not '%s'", line
);
1175 o
= parse_object(&oid
);
1178 "ERR upload-pack: not our ref %s",
1180 die("git upload-pack: not our ref %s",
1184 if (!(o
->flags
& WANTED
)) {
1186 add_object_array(o
, NULL
, &want_obj
);
1195 static int parse_want_ref(const char *line
, struct string_list
*wanted_refs
)
1198 if (skip_prefix(line
, "want-ref ", &arg
)) {
1199 struct object_id oid
;
1200 struct string_list_item
*item
;
1203 if (read_ref(arg
, &oid
)) {
1204 packet_write_fmt(1, "ERR unknown ref %s", arg
);
1205 die("unknown ref %s", arg
);
1208 item
= string_list_append(wanted_refs
, arg
);
1209 item
->util
= oiddup(&oid
);
1211 o
= parse_object_or_die(&oid
, arg
);
1212 if (!(o
->flags
& WANTED
)) {
1214 add_object_array(o
, NULL
, &want_obj
);
1223 static int parse_have(const char *line
, struct oid_array
*haves
)
1226 if (skip_prefix(line
, "have ", &arg
)) {
1227 struct object_id oid
;
1229 if (get_oid_hex(arg
, &oid
))
1230 die("git upload-pack: expected SHA1 object, got '%s'", arg
);
1231 oid_array_append(haves
, &oid
);
1238 static void process_args(struct packet_reader
*request
,
1239 struct upload_pack_data
*data
)
1241 while (packet_reader_read(request
) != PACKET_READ_FLUSH
) {
1242 const char *arg
= request
->line
;
1246 if (parse_want(arg
))
1248 if (allow_ref_in_want
&& parse_want_ref(arg
, &data
->wanted_refs
))
1250 /* process have line */
1251 if (parse_have(arg
, &data
->haves
))
1254 /* process args like thin-pack */
1255 if (!strcmp(arg
, "thin-pack")) {
1259 if (!strcmp(arg
, "ofs-delta")) {
1263 if (!strcmp(arg
, "no-progress")) {
1267 if (!strcmp(arg
, "include-tag")) {
1268 use_include_tag
= 1;
1271 if (!strcmp(arg
, "done")) {
1276 /* Shallow related arguments */
1277 if (process_shallow(arg
, &data
->shallows
))
1279 if (process_deepen(arg
, &data
->depth
))
1281 if (process_deepen_since(arg
, &data
->deepen_since
,
1282 &data
->deepen_rev_list
))
1284 if (process_deepen_not(arg
, &data
->deepen_not
,
1285 &data
->deepen_rev_list
))
1287 if (!strcmp(arg
, "deepen-relative")) {
1288 data
->deepen_relative
= 1;
1292 if (allow_filter
&& skip_prefix(arg
, "filter ", &p
)) {
1293 parse_list_objects_filter(&filter_options
, p
);
1297 /* ignore unknown lines maybe? */
1298 die("unexpected line: '%s'", arg
);
1302 static int process_haves(struct oid_array
*haves
, struct oid_array
*common
)
1307 for (i
= 0; i
< haves
->nr
; i
++) {
1308 const struct object_id
*oid
= &haves
->oid
[i
];
1310 int we_knew_they_have
= 0;
1312 if (!has_object_file(oid
))
1315 oid_array_append(common
, oid
);
1317 o
= parse_object(oid
);
1319 die("oops (%s)", oid_to_hex(oid
));
1320 if (o
->type
== OBJ_COMMIT
) {
1321 struct commit_list
*parents
;
1322 struct commit
*commit
= (struct commit
*)o
;
1323 if (o
->flags
& THEY_HAVE
)
1324 we_knew_they_have
= 1;
1326 o
->flags
|= THEY_HAVE
;
1327 if (!oldest_have
|| (commit
->date
< oldest_have
))
1328 oldest_have
= commit
->date
;
1329 for (parents
= commit
->parents
;
1331 parents
= parents
->next
)
1332 parents
->item
->object
.flags
|= THEY_HAVE
;
1334 if (!we_knew_they_have
)
1335 add_object_array(o
, NULL
, &have_obj
);
1341 static int send_acks(struct oid_array
*acks
, struct strbuf
*response
)
1345 packet_buf_write(response
, "acknowledgments\n");
1349 packet_buf_write(response
, "NAK\n");
1351 for (i
= 0; i
< acks
->nr
; i
++) {
1352 packet_buf_write(response
, "ACK %s\n",
1353 oid_to_hex(&acks
->oid
[i
]));
1356 if (ok_to_give_up()) {
1358 packet_buf_write(response
, "ready\n");
1365 static int process_haves_and_send_acks(struct upload_pack_data
*data
)
1367 struct oid_array common
= OID_ARRAY_INIT
;
1368 struct strbuf response
= STRBUF_INIT
;
1371 process_haves(&data
->haves
, &common
);
1374 } else if (send_acks(&common
, &response
)) {
1375 packet_buf_delim(&response
);
1379 packet_buf_flush(&response
);
1384 write_or_die(1, response
.buf
, response
.len
);
1385 strbuf_release(&response
);
1387 oid_array_clear(&data
->haves
);
1388 oid_array_clear(&common
);
1392 static void send_wanted_ref_info(struct upload_pack_data
*data
)
1394 const struct string_list_item
*item
;
1396 if (!data
->wanted_refs
.nr
)
1399 packet_write_fmt(1, "wanted-refs\n");
1401 for_each_string_list_item(item
, &data
->wanted_refs
) {
1402 packet_write_fmt(1, "%s %s\n",
1403 oid_to_hex(item
->util
),
1410 static void send_shallow_info(struct upload_pack_data
*data
)
1412 /* No shallow info needs to be sent */
1413 if (!data
->depth
&& !data
->deepen_rev_list
&& !data
->shallows
.nr
&&
1414 !is_repository_shallow())
1417 packet_write_fmt(1, "shallow-info\n");
1419 if (!send_shallow_list(data
->depth
, data
->deepen_rev_list
,
1420 data
->deepen_since
, &data
->deepen_not
,
1421 &data
->shallows
) && is_repository_shallow())
1422 deepen(INFINITE_DEPTH
, data
->deepen_relative
, &data
->shallows
);
1428 FETCH_PROCESS_ARGS
= 0,
1434 int upload_pack_v2(struct repository
*r
, struct argv_array
*keys
,
1435 struct packet_reader
*request
)
1437 enum fetch_state state
= FETCH_PROCESS_ARGS
;
1438 struct upload_pack_data data
;
1440 git_config(upload_pack_config
, NULL
);
1442 upload_pack_data_init(&data
);
1443 use_sideband
= LARGE_PACKET_MAX
;
1445 while (state
!= FETCH_DONE
) {
1447 case FETCH_PROCESS_ARGS
:
1448 process_args(request
, &data
);
1452 * Request didn't contain any 'want' lines,
1453 * guess they didn't want anything.
1456 } else if (data
.haves
.nr
) {
1458 * Request had 'have' lines, so lets ACK them.
1460 state
= FETCH_SEND_ACKS
;
1463 * Request had 'want's but no 'have's so we can
1464 * immedietly go to construct and send a pack.
1466 state
= FETCH_SEND_PACK
;
1469 case FETCH_SEND_ACKS
:
1470 if (process_haves_and_send_acks(&data
))
1471 state
= FETCH_SEND_PACK
;
1475 case FETCH_SEND_PACK
:
1476 send_wanted_ref_info(&data
);
1477 send_shallow_info(&data
);
1479 packet_write_fmt(1, "packfile\n");
1488 upload_pack_data_clear(&data
);
1492 int upload_pack_advertise(struct repository
*r
,
1493 struct strbuf
*value
)
1496 int allow_filter_value
;
1497 int allow_ref_in_want
;
1499 strbuf_addstr(value
, "shallow");
1501 if (!repo_config_get_bool(the_repository
,
1502 "uploadpack.allowfilter",
1503 &allow_filter_value
) &&
1505 strbuf_addstr(value
, " filter");
1507 if (!repo_config_get_bool(the_repository
,
1508 "uploadpack.allowrefinwant",
1509 &allow_ref_in_want
) &&
1511 strbuf_addstr(value
, " ref-in-want");