2 #include "repository.h"
12 #include "fetch-pack.h"
14 #include "run-command.h"
16 #include "transport.h"
18 #include "sha1-array.h"
21 #include "object-store.h"
22 #include "connected.h"
23 #include "fetch-negotiator.h"
26 static int transfer_unpack_limit = -1;
27 static int fetch_unpack_limit = -1;
28 static int unpack_limit = 100;
29 static int prefer_ofs_delta = 1;
31 static int deepen_since_ok;
32 static int deepen_not_ok;
33 static int fetch_fsck_objects = -1;
34 static int transfer_fsck_objects = -1;
35 static int agent_supported;
36 static int server_supports_filtering;
37 static struct lock_file shallow_lock;
38 static const char *alternate_shallow_file;
39 static char *negotiation_algorithm;
40 static struct strbuf fsck_msg_types = STRBUF_INIT;
42 /* Remember to update object flag allocation in object.h */
43 #define COMPLETE (1U << 0)
44 #define ALTERNATE (1U << 1)
47 * After sending this many "have"s if we do not get any new ACK , we
48 * give up traversing our history.
50 #define MAX_IN_VAIN 256
52 static int multi_ack, use_sideband;
53 /* Allow specifying sha1 if it is a ref tip. */
54 #define ALLOW_TIP_SHA1 01
55 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
56 #define ALLOW_REACHABLE_SHA1 02
57 static unsigned int allow_unadvertised_object_request;
59 __attribute__((format (printf, 2, 3)))
60 static inline void print_verbose(const struct fetch_pack_args *args,
68 va_start(params, fmt);
69 vfprintf(stderr, fmt, params);
74 struct alternate_object_cache {
75 struct object **items;
79 static void cache_one_alternate(const struct object_id *oid,
82 struct alternate_object_cache *cache = vcache;
83 struct object *obj = parse_object(the_repository, oid);
85 if (!obj || (obj->flags & ALTERNATE))
88 obj->flags |= ALTERNATE;
89 ALLOC_GROW(cache->items, cache->nr + 1, cache->alloc);
90 cache->items[cache->nr++] = obj;
93 static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
94 void (*cb)(struct fetch_negotiator *,
97 static int initialized;
98 static struct alternate_object_cache cache;
102 for_each_alternate_ref(cache_one_alternate, &cache);
106 for (i = 0; i < cache.nr; i++)
107 cb(negotiator, cache.items[i]);
110 static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
112 const struct object_id *oid)
114 struct object *o = deref_tag(the_repository,
115 parse_object(the_repository, oid),
118 if (o && o->type == OBJ_COMMIT)
119 negotiator->add_tip(negotiator, (struct commit *)o);
124 static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid,
125 int flag, void *cb_data)
127 return rev_list_insert_ref(cb_data, refname, oid);
138 static void consume_shallow_list(struct fetch_pack_args *args, int fd)
140 if (args->stateless_rpc && args->deepen) {
141 /* If we sent a depth we will get back "duplicate"
142 * shallow and unshallow commands every time there
143 * is a block of have lines exchanged.
146 while ((line = packet_read_line(fd, NULL))) {
147 if (starts_with(line, "shallow "))
149 if (starts_with(line, "unshallow "))
151 die(_("git fetch-pack: expected shallow list"));
156 static enum ack_type get_ack(int fd, struct object_id *result_oid)
159 char *line = packet_read_line(fd, &len);
163 die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
164 if (!strcmp(line, "NAK"))
166 if (skip_prefix(line, "ACK ", &arg)) {
167 if (!get_oid_hex(arg, result_oid)) {
172 if (strstr(arg, "continue"))
174 if (strstr(arg, "common"))
176 if (strstr(arg, "ready"))
181 if (skip_prefix(line, "ERR ", &arg))
182 die(_("remote error: %s"), arg);
183 die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
186 static void send_request(struct fetch_pack_args *args,
187 int fd, struct strbuf *buf)
189 if (args->stateless_rpc) {
190 send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
193 write_or_die(fd, buf->buf, buf->len);
196 static void insert_one_alternate_object(struct fetch_negotiator *negotiator,
199 rev_list_insert_ref(negotiator, NULL, &obj->oid);
202 #define INITIAL_FLUSH 16
203 #define PIPESAFE_FLUSH 32
204 #define LARGE_FLUSH 16384
206 static int next_flush(int stateless_rpc, int count)
209 if (count < LARGE_FLUSH)
212 count = count * 11 / 10;
214 if (count < PIPESAFE_FLUSH)
217 count += PIPESAFE_FLUSH;
222 static void mark_tips(struct fetch_negotiator *negotiator,
223 const struct oid_array *negotiation_tips)
227 if (!negotiation_tips) {
228 for_each_ref(rev_list_insert_ref_oid, negotiator);
232 for (i = 0; i < negotiation_tips->nr; i++)
233 rev_list_insert_ref(negotiator, NULL,
234 &negotiation_tips->oid[i]);
238 static int find_common(struct fetch_negotiator *negotiator,
239 struct fetch_pack_args *args,
240 int fd[2], struct object_id *result_oid,
244 int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval;
245 const struct object_id *oid;
246 unsigned in_vain = 0;
247 int got_continue = 0;
249 struct strbuf req_buf = STRBUF_INIT;
250 size_t state_len = 0;
252 if (args->stateless_rpc && multi_ack == 1)
253 die(_("--stateless-rpc requires multi_ack_detailed"));
255 if (!args->no_dependents) {
256 mark_tips(negotiator, args->negotiation_tips);
257 for_each_cached_alternate(negotiator, insert_one_alternate_object);
261 for ( ; refs ; refs = refs->next) {
262 struct object_id *remote = &refs->old_oid;
263 const char *remote_hex;
267 * If that object is complete (i.e. it is an ancestor of a
268 * local ref), we tell them we have it but do not have to
269 * tell them about its ancestors, which they already know
272 * We use lookup_object here because we are only
273 * interested in the case we *know* the object is
274 * reachable and we have already scanned it.
276 * Do this only if args->no_dependents is false (if it is true,
277 * we cannot trust the object flags).
279 if (!args->no_dependents &&
280 ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
281 (o->flags & COMPLETE)) {
285 remote_hex = oid_to_hex(remote);
287 struct strbuf c = STRBUF_INIT;
288 if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed");
289 if (multi_ack == 1) strbuf_addstr(&c, " multi_ack");
290 if (no_done) strbuf_addstr(&c, " no-done");
291 if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k");
292 if (use_sideband == 1) strbuf_addstr(&c, " side-band");
293 if (args->deepen_relative) strbuf_addstr(&c, " deepen-relative");
294 if (args->use_thin_pack) strbuf_addstr(&c, " thin-pack");
295 if (args->no_progress) strbuf_addstr(&c, " no-progress");
296 if (args->include_tag) strbuf_addstr(&c, " include-tag");
297 if (prefer_ofs_delta) strbuf_addstr(&c, " ofs-delta");
298 if (deepen_since_ok) strbuf_addstr(&c, " deepen-since");
299 if (deepen_not_ok) strbuf_addstr(&c, " deepen-not");
300 if (agent_supported) strbuf_addf(&c, " agent=%s",
301 git_user_agent_sanitized());
302 if (args->filter_options.choice)
303 strbuf_addstr(&c, " filter");
304 packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf);
307 packet_buf_write(&req_buf, "want %s\n", remote_hex);
312 strbuf_release(&req_buf);
317 if (is_repository_shallow(the_repository))
318 write_shallow_commits(&req_buf, 1, NULL);
320 packet_buf_write(&req_buf, "deepen %d", args->depth);
321 if (args->deepen_since) {
322 timestamp_t max_age = approxidate(args->deepen_since);
323 packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age);
325 if (args->deepen_not) {
327 for (i = 0; i < args->deepen_not->nr; i++) {
328 struct string_list_item *s = args->deepen_not->items + i;
329 packet_buf_write(&req_buf, "deepen-not %s", s->string);
332 if (server_supports_filtering && args->filter_options.choice)
333 packet_buf_write(&req_buf, "filter %s",
334 args->filter_options.filter_spec);
335 packet_buf_flush(&req_buf);
336 state_len = req_buf.len;
341 struct object_id oid;
343 send_request(args, fd[1], &req_buf);
344 while ((line = packet_read_line(fd[0], NULL))) {
345 if (skip_prefix(line, "shallow ", &arg)) {
346 if (get_oid_hex(arg, &oid))
347 die(_("invalid shallow line: %s"), line);
348 register_shallow(the_repository, &oid);
351 if (skip_prefix(line, "unshallow ", &arg)) {
352 if (get_oid_hex(arg, &oid))
353 die(_("invalid unshallow line: %s"), line);
354 if (!lookup_object(the_repository, oid.hash))
355 die(_("object not found: %s"), line);
356 /* make sure that it is parsed as shallow */
357 if (!parse_object(the_repository, &oid))
358 die(_("error in object: %s"), line);
359 if (unregister_shallow(&oid))
360 die(_("no shallow found: %s"), line);
363 die(_("expected shallow/unshallow, got %s"), line);
365 } else if (!args->stateless_rpc)
366 send_request(args, fd[1], &req_buf);
368 if (!args->stateless_rpc) {
369 /* If we aren't using the stateless-rpc interface
370 * we don't need to retain the headers.
372 strbuf_setlen(&req_buf, 0);
378 if (args->no_dependents)
380 while ((oid = negotiator->next(negotiator))) {
381 packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid));
382 print_verbose(args, "have %s", oid_to_hex(oid));
384 if (flush_at <= ++count) {
387 packet_buf_flush(&req_buf);
388 send_request(args, fd[1], &req_buf);
389 strbuf_setlen(&req_buf, state_len);
391 flush_at = next_flush(args->stateless_rpc, count);
394 * We keep one window "ahead" of the other side, and
395 * will wait for an ACK only on the next one
397 if (!args->stateless_rpc && count == INITIAL_FLUSH)
400 consume_shallow_list(args, fd[0]);
402 ack = get_ack(fd[0], result_oid);
404 print_verbose(args, _("got %s %d %s"), "ack",
405 ack, oid_to_hex(result_oid));
415 struct commit *commit =
416 lookup_commit(the_repository,
421 die(_("invalid commit %s"), oid_to_hex(result_oid));
422 was_common = negotiator->ack(negotiator, commit);
423 if (args->stateless_rpc
426 /* We need to replay the have for this object
427 * on the next RPC request so the peer knows
428 * it is in common with us.
430 const char *hex = oid_to_hex(result_oid);
431 packet_buf_write(&req_buf, "have %s\n", hex);
432 state_len = req_buf.len;
434 * Reset in_vain because an ack
435 * for this commit has not been
439 } else if (!args->stateless_rpc
440 || ack != ACK_common)
444 if (ack == ACK_ready)
451 if (got_continue && MAX_IN_VAIN < in_vain) {
452 print_verbose(args, _("giving up"));
460 if (!got_ready || !no_done) {
461 packet_buf_write(&req_buf, "done\n");
462 send_request(args, fd[1], &req_buf);
464 print_verbose(args, _("done"));
469 strbuf_release(&req_buf);
471 if (!got_ready || !no_done)
472 consume_shallow_list(args, fd[0]);
473 while (flushes || multi_ack) {
474 int ack = get_ack(fd[0], result_oid);
476 print_verbose(args, _("got %s (%d) %s"), "ack",
477 ack, oid_to_hex(result_oid));
485 /* it is no error to fetch into a completely empty repo */
486 return count ? retval : 0;
489 static struct commit_list *complete;
491 static int mark_complete(const struct object_id *oid)
493 struct object *o = parse_object(the_repository, oid);
495 while (o && o->type == OBJ_TAG) {
496 struct tag *t = (struct tag *) o;
498 break; /* broken repository */
499 o->flags |= COMPLETE;
500 o = parse_object(the_repository, &t->tagged->oid);
502 if (o && o->type == OBJ_COMMIT) {
503 struct commit *commit = (struct commit *)o;
504 if (!(commit->object.flags & COMPLETE)) {
505 commit->object.flags |= COMPLETE;
506 commit_list_insert(commit, &complete);
512 static int mark_complete_oid(const char *refname, const struct object_id *oid,
513 int flag, void *cb_data)
515 return mark_complete(oid);
518 static void mark_recent_complete_commits(struct fetch_pack_args *args,
521 while (complete && cutoff <= complete->item->date) {
522 print_verbose(args, _("Marking %s as complete"),
523 oid_to_hex(&complete->item->object.oid));
524 pop_most_recent_commit(&complete, COMPLETE);
528 static void add_refs_to_oidset(struct oidset *oids, struct ref *refs)
530 for (; refs; refs = refs->next)
531 oidset_insert(oids, &refs->old_oid);
534 static int is_unmatched_ref(const struct ref *ref)
536 struct object_id oid;
538 return ref->match_status == REF_NOT_MATCHED &&
539 !parse_oid_hex(ref->name, &oid, &p) &&
541 oideq(&oid, &ref->old_oid);
544 static void filter_refs(struct fetch_pack_args *args,
546 struct ref **sought, int nr_sought)
548 struct ref *newlist = NULL;
549 struct ref **newtail = &newlist;
550 struct ref *unmatched = NULL;
551 struct ref *ref, *next;
552 struct oidset tip_oids = OIDSET_INIT;
554 int strict = !(allow_unadvertised_object_request &
555 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
558 for (ref = *refs; ref; ref = next) {
562 if (starts_with(ref->name, "refs/") &&
563 check_refname_format(ref->name, 0))
566 while (i < nr_sought) {
567 int cmp = strcmp(ref->name, sought[i]->name);
569 break; /* definitely do not have it */
571 keep = 1; /* definitely have it */
572 sought[i]->match_status = REF_MATCHED;
577 if (!keep && args->fetch_all &&
578 (!args->deepen || !starts_with(ref->name, "refs/tags/")))
585 newtail = &ref->next;
587 ref->next = unmatched;
593 for (i = 0; i < nr_sought; i++) {
595 if (!is_unmatched_ref(ref))
598 add_refs_to_oidset(&tip_oids, unmatched);
599 add_refs_to_oidset(&tip_oids, newlist);
604 /* Append unmatched requests to the list */
605 for (i = 0; i < nr_sought; i++) {
607 if (!is_unmatched_ref(ref))
610 if (!strict || oidset_contains(&tip_oids, &ref->old_oid)) {
611 ref->match_status = REF_MATCHED;
612 *newtail = copy_ref(ref);
613 newtail = &(*newtail)->next;
615 ref->match_status = REF_UNADVERTISED_NOT_ALLOWED;
619 oidset_clear(&tip_oids);
620 for (ref = unmatched; ref; ref = next) {
628 static void mark_alternate_complete(struct fetch_negotiator *unused,
631 mark_complete(&obj->oid);
634 struct loose_object_iter {
635 struct oidset *loose_object_set;
640 * Mark recent commits available locally and reachable from a local ref as
641 * COMPLETE. If args->no_dependents is false, also mark COMPLETE remote refs as
642 * COMMON_REF (otherwise, we are not planning to participate in negotiation, and
643 * thus do not need COMMON_REF marks).
645 * The cutoff time for recency is determined by this heuristic: it is the
646 * earliest commit time of the objects in refs that are commits and that we know
647 * the commit time of.
649 static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
650 struct fetch_pack_args *args,
654 int old_save_commit_buffer = save_commit_buffer;
655 timestamp_t cutoff = 0;
657 save_commit_buffer = 0;
659 for (ref = *refs; ref; ref = ref->next) {
662 if (!has_object_file_with_flags(&ref->old_oid,
665 o = parse_object(the_repository, &ref->old_oid);
669 /* We already have it -- which may mean that we were
670 * in sync with the other side at some time after
671 * that (it is OK if we guess wrong here).
673 if (o->type == OBJ_COMMIT) {
674 struct commit *commit = (struct commit *)o;
675 if (!cutoff || cutoff < commit->date)
676 cutoff = commit->date;
681 for_each_ref(mark_complete_oid, NULL);
682 for_each_cached_alternate(NULL, mark_alternate_complete);
683 commit_list_sort_by_date(&complete);
685 mark_recent_complete_commits(args, cutoff);
689 * Mark all complete remote refs as common refs.
690 * Don't mark them common yet; the server has to be told so first.
692 for (ref = *refs; ref; ref = ref->next) {
693 struct object *o = deref_tag(the_repository,
694 lookup_object(the_repository,
698 if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
701 negotiator->known_common(negotiator,
705 save_commit_buffer = old_save_commit_buffer;
709 * Returns 1 if every object pointed to by the given remote refs is available
710 * locally and reachable from a local ref, and 0 otherwise.
712 static int everything_local(struct fetch_pack_args *args,
718 for (retval = 1, ref = *refs; ref ; ref = ref->next) {
719 const struct object_id *remote = &ref->old_oid;
722 o = lookup_object(the_repository, remote->hash);
723 if (!o || !(o->flags & COMPLETE)) {
725 print_verbose(args, "want %s (%s)", oid_to_hex(remote),
729 print_verbose(args, _("already have %s (%s)"), oid_to_hex(remote),
736 static int sideband_demux(int in, int out, void *data)
741 ret = recv_sideband("fetch-pack", xd[0], out);
746 static int get_pack(struct fetch_pack_args *args,
747 int xd[2], char **pack_lockfile)
750 int do_keep = args->keep_pack;
751 const char *cmd_name;
752 struct pack_header header;
754 struct child_process cmd = CHILD_PROCESS_INIT;
757 memset(&demux, 0, sizeof(demux));
759 /* xd[] is talking with upload-pack; subprocess reads from
760 * xd[0], spits out band#2 to stderr, and feeds us band#1
761 * through demux->out.
763 demux.proc = sideband_demux;
766 demux.isolate_sigpipe = 1;
767 if (start_async(&demux))
768 die(_("fetch-pack: unable to fork off sideband demultiplexer"));
773 if (!args->keep_pack && unpack_limit) {
775 if (read_pack_header(demux.out, &header))
776 die(_("protocol error: bad pack header"));
778 if (ntohl(header.hdr_entries) < unpack_limit)
784 if (alternate_shallow_file) {
785 argv_array_push(&cmd.args, "--shallow-file");
786 argv_array_push(&cmd.args, alternate_shallow_file);
789 if (do_keep || args->from_promisor) {
792 cmd_name = "index-pack";
793 argv_array_push(&cmd.args, cmd_name);
794 argv_array_push(&cmd.args, "--stdin");
795 if (!args->quiet && !args->no_progress)
796 argv_array_push(&cmd.args, "-v");
797 if (args->use_thin_pack)
798 argv_array_push(&cmd.args, "--fix-thin");
799 if (do_keep && (args->lock_pack || unpack_limit)) {
800 char hostname[HOST_NAME_MAX + 1];
801 if (xgethostname(hostname, sizeof(hostname)))
802 xsnprintf(hostname, sizeof(hostname), "localhost");
803 argv_array_pushf(&cmd.args,
804 "--keep=fetch-pack %"PRIuMAX " on %s",
805 (uintmax_t)getpid(), hostname);
807 if (args->check_self_contained_and_connected)
808 argv_array_push(&cmd.args, "--check-self-contained-and-connected");
809 if (args->from_promisor)
810 argv_array_push(&cmd.args, "--promisor");
813 cmd_name = "unpack-objects";
814 argv_array_push(&cmd.args, cmd_name);
815 if (args->quiet || args->no_progress)
816 argv_array_push(&cmd.args, "-q");
817 args->check_self_contained_and_connected = 0;
821 argv_array_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32,
822 ntohl(header.hdr_version),
823 ntohl(header.hdr_entries));
824 if (fetch_fsck_objects >= 0
826 : transfer_fsck_objects >= 0
827 ? transfer_fsck_objects
829 if (args->from_promisor)
831 * We cannot use --strict in index-pack because it
832 * checks both broken objects and links, but we only
833 * want to check for broken objects.
835 argv_array_push(&cmd.args, "--fsck-objects");
837 argv_array_pushf(&cmd.args, "--strict%s",
843 if (start_command(&cmd))
844 die(_("fetch-pack: unable to fork off %s"), cmd_name);
845 if (do_keep && pack_lockfile) {
846 *pack_lockfile = index_pack_lockfile(cmd.out);
851 /* Closed by start_command() */
854 ret = finish_command(&cmd);
855 if (!ret || (args->check_self_contained_and_connected && ret == 1))
856 args->self_contained_and_connected =
857 args->check_self_contained_and_connected &&
860 die(_("%s failed"), cmd_name);
861 if (use_sideband && finish_async(&demux))
862 die(_("error in sideband demultiplexer"));
866 static int cmp_ref_by_name(const void *a_, const void *b_)
868 const struct ref *a = *((const struct ref **)a_);
869 const struct ref *b = *((const struct ref **)b_);
870 return strcmp(a->name, b->name);
873 static struct ref *do_fetch_pack(struct fetch_pack_args *args,
875 const struct ref *orig_ref,
876 struct ref **sought, int nr_sought,
877 struct shallow_info *si,
878 char **pack_lockfile)
880 struct ref *ref = copy_ref_list(orig_ref);
881 struct object_id oid;
882 const char *agent_feature;
884 struct fetch_negotiator negotiator;
885 fetch_negotiator_init(&negotiator, negotiation_algorithm);
887 sort_ref_list(&ref, ref_compare_name);
888 QSORT(sought, nr_sought, cmp_ref_by_name);
890 if ((args->depth > 0 || is_repository_shallow(the_repository)) && !server_supports("shallow"))
891 die(_("Server does not support shallow clients"));
892 if (args->depth > 0 || args->deepen_since || args->deepen_not)
894 if (server_supports("multi_ack_detailed")) {
895 print_verbose(args, _("Server supports multi_ack_detailed"));
897 if (server_supports("no-done")) {
898 print_verbose(args, _("Server supports no-done"));
899 if (args->stateless_rpc)
903 else if (server_supports("multi_ack")) {
904 print_verbose(args, _("Server supports multi_ack"));
907 if (server_supports("side-band-64k")) {
908 print_verbose(args, _("Server supports side-band-64k"));
911 else if (server_supports("side-band")) {
912 print_verbose(args, _("Server supports side-band"));
915 if (server_supports("allow-tip-sha1-in-want")) {
916 print_verbose(args, _("Server supports allow-tip-sha1-in-want"));
917 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
919 if (server_supports("allow-reachable-sha1-in-want")) {
920 print_verbose(args, _("Server supports allow-reachable-sha1-in-want"));
921 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
923 if (!server_supports("thin-pack"))
924 args->use_thin_pack = 0;
925 if (!server_supports("no-progress"))
926 args->no_progress = 0;
927 if (!server_supports("include-tag"))
928 args->include_tag = 0;
929 if (server_supports("ofs-delta"))
930 print_verbose(args, _("Server supports ofs-delta"));
932 prefer_ofs_delta = 0;
934 if (server_supports("filter")) {
935 server_supports_filtering = 1;
936 print_verbose(args, _("Server supports filter"));
937 } else if (args->filter_options.choice) {
938 warning("filtering not recognized by server, ignoring");
941 if ((agent_feature = server_feature_value("agent", &agent_len))) {
944 print_verbose(args, _("Server version is %.*s"),
945 agent_len, agent_feature);
947 if (server_supports("deepen-since"))
949 else if (args->deepen_since)
950 die(_("Server does not support --shallow-since"));
951 if (server_supports("deepen-not"))
953 else if (args->deepen_not)
954 die(_("Server does not support --shallow-exclude"));
955 if (!server_supports("deepen-relative") && args->deepen_relative)
956 die(_("Server does not support --deepen"));
958 if (!args->no_dependents) {
959 mark_complete_and_common_ref(&negotiator, args, &ref);
960 filter_refs(args, &ref, sought, nr_sought);
961 if (everything_local(args, &ref)) {
966 filter_refs(args, &ref, sought, nr_sought);
968 if (find_common(&negotiator, args, fd, &oid, ref) < 0)
969 if (!args->keep_pack)
970 /* When cloning, it is not unusual to have
973 warning(_("no common commits"));
975 if (args->stateless_rpc)
978 setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
980 else if (si->nr_ours || si->nr_theirs)
981 alternate_shallow_file = setup_temporary_shallow(si->shallow);
983 alternate_shallow_file = NULL;
984 if (get_pack(args, fd, pack_lockfile))
985 die(_("git fetch-pack: fetch failed."));
988 negotiator.release(&negotiator);
992 static void add_shallow_requests(struct strbuf *req_buf,
993 const struct fetch_pack_args *args)
995 if (is_repository_shallow(the_repository))
996 write_shallow_commits(req_buf, 1, NULL);
998 packet_buf_write(req_buf, "deepen %d", args->depth);
999 if (args->deepen_since) {
1000 timestamp_t max_age = approxidate(args->deepen_since);
1001 packet_buf_write(req_buf, "deepen-since %"PRItime, max_age);
1003 if (args->deepen_not) {
1005 for (i = 0; i < args->deepen_not->nr; i++) {
1006 struct string_list_item *s = args->deepen_not->items + i;
1007 packet_buf_write(req_buf, "deepen-not %s", s->string);
1010 if (args->deepen_relative)
1011 packet_buf_write(req_buf, "deepen-relative\n");
1014 static void add_wants(int no_dependents, const struct ref *wants, struct strbuf *req_buf)
1016 int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0);
1018 for ( ; wants ; wants = wants->next) {
1019 const struct object_id *remote = &wants->old_oid;
1023 * If that object is complete (i.e. it is an ancestor of a
1024 * local ref), we tell them we have it but do not have to
1025 * tell them about its ancestors, which they already know
1028 * We use lookup_object here because we are only
1029 * interested in the case we *know* the object is
1030 * reachable and we have already scanned it.
1032 * Do this only if args->no_dependents is false (if it is true,
1033 * we cannot trust the object flags).
1035 if (!no_dependents &&
1036 ((o = lookup_object(the_repository, remote->hash)) != NULL) &&
1037 (o->flags & COMPLETE)) {
1041 if (!use_ref_in_want || wants->exact_oid)
1042 packet_buf_write(req_buf, "want %s\n", oid_to_hex(remote));
1044 packet_buf_write(req_buf, "want-ref %s\n", wants->name);
1048 static void add_common(struct strbuf *req_buf, struct oidset *common)
1050 struct oidset_iter iter;
1051 const struct object_id *oid;
1052 oidset_iter_init(common, &iter);
1054 while ((oid = oidset_iter_next(&iter))) {
1055 packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
1059 static int add_haves(struct fetch_negotiator *negotiator,
1060 struct strbuf *req_buf,
1061 int *haves_to_send, int *in_vain)
1064 int haves_added = 0;
1065 const struct object_id *oid;
1067 while ((oid = negotiator->next(negotiator))) {
1068 packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
1069 if (++haves_added >= *haves_to_send)
1073 *in_vain += haves_added;
1074 if (!haves_added || *in_vain >= MAX_IN_VAIN) {
1076 packet_buf_write(req_buf, "done\n");
1080 /* Increase haves to send on next round */
1081 *haves_to_send = next_flush(1, *haves_to_send);
1086 static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
1087 const struct fetch_pack_args *args,
1088 const struct ref *wants, struct oidset *common,
1089 int *haves_to_send, int *in_vain)
1092 struct strbuf req_buf = STRBUF_INIT;
1094 if (server_supports_v2("fetch", 1))
1095 packet_buf_write(&req_buf, "command=fetch");
1096 if (server_supports_v2("agent", 0))
1097 packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized());
1098 if (args->server_options && args->server_options->nr &&
1099 server_supports_v2("server-option", 1)) {
1101 for (i = 0; i < args->server_options->nr; i++)
1102 packet_write_fmt(fd_out, "server-option=%s",
1103 args->server_options->items[i].string);
1106 packet_buf_delim(&req_buf);
1107 if (args->use_thin_pack)
1108 packet_buf_write(&req_buf, "thin-pack");
1109 if (args->no_progress)
1110 packet_buf_write(&req_buf, "no-progress");
1111 if (args->include_tag)
1112 packet_buf_write(&req_buf, "include-tag");
1113 if (prefer_ofs_delta)
1114 packet_buf_write(&req_buf, "ofs-delta");
1116 /* Add shallow-info and deepen request */
1117 if (server_supports_feature("fetch", "shallow", 0))
1118 add_shallow_requests(&req_buf, args);
1119 else if (is_repository_shallow(the_repository) || args->deepen)
1120 die(_("Server does not support shallow requests"));
1123 if (server_supports_feature("fetch", "filter", 0) &&
1124 args->filter_options.choice) {
1125 print_verbose(args, _("Server supports filter"));
1126 packet_buf_write(&req_buf, "filter %s",
1127 args->filter_options.filter_spec);
1128 } else if (args->filter_options.choice) {
1129 warning("filtering not recognized by server, ignoring");
1133 add_wants(args->no_dependents, wants, &req_buf);
1135 if (args->no_dependents) {
1136 packet_buf_write(&req_buf, "done");
1139 /* Add all of the common commits we've found in previous rounds */
1140 add_common(&req_buf, common);
1142 /* Add initial haves */
1143 ret = add_haves(negotiator, &req_buf, haves_to_send, in_vain);
1147 packet_buf_flush(&req_buf);
1148 write_or_die(fd_out, req_buf.buf, req_buf.len);
1150 strbuf_release(&req_buf);
1155 * Processes a section header in a server's response and checks if it matches
1156 * `section`. If the value of `peek` is 1, the header line will be peeked (and
1157 * not consumed); if 0, the line will be consumed and the function will die if
1158 * the section header doesn't match what was expected.
1160 static int process_section_header(struct packet_reader *reader,
1161 const char *section, int peek)
1165 if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
1166 die(_("error reading section header '%s'"), section);
1168 ret = !strcmp(reader->line, section);
1172 die(_("expected '%s', received '%s'"),
1173 section, reader->line);
1174 packet_reader_read(reader);
1180 static int process_acks(struct fetch_negotiator *negotiator,
1181 struct packet_reader *reader,
1182 struct oidset *common)
1185 int received_ready = 0;
1186 int received_ack = 0;
1188 process_section_header(reader, "acknowledgments", 0);
1189 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1192 if (!strcmp(reader->line, "NAK"))
1195 if (skip_prefix(reader->line, "ACK ", &arg)) {
1196 struct object_id oid;
1197 if (!get_oid_hex(arg, &oid)) {
1198 struct commit *commit;
1199 oidset_insert(common, &oid);
1200 commit = lookup_commit(the_repository, &oid);
1201 negotiator->ack(negotiator, commit);
1206 if (!strcmp(reader->line, "ready")) {
1211 die(_("unexpected acknowledgment line: '%s'"), reader->line);
1214 if (reader->status != PACKET_READ_FLUSH &&
1215 reader->status != PACKET_READ_DELIM)
1216 die(_("error processing acks: %d"), reader->status);
1219 * If an "acknowledgments" section is sent, a packfile is sent if and
1220 * only if "ready" was sent in this section. The other sections
1221 * ("shallow-info" and "wanted-refs") are sent only if a packfile is
1222 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
1225 if (received_ready && reader->status != PACKET_READ_DELIM)
1226 die(_("expected packfile to be sent after 'ready'"));
1227 if (!received_ready && reader->status != PACKET_READ_FLUSH)
1228 die(_("expected no other sections to be sent after no 'ready'"));
1230 /* return 0 if no common, 1 if there are common, or 2 if ready */
1231 return received_ready ? 2 : (received_ack ? 1 : 0);
1234 static void receive_shallow_info(struct fetch_pack_args *args,
1235 struct packet_reader *reader)
1237 int line_received = 0;
1239 process_section_header(reader, "shallow-info", 0);
1240 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1242 struct object_id oid;
1244 if (skip_prefix(reader->line, "shallow ", &arg)) {
1245 if (get_oid_hex(arg, &oid))
1246 die(_("invalid shallow line: %s"), reader->line);
1247 register_shallow(the_repository, &oid);
1251 if (skip_prefix(reader->line, "unshallow ", &arg)) {
1252 if (get_oid_hex(arg, &oid))
1253 die(_("invalid unshallow line: %s"), reader->line);
1254 if (!lookup_object(the_repository, oid.hash))
1255 die(_("object not found: %s"), reader->line);
1256 /* make sure that it is parsed as shallow */
1257 if (!parse_object(the_repository, &oid))
1258 die(_("error in object: %s"), reader->line);
1259 if (unregister_shallow(&oid))
1260 die(_("no shallow found: %s"), reader->line);
1264 die(_("expected shallow/unshallow, got %s"), reader->line);
1267 if (reader->status != PACKET_READ_FLUSH &&
1268 reader->status != PACKET_READ_DELIM)
1269 die(_("error processing shallow info: %d"), reader->status);
1271 if (line_received) {
1272 setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
1278 static void receive_wanted_refs(struct packet_reader *reader,
1279 struct ref **sought, int nr_sought)
1281 process_section_header(reader, "wanted-refs", 0);
1282 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1283 struct object_id oid;
1287 if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
1288 die(_("expected wanted-ref, got '%s'"), reader->line);
1290 for (i = 0; i < nr_sought; i++) {
1291 if (!strcmp(end, sought[i]->name)) {
1292 oidcpy(&sought[i]->old_oid, &oid);
1298 die(_("unexpected wanted-ref: '%s'"), reader->line);
1301 if (reader->status != PACKET_READ_DELIM)
1302 die(_("error processing wanted refs: %d"), reader->status);
1306 FETCH_CHECK_LOCAL = 0,
1313 static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
1315 const struct ref *orig_ref,
1316 struct ref **sought, int nr_sought,
1317 char **pack_lockfile)
1319 struct ref *ref = copy_ref_list(orig_ref);
1320 enum fetch_state state = FETCH_CHECK_LOCAL;
1321 struct oidset common = OIDSET_INIT;
1322 struct packet_reader reader;
1324 int haves_to_send = INITIAL_FLUSH;
1325 struct fetch_negotiator negotiator;
1326 fetch_negotiator_init(&negotiator, negotiation_algorithm);
1327 packet_reader_init(&reader, fd[0], NULL, 0,
1328 PACKET_READ_CHOMP_NEWLINE);
1330 while (state != FETCH_DONE) {
1332 case FETCH_CHECK_LOCAL:
1333 sort_ref_list(&ref, ref_compare_name);
1334 QSORT(sought, nr_sought, cmp_ref_by_name);
1336 /* v2 supports these by default */
1337 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1339 if (args->depth > 0 || args->deepen_since || args->deepen_not)
1342 /* Filter 'ref' by 'sought' and those that aren't local */
1343 if (!args->no_dependents) {
1344 mark_complete_and_common_ref(&negotiator, args, &ref);
1345 filter_refs(args, &ref, sought, nr_sought);
1346 if (everything_local(args, &ref))
1349 state = FETCH_SEND_REQUEST;
1351 mark_tips(&negotiator, args->negotiation_tips);
1352 for_each_cached_alternate(&negotiator,
1353 insert_one_alternate_object);
1355 filter_refs(args, &ref, sought, nr_sought);
1356 state = FETCH_SEND_REQUEST;
1359 case FETCH_SEND_REQUEST:
1360 if (send_fetch_request(&negotiator, fd[1], args, ref,
1362 &haves_to_send, &in_vain))
1363 state = FETCH_GET_PACK;
1365 state = FETCH_PROCESS_ACKS;
1367 case FETCH_PROCESS_ACKS:
1368 /* Process ACKs/NAKs */
1369 switch (process_acks(&negotiator, &reader, &common)) {
1371 state = FETCH_GET_PACK;
1377 state = FETCH_SEND_REQUEST;
1381 case FETCH_GET_PACK:
1382 /* Check for shallow-info section */
1383 if (process_section_header(&reader, "shallow-info", 1))
1384 receive_shallow_info(args, &reader);
1386 if (process_section_header(&reader, "wanted-refs", 1))
1387 receive_wanted_refs(&reader, sought, nr_sought);
1390 process_section_header(&reader, "packfile", 0);
1391 if (get_pack(args, fd, pack_lockfile))
1392 die(_("git fetch-pack: fetch failed."));
1401 negotiator.release(&negotiator);
1402 oidset_clear(&common);
1406 static int fetch_pack_config_cb(const char *var, const char *value, void *cb)
1408 if (strcmp(var, "fetch.fsck.skiplist") == 0) {
1411 if (git_config_pathname(&path, var, value))
1413 strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
1414 fsck_msg_types.len ? ',' : '=', path);
1419 if (skip_prefix(var, "fetch.fsck.", &var)) {
1420 if (is_valid_msg_type(var, value))
1421 strbuf_addf(&fsck_msg_types, "%c%s=%s",
1422 fsck_msg_types.len ? ',' : '=', var, value);
1424 warning("Skipping unknown msg id '%s'", var);
1428 return git_default_config(var, value, cb);
1431 static void fetch_pack_config(void)
1433 git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit);
1434 git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit);
1435 git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
1436 git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
1437 git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
1438 git_config_get_string("fetch.negotiationalgorithm",
1439 &negotiation_algorithm);
1441 git_config(fetch_pack_config_cb, NULL);
1444 static void fetch_pack_setup(void)
1446 static int did_setup;
1449 fetch_pack_config();
1450 if (0 <= transfer_unpack_limit)
1451 unpack_limit = transfer_unpack_limit;
1452 else if (0 <= fetch_unpack_limit)
1453 unpack_limit = fetch_unpack_limit;
1457 static int remove_duplicates_in_refs(struct ref **ref, int nr)
1459 struct string_list names = STRING_LIST_INIT_NODUP;
1462 for (src = dst = 0; src < nr; src++) {
1463 struct string_list_item *item;
1464 item = string_list_insert(&names, ref[src]->name);
1466 continue; /* already have it */
1467 item->util = ref[src];
1469 ref[dst] = ref[src];
1472 for (src = dst; src < nr; src++)
1474 string_list_clear(&names, 0);
1478 static void update_shallow(struct fetch_pack_args *args,
1479 struct ref **sought, int nr_sought,
1480 struct shallow_info *si)
1482 struct oid_array ref = OID_ARRAY_INIT;
1486 if (args->deepen && alternate_shallow_file) {
1487 if (*alternate_shallow_file == '\0') { /* --unshallow */
1488 unlink_or_warn(git_path_shallow(the_repository));
1489 rollback_lock_file(&shallow_lock);
1491 commit_lock_file(&shallow_lock);
1495 if (!si->shallow || !si->shallow->nr)
1498 if (args->cloning) {
1500 * remote is shallow, but this is a clone, there are
1501 * no objects in repo to worry about. Accept any
1502 * shallow points that exist in the pack (iow in repo
1503 * after get_pack() and reprepare_packed_git())
1505 struct oid_array extra = OID_ARRAY_INIT;
1506 struct object_id *oid = si->shallow->oid;
1507 for (i = 0; i < si->shallow->nr; i++)
1508 if (has_object_file(&oid[i]))
1509 oid_array_append(&extra, &oid[i]);
1511 setup_alternate_shallow(&shallow_lock,
1512 &alternate_shallow_file,
1514 commit_lock_file(&shallow_lock);
1516 oid_array_clear(&extra);
1520 if (!si->nr_ours && !si->nr_theirs)
1523 remove_nonexistent_theirs_shallow(si);
1524 if (!si->nr_ours && !si->nr_theirs)
1526 for (i = 0; i < nr_sought; i++)
1527 oid_array_append(&ref, &sought[i]->old_oid);
1530 if (args->update_shallow) {
1532 * remote is also shallow, .git/shallow may be updated
1533 * so all refs can be accepted. Make sure we only add
1534 * shallow roots that are actually reachable from new
1537 struct oid_array extra = OID_ARRAY_INIT;
1538 struct object_id *oid = si->shallow->oid;
1539 assign_shallow_commits_to_refs(si, NULL, NULL);
1540 if (!si->nr_ours && !si->nr_theirs) {
1541 oid_array_clear(&ref);
1544 for (i = 0; i < si->nr_ours; i++)
1545 oid_array_append(&extra, &oid[si->ours[i]]);
1546 for (i = 0; i < si->nr_theirs; i++)
1547 oid_array_append(&extra, &oid[si->theirs[i]]);
1548 setup_alternate_shallow(&shallow_lock,
1549 &alternate_shallow_file,
1551 commit_lock_file(&shallow_lock);
1552 oid_array_clear(&extra);
1553 oid_array_clear(&ref);
1558 * remote is also shallow, check what ref is safe to update
1559 * without updating .git/shallow
1561 status = xcalloc(nr_sought, sizeof(*status));
1562 assign_shallow_commits_to_refs(si, NULL, status);
1563 if (si->nr_ours || si->nr_theirs) {
1564 for (i = 0; i < nr_sought; i++)
1566 sought[i]->status = REF_STATUS_REJECT_SHALLOW;
1569 oid_array_clear(&ref);
1572 static int iterate_ref_map(void *cb_data, struct object_id *oid)
1574 struct ref **rm = cb_data;
1575 struct ref *ref = *rm;
1578 return -1; /* end of the list */
1580 oidcpy(oid, &ref->old_oid);
1584 struct ref *fetch_pack(struct fetch_pack_args *args,
1585 int fd[], struct child_process *conn,
1586 const struct ref *ref,
1588 struct ref **sought, int nr_sought,
1589 struct oid_array *shallow,
1590 char **pack_lockfile,
1591 enum protocol_version version)
1593 struct ref *ref_cpy;
1594 struct shallow_info si;
1598 nr_sought = remove_duplicates_in_refs(sought, nr_sought);
1600 if (args->no_dependents && !args->filter_options.choice) {
1602 * The protocol does not support requesting that only the
1603 * wanted objects be sent, so approximate this by setting a
1604 * "blob:none" filter if no filter is already set. This works
1605 * for all object types: note that wanted blobs will still be
1606 * sent because they are directly specified as a "want".
1608 * NEEDSWORK: Add an option in the protocol to request that
1609 * only the wanted objects be sent, and implement it.
1611 parse_list_objects_filter(&args->filter_options, "blob:none");
1614 if (version != protocol_v2 && !ref) {
1615 packet_flush(fd[1]);
1616 die(_("no matching remote head"));
1618 prepare_shallow_info(&si, shallow);
1619 if (version == protocol_v2)
1620 ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought,
1623 ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
1624 &si, pack_lockfile);
1625 reprepare_packed_git(the_repository);
1627 if (!args->cloning && args->deepen) {
1628 struct check_connected_options opt = CHECK_CONNECTED_INIT;
1629 struct ref *iterator = ref_cpy;
1630 opt.shallow_file = alternate_shallow_file;
1632 opt.is_deepening_fetch = 1;
1633 if (check_connected(iterate_ref_map, &iterator, &opt)) {
1634 error(_("remote did not send all necessary objects"));
1637 rollback_lock_file(&shallow_lock);
1640 args->connectivity_checked = 1;
1643 update_shallow(args, sought, nr_sought, &si);
1645 clear_shallow_info(&si);
1649 int report_unmatched_refs(struct ref **sought, int nr_sought)
1653 for (i = 0; i < nr_sought; i++) {
1656 switch (sought[i]->match_status) {
1659 case REF_NOT_MATCHED:
1660 error(_("no such remote ref %s"), sought[i]->name);
1662 case REF_UNADVERTISED_NOT_ALLOWED:
1663 error(_("Server does not allow request for unadvertised object %s"),