6 #include "repository.h"
7 #include "object-store.h"
13 #include "list-objects.h"
14 #include "list-objects-filter.h"
15 #include "list-objects-filter-options.h"
16 #include "run-command.h"
20 #include "string-list.h"
21 #include "argv-array.h"
22 #include "prio-queue.h"
25 #include "upload-pack.h"
27 #include "commit-reach.h"
29 /* Remember to update object flag allocation in object.h */
30 #define THEY_HAVE (1u << 11)
31 #define OUR_REF (1u << 12)
32 #define WANTED (1u << 13)
33 #define COMMON_KNOWN (1u << 14)
35 #define SHALLOW (1u << 16)
36 #define NOT_SHALLOW (1u << 17)
37 #define CLIENT_SHALLOW (1u << 18)
38 #define HIDDEN_REF (1u << 19)
40 static timestamp_t oldest_have
;
42 static int deepen_relative
;
45 static int use_thin_pack
, use_ofs_delta
, use_include_tag
;
46 static int no_progress
, daemon_mode
;
47 /* Allow specifying sha1 if it is a ref tip. */
48 #define ALLOW_TIP_SHA1 01
49 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
50 #define ALLOW_REACHABLE_SHA1 02
51 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
52 #define ALLOW_ANY_SHA1 07
53 static unsigned int allow_unadvertised_object_request
;
54 static int shallow_nr
;
55 static struct object_array have_obj
;
56 static struct object_array want_obj
;
57 static struct object_array extra_edge_obj
;
58 static unsigned int timeout
;
59 static int keepalive
= 5;
61 * otherwise maximum packet size (up to 65520 bytes).
63 static int use_sideband
;
64 static int stateless_rpc
;
65 static const char *pack_objects_hook
;
67 static int filter_capability_requested
;
68 static int allow_filter
;
69 static int allow_ref_in_want
;
70 static struct list_objects_filter_options filter_options
;
72 static void reset_timeout(void)
77 static void send_client_data(int fd
, const char *data
, ssize_t sz
)
80 send_sideband(1, fd
, data
, sz
, use_sideband
);
87 /* XXX: are we happy to lose stuff here? */
91 write_or_die(fd
, data
, sz
);
94 static int write_one_shallow(const struct commit_graft
*graft
, void *cb_data
)
97 if (graft
->nr_parent
== -1)
98 fprintf(fp
, "--shallow %s\n", oid_to_hex(&graft
->oid
));
102 static void create_pack_file(void)
104 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
105 char data
[8193], progress
[128];
106 char abort_msg
[] = "aborting due to possible repository "
107 "corruption on the remote side.";
113 if (!pack_objects_hook
)
114 pack_objects
.git_cmd
= 1;
116 argv_array_push(&pack_objects
.args
, pack_objects_hook
);
117 argv_array_push(&pack_objects
.args
, "git");
118 pack_objects
.use_shell
= 1;
122 argv_array_push(&pack_objects
.args
, "--shallow-file");
123 argv_array_push(&pack_objects
.args
, "");
125 argv_array_push(&pack_objects
.args
, "pack-objects");
126 argv_array_push(&pack_objects
.args
, "--revs");
128 argv_array_push(&pack_objects
.args
, "--thin");
130 argv_array_push(&pack_objects
.args
, "--stdout");
132 argv_array_push(&pack_objects
.args
, "--shallow");
134 argv_array_push(&pack_objects
.args
, "--progress");
136 argv_array_push(&pack_objects
.args
, "--delta-base-offset");
138 argv_array_push(&pack_objects
.args
, "--include-tag");
139 if (filter_options
.filter_spec
) {
140 if (pack_objects
.use_shell
) {
141 struct strbuf buf
= STRBUF_INIT
;
142 sq_quote_buf(&buf
, filter_options
.filter_spec
);
143 argv_array_pushf(&pack_objects
.args
, "--filter=%s", buf
.buf
);
144 strbuf_release(&buf
);
146 argv_array_pushf(&pack_objects
.args
, "--filter=%s",
147 filter_options
.filter_spec
);
151 pack_objects
.in
= -1;
152 pack_objects
.out
= -1;
153 pack_objects
.err
= -1;
155 if (start_command(&pack_objects
))
156 die("git upload-pack: unable to fork git-pack-objects");
158 pipe_fd
= xfdopen(pack_objects
.in
, "w");
161 for_each_commit_graft(write_one_shallow
, pipe_fd
);
163 for (i
= 0; i
< want_obj
.nr
; i
++)
164 fprintf(pipe_fd
, "%s\n",
165 oid_to_hex(&want_obj
.objects
[i
].item
->oid
));
166 fprintf(pipe_fd
, "--not\n");
167 for (i
= 0; i
< have_obj
.nr
; i
++)
168 fprintf(pipe_fd
, "%s\n",
169 oid_to_hex(&have_obj
.objects
[i
].item
->oid
));
170 for (i
= 0; i
< extra_edge_obj
.nr
; i
++)
171 fprintf(pipe_fd
, "%s\n",
172 oid_to_hex(&extra_edge_obj
.objects
[i
].item
->oid
));
173 fprintf(pipe_fd
, "\n");
177 /* We read from pack_objects.err to capture stderr output for
178 * progress bar, and pack_objects.out to capture the pack data.
182 struct pollfd pfd
[2];
183 int pe
, pu
, pollsize
;
191 if (0 <= pack_objects
.out
) {
192 pfd
[pollsize
].fd
= pack_objects
.out
;
193 pfd
[pollsize
].events
= POLLIN
;
197 if (0 <= pack_objects
.err
) {
198 pfd
[pollsize
].fd
= pack_objects
.err
;
199 pfd
[pollsize
].events
= POLLIN
;
207 ret
= poll(pfd
, pollsize
,
208 keepalive
< 0 ? -1 : 1000 * keepalive
);
211 if (errno
!= EINTR
) {
212 error_errno("poll failed, resuming");
217 if (0 <= pe
&& (pfd
[pe
].revents
& (POLLIN
|POLLHUP
))) {
218 /* Status ready; we ship that in the side-band
219 * or dump to the standard error.
221 sz
= xread(pack_objects
.err
, progress
,
224 send_client_data(2, progress
, sz
);
226 close(pack_objects
.err
);
227 pack_objects
.err
= -1;
231 /* give priority to status messages */
234 if (0 <= pu
&& (pfd
[pu
].revents
& (POLLIN
|POLLHUP
))) {
235 /* Data ready; we keep the last byte to ourselves
236 * in case we detect broken rev-list, so that we
237 * can leave the stream corrupted. This is
238 * unfortunate -- unpack-objects would happily
239 * accept a valid packdata with trailing garbage,
240 * so appending garbage after we pass all the
241 * pack data is not good enough to signal
242 * breakage to downstream.
250 sz
= xread(pack_objects
.out
, cp
,
251 sizeof(data
) - outsz
);
255 close(pack_objects
.out
);
256 pack_objects
.out
= -1;
262 buffered
= data
[sz
-1] & 0xFF;
267 send_client_data(1, data
, sz
);
271 * We hit the keepalive timeout without saying anything; send
272 * an empty message on the data sideband just to let the other
273 * side know we're still working on it, but don't have any data
276 * If we don't have a sideband channel, there's no room in the
277 * protocol to say anything, so those clients are just out of
280 if (!ret
&& use_sideband
) {
281 static const char buf
[] = "0005\1";
282 write_or_die(1, buf
, 5);
286 if (finish_command(&pack_objects
)) {
287 error("git upload-pack: git-pack-objects died with error.");
294 send_client_data(1, data
, 1);
295 fprintf(stderr
, "flushed.\n");
302 send_client_data(3, abort_msg
, sizeof(abort_msg
));
303 die("git upload-pack: %s", abort_msg
);
306 static int got_oid(const char *hex
, struct object_id
*oid
)
309 int we_knew_they_have
= 0;
311 if (get_oid_hex(hex
, oid
))
312 die("git upload-pack: expected SHA1 object, got '%s'", hex
);
313 if (!has_object_file(oid
))
316 o
= parse_object(the_repository
, oid
);
318 die("oops (%s)", oid_to_hex(oid
));
319 if (o
->type
== OBJ_COMMIT
) {
320 struct commit_list
*parents
;
321 struct commit
*commit
= (struct commit
*)o
;
322 if (o
->flags
& THEY_HAVE
)
323 we_knew_they_have
= 1;
325 o
->flags
|= THEY_HAVE
;
326 if (!oldest_have
|| (commit
->date
< oldest_have
))
327 oldest_have
= commit
->date
;
328 for (parents
= commit
->parents
;
330 parents
= parents
->next
)
331 parents
->item
->object
.flags
|= THEY_HAVE
;
333 if (!we_knew_they_have
) {
334 add_object_array(o
, NULL
, &have_obj
);
340 static int ok_to_give_up(void)
342 uint32_t min_generation
= GENERATION_NUMBER_ZERO
;
347 return can_all_from_reach_with_flag(&want_obj
, THEY_HAVE
,
348 COMMON_KNOWN
, oldest_have
,
352 static int get_common_commits(void)
354 struct object_id oid
;
355 char last_hex
[GIT_MAX_HEXSZ
+ 1];
360 save_commit_buffer
= 0;
363 char *line
= packet_read_line(0, NULL
);
369 if (multi_ack
== 2 && got_common
370 && !got_other
&& ok_to_give_up()) {
372 packet_write_fmt(1, "ACK %s ready\n", last_hex
);
374 if (have_obj
.nr
== 0 || multi_ack
)
375 packet_write_fmt(1, "NAK\n");
377 if (no_done
&& sent_ready
) {
378 packet_write_fmt(1, "ACK %s\n", last_hex
);
387 if (skip_prefix(line
, "have ", &arg
)) {
388 switch (got_oid(arg
, &oid
)) {
389 case -1: /* they have what we do not */
391 if (multi_ack
&& ok_to_give_up()) {
392 const char *hex
= oid_to_hex(&oid
);
393 if (multi_ack
== 2) {
395 packet_write_fmt(1, "ACK %s ready\n", hex
);
397 packet_write_fmt(1, "ACK %s continue\n", hex
);
402 oid_to_hex_r(last_hex
, &oid
);
404 packet_write_fmt(1, "ACK %s common\n", last_hex
);
406 packet_write_fmt(1, "ACK %s continue\n", last_hex
);
407 else if (have_obj
.nr
== 1)
408 packet_write_fmt(1, "ACK %s\n", last_hex
);
413 if (!strcmp(line
, "done")) {
414 if (have_obj
.nr
> 0) {
416 packet_write_fmt(1, "ACK %s\n", last_hex
);
419 packet_write_fmt(1, "NAK\n");
422 die("git upload-pack: expected SHA1 list, got '%s'", line
);
426 static int is_our_ref(struct object
*o
)
428 int allow_hidden_ref
= (allow_unadvertised_object_request
&
429 (ALLOW_TIP_SHA1
| ALLOW_REACHABLE_SHA1
));
430 return o
->flags
& ((allow_hidden_ref
? HIDDEN_REF
: 0) | OUR_REF
);
434 * on successful case, it's up to the caller to close cmd->out
436 static int do_reachable_revlist(struct child_process
*cmd
,
437 struct object_array
*src
,
438 struct object_array
*reachable
)
440 static const char *argv
[] = {
441 "rev-list", "--stdin", NULL
,
444 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
446 const unsigned hexsz
= the_hash_algo
->hexsz
;
455 * If the next rev-list --stdin encounters an unknown commit,
456 * it terminates, which will cause SIGPIPE in the write loop
459 sigchain_push(SIGPIPE
, SIG_IGN
);
461 if (start_command(cmd
))
465 namebuf
[hexsz
+ 1] = '\n';
466 for (i
= get_max_object_index(); 0 < i
; ) {
467 o
= get_indexed_object(--i
);
470 if (reachable
&& o
->type
== OBJ_COMMIT
)
471 o
->flags
&= ~TMP_MARK
;
474 memcpy(namebuf
+ 1, oid_to_hex(&o
->oid
), hexsz
);
475 if (write_in_full(cmd
->in
, namebuf
, hexsz
+ 2) < 0)
478 namebuf
[hexsz
] = '\n';
479 for (i
= 0; i
< src
->nr
; i
++) {
480 o
= src
->objects
[i
].item
;
483 add_object_array(o
, NULL
, reachable
);
486 if (reachable
&& o
->type
== OBJ_COMMIT
)
487 o
->flags
|= TMP_MARK
;
488 memcpy(namebuf
, oid_to_hex(&o
->oid
), hexsz
);
489 if (write_in_full(cmd
->in
, namebuf
, hexsz
+ 1) < 0)
494 sigchain_pop(SIGPIPE
);
499 sigchain_pop(SIGPIPE
);
508 static int get_reachable_list(struct object_array
*src
,
509 struct object_array
*reachable
)
511 struct child_process cmd
= CHILD_PROCESS_INIT
;
514 char namebuf
[GIT_MAX_HEXSZ
+ 2]; /* ^ + hash + LF */
515 const unsigned hexsz
= the_hash_algo
->hexsz
;
517 if (do_reachable_revlist(&cmd
, src
, reachable
) < 0)
520 while ((i
= read_in_full(cmd
.out
, namebuf
, hexsz
+ 1)) == hexsz
+ 1) {
521 struct object_id sha1
;
524 if (parse_oid_hex(namebuf
, &sha1
, &p
) || *p
!= '\n')
527 o
= lookup_object(the_repository
, sha1
.hash
);
528 if (o
&& o
->type
== OBJ_COMMIT
) {
529 o
->flags
&= ~TMP_MARK
;
532 for (i
= get_max_object_index(); 0 < i
; i
--) {
533 o
= get_indexed_object(i
- 1);
534 if (o
&& o
->type
== OBJ_COMMIT
&&
535 (o
->flags
& TMP_MARK
)) {
536 add_object_array(o
, NULL
, reachable
);
537 o
->flags
&= ~TMP_MARK
;
542 if (finish_command(&cmd
))
548 static int has_unreachable(struct object_array
*src
)
550 struct child_process cmd
= CHILD_PROCESS_INIT
;
554 if (do_reachable_revlist(&cmd
, src
, NULL
) < 0)
558 * The commits out of the rev-list are not ancestors of
561 i
= read_in_full(cmd
.out
, buf
, 1);
568 * rev-list may have died by encountering a bad commit
569 * in the history, in which case we do want to bail out
570 * even when it showed no commit.
572 if (finish_command(&cmd
))
575 /* All the non-tip ones are ancestors of what we advertised */
579 sigchain_pop(SIGPIPE
);
585 static void check_non_tip(void)
590 * In the normal in-process case without
591 * uploadpack.allowReachableSHA1InWant,
592 * non-tip requests can never happen.
594 if (!stateless_rpc
&& !(allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
))
596 if (!has_unreachable(&want_obj
))
597 /* All the non-tip ones are ancestors of what we advertised */
601 /* Pick one of them (we know there at least is one) */
602 for (i
= 0; i
< want_obj
.nr
; i
++) {
603 struct object
*o
= want_obj
.objects
[i
].item
;
605 die("git upload-pack: not our ref %s",
606 oid_to_hex(&o
->oid
));
610 static void send_shallow(struct commit_list
*result
)
613 struct object
*object
= &result
->item
->object
;
614 if (!(object
->flags
& (CLIENT_SHALLOW
|NOT_SHALLOW
))) {
615 packet_write_fmt(1, "shallow %s",
616 oid_to_hex(&object
->oid
));
617 register_shallow(the_repository
, &object
->oid
);
620 result
= result
->next
;
624 static void send_unshallow(const struct object_array
*shallows
)
628 for (i
= 0; i
< shallows
->nr
; i
++) {
629 struct object
*object
= shallows
->objects
[i
].item
;
630 if (object
->flags
& NOT_SHALLOW
) {
631 struct commit_list
*parents
;
632 packet_write_fmt(1, "unshallow %s",
633 oid_to_hex(&object
->oid
));
634 object
->flags
&= ~CLIENT_SHALLOW
;
636 * We want to _register_ "object" as shallow, but we
637 * also need to traverse object's parents to deepen a
638 * shallow clone. Unregister it for now so we can
639 * parse and add the parents to the want list, then
642 unregister_shallow(&object
->oid
);
644 parse_commit_or_die((struct commit
*)object
);
645 parents
= ((struct commit
*)object
)->parents
;
647 add_object_array(&parents
->item
->object
,
649 parents
= parents
->next
;
651 add_object_array(object
, NULL
, &extra_edge_obj
);
653 /* make sure commit traversal conforms to client */
654 register_shallow(the_repository
, &object
->oid
);
658 static void deepen(int depth
, int deepen_relative
,
659 struct object_array
*shallows
)
661 if (depth
== INFINITE_DEPTH
&& !is_repository_shallow(the_repository
)) {
664 for (i
= 0; i
< shallows
->nr
; i
++) {
665 struct object
*object
= shallows
->objects
[i
].item
;
666 object
->flags
|= NOT_SHALLOW
;
668 } else if (deepen_relative
) {
669 struct object_array reachable_shallows
= OBJECT_ARRAY_INIT
;
670 struct commit_list
*result
;
672 get_reachable_list(shallows
, &reachable_shallows
);
673 result
= get_shallow_commits(&reachable_shallows
,
675 SHALLOW
, NOT_SHALLOW
);
676 send_shallow(result
);
677 free_commit_list(result
);
678 object_array_clear(&reachable_shallows
);
680 struct commit_list
*result
;
682 result
= get_shallow_commits(&want_obj
, depth
,
683 SHALLOW
, NOT_SHALLOW
);
684 send_shallow(result
);
685 free_commit_list(result
);
688 send_unshallow(shallows
);
691 static void deepen_by_rev_list(int ac
, const char **av
,
692 struct object_array
*shallows
)
694 struct commit_list
*result
;
696 result
= get_shallow_commits_by_rev_list(ac
, av
, SHALLOW
, NOT_SHALLOW
);
697 send_shallow(result
);
698 free_commit_list(result
);
699 send_unshallow(shallows
);
702 /* Returns 1 if a shallow list is sent or 0 otherwise */
703 static int send_shallow_list(int depth
, int deepen_rev_list
,
704 timestamp_t deepen_since
,
705 struct string_list
*deepen_not
,
706 struct object_array
*shallows
)
710 if (depth
> 0 && deepen_rev_list
)
711 die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
713 deepen(depth
, deepen_relative
, shallows
);
715 } else if (deepen_rev_list
) {
716 struct argv_array av
= ARGV_ARRAY_INIT
;
719 argv_array_push(&av
, "rev-list");
721 argv_array_pushf(&av
, "--max-age=%"PRItime
, deepen_since
);
722 if (deepen_not
->nr
) {
723 argv_array_push(&av
, "--not");
724 for (i
= 0; i
< deepen_not
->nr
; i
++) {
725 struct string_list_item
*s
= deepen_not
->items
+ i
;
726 argv_array_push(&av
, s
->string
);
728 argv_array_push(&av
, "--not");
730 for (i
= 0; i
< want_obj
.nr
; i
++) {
731 struct object
*o
= want_obj
.objects
[i
].item
;
732 argv_array_push(&av
, oid_to_hex(&o
->oid
));
734 deepen_by_rev_list(av
.argc
, av
.argv
, shallows
);
735 argv_array_clear(&av
);
738 if (shallows
->nr
> 0) {
740 for (i
= 0; i
< shallows
->nr
; i
++)
741 register_shallow(the_repository
,
742 &shallows
->objects
[i
].item
->oid
);
746 shallow_nr
+= shallows
->nr
;
750 static int process_shallow(const char *line
, struct object_array
*shallows
)
753 if (skip_prefix(line
, "shallow ", &arg
)) {
754 struct object_id oid
;
755 struct object
*object
;
756 if (get_oid_hex(arg
, &oid
))
757 die("invalid shallow line: %s", line
);
758 object
= parse_object(the_repository
, &oid
);
761 if (object
->type
!= OBJ_COMMIT
)
762 die("invalid shallow object %s", oid_to_hex(&oid
));
763 if (!(object
->flags
& CLIENT_SHALLOW
)) {
764 object
->flags
|= CLIENT_SHALLOW
;
765 add_object_array(object
, NULL
, shallows
);
773 static int process_deepen(const char *line
, int *depth
)
776 if (skip_prefix(line
, "deepen ", &arg
)) {
778 *depth
= (int)strtol(arg
, &end
, 0);
779 if (!end
|| *end
|| *depth
<= 0)
780 die("Invalid deepen: %s", line
);
787 static int process_deepen_since(const char *line
, timestamp_t
*deepen_since
, int *deepen_rev_list
)
790 if (skip_prefix(line
, "deepen-since ", &arg
)) {
792 *deepen_since
= parse_timestamp(arg
, &end
, 0);
793 if (!end
|| *end
|| !deepen_since
||
794 /* revisions.c's max_age -1 is special */
796 die("Invalid deepen-since: %s", line
);
797 *deepen_rev_list
= 1;
803 static int process_deepen_not(const char *line
, struct string_list
*deepen_not
, int *deepen_rev_list
)
806 if (skip_prefix(line
, "deepen-not ", &arg
)) {
808 struct object_id oid
;
809 if (expand_ref(arg
, strlen(arg
), &oid
, &ref
) != 1)
810 die("git upload-pack: ambiguous deepen-not: %s", line
);
811 string_list_append(deepen_not
, ref
);
813 *deepen_rev_list
= 1;
819 static void receive_needs(void)
821 struct object_array shallows
= OBJECT_ARRAY_INIT
;
822 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
825 timestamp_t deepen_since
= 0;
826 int deepen_rev_list
= 0;
831 const char *features
;
832 struct object_id oid_buf
;
833 char *line
= packet_read_line(0, NULL
);
840 if (process_shallow(line
, &shallows
))
842 if (process_deepen(line
, &depth
))
844 if (process_deepen_since(line
, &deepen_since
, &deepen_rev_list
))
846 if (process_deepen_not(line
, &deepen_not
, &deepen_rev_list
))
849 if (skip_prefix(line
, "filter ", &arg
)) {
850 if (!filter_capability_requested
)
851 die("git upload-pack: filtering capability not negotiated");
852 parse_list_objects_filter(&filter_options
, arg
);
856 if (!skip_prefix(line
, "want ", &arg
) ||
857 parse_oid_hex(arg
, &oid_buf
, &features
))
858 die("git upload-pack: protocol error, "
859 "expected to get object ID, not '%s'", line
);
861 if (parse_feature_request(features
, "deepen-relative"))
863 if (parse_feature_request(features
, "multi_ack_detailed"))
865 else if (parse_feature_request(features
, "multi_ack"))
867 if (parse_feature_request(features
, "no-done"))
869 if (parse_feature_request(features
, "thin-pack"))
871 if (parse_feature_request(features
, "ofs-delta"))
873 if (parse_feature_request(features
, "side-band-64k"))
874 use_sideband
= LARGE_PACKET_MAX
;
875 else if (parse_feature_request(features
, "side-band"))
876 use_sideband
= DEFAULT_PACKET_MAX
;
877 if (parse_feature_request(features
, "no-progress"))
879 if (parse_feature_request(features
, "include-tag"))
881 if (allow_filter
&& parse_feature_request(features
, "filter"))
882 filter_capability_requested
= 1;
884 o
= parse_object(the_repository
, &oid_buf
);
887 "ERR upload-pack: not our ref %s",
888 oid_to_hex(&oid_buf
));
889 die("git upload-pack: not our ref %s",
890 oid_to_hex(&oid_buf
));
892 if (!(o
->flags
& WANTED
)) {
894 if (!((allow_unadvertised_object_request
& ALLOW_ANY_SHA1
) == ALLOW_ANY_SHA1
897 add_object_array(o
, NULL
, &want_obj
);
902 * We have sent all our refs already, and the other end
903 * should have chosen out of them. When we are operating
904 * in the stateless RPC mode, however, their choice may
905 * have been based on the set of older refs advertised
906 * by another process that handled the initial request.
911 if (!use_sideband
&& daemon_mode
)
914 if (depth
== 0 && !deepen_rev_list
&& shallows
.nr
== 0)
917 if (send_shallow_list(depth
, deepen_rev_list
, deepen_since
,
918 &deepen_not
, &shallows
))
920 object_array_clear(&shallows
);
923 /* return non-zero if the ref is hidden, otherwise 0 */
924 static int mark_our_ref(const char *refname
, const char *refname_full
,
925 const struct object_id
*oid
)
927 struct object
*o
= lookup_unknown_object(oid
->hash
);
929 if (ref_is_hidden(refname
, refname_full
)) {
930 o
->flags
|= HIDDEN_REF
;
937 static int check_ref(const char *refname_full
, const struct object_id
*oid
,
938 int flag
, void *cb_data
)
940 const char *refname
= strip_namespace(refname_full
);
942 mark_our_ref(refname
, refname_full
, oid
);
946 static void format_symref_info(struct strbuf
*buf
, struct string_list
*symref
)
948 struct string_list_item
*item
;
952 for_each_string_list_item(item
, symref
)
953 strbuf_addf(buf
, " symref=%s:%s", item
->string
, (char *)item
->util
);
956 static int send_ref(const char *refname
, const struct object_id
*oid
,
957 int flag
, void *cb_data
)
959 static const char *capabilities
= "multi_ack thin-pack side-band"
960 " side-band-64k ofs-delta shallow deepen-since deepen-not"
961 " deepen-relative no-progress include-tag multi_ack_detailed";
962 const char *refname_nons
= strip_namespace(refname
);
963 struct object_id peeled
;
965 if (mark_our_ref(refname_nons
, refname
, oid
))
969 struct strbuf symref_info
= STRBUF_INIT
;
971 format_symref_info(&symref_info
, cb_data
);
972 packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
973 oid_to_hex(oid
), refname_nons
,
975 (allow_unadvertised_object_request
& ALLOW_TIP_SHA1
) ?
976 " allow-tip-sha1-in-want" : "",
977 (allow_unadvertised_object_request
& ALLOW_REACHABLE_SHA1
) ?
978 " allow-reachable-sha1-in-want" : "",
979 stateless_rpc
? " no-done" : "",
981 allow_filter
? " filter" : "",
982 git_user_agent_sanitized());
983 strbuf_release(&symref_info
);
985 packet_write_fmt(1, "%s %s\n", oid_to_hex(oid
), refname_nons
);
988 if (!peel_ref(refname
, &peeled
))
989 packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled
), refname_nons
);
993 static int find_symref(const char *refname
, const struct object_id
*oid
,
994 int flag
, void *cb_data
)
996 const char *symref_target
;
997 struct string_list_item
*item
;
999 if ((flag
& REF_ISSYMREF
) == 0)
1001 symref_target
= resolve_ref_unsafe(refname
, 0, NULL
, &flag
);
1002 if (!symref_target
|| (flag
& REF_ISSYMREF
) == 0)
1003 die("'%s' is a symref but it is not?", refname
);
1004 item
= string_list_append(cb_data
, refname
);
1005 item
->util
= xstrdup(symref_target
);
1009 static int upload_pack_config(const char *var
, const char *value
, void *unused
)
1011 if (!strcmp("uploadpack.allowtipsha1inwant", var
)) {
1012 if (git_config_bool(var
, value
))
1013 allow_unadvertised_object_request
|= ALLOW_TIP_SHA1
;
1015 allow_unadvertised_object_request
&= ~ALLOW_TIP_SHA1
;
1016 } else if (!strcmp("uploadpack.allowreachablesha1inwant", var
)) {
1017 if (git_config_bool(var
, value
))
1018 allow_unadvertised_object_request
|= ALLOW_REACHABLE_SHA1
;
1020 allow_unadvertised_object_request
&= ~ALLOW_REACHABLE_SHA1
;
1021 } else if (!strcmp("uploadpack.allowanysha1inwant", var
)) {
1022 if (git_config_bool(var
, value
))
1023 allow_unadvertised_object_request
|= ALLOW_ANY_SHA1
;
1025 allow_unadvertised_object_request
&= ~ALLOW_ANY_SHA1
;
1026 } else if (!strcmp("uploadpack.keepalive", var
)) {
1027 keepalive
= git_config_int(var
, value
);
1030 } else if (current_config_scope() != CONFIG_SCOPE_REPO
) {
1031 if (!strcmp("uploadpack.packobjectshook", var
))
1032 return git_config_string(&pack_objects_hook
, var
, value
);
1033 } else if (!strcmp("uploadpack.allowfilter", var
)) {
1034 allow_filter
= git_config_bool(var
, value
);
1035 } else if (!strcmp("uploadpack.allowrefinwant", var
)) {
1036 allow_ref_in_want
= git_config_bool(var
, value
);
1038 return parse_hide_refs_config(var
, value
, "uploadpack");
1041 void upload_pack(struct upload_pack_options
*options
)
1043 struct string_list symref
= STRING_LIST_INIT_DUP
;
1045 stateless_rpc
= options
->stateless_rpc
;
1046 timeout
= options
->timeout
;
1047 daemon_mode
= options
->daemon_mode
;
1049 git_config(upload_pack_config
, NULL
);
1051 head_ref_namespaced(find_symref
, &symref
);
1053 if (options
->advertise_refs
|| !stateless_rpc
) {
1055 head_ref_namespaced(send_ref
, &symref
);
1056 for_each_namespaced_ref(send_ref
, &symref
);
1057 advertise_shallow_grafts(1);
1060 head_ref_namespaced(check_ref
, NULL
);
1061 for_each_namespaced_ref(check_ref
, NULL
);
1063 string_list_clear(&symref
, 1);
1064 if (options
->advertise_refs
)
1069 get_common_commits();
1074 struct upload_pack_data
{
1075 struct object_array wants
;
1076 struct string_list wanted_refs
;
1077 struct oid_array haves
;
1079 struct object_array shallows
;
1080 struct string_list deepen_not
;
1082 timestamp_t deepen_since
;
1083 int deepen_rev_list
;
1084 int deepen_relative
;
1086 unsigned stateless_rpc
: 1;
1088 unsigned use_thin_pack
: 1;
1089 unsigned use_ofs_delta
: 1;
1090 unsigned no_progress
: 1;
1091 unsigned use_include_tag
: 1;
1095 static void upload_pack_data_init(struct upload_pack_data
*data
)
1097 struct object_array wants
= OBJECT_ARRAY_INIT
;
1098 struct string_list wanted_refs
= STRING_LIST_INIT_DUP
;
1099 struct oid_array haves
= OID_ARRAY_INIT
;
1100 struct object_array shallows
= OBJECT_ARRAY_INIT
;
1101 struct string_list deepen_not
= STRING_LIST_INIT_DUP
;
1103 memset(data
, 0, sizeof(*data
));
1104 data
->wants
= wants
;
1105 data
->wanted_refs
= wanted_refs
;
1106 data
->haves
= haves
;
1107 data
->shallows
= shallows
;
1108 data
->deepen_not
= deepen_not
;
1111 static void upload_pack_data_clear(struct upload_pack_data
*data
)
1113 object_array_clear(&data
->wants
);
1114 string_list_clear(&data
->wanted_refs
, 1);
1115 oid_array_clear(&data
->haves
);
1116 object_array_clear(&data
->shallows
);
1117 string_list_clear(&data
->deepen_not
, 0);
1120 static int parse_want(const char *line
)
1123 if (skip_prefix(line
, "want ", &arg
)) {
1124 struct object_id oid
;
1127 if (get_oid_hex(arg
, &oid
))
1128 die("git upload-pack: protocol error, "
1129 "expected to get oid, not '%s'", line
);
1131 o
= parse_object(the_repository
, &oid
);
1134 "ERR upload-pack: not our ref %s",
1136 die("git upload-pack: not our ref %s",
1140 if (!(o
->flags
& WANTED
)) {
1142 add_object_array(o
, NULL
, &want_obj
);
1151 static int parse_want_ref(const char *line
, struct string_list
*wanted_refs
)
1154 if (skip_prefix(line
, "want-ref ", &arg
)) {
1155 struct object_id oid
;
1156 struct string_list_item
*item
;
1159 if (read_ref(arg
, &oid
)) {
1160 packet_write_fmt(1, "ERR unknown ref %s", arg
);
1161 die("unknown ref %s", arg
);
1164 item
= string_list_append(wanted_refs
, arg
);
1165 item
->util
= oiddup(&oid
);
1167 o
= parse_object_or_die(&oid
, arg
);
1168 if (!(o
->flags
& WANTED
)) {
1170 add_object_array(o
, NULL
, &want_obj
);
1179 static int parse_have(const char *line
, struct oid_array
*haves
)
1182 if (skip_prefix(line
, "have ", &arg
)) {
1183 struct object_id oid
;
1185 if (get_oid_hex(arg
, &oid
))
1186 die("git upload-pack: expected SHA1 object, got '%s'", arg
);
1187 oid_array_append(haves
, &oid
);
1194 static void process_args(struct packet_reader
*request
,
1195 struct upload_pack_data
*data
)
1197 while (packet_reader_read(request
) != PACKET_READ_FLUSH
) {
1198 const char *arg
= request
->line
;
1202 if (parse_want(arg
))
1204 if (allow_ref_in_want
&& parse_want_ref(arg
, &data
->wanted_refs
))
1206 /* process have line */
1207 if (parse_have(arg
, &data
->haves
))
1210 /* process args like thin-pack */
1211 if (!strcmp(arg
, "thin-pack")) {
1215 if (!strcmp(arg
, "ofs-delta")) {
1219 if (!strcmp(arg
, "no-progress")) {
1223 if (!strcmp(arg
, "include-tag")) {
1224 use_include_tag
= 1;
1227 if (!strcmp(arg
, "done")) {
1232 /* Shallow related arguments */
1233 if (process_shallow(arg
, &data
->shallows
))
1235 if (process_deepen(arg
, &data
->depth
))
1237 if (process_deepen_since(arg
, &data
->deepen_since
,
1238 &data
->deepen_rev_list
))
1240 if (process_deepen_not(arg
, &data
->deepen_not
,
1241 &data
->deepen_rev_list
))
1243 if (!strcmp(arg
, "deepen-relative")) {
1244 data
->deepen_relative
= 1;
1248 if (allow_filter
&& skip_prefix(arg
, "filter ", &p
)) {
1249 parse_list_objects_filter(&filter_options
, p
);
1253 /* ignore unknown lines maybe? */
1254 die("unexpected line: '%s'", arg
);
1258 static int process_haves(struct oid_array
*haves
, struct oid_array
*common
)
1263 for (i
= 0; i
< haves
->nr
; i
++) {
1264 const struct object_id
*oid
= &haves
->oid
[i
];
1266 int we_knew_they_have
= 0;
1268 if (!has_object_file(oid
))
1271 oid_array_append(common
, oid
);
1273 o
= parse_object(the_repository
, oid
);
1275 die("oops (%s)", oid_to_hex(oid
));
1276 if (o
->type
== OBJ_COMMIT
) {
1277 struct commit_list
*parents
;
1278 struct commit
*commit
= (struct commit
*)o
;
1279 if (o
->flags
& THEY_HAVE
)
1280 we_knew_they_have
= 1;
1282 o
->flags
|= THEY_HAVE
;
1283 if (!oldest_have
|| (commit
->date
< oldest_have
))
1284 oldest_have
= commit
->date
;
1285 for (parents
= commit
->parents
;
1287 parents
= parents
->next
)
1288 parents
->item
->object
.flags
|= THEY_HAVE
;
1290 if (!we_knew_they_have
)
1291 add_object_array(o
, NULL
, &have_obj
);
1297 static int send_acks(struct oid_array
*acks
, struct strbuf
*response
)
1301 packet_buf_write(response
, "acknowledgments\n");
1305 packet_buf_write(response
, "NAK\n");
1307 for (i
= 0; i
< acks
->nr
; i
++) {
1308 packet_buf_write(response
, "ACK %s\n",
1309 oid_to_hex(&acks
->oid
[i
]));
1312 if (ok_to_give_up()) {
1314 packet_buf_write(response
, "ready\n");
1321 static int process_haves_and_send_acks(struct upload_pack_data
*data
)
1323 struct oid_array common
= OID_ARRAY_INIT
;
1324 struct strbuf response
= STRBUF_INIT
;
1327 process_haves(&data
->haves
, &common
);
1330 } else if (send_acks(&common
, &response
)) {
1331 packet_buf_delim(&response
);
1335 packet_buf_flush(&response
);
1340 write_or_die(1, response
.buf
, response
.len
);
1341 strbuf_release(&response
);
1343 oid_array_clear(&data
->haves
);
1344 oid_array_clear(&common
);
1348 static void send_wanted_ref_info(struct upload_pack_data
*data
)
1350 const struct string_list_item
*item
;
1352 if (!data
->wanted_refs
.nr
)
1355 packet_write_fmt(1, "wanted-refs\n");
1357 for_each_string_list_item(item
, &data
->wanted_refs
) {
1358 packet_write_fmt(1, "%s %s\n",
1359 oid_to_hex(item
->util
),
1366 static void send_shallow_info(struct upload_pack_data
*data
)
1368 /* No shallow info needs to be sent */
1369 if (!data
->depth
&& !data
->deepen_rev_list
&& !data
->shallows
.nr
&&
1370 !is_repository_shallow(the_repository
))
1373 packet_write_fmt(1, "shallow-info\n");
1375 if (!send_shallow_list(data
->depth
, data
->deepen_rev_list
,
1376 data
->deepen_since
, &data
->deepen_not
,
1378 is_repository_shallow(the_repository
))
1379 deepen(INFINITE_DEPTH
, data
->deepen_relative
, &data
->shallows
);
1385 FETCH_PROCESS_ARGS
= 0,
1391 int upload_pack_v2(struct repository
*r
, struct argv_array
*keys
,
1392 struct packet_reader
*request
)
1394 enum fetch_state state
= FETCH_PROCESS_ARGS
;
1395 struct upload_pack_data data
;
1397 git_config(upload_pack_config
, NULL
);
1399 upload_pack_data_init(&data
);
1400 use_sideband
= LARGE_PACKET_MAX
;
1402 while (state
!= FETCH_DONE
) {
1404 case FETCH_PROCESS_ARGS
:
1405 process_args(request
, &data
);
1409 * Request didn't contain any 'want' lines,
1410 * guess they didn't want anything.
1413 } else if (data
.haves
.nr
) {
1415 * Request had 'have' lines, so lets ACK them.
1417 state
= FETCH_SEND_ACKS
;
1420 * Request had 'want's but no 'have's so we can
1421 * immedietly go to construct and send a pack.
1423 state
= FETCH_SEND_PACK
;
1426 case FETCH_SEND_ACKS
:
1427 if (process_haves_and_send_acks(&data
))
1428 state
= FETCH_SEND_PACK
;
1432 case FETCH_SEND_PACK
:
1433 send_wanted_ref_info(&data
);
1434 send_shallow_info(&data
);
1436 packet_write_fmt(1, "packfile\n");
1445 upload_pack_data_clear(&data
);
1449 int upload_pack_advertise(struct repository
*r
,
1450 struct strbuf
*value
)
1453 int allow_filter_value
;
1454 int allow_ref_in_want
;
1456 strbuf_addstr(value
, "shallow");
1458 if (!repo_config_get_bool(the_repository
,
1459 "uploadpack.allowfilter",
1460 &allow_filter_value
) &&
1462 strbuf_addstr(value
, " filter");
1464 if (!repo_config_get_bool(the_repository
,
1465 "uploadpack.allowrefinwant",
1466 &allow_ref_in_want
) &&
1468 strbuf_addstr(value
, " ref-in-want");