Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1 | #include "cache.h" |
Stefan Beller | a49d283 | 2018-03-23 18:45:21 +0100 | [diff] [blame] | 2 | #include "repository.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Michael Haggerty | 697cc8e | 2014-10-01 12:28:42 +0200 | [diff] [blame] | 4 | #include "lockfile.h" |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 5 | #include "refs.h" |
| 6 | #include "pkt-line.h" |
| 7 | #include "commit.h" |
| 8 | #include "tag.h" |
Stefan Beller | d807c4a | 2018-04-10 14:26:18 -0700 | [diff] [blame] | 9 | #include "exec-cmd.h" |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 10 | #include "pack.h" |
| 11 | #include "sideband.h" |
| 12 | #include "fetch-pack.h" |
| 13 | #include "remote.h" |
| 14 | #include "run-command.h" |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 15 | #include "connect.h" |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 16 | #include "transport.h" |
| 17 | #include "version.h" |
Jeff King | fe299ec | 2020-03-30 10:03:46 -0400 | [diff] [blame] | 18 | #include "oid-array.h" |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 19 | #include "oidset.h" |
Jonathan Tan | 0abe14f | 2017-08-18 15:20:26 -0700 | [diff] [blame] | 20 | #include "packfile.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 21 | #include "object-store.h" |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 22 | #include "connected.h" |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 23 | #include "fetch-negotiator.h" |
Ævar Arnfjörð Bjarmason | 1362df0 | 2018-07-27 14:37:17 +0000 | [diff] [blame] | 24 | #include "fsck.h" |
Taylor Blau | 120ad2b | 2020-04-30 13:48:50 -0600 | [diff] [blame] | 25 | #include "shallow.h" |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 26 | #include "commit-reach.h" |
| 27 | #include "commit-graph.h" |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 28 | |
| 29 | static int transfer_unpack_limit = -1; |
| 30 | static int fetch_unpack_limit = -1; |
| 31 | static int unpack_limit = 100; |
| 32 | static int prefer_ofs_delta = 1; |
| 33 | static int no_done; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 34 | static int deepen_since_ok; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 35 | static int deepen_not_ok; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 36 | static int fetch_fsck_objects = -1; |
| 37 | static int transfer_fsck_objects = -1; |
| 38 | static int agent_supported; |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 39 | static int server_supports_filtering; |
Josh Steadmon | 1e905bb | 2020-11-11 15:29:31 -0800 | [diff] [blame] | 40 | static int advertise_sid; |
Taylor Blau | cac4b8e | 2020-04-30 13:48:57 -0600 | [diff] [blame] | 41 | static struct shallow_lock shallow_lock; |
Nguyễn Thái Ngọc Duy | 6035d6a | 2013-05-26 08:16:15 +0700 | [diff] [blame] | 42 | static const char *alternate_shallow_file; |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 43 | static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES; |
Ævar Arnfjörð Bjarmason | 1362df0 | 2018-07-27 14:37:17 +0000 | [diff] [blame] | 44 | static struct strbuf fsck_msg_types = STRBUF_INIT; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 45 | static struct string_list uri_protocols = STRING_LIST_INIT_DUP; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 46 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 47 | /* Remember to update object flag allocation in object.h */ |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 48 | #define COMPLETE (1U << 0) |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 49 | #define ALTERNATE (1U << 1) |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 50 | #define COMMON (1U << 6) |
| 51 | #define REACH_SCRATCH (1U << 7) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 52 | |
| 53 | /* |
| 54 | * After sending this many "have"s if we do not get any new ACK , we |
| 55 | * give up traversing our history. |
| 56 | */ |
| 57 | #define MAX_IN_VAIN 256 |
| 58 | |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 59 | static int multi_ack, use_sideband; |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 60 | /* Allow specifying sha1 if it is a ref tip. */ |
| 61 | #define ALLOW_TIP_SHA1 01 |
Fredrik Medley | 68ee628 | 2015-05-21 22:23:39 +0200 | [diff] [blame] | 62 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ |
| 63 | #define ALLOW_REACHABLE_SHA1 02 |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 64 | static unsigned int allow_unadvertised_object_request; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 65 | |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 66 | __attribute__((format (printf, 2, 3))) |
| 67 | static inline void print_verbose(const struct fetch_pack_args *args, |
| 68 | const char *fmt, ...) |
| 69 | { |
| 70 | va_list params; |
| 71 | |
| 72 | if (!args->verbose) |
| 73 | return; |
| 74 | |
| 75 | va_start(params, fmt); |
| 76 | vfprintf(stderr, fmt, params); |
| 77 | va_end(params); |
| 78 | fputc('\n', stderr); |
| 79 | } |
| 80 | |
Jeff King | 41a078c | 2017-02-08 15:53:03 -0500 | [diff] [blame] | 81 | struct alternate_object_cache { |
| 82 | struct object **items; |
| 83 | size_t nr, alloc; |
| 84 | }; |
| 85 | |
Jeff King | bdf4276 | 2018-10-08 11:09:23 -0700 | [diff] [blame] | 86 | static void cache_one_alternate(const struct object_id *oid, |
Jeff King | 41a078c | 2017-02-08 15:53:03 -0500 | [diff] [blame] | 87 | void *vcache) |
| 88 | { |
| 89 | struct alternate_object_cache *cache = vcache; |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 90 | struct object *obj = parse_object(the_repository, oid); |
Jeff King | 41a078c | 2017-02-08 15:53:03 -0500 | [diff] [blame] | 91 | |
| 92 | if (!obj || (obj->flags & ALTERNATE)) |
| 93 | return; |
| 94 | |
| 95 | obj->flags |= ALTERNATE; |
| 96 | ALLOC_GROW(cache->items, cache->nr + 1, cache->alloc); |
| 97 | cache->items[cache->nr++] = obj; |
| 98 | } |
| 99 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 100 | static void for_each_cached_alternate(struct fetch_negotiator *negotiator, |
| 101 | void (*cb)(struct fetch_negotiator *, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 102 | struct object *)) |
Jeff King | 41a078c | 2017-02-08 15:53:03 -0500 | [diff] [blame] | 103 | { |
| 104 | static int initialized; |
| 105 | static struct alternate_object_cache cache; |
| 106 | size_t i; |
| 107 | |
| 108 | if (!initialized) { |
| 109 | for_each_alternate_ref(cache_one_alternate, &cache); |
| 110 | initialized = 1; |
| 111 | } |
| 112 | |
| 113 | for (i = 0; i < cache.nr; i++) |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 114 | cb(negotiator, cache.items[i]); |
Jeff King | 41a078c | 2017-02-08 15:53:03 -0500 | [diff] [blame] | 115 | } |
| 116 | |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 117 | static struct commit *deref_without_lazy_fetch(const struct object_id *oid, |
| 118 | int mark_tags_complete) |
| 119 | { |
| 120 | enum object_type type; |
| 121 | struct object_info info = { .typep = &type }; |
| 122 | |
| 123 | while (1) { |
| 124 | if (oid_object_info_extended(the_repository, oid, &info, |
| 125 | OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK)) |
| 126 | return NULL; |
| 127 | if (type == OBJ_TAG) { |
| 128 | struct tag *tag = (struct tag *) |
| 129 | parse_object(the_repository, oid); |
| 130 | |
| 131 | if (!tag->tagged) |
| 132 | return NULL; |
| 133 | if (mark_tags_complete) |
| 134 | tag->object.flags |= COMPLETE; |
| 135 | oid = &tag->tagged->oid; |
| 136 | } else { |
| 137 | break; |
| 138 | } |
| 139 | } |
| 140 | if (type == OBJ_COMMIT) |
| 141 | return (struct commit *) parse_object(the_repository, oid); |
| 142 | return NULL; |
| 143 | } |
| 144 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 145 | static int rev_list_insert_ref(struct fetch_negotiator *negotiator, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 146 | const struct object_id *oid) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 147 | { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 148 | struct commit *c = deref_without_lazy_fetch(oid, 0); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 149 | |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 150 | if (c) |
| 151 | negotiator->add_tip(negotiator, c); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 152 | return 0; |
| 153 | } |
| 154 | |
Michael Haggerty | b1b49c6 | 2015-05-25 18:39:18 +0000 | [diff] [blame] | 155 | static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid, |
| 156 | int flag, void *cb_data) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 157 | { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 158 | return rev_list_insert_ref(cb_data, oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 159 | } |
| 160 | |
| 161 | enum ack_type { |
| 162 | NAK = 0, |
| 163 | ACK, |
| 164 | ACK_continue, |
| 165 | ACK_common, |
| 166 | ACK_ready |
| 167 | }; |
| 168 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 169 | static void consume_shallow_list(struct fetch_pack_args *args, |
| 170 | struct packet_reader *reader) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 171 | { |
Nguyễn Thái Ngọc Duy | 79891cb | 2016-06-12 17:53:56 +0700 | [diff] [blame] | 172 | if (args->stateless_rpc && args->deepen) { |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 173 | /* If we sent a depth we will get back "duplicate" |
| 174 | * shallow and unshallow commands every time there |
| 175 | * is a block of have lines exchanged. |
| 176 | */ |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 177 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
| 178 | if (starts_with(reader->line, "shallow ")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 179 | continue; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 180 | if (starts_with(reader->line, "unshallow ")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 181 | continue; |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 182 | die(_("git fetch-pack: expected shallow list")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 183 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 184 | if (reader->status != PACKET_READ_FLUSH) |
| 185 | die(_("git fetch-pack: expected a flush packet after shallow list")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 186 | } |
| 187 | } |
| 188 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 189 | static enum ack_type get_ack(struct packet_reader *reader, |
| 190 | struct object_id *result_oid) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 191 | { |
Jeff King | 74543a0 | 2013-02-20 15:02:57 -0500 | [diff] [blame] | 192 | int len; |
Jeff King | 82e5676 | 2014-06-18 15:56:03 -0400 | [diff] [blame] | 193 | const char *arg; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 194 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 195 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
Jeff King | bc9d4dc | 2018-02-08 13:47:49 -0500 | [diff] [blame] | 196 | die(_("git fetch-pack: expected ACK/NAK, got a flush packet")); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 197 | len = reader->pktlen; |
| 198 | |
| 199 | if (!strcmp(reader->line, "NAK")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 200 | return NAK; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 201 | if (skip_prefix(reader->line, "ACK ", &arg)) { |
brian m. carlson | f6af19a | 2019-08-18 20:04:04 +0000 | [diff] [blame] | 202 | const char *p; |
| 203 | if (!parse_oid_hex(arg, result_oid, &p)) { |
| 204 | len -= p - reader->line; |
Jeff King | 82e5676 | 2014-06-18 15:56:03 -0400 | [diff] [blame] | 205 | if (len < 1) |
Jeff King | 030e9dd | 2013-02-20 15:00:28 -0500 | [diff] [blame] | 206 | return ACK; |
brian m. carlson | f6af19a | 2019-08-18 20:04:04 +0000 | [diff] [blame] | 207 | if (strstr(p, "continue")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 208 | return ACK_continue; |
brian m. carlson | f6af19a | 2019-08-18 20:04:04 +0000 | [diff] [blame] | 209 | if (strstr(p, "common")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 210 | return ACK_common; |
brian m. carlson | f6af19a | 2019-08-18 20:04:04 +0000 | [diff] [blame] | 211 | if (strstr(p, "ready")) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 212 | return ACK_ready; |
| 213 | return ACK; |
| 214 | } |
| 215 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 216 | die(_("git fetch-pack: expected ACK/NAK, got '%s'"), reader->line); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 217 | } |
| 218 | |
| 219 | static void send_request(struct fetch_pack_args *args, |
| 220 | int fd, struct strbuf *buf) |
| 221 | { |
| 222 | if (args->stateless_rpc) { |
| 223 | send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX); |
| 224 | packet_flush(fd); |
Jeff King | 37c8001 | 2019-03-04 23:11:39 -0500 | [diff] [blame] | 225 | } else { |
| 226 | if (write_in_full(fd, buf->buf, buf->len) < 0) |
| 227 | die_errno(_("unable to write to remote")); |
| 228 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 229 | } |
| 230 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 231 | static void insert_one_alternate_object(struct fetch_negotiator *negotiator, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 232 | struct object *obj) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 233 | { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 234 | rev_list_insert_ref(negotiator, &obj->oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 235 | } |
| 236 | |
| 237 | #define INITIAL_FLUSH 16 |
| 238 | #define PIPESAFE_FLUSH 32 |
Jonathan Tan | da47098 | 2016-07-18 15:21:38 -0700 | [diff] [blame] | 239 | #define LARGE_FLUSH 16384 |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 240 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 241 | static int next_flush(int stateless_rpc, int count) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 242 | { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 243 | if (stateless_rpc) { |
Jonathan Tan | da47098 | 2016-07-18 15:21:38 -0700 | [diff] [blame] | 244 | if (count < LARGE_FLUSH) |
| 245 | count <<= 1; |
| 246 | else |
| 247 | count = count * 11 / 10; |
| 248 | } else { |
| 249 | if (count < PIPESAFE_FLUSH) |
| 250 | count <<= 1; |
| 251 | else |
| 252 | count += PIPESAFE_FLUSH; |
| 253 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 254 | return count; |
| 255 | } |
| 256 | |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 257 | static void mark_tips(struct fetch_negotiator *negotiator, |
| 258 | const struct oid_array *negotiation_tips) |
| 259 | { |
| 260 | int i; |
| 261 | |
| 262 | if (!negotiation_tips) { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 263 | for_each_rawref(rev_list_insert_ref_oid, negotiator); |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 264 | return; |
| 265 | } |
| 266 | |
| 267 | for (i = 0; i < negotiation_tips->nr; i++) |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 268 | rev_list_insert_ref(negotiator, &negotiation_tips->oid[i]); |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 269 | return; |
| 270 | } |
| 271 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 272 | static int find_common(struct fetch_negotiator *negotiator, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 273 | struct fetch_pack_args *args, |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 274 | int fd[2], struct object_id *result_oid, |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 275 | struct ref *refs) |
| 276 | { |
| 277 | int fetching; |
| 278 | int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval; |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 279 | const struct object_id *oid; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 280 | unsigned in_vain = 0; |
| 281 | int got_continue = 0; |
| 282 | int got_ready = 0; |
| 283 | struct strbuf req_buf = STRBUF_INIT; |
| 284 | size_t state_len = 0; |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 285 | struct packet_reader reader; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 286 | |
| 287 | if (args->stateless_rpc && multi_ack == 1) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 288 | die(_("--stateless-rpc requires multi_ack_detailed")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 289 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 290 | packet_reader_init(&reader, fd[0], NULL, 0, |
Masaya Suzuki | 2d103c3 | 2018-12-29 13:19:15 -0800 | [diff] [blame] | 291 | PACKET_READ_CHOMP_NEWLINE | |
| 292 | PACKET_READ_DIE_ON_ERR_PACKET); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 293 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 294 | mark_tips(negotiator, args->negotiation_tips); |
| 295 | for_each_cached_alternate(negotiator, insert_one_alternate_object); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 296 | |
| 297 | fetching = 0; |
| 298 | for ( ; refs ; refs = refs->next) { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 299 | struct object_id *remote = &refs->old_oid; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 300 | const char *remote_hex; |
| 301 | struct object *o; |
| 302 | |
| 303 | /* |
| 304 | * If that object is complete (i.e. it is an ancestor of a |
| 305 | * local ref), we tell them we have it but do not have to |
| 306 | * tell them about its ancestors, which they already know |
| 307 | * about. |
| 308 | * |
| 309 | * We use lookup_object here because we are only |
| 310 | * interested in the case we *know* the object is |
| 311 | * reachable and we have already scanned it. |
| 312 | */ |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 313 | if (((o = lookup_object(the_repository, remote)) != NULL) && |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 314 | (o->flags & COMPLETE)) { |
| 315 | continue; |
| 316 | } |
| 317 | |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 318 | remote_hex = oid_to_hex(remote); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 319 | if (!fetching) { |
| 320 | struct strbuf c = STRBUF_INIT; |
| 321 | if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed"); |
| 322 | if (multi_ack == 1) strbuf_addstr(&c, " multi_ack"); |
| 323 | if (no_done) strbuf_addstr(&c, " no-done"); |
| 324 | if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k"); |
| 325 | if (use_sideband == 1) strbuf_addstr(&c, " side-band"); |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 326 | if (args->deepen_relative) strbuf_addstr(&c, " deepen-relative"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 327 | if (args->use_thin_pack) strbuf_addstr(&c, " thin-pack"); |
| 328 | if (args->no_progress) strbuf_addstr(&c, " no-progress"); |
| 329 | if (args->include_tag) strbuf_addstr(&c, " include-tag"); |
| 330 | if (prefer_ofs_delta) strbuf_addstr(&c, " ofs-delta"); |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 331 | if (deepen_since_ok) strbuf_addstr(&c, " deepen-since"); |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 332 | if (deepen_not_ok) strbuf_addstr(&c, " deepen-not"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 333 | if (agent_supported) strbuf_addf(&c, " agent=%s", |
| 334 | git_user_agent_sanitized()); |
Josh Steadmon | 1e905bb | 2020-11-11 15:29:31 -0800 | [diff] [blame] | 335 | if (advertise_sid) |
| 336 | strbuf_addf(&c, " session-id=%s", trace2_session_id()); |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 337 | if (args->filter_options.choice) |
| 338 | strbuf_addstr(&c, " filter"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 339 | packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf); |
| 340 | strbuf_release(&c); |
| 341 | } else |
| 342 | packet_buf_write(&req_buf, "want %s\n", remote_hex); |
| 343 | fetching++; |
| 344 | } |
| 345 | |
| 346 | if (!fetching) { |
| 347 | strbuf_release(&req_buf); |
| 348 | packet_flush(fd[1]); |
| 349 | return 1; |
| 350 | } |
| 351 | |
Stefan Beller | c881348 | 2018-05-17 15:51:46 -0700 | [diff] [blame] | 352 | if (is_repository_shallow(the_repository)) |
Nguyễn Thái Ngọc Duy | 1a30f5a | 2013-12-05 20:02:34 +0700 | [diff] [blame] | 353 | write_shallow_commits(&req_buf, 1, NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 354 | if (args->depth > 0) |
| 355 | packet_buf_write(&req_buf, "deepen %d", args->depth); |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 356 | if (args->deepen_since) { |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 357 | timestamp_t max_age = approxidate(args->deepen_since); |
Johannes Schindelin | cb71f8b | 2017-04-21 12:45:48 +0200 | [diff] [blame] | 358 | packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age); |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 359 | } |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 360 | if (args->deepen_not) { |
| 361 | int i; |
| 362 | for (i = 0; i < args->deepen_not->nr; i++) { |
| 363 | struct string_list_item *s = args->deepen_not->items + i; |
| 364 | packet_buf_write(&req_buf, "deepen-not %s", s->string); |
| 365 | } |
| 366 | } |
Josh Steadmon | 87c2d9d | 2019-01-07 16:17:09 -0800 | [diff] [blame] | 367 | if (server_supports_filtering && args->filter_options.choice) { |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 368 | const char *spec = |
| 369 | expand_list_objects_filter_spec(&args->filter_options); |
| 370 | packet_buf_write(&req_buf, "filter %s", spec); |
Josh Steadmon | 87c2d9d | 2019-01-07 16:17:09 -0800 | [diff] [blame] | 371 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 372 | packet_buf_flush(&req_buf); |
| 373 | state_len = req_buf.len; |
| 374 | |
Nguyễn Thái Ngọc Duy | 79891cb | 2016-06-12 17:53:56 +0700 | [diff] [blame] | 375 | if (args->deepen) { |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 376 | const char *arg; |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 377 | struct object_id oid; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 378 | |
| 379 | send_request(args, fd[1], &req_buf); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 380 | while (packet_reader_read(&reader) == PACKET_READ_NORMAL) { |
| 381 | if (skip_prefix(reader.line, "shallow ", &arg)) { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 382 | if (get_oid_hex(arg, &oid)) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 383 | die(_("invalid shallow line: %s"), reader.line); |
Stefan Beller | 19143f1 | 2018-05-17 15:51:44 -0700 | [diff] [blame] | 384 | register_shallow(the_repository, &oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 385 | continue; |
| 386 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 387 | if (skip_prefix(reader.line, "unshallow ", &arg)) { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 388 | if (get_oid_hex(arg, &oid)) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 389 | die(_("invalid unshallow line: %s"), reader.line); |
Jeff King | d0229ab | 2019-06-20 03:41:14 -0400 | [diff] [blame] | 390 | if (!lookup_object(the_repository, &oid)) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 391 | die(_("object not found: %s"), reader.line); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 392 | /* make sure that it is parsed as shallow */ |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 393 | if (!parse_object(the_repository, &oid)) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 394 | die(_("error in object: %s"), reader.line); |
brian m. carlson | e92b848 | 2017-05-06 22:10:06 +0000 | [diff] [blame] | 395 | if (unregister_shallow(&oid)) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 396 | die(_("no shallow found: %s"), reader.line); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 397 | continue; |
| 398 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 399 | die(_("expected shallow/unshallow, got %s"), reader.line); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 400 | } |
| 401 | } else if (!args->stateless_rpc) |
| 402 | send_request(args, fd[1], &req_buf); |
| 403 | |
| 404 | if (!args->stateless_rpc) { |
| 405 | /* If we aren't using the stateless-rpc interface |
| 406 | * we don't need to retain the headers. |
| 407 | */ |
| 408 | strbuf_setlen(&req_buf, 0); |
| 409 | state_len = 0; |
| 410 | } |
| 411 | |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 412 | trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 413 | flushes = 0; |
| 414 | retval = -1; |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 415 | while ((oid = negotiator->next(negotiator))) { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 416 | packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid)); |
| 417 | print_verbose(args, "have %s", oid_to_hex(oid)); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 418 | in_vain++; |
| 419 | if (flush_at <= ++count) { |
| 420 | int ack; |
| 421 | |
| 422 | packet_buf_flush(&req_buf); |
| 423 | send_request(args, fd[1], &req_buf); |
| 424 | strbuf_setlen(&req_buf, state_len); |
| 425 | flushes++; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 426 | flush_at = next_flush(args->stateless_rpc, count); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 427 | |
| 428 | /* |
| 429 | * We keep one window "ahead" of the other side, and |
| 430 | * will wait for an ACK only on the next one |
| 431 | */ |
| 432 | if (!args->stateless_rpc && count == INITIAL_FLUSH) |
| 433 | continue; |
| 434 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 435 | consume_shallow_list(args, &reader); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 436 | do { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 437 | ack = get_ack(&reader, result_oid); |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 438 | if (ack) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 439 | print_verbose(args, _("got %s %d %s"), "ack", |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 440 | ack, oid_to_hex(result_oid)); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 441 | switch (ack) { |
| 442 | case ACK: |
| 443 | flushes = 0; |
| 444 | multi_ack = 0; |
| 445 | retval = 0; |
| 446 | goto done; |
| 447 | case ACK_common: |
| 448 | case ACK_ready: |
| 449 | case ACK_continue: { |
| 450 | struct commit *commit = |
Stefan Beller | c1f5eb4 | 2018-06-28 18:21:59 -0700 | [diff] [blame] | 451 | lookup_commit(the_repository, |
| 452 | result_oid); |
Jonathan Tan | d093bc7 | 2018-06-14 15:54:27 -0700 | [diff] [blame] | 453 | int was_common; |
Junio C Hamano | 3a2a1dc | 2018-08-02 15:30:42 -0700 | [diff] [blame] | 454 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 455 | if (!commit) |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 456 | die(_("invalid commit %s"), oid_to_hex(result_oid)); |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 457 | was_common = negotiator->ack(negotiator, commit); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 458 | if (args->stateless_rpc |
| 459 | && ack == ACK_common |
Jonathan Tan | d093bc7 | 2018-06-14 15:54:27 -0700 | [diff] [blame] | 460 | && !was_common) { |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 461 | /* We need to replay the have for this object |
| 462 | * on the next RPC request so the peer knows |
| 463 | * it is in common with us. |
| 464 | */ |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 465 | const char *hex = oid_to_hex(result_oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 466 | packet_buf_write(&req_buf, "have %s\n", hex); |
| 467 | state_len = req_buf.len; |
Jonathan Tan | 06b3d38 | 2016-09-23 10:41:35 -0700 | [diff] [blame] | 468 | /* |
| 469 | * Reset in_vain because an ack |
| 470 | * for this commit has not been |
| 471 | * seen. |
| 472 | */ |
| 473 | in_vain = 0; |
| 474 | } else if (!args->stateless_rpc |
| 475 | || ack != ACK_common) |
| 476 | in_vain = 0; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 477 | retval = 0; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 478 | got_continue = 1; |
Jonathan Tan | 21bcf6e | 2018-06-14 15:54:24 -0700 | [diff] [blame] | 479 | if (ack == ACK_ready) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 480 | got_ready = 1; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 481 | break; |
| 482 | } |
| 483 | } |
| 484 | } while (ack); |
| 485 | flushes--; |
| 486 | if (got_continue && MAX_IN_VAIN < in_vain) { |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 487 | print_verbose(args, _("giving up")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 488 | break; /* give up */ |
| 489 | } |
Jonathan Tan | 21bcf6e | 2018-06-14 15:54:24 -0700 | [diff] [blame] | 490 | if (got_ready) |
| 491 | break; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 492 | } |
| 493 | } |
| 494 | done: |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 495 | trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 496 | if (!got_ready || !no_done) { |
| 497 | packet_buf_write(&req_buf, "done\n"); |
| 498 | send_request(args, fd[1], &req_buf); |
| 499 | } |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 500 | print_verbose(args, _("done")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 501 | if (retval != 0) { |
| 502 | multi_ack = 0; |
| 503 | flushes++; |
| 504 | } |
| 505 | strbuf_release(&req_buf); |
| 506 | |
Nguyễn Thái Ngọc Duy | ff62eca | 2014-02-06 22:10:39 +0700 | [diff] [blame] | 507 | if (!got_ready || !no_done) |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 508 | consume_shallow_list(args, &reader); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 509 | while (flushes || multi_ack) { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 510 | int ack = get_ack(&reader, result_oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 511 | if (ack) { |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 512 | print_verbose(args, _("got %s (%d) %s"), "ack", |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 513 | ack, oid_to_hex(result_oid)); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 514 | if (ack == ACK) |
| 515 | return 0; |
| 516 | multi_ack = 1; |
| 517 | continue; |
| 518 | } |
| 519 | flushes--; |
| 520 | } |
| 521 | /* it is no error to fetch into a completely empty repo */ |
| 522 | return count ? retval : 0; |
| 523 | } |
| 524 | |
| 525 | static struct commit_list *complete; |
| 526 | |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 527 | static int mark_complete(const struct object_id *oid) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 528 | { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 529 | struct commit *commit = deref_without_lazy_fetch(oid, 1); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 530 | |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 531 | if (commit && !(commit->object.flags & COMPLETE)) { |
| 532 | commit->object.flags |= COMPLETE; |
| 533 | commit_list_insert(commit, &complete); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 534 | } |
| 535 | return 0; |
| 536 | } |
| 537 | |
Michael Haggerty | f8ee4d8 | 2015-05-25 18:39:16 +0000 | [diff] [blame] | 538 | static int mark_complete_oid(const char *refname, const struct object_id *oid, |
| 539 | int flag, void *cb_data) |
| 540 | { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 541 | return mark_complete(oid); |
Michael Haggerty | f8ee4d8 | 2015-05-25 18:39:16 +0000 | [diff] [blame] | 542 | } |
| 543 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 544 | static void mark_recent_complete_commits(struct fetch_pack_args *args, |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 545 | timestamp_t cutoff) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 546 | { |
| 547 | while (complete && cutoff <= complete->item->date) { |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 548 | print_verbose(args, _("Marking %s as complete"), |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 549 | oid_to_hex(&complete->item->object.oid)); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 550 | pop_most_recent_commit(&complete, COMPLETE); |
| 551 | } |
| 552 | } |
| 553 | |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 554 | static void add_refs_to_oidset(struct oidset *oids, struct ref *refs) |
| 555 | { |
| 556 | for (; refs; refs = refs->next) |
| 557 | oidset_insert(oids, &refs->old_oid); |
| 558 | } |
| 559 | |
René Scharfe | bf73282 | 2018-10-04 17:09:06 +0200 | [diff] [blame] | 560 | static int is_unmatched_ref(const struct ref *ref) |
| 561 | { |
| 562 | struct object_id oid; |
| 563 | const char *p; |
| 564 | return ref->match_status == REF_NOT_MATCHED && |
| 565 | !parse_oid_hex(ref->name, &oid, &p) && |
| 566 | *p == '\0' && |
| 567 | oideq(&oid, &ref->old_oid); |
| 568 | } |
| 569 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 570 | static void filter_refs(struct fetch_pack_args *args, |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 571 | struct ref **refs, |
| 572 | struct ref **sought, int nr_sought) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 573 | { |
| 574 | struct ref *newlist = NULL; |
| 575 | struct ref **newtail = &newlist; |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 576 | struct ref *unmatched = NULL; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 577 | struct ref *ref, *next; |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 578 | struct oidset tip_oids = OIDSET_INIT; |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 579 | int i; |
René Scharfe | 22a1646 | 2018-10-04 17:09:39 +0200 | [diff] [blame] | 580 | int strict = !(allow_unadvertised_object_request & |
| 581 | (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 582 | |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 583 | i = 0; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 584 | for (ref = *refs; ref; ref = next) { |
| 585 | int keep = 0; |
| 586 | next = ref->next; |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 587 | |
René Scharfe | 50e19a8 | 2014-06-06 19:24:48 +0200 | [diff] [blame] | 588 | if (starts_with(ref->name, "refs/") && |
Jeff King | 34066f0 | 2019-04-13 01:57:37 -0400 | [diff] [blame] | 589 | check_refname_format(ref->name, 0)) { |
| 590 | /* |
| 591 | * trash or a peeled value; do not even add it to |
| 592 | * unmatched list |
| 593 | */ |
| 594 | free_one_ref(ref); |
| 595 | continue; |
| 596 | } else { |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 597 | while (i < nr_sought) { |
| 598 | int cmp = strcmp(ref->name, sought[i]->name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 599 | if (cmp < 0) |
| 600 | break; /* definitely do not have it */ |
| 601 | else if (cmp == 0) { |
| 602 | keep = 1; /* definitely have it */ |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 603 | sought[i]->match_status = REF_MATCHED; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 604 | } |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 605 | i++; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 606 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 607 | |
Jeff King | e9502c0 | 2018-06-11 01:53:57 -0400 | [diff] [blame] | 608 | if (!keep && args->fetch_all && |
| 609 | (!args->deepen || !starts_with(ref->name, "refs/tags/"))) |
| 610 | keep = 1; |
| 611 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 612 | |
| 613 | if (keep) { |
| 614 | *newtail = ref; |
| 615 | ref->next = NULL; |
| 616 | newtail = &ref->next; |
| 617 | } else { |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 618 | ref->next = unmatched; |
| 619 | unmatched = ref; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 620 | } |
| 621 | } |
| 622 | |
René Scharfe | 22a1646 | 2018-10-04 17:09:39 +0200 | [diff] [blame] | 623 | if (strict) { |
| 624 | for (i = 0; i < nr_sought; i++) { |
| 625 | ref = sought[i]; |
| 626 | if (!is_unmatched_ref(ref)) |
| 627 | continue; |
| 628 | |
| 629 | add_refs_to_oidset(&tip_oids, unmatched); |
| 630 | add_refs_to_oidset(&tip_oids, newlist); |
| 631 | break; |
| 632 | } |
| 633 | } |
| 634 | |
Junio C Hamano | 6e7b66e | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 635 | /* Append unmatched requests to the list */ |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 636 | for (i = 0; i < nr_sought; i++) { |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 637 | ref = sought[i]; |
René Scharfe | bf73282 | 2018-10-04 17:09:06 +0200 | [diff] [blame] | 638 | if (!is_unmatched_ref(ref)) |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 639 | continue; |
Junio C Hamano | 6e7b66e | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 640 | |
René Scharfe | 22a1646 | 2018-10-04 17:09:39 +0200 | [diff] [blame] | 641 | if (!strict || oidset_contains(&tip_oids, &ref->old_oid)) { |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 642 | ref->match_status = REF_MATCHED; |
Jeff King | c3c17bf | 2015-03-19 16:37:09 -0400 | [diff] [blame] | 643 | *newtail = copy_ref(ref); |
| 644 | newtail = &(*newtail)->next; |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 645 | } else { |
| 646 | ref->match_status = REF_UNADVERTISED_NOT_ALLOWED; |
Junio C Hamano | 6e7b66e | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 647 | } |
| 648 | } |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 649 | |
| 650 | oidset_clear(&tip_oids); |
Jeff King | 259eddd | 2019-04-13 01:54:09 -0400 | [diff] [blame] | 651 | free_refs(unmatched); |
Jonathan Tan | fdb69d3 | 2017-05-15 10:32:20 -0700 | [diff] [blame] | 652 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 653 | *refs = newlist; |
| 654 | } |
| 655 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 656 | static void mark_alternate_complete(struct fetch_negotiator *unused, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 657 | struct object *obj) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 658 | { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 659 | mark_complete(&obj->oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 660 | } |
| 661 | |
Takuto Ikuta | 024aa46 | 2018-03-14 15:32:42 +0900 | [diff] [blame] | 662 | struct loose_object_iter { |
| 663 | struct oidset *loose_object_set; |
| 664 | struct ref *refs; |
| 665 | }; |
| 666 | |
| 667 | /* |
Jonathan Tan | 34c2903 | 2018-06-06 13:47:07 -0700 | [diff] [blame] | 668 | * Mark recent commits available locally and reachable from a local ref as |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 669 | * COMPLETE. |
Jonathan Tan | 34c2903 | 2018-06-06 13:47:07 -0700 | [diff] [blame] | 670 | * |
| 671 | * The cutoff time for recency is determined by this heuristic: it is the |
| 672 | * earliest commit time of the objects in refs that are commits and that we know |
| 673 | * the commit time of. |
| 674 | */ |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 675 | static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, |
Jonathan Tan | d30fe89 | 2018-06-14 15:54:26 -0700 | [diff] [blame] | 676 | struct fetch_pack_args *args, |
Jonathan Tan | 34c2903 | 2018-06-06 13:47:07 -0700 | [diff] [blame] | 677 | struct ref **refs) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 678 | { |
| 679 | struct ref *ref; |
Jonathan Tan | a1c6d7c | 2017-12-08 15:58:48 +0000 | [diff] [blame] | 680 | int old_save_commit_buffer = save_commit_buffer; |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 681 | timestamp_t cutoff = 0; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 682 | |
| 683 | save_commit_buffer = 0; |
| 684 | |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 685 | trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 686 | for (ref = *refs; ref; ref = ref->next) { |
| 687 | struct object *o; |
| 688 | |
Jeff King | 97b2fa0 | 2018-11-12 09:55:58 -0500 | [diff] [blame] | 689 | if (!has_object_file_with_flags(&ref->old_oid, |
Jonathan Tan | 6462d5e | 2019-11-05 10:56:19 -0800 | [diff] [blame] | 690 | OBJECT_INFO_QUICK | |
| 691 | OBJECT_INFO_SKIP_FETCH_OBJECT)) |
Junio C Hamano | 012a1bb | 2013-01-26 19:42:09 -0800 | [diff] [blame] | 692 | continue; |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 693 | o = parse_object(the_repository, &ref->old_oid); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 694 | if (!o) |
| 695 | continue; |
| 696 | |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 697 | /* |
| 698 | * We already have it -- which may mean that we were |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 699 | * in sync with the other side at some time after |
| 700 | * that (it is OK if we guess wrong here). |
| 701 | */ |
| 702 | if (o->type == OBJ_COMMIT) { |
| 703 | struct commit *commit = (struct commit *)o; |
| 704 | if (!cutoff || cutoff < commit->date) |
| 705 | cutoff = commit->date; |
| 706 | } |
| 707 | } |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 708 | trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 709 | |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 710 | /* |
| 711 | * This block marks all local refs as COMPLETE, and then recursively marks all |
| 712 | * parents of those refs as COMPLETE. |
| 713 | */ |
| 714 | trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL); |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 715 | if (!args->deepen) { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 716 | for_each_rawref(mark_complete_oid, NULL); |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 717 | for_each_cached_alternate(NULL, mark_alternate_complete); |
| 718 | commit_list_sort_by_date(&complete); |
| 719 | if (cutoff) |
| 720 | mark_recent_complete_commits(args, cutoff); |
| 721 | } |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 722 | trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 723 | |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 724 | /* |
| 725 | * Mark all complete remote refs as common refs. |
| 726 | * Don't mark them common yet; the server has to be told so first. |
| 727 | */ |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 728 | trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL); |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 729 | for (ref = *refs; ref; ref = ref->next) { |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 730 | struct commit *c = deref_without_lazy_fetch(&ref->old_oid, 0); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 731 | |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 732 | if (!c || !(c->object.flags & COMPLETE)) |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 733 | continue; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 734 | |
Jonathan Tan | 5c3b801 | 2020-08-17 21:01:35 -0700 | [diff] [blame] | 735 | negotiator->known_common(negotiator, c); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 736 | } |
Erik Chen | 9e5afdf | 2019-11-19 23:02:09 +0000 | [diff] [blame] | 737 | trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 738 | |
Jonathan Tan | 34c2903 | 2018-06-06 13:47:07 -0700 | [diff] [blame] | 739 | save_commit_buffer = old_save_commit_buffer; |
| 740 | } |
| 741 | |
| 742 | /* |
| 743 | * Returns 1 if every object pointed to by the given remote refs is available |
| 744 | * locally and reachable from a local ref, and 0 otherwise. |
| 745 | */ |
| 746 | static int everything_local(struct fetch_pack_args *args, |
| 747 | struct ref **refs) |
| 748 | { |
| 749 | struct ref *ref; |
| 750 | int retval; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 751 | |
| 752 | for (retval = 1, ref = *refs; ref ; ref = ref->next) { |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 753 | const struct object_id *remote = &ref->old_oid; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 754 | struct object *o; |
| 755 | |
Jeff King | d0229ab | 2019-06-20 03:41:14 -0400 | [diff] [blame] | 756 | o = lookup_object(the_repository, remote); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 757 | if (!o || !(o->flags & COMPLETE)) { |
| 758 | retval = 0; |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 759 | print_verbose(args, "want %s (%s)", oid_to_hex(remote), |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 760 | ref->name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 761 | continue; |
| 762 | } |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 763 | print_verbose(args, _("already have %s (%s)"), oid_to_hex(remote), |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 764 | ref->name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 765 | } |
Jonathan Tan | a1c6d7c | 2017-12-08 15:58:48 +0000 | [diff] [blame] | 766 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 767 | return retval; |
| 768 | } |
| 769 | |
| 770 | static int sideband_demux(int in, int out, void *data) |
| 771 | { |
| 772 | int *xd = data; |
Jeff King | 9ff18fa | 2016-02-24 02:44:58 -0500 | [diff] [blame] | 773 | int ret; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 774 | |
Jeff King | 9ff18fa | 2016-02-24 02:44:58 -0500 | [diff] [blame] | 775 | ret = recv_sideband("fetch-pack", xd[0], out); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 776 | close(out); |
| 777 | return ret; |
| 778 | } |
| 779 | |
Christian Couder | 9d7fa3b | 2021-01-12 09:21:58 +0100 | [diff] [blame] | 780 | static void create_promisor_file(const char *keep_name, |
| 781 | struct ref **sought, int nr_sought) |
Jonathan Tan | 5374a29 | 2019-10-14 17:12:31 -0700 | [diff] [blame] | 782 | { |
| 783 | struct strbuf promisor_name = STRBUF_INIT; |
| 784 | int suffix_stripped; |
Jonathan Tan | 5374a29 | 2019-10-14 17:12:31 -0700 | [diff] [blame] | 785 | |
| 786 | strbuf_addstr(&promisor_name, keep_name); |
| 787 | suffix_stripped = strbuf_strip_suffix(&promisor_name, ".keep"); |
| 788 | if (!suffix_stripped) |
| 789 | BUG("name of pack lockfile should end with .keep (was '%s')", |
| 790 | keep_name); |
| 791 | strbuf_addstr(&promisor_name, ".promisor"); |
| 792 | |
Christian Couder | 33add2a | 2021-01-12 09:21:59 +0100 | [diff] [blame] | 793 | write_promisor_file(promisor_name.buf, sought, nr_sought); |
Jonathan Tan | 5374a29 | 2019-10-14 17:12:31 -0700 | [diff] [blame] | 794 | |
| 795 | strbuf_release(&promisor_name); |
| 796 | } |
| 797 | |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 798 | static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids) |
| 799 | { |
| 800 | int len = the_hash_algo->hexsz + 1; /* hash + NL */ |
| 801 | |
| 802 | do { |
| 803 | char hex_hash[GIT_MAX_HEXSZ + 1]; |
| 804 | int read_len = read_in_full(fd, hex_hash, len); |
| 805 | struct object_id oid; |
| 806 | const char *end; |
| 807 | |
| 808 | if (!read_len) |
| 809 | return; |
| 810 | if (read_len != len) |
| 811 | die("invalid length read %d", read_len); |
| 812 | if (parse_oid_hex(hex_hash, &oid, &end) || *end != '\n') |
| 813 | die("invalid hash"); |
| 814 | oidset_insert(gitmodules_oids, &oid); |
| 815 | } while (1); |
| 816 | } |
| 817 | |
Jonathan Tan | ece9aea | 2020-08-17 12:48:19 -0700 | [diff] [blame] | 818 | /* |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 819 | * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args. |
| 820 | * The strings to pass as the --index-pack-arg arguments to http-fetch will be |
| 821 | * stored there. (It must be freed by the caller.) |
Jonathan Tan | ece9aea | 2020-08-17 12:48:19 -0700 | [diff] [blame] | 822 | */ |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 823 | static int get_pack(struct fetch_pack_args *args, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 824 | int xd[2], struct string_list *pack_lockfiles, |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 825 | struct strvec *index_pack_args, |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 826 | struct ref **sought, int nr_sought, |
| 827 | struct oidset *gitmodules_oids) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 828 | { |
| 829 | struct async demux; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 830 | int do_keep = args->keep_pack; |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 831 | const char *cmd_name; |
| 832 | struct pack_header header; |
| 833 | int pass_header = 0; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 834 | struct child_process cmd = CHILD_PROCESS_INIT; |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 835 | int fsck_objects = 0; |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 836 | int ret; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 837 | |
| 838 | memset(&demux, 0, sizeof(demux)); |
| 839 | if (use_sideband) { |
| 840 | /* xd[] is talking with upload-pack; subprocess reads from |
| 841 | * xd[0], spits out band#2 to stderr, and feeds us band#1 |
| 842 | * through demux->out. |
| 843 | */ |
| 844 | demux.proc = sideband_demux; |
| 845 | demux.data = xd; |
| 846 | demux.out = -1; |
Jeff King | df85757 | 2016-04-19 18:50:29 -0400 | [diff] [blame] | 847 | demux.isolate_sigpipe = 1; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 848 | if (start_async(&demux)) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 849 | die(_("fetch-pack: unable to fork off sideband demultiplexer")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 850 | } |
| 851 | else |
| 852 | demux.out = xd[0]; |
| 853 | |
Jonathan Tan | 2aec3bc | 2021-03-04 17:16:20 -0800 | [diff] [blame] | 854 | if (!args->keep_pack && unpack_limit && !index_pack_args) { |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 855 | |
| 856 | if (read_pack_header(demux.out, &header)) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 857 | die(_("protocol error: bad pack header")); |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 858 | pass_header = 1; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 859 | if (ntohl(header.hdr_entries) < unpack_limit) |
| 860 | do_keep = 0; |
| 861 | else |
| 862 | do_keep = 1; |
| 863 | } |
| 864 | |
Nguyễn Thái Ngọc Duy | 6035d6a | 2013-05-26 08:16:15 +0700 | [diff] [blame] | 865 | if (alternate_shallow_file) { |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 866 | strvec_push(&cmd.args, "--shallow-file"); |
| 867 | strvec_push(&cmd.args, alternate_shallow_file); |
Nguyễn Thái Ngọc Duy | 6035d6a | 2013-05-26 08:16:15 +0700 | [diff] [blame] | 868 | } |
| 869 | |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 870 | if (fetch_fsck_objects >= 0 |
| 871 | ? fetch_fsck_objects |
| 872 | : transfer_fsck_objects >= 0 |
| 873 | ? transfer_fsck_objects |
| 874 | : 0) |
| 875 | fsck_objects = 1; |
| 876 | |
| 877 | if (do_keep || args->from_promisor || index_pack_args || fsck_objects) { |
| 878 | if (pack_lockfiles || fsck_objects) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 879 | cmd.out = -1; |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 880 | cmd_name = "index-pack"; |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 881 | strvec_push(&cmd.args, cmd_name); |
| 882 | strvec_push(&cmd.args, "--stdin"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 883 | if (!args->quiet && !args->no_progress) |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 884 | strvec_push(&cmd.args, "-v"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 885 | if (args->use_thin_pack) |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 886 | strvec_push(&cmd.args, "--fix-thin"); |
Jonathan Tan | 2aec3bc | 2021-03-04 17:16:20 -0800 | [diff] [blame] | 887 | if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) { |
René Scharfe | da25bdb | 2017-04-18 17:57:42 -0400 | [diff] [blame] | 888 | char hostname[HOST_NAME_MAX + 1]; |
David Turner | 5781a9a | 2017-04-18 17:57:43 -0400 | [diff] [blame] | 889 | if (xgethostname(hostname, sizeof(hostname))) |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 890 | xsnprintf(hostname, sizeof(hostname), "localhost"); |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 891 | strvec_pushf(&cmd.args, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 892 | "--keep=fetch-pack %"PRIuMAX " on %s", |
| 893 | (uintmax_t)getpid(), hostname); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 894 | } |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 895 | if (!index_pack_args && args->check_self_contained_and_connected) |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 896 | strvec_push(&cmd.args, "--check-self-contained-and-connected"); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 897 | else |
| 898 | /* |
| 899 | * We cannot perform any connectivity checks because |
| 900 | * not all packs have been downloaded; let the caller |
| 901 | * have this responsibility. |
| 902 | */ |
| 903 | args->check_self_contained_and_connected = 0; |
Jonathan Tan | 1b03df5 | 2020-08-20 10:51:16 -0700 | [diff] [blame] | 904 | |
| 905 | if (args->from_promisor) |
| 906 | /* |
Christian Couder | 9d7fa3b | 2021-01-12 09:21:58 +0100 | [diff] [blame] | 907 | * create_promisor_file() may be called afterwards but |
Jonathan Tan | 1b03df5 | 2020-08-20 10:51:16 -0700 | [diff] [blame] | 908 | * we still need index-pack to know that this is a |
| 909 | * promisor pack. For example, if transfer.fsckobjects |
| 910 | * is true, index-pack needs to know that .gitmodules |
| 911 | * is a promisor object (so that it won't complain if |
| 912 | * it is missing). |
| 913 | */ |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 914 | strvec_push(&cmd.args, "--promisor"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 915 | } |
| 916 | else { |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 917 | cmd_name = "unpack-objects"; |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 918 | strvec_push(&cmd.args, cmd_name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 919 | if (args->quiet || args->no_progress) |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 920 | strvec_push(&cmd.args, "-q"); |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 921 | args->check_self_contained_and_connected = 0; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 922 | } |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 923 | |
| 924 | if (pass_header) |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 925 | strvec_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32, |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 926 | ntohl(header.hdr_version), |
Jeff King | 984a43b | 2015-09-24 17:07:54 -0400 | [diff] [blame] | 927 | ntohl(header.hdr_entries)); |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 928 | if (fsck_objects) { |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 929 | if (args->from_promisor || index_pack_args) |
Jonathan Tan | 98a2ea4 | 2018-03-14 11:42:41 -0700 | [diff] [blame] | 930 | /* |
| 931 | * We cannot use --strict in index-pack because it |
| 932 | * checks both broken objects and links, but we only |
| 933 | * want to check for broken objects. |
| 934 | */ |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 935 | strvec_push(&cmd.args, "--fsck-objects"); |
Jonathan Tan | 98a2ea4 | 2018-03-14 11:42:41 -0700 | [diff] [blame] | 936 | else |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 937 | strvec_pushf(&cmd.args, "--strict%s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 938 | fsck_msg_types.buf); |
Jonathan Tan | 98a2ea4 | 2018-03-14 11:42:41 -0700 | [diff] [blame] | 939 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 940 | |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 941 | if (index_pack_args) { |
| 942 | int i; |
| 943 | |
| 944 | for (i = 0; i < cmd.args.nr; i++) |
| 945 | strvec_push(index_pack_args, cmd.args.v[i]); |
| 946 | } |
| 947 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 948 | cmd.in = demux.out; |
| 949 | cmd.git_cmd = 1; |
| 950 | if (start_command(&cmd)) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 951 | die(_("fetch-pack: unable to fork off %s"), cmd_name); |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 952 | if (do_keep && (pack_lockfiles || fsck_objects)) { |
| 953 | int is_well_formed; |
| 954 | char *pack_lockfile = index_pack_lockfile(cmd.out, &is_well_formed); |
| 955 | |
| 956 | if (!is_well_formed) |
| 957 | die(_("fetch-pack: invalid index-pack output")); |
René Scharfe | 6031af3 | 2020-11-30 20:27:15 +0100 | [diff] [blame] | 958 | if (pack_lockfile) |
| 959 | string_list_append_nodup(pack_lockfiles, pack_lockfile); |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 960 | parse_gitmodules_oids(cmd.out, gitmodules_oids); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 961 | close(cmd.out); |
| 962 | } |
| 963 | |
Jens Lindstrom | 37cb1dd | 2013-10-22 15:36:02 +0200 | [diff] [blame] | 964 | if (!use_sideband) |
| 965 | /* Closed by start_command() */ |
| 966 | xd[0] = -1; |
| 967 | |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 968 | ret = finish_command(&cmd); |
| 969 | if (!ret || (args->check_self_contained_and_connected && ret == 1)) |
| 970 | args->self_contained_and_connected = |
| 971 | args->check_self_contained_and_connected && |
| 972 | ret == 0; |
| 973 | else |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 974 | die(_("%s failed"), cmd_name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 975 | if (use_sideband && finish_async(&demux)) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 976 | die(_("error in sideband demultiplexer")); |
Jonathan Tan | 5374a29 | 2019-10-14 17:12:31 -0700 | [diff] [blame] | 977 | |
| 978 | /* |
| 979 | * Now that index-pack has succeeded, write the promisor file using the |
| 980 | * obtained .keep filename if necessary |
| 981 | */ |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 982 | if (do_keep && pack_lockfiles && pack_lockfiles->nr && args->from_promisor) |
Christian Couder | 9d7fa3b | 2021-01-12 09:21:58 +0100 | [diff] [blame] | 983 | create_promisor_file(pack_lockfiles->items[0].string, sought, nr_sought); |
Jonathan Tan | 5374a29 | 2019-10-14 17:12:31 -0700 | [diff] [blame] | 984 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 985 | return 0; |
| 986 | } |
| 987 | |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 988 | static int cmp_ref_by_name(const void *a_, const void *b_) |
| 989 | { |
| 990 | const struct ref *a = *((const struct ref **)a_); |
| 991 | const struct ref *b = *((const struct ref **)b_); |
| 992 | return strcmp(a->name, b->name); |
| 993 | } |
| 994 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 995 | static struct ref *do_fetch_pack(struct fetch_pack_args *args, |
| 996 | int fd[2], |
| 997 | const struct ref *orig_ref, |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 998 | struct ref **sought, int nr_sought, |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 999 | struct shallow_info *si, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1000 | struct string_list *pack_lockfiles) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1001 | { |
Derrick Stolee | aaf633c | 2019-08-13 11:37:48 -0700 | [diff] [blame] | 1002 | struct repository *r = the_repository; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1003 | struct ref *ref = copy_ref_list(orig_ref); |
brian m. carlson | 1b28337 | 2017-05-01 02:28:54 +0000 | [diff] [blame] | 1004 | struct object_id oid; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1005 | const char *agent_feature; |
| 1006 | int agent_len; |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1007 | struct fetch_negotiator negotiator_alloc; |
| 1008 | struct fetch_negotiator *negotiator; |
| 1009 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1010 | negotiator = &negotiator_alloc; |
| 1011 | fetch_negotiator_init(r, negotiator); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1012 | |
| 1013 | sort_ref_list(&ref, ref_compare_name); |
René Scharfe | 9ed0d8d | 2016-09-29 17:27:31 +0200 | [diff] [blame] | 1014 | QSORT(sought, nr_sought, cmp_ref_by_name); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1015 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1016 | if ((agent_feature = server_feature_value("agent", &agent_len))) { |
| 1017 | agent_supported = 1; |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 1018 | if (agent_len) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 1019 | print_verbose(args, _("Server version is %.*s"), |
Nguyễn Thái Ngọc Duy | 0d789a5 | 2016-06-12 17:53:54 +0700 | [diff] [blame] | 1020 | agent_len, agent_feature); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1021 | } |
Nguyễn Thái Ngọc Duy | 0e04297 | 2019-06-20 18:59:51 +0700 | [diff] [blame] | 1022 | |
Josh Steadmon | 1e905bb | 2020-11-11 15:29:31 -0800 | [diff] [blame] | 1023 | if (!server_supports("session-id")) |
| 1024 | advertise_sid = 0; |
| 1025 | |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1026 | if (server_supports("shallow")) |
| 1027 | print_verbose(args, _("Server supports %s"), "shallow"); |
Derrick Stolee | aaf633c | 2019-08-13 11:37:48 -0700 | [diff] [blame] | 1028 | else if (args->depth > 0 || is_repository_shallow(r)) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1029 | die(_("Server does not support shallow clients")); |
| 1030 | if (args->depth > 0 || args->deepen_since || args->deepen_not) |
| 1031 | args->deepen = 1; |
| 1032 | if (server_supports("multi_ack_detailed")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1033 | print_verbose(args, _("Server supports %s"), "multi_ack_detailed"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1034 | multi_ack = 2; |
| 1035 | if (server_supports("no-done")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1036 | print_verbose(args, _("Server supports %s"), "no-done"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1037 | if (args->stateless_rpc) |
| 1038 | no_done = 1; |
| 1039 | } |
| 1040 | } |
| 1041 | else if (server_supports("multi_ack")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1042 | print_verbose(args, _("Server supports %s"), "multi_ack"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1043 | multi_ack = 1; |
| 1044 | } |
| 1045 | if (server_supports("side-band-64k")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1046 | print_verbose(args, _("Server supports %s"), "side-band-64k"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1047 | use_sideband = 2; |
| 1048 | } |
| 1049 | else if (server_supports("side-band")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1050 | print_verbose(args, _("Server supports %s"), "side-band"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1051 | use_sideband = 1; |
| 1052 | } |
| 1053 | if (server_supports("allow-tip-sha1-in-want")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1054 | print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1055 | allow_unadvertised_object_request |= ALLOW_TIP_SHA1; |
| 1056 | } |
| 1057 | if (server_supports("allow-reachable-sha1-in-want")) { |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1058 | print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1059 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; |
| 1060 | } |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1061 | if (server_supports("thin-pack")) |
| 1062 | print_verbose(args, _("Server supports %s"), "thin-pack"); |
| 1063 | else |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1064 | args->use_thin_pack = 0; |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1065 | if (server_supports("no-progress")) |
| 1066 | print_verbose(args, _("Server supports %s"), "no-progress"); |
| 1067 | else |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1068 | args->no_progress = 0; |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1069 | if (server_supports("include-tag")) |
| 1070 | print_verbose(args, _("Server supports %s"), "include-tag"); |
| 1071 | else |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1072 | args->include_tag = 0; |
| 1073 | if (server_supports("ofs-delta")) |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1074 | print_verbose(args, _("Server supports %s"), "ofs-delta"); |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 1075 | else |
| 1076 | prefer_ofs_delta = 0; |
| 1077 | |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1078 | if (server_supports("filter")) { |
| 1079 | server_supports_filtering = 1; |
Nguyễn Thái Ngọc Duy | 0778b29 | 2019-06-20 18:59:49 +0700 | [diff] [blame] | 1080 | print_verbose(args, _("Server supports %s"), "filter"); |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 1081 | } else if (args->filter_options.choice) { |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1082 | warning("filtering not recognized by server, ignoring"); |
| 1083 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1084 | |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1085 | if (server_supports("deepen-since")) { |
| 1086 | print_verbose(args, _("Server supports %s"), "deepen-since"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1087 | deepen_since_ok = 1; |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1088 | } else if (args->deepen_since) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1089 | die(_("Server does not support --shallow-since")); |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1090 | if (server_supports("deepen-not")) { |
| 1091 | print_verbose(args, _("Server supports %s"), "deepen-not"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1092 | deepen_not_ok = 1; |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1093 | } else if (args->deepen_not) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1094 | die(_("Server does not support --shallow-exclude")); |
Nguyễn Thái Ngọc Duy | 5a88583 | 2019-06-20 18:59:50 +0700 | [diff] [blame] | 1095 | if (server_supports("deepen-relative")) |
| 1096 | print_verbose(args, _("Server supports %s"), "deepen-relative"); |
| 1097 | else if (args->deepen_relative) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1098 | die(_("Server does not support --deepen")); |
brian m. carlson | 48bf141 | 2020-05-25 19:58:59 +0000 | [diff] [blame] | 1099 | if (!server_supports_hash(the_hash_algo->name, NULL)) |
| 1100 | die(_("Server does not support this repository's object format")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1101 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1102 | mark_complete_and_common_ref(negotiator, args, &ref); |
| 1103 | filter_refs(args, &ref, sought, nr_sought); |
| 1104 | if (everything_local(args, &ref)) { |
| 1105 | packet_flush(fd[1]); |
| 1106 | goto all_done; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1107 | } |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1108 | if (find_common(negotiator, args, fd, &oid, ref) < 0) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1109 | if (!args->keep_pack) |
| 1110 | /* When cloning, it is not unusual to have |
| 1111 | * no common commit. |
| 1112 | */ |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 1113 | warning(_("no common commits")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1114 | |
| 1115 | if (args->stateless_rpc) |
| 1116 | packet_flush(fd[1]); |
Nguyễn Thái Ngọc Duy | 79891cb | 2016-06-12 17:53:56 +0700 | [diff] [blame] | 1117 | if (args->deepen) |
Nguyễn Thái Ngọc Duy | 1a30f5a | 2013-12-05 20:02:34 +0700 | [diff] [blame] | 1118 | setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, |
| 1119 | NULL); |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 1120 | else if (si->nr_ours || si->nr_theirs) { |
| 1121 | if (args->reject_shallow_remote) |
| 1122 | die(_("source repository is shallow, reject to clone.")); |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1123 | alternate_shallow_file = setup_temporary_shallow(si->shallow); |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 1124 | } else |
Nguyễn Thái Ngọc Duy | 6da8bdc | 2013-08-26 09:17:26 +0700 | [diff] [blame] | 1125 | alternate_shallow_file = NULL; |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 1126 | if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought, |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 1127 | &fsck_options.gitmodules_found)) |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 1128 | die(_("git fetch-pack: fetch failed.")); |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 1129 | if (fsck_finish(&fsck_options)) |
| 1130 | die("fsck failed"); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1131 | |
| 1132 | all_done: |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1133 | if (negotiator) |
| 1134 | negotiator->release(negotiator); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1135 | return ref; |
| 1136 | } |
| 1137 | |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1138 | static void add_shallow_requests(struct strbuf *req_buf, |
| 1139 | const struct fetch_pack_args *args) |
| 1140 | { |
Junio C Hamano | 00624d6 | 2018-07-18 12:20:27 -0700 | [diff] [blame] | 1141 | if (is_repository_shallow(the_repository)) |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1142 | write_shallow_commits(req_buf, 1, NULL); |
| 1143 | if (args->depth > 0) |
| 1144 | packet_buf_write(req_buf, "deepen %d", args->depth); |
| 1145 | if (args->deepen_since) { |
| 1146 | timestamp_t max_age = approxidate(args->deepen_since); |
| 1147 | packet_buf_write(req_buf, "deepen-since %"PRItime, max_age); |
| 1148 | } |
| 1149 | if (args->deepen_not) { |
| 1150 | int i; |
| 1151 | for (i = 0; i < args->deepen_not->nr; i++) { |
| 1152 | struct string_list_item *s = args->deepen_not->items + i; |
| 1153 | packet_buf_write(req_buf, "deepen-not %s", s->string); |
| 1154 | } |
| 1155 | } |
Jonathan Tan | 5056cf4 | 2018-12-18 13:24:35 -0800 | [diff] [blame] | 1156 | if (args->deepen_relative) |
| 1157 | packet_buf_write(req_buf, "deepen-relative\n"); |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1158 | } |
| 1159 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1160 | static void add_wants(const struct ref *wants, struct strbuf *req_buf) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1161 | { |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1162 | int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0); |
| 1163 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1164 | for ( ; wants ; wants = wants->next) { |
| 1165 | const struct object_id *remote = &wants->old_oid; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1166 | struct object *o; |
| 1167 | |
| 1168 | /* |
| 1169 | * If that object is complete (i.e. it is an ancestor of a |
| 1170 | * local ref), we tell them we have it but do not have to |
| 1171 | * tell them about its ancestors, which they already know |
| 1172 | * about. |
| 1173 | * |
| 1174 | * We use lookup_object here because we are only |
| 1175 | * interested in the case we *know* the object is |
| 1176 | * reachable and we have already scanned it. |
| 1177 | */ |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1178 | if (((o = lookup_object(the_repository, remote)) != NULL) && |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1179 | (o->flags & COMPLETE)) { |
| 1180 | continue; |
| 1181 | } |
| 1182 | |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1183 | if (!use_ref_in_want || wants->exact_oid) |
| 1184 | packet_buf_write(req_buf, "want %s\n", oid_to_hex(remote)); |
| 1185 | else |
| 1186 | packet_buf_write(req_buf, "want-ref %s\n", wants->name); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1187 | } |
| 1188 | } |
| 1189 | |
| 1190 | static void add_common(struct strbuf *req_buf, struct oidset *common) |
| 1191 | { |
| 1192 | struct oidset_iter iter; |
| 1193 | const struct object_id *oid; |
| 1194 | oidset_iter_init(common, &iter); |
| 1195 | |
| 1196 | while ((oid = oidset_iter_next(&iter))) { |
| 1197 | packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid)); |
| 1198 | } |
| 1199 | } |
| 1200 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 1201 | static int add_haves(struct fetch_negotiator *negotiator, |
| 1202 | struct strbuf *req_buf, |
Jonathan Tan | 57c3451 | 2021-04-08 18:10:00 -0700 | [diff] [blame] | 1203 | int *haves_to_send) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1204 | { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1205 | int haves_added = 0; |
| 1206 | const struct object_id *oid; |
| 1207 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 1208 | while ((oid = negotiator->next(negotiator))) { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1209 | packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid)); |
| 1210 | if (++haves_added >= *haves_to_send) |
| 1211 | break; |
| 1212 | } |
| 1213 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1214 | /* Increase haves to send on next round */ |
| 1215 | *haves_to_send = next_flush(1, *haves_to_send); |
| 1216 | |
Jonathan Tan | 57c3451 | 2021-04-08 18:10:00 -0700 | [diff] [blame] | 1217 | return haves_added; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1218 | } |
| 1219 | |
Jonathan Tan | 6871d0c | 2021-04-08 18:10:01 -0700 | [diff] [blame] | 1220 | static void write_fetch_command_and_capabilities(struct strbuf *req_buf, |
| 1221 | const struct string_list *server_options) |
| 1222 | { |
| 1223 | const char *hash_name; |
| 1224 | |
| 1225 | if (server_supports_v2("fetch", 1)) |
| 1226 | packet_buf_write(req_buf, "command=fetch"); |
| 1227 | if (server_supports_v2("agent", 0)) |
| 1228 | packet_buf_write(req_buf, "agent=%s", git_user_agent_sanitized()); |
| 1229 | if (advertise_sid && server_supports_v2("session-id", 0)) |
| 1230 | packet_buf_write(req_buf, "session-id=%s", trace2_session_id()); |
| 1231 | if (server_options && server_options->nr && |
| 1232 | server_supports_v2("server-option", 1)) { |
| 1233 | int i; |
| 1234 | for (i = 0; i < server_options->nr; i++) |
| 1235 | packet_buf_write(req_buf, "server-option=%s", |
| 1236 | server_options->items[i].string); |
| 1237 | } |
| 1238 | |
| 1239 | if (server_feature_v2("object-format", &hash_name)) { |
| 1240 | int hash_algo = hash_algo_by_name(hash_name); |
| 1241 | if (hash_algo_by_ptr(the_hash_algo) != hash_algo) |
| 1242 | die(_("mismatched algorithms: client %s; server %s"), |
| 1243 | the_hash_algo->name, hash_name); |
| 1244 | packet_buf_write(req_buf, "object-format=%s", the_hash_algo->name); |
| 1245 | } else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) { |
| 1246 | die(_("the server does not support algorithm '%s'"), |
| 1247 | the_hash_algo->name); |
| 1248 | } |
| 1249 | packet_buf_delim(req_buf); |
| 1250 | } |
| 1251 | |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 1252 | static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 1253 | struct fetch_pack_args *args, |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1254 | const struct ref *wants, struct oidset *common, |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1255 | int *haves_to_send, int *in_vain, |
Jonathan Tan | 4fa3f00 | 2020-04-27 17:01:09 -0700 | [diff] [blame] | 1256 | int sideband_all, int seen_ack) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1257 | { |
Jonathan Tan | 57c3451 | 2021-04-08 18:10:00 -0700 | [diff] [blame] | 1258 | int haves_added; |
| 1259 | int done_sent = 0; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1260 | struct strbuf req_buf = STRBUF_INIT; |
| 1261 | |
Jonathan Tan | 6871d0c | 2021-04-08 18:10:01 -0700 | [diff] [blame] | 1262 | write_fetch_command_and_capabilities(&req_buf, args->server_options); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1263 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1264 | if (args->use_thin_pack) |
| 1265 | packet_buf_write(&req_buf, "thin-pack"); |
| 1266 | if (args->no_progress) |
| 1267 | packet_buf_write(&req_buf, "no-progress"); |
| 1268 | if (args->include_tag) |
| 1269 | packet_buf_write(&req_buf, "include-tag"); |
| 1270 | if (prefer_ofs_delta) |
| 1271 | packet_buf_write(&req_buf, "ofs-delta"); |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1272 | if (sideband_all) |
| 1273 | packet_buf_write(&req_buf, "sideband-all"); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1274 | |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1275 | /* Add shallow-info and deepen request */ |
| 1276 | if (server_supports_feature("fetch", "shallow", 0)) |
| 1277 | add_shallow_requests(&req_buf, args); |
Junio C Hamano | 00624d6 | 2018-07-18 12:20:27 -0700 | [diff] [blame] | 1278 | else if (is_repository_shallow(the_repository) || args->deepen) |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1279 | die(_("Server does not support shallow requests")); |
| 1280 | |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1281 | /* Add filter */ |
| 1282 | if (server_supports_feature("fetch", "filter", 0) && |
| 1283 | args->filter_options.choice) { |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 1284 | const char *spec = |
| 1285 | expand_list_objects_filter_spec(&args->filter_options); |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1286 | print_verbose(args, _("Server supports filter")); |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 1287 | packet_buf_write(&req_buf, "filter %s", spec); |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1288 | } else if (args->filter_options.choice) { |
| 1289 | warning("filtering not recognized by server, ignoring"); |
| 1290 | } |
| 1291 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1292 | if (server_supports_feature("fetch", "packfile-uris", 0)) { |
| 1293 | int i; |
| 1294 | struct strbuf to_send = STRBUF_INIT; |
| 1295 | |
| 1296 | for (i = 0; i < uri_protocols.nr; i++) { |
| 1297 | const char *s = uri_protocols.items[i].string; |
| 1298 | |
| 1299 | if (!strcmp(s, "https") || !strcmp(s, "http")) { |
| 1300 | if (to_send.len) |
| 1301 | strbuf_addch(&to_send, ','); |
| 1302 | strbuf_addstr(&to_send, s); |
| 1303 | } |
| 1304 | } |
| 1305 | if (to_send.len) { |
| 1306 | packet_buf_write(&req_buf, "packfile-uris %s", |
| 1307 | to_send.buf); |
| 1308 | strbuf_release(&to_send); |
| 1309 | } |
| 1310 | } |
| 1311 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1312 | /* add wants */ |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1313 | add_wants(wants, &req_buf); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1314 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1315 | /* Add all of the common commits we've found in previous rounds */ |
| 1316 | add_common(&req_buf, common); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1317 | |
Jonathan Tan | 57c3451 | 2021-04-08 18:10:00 -0700 | [diff] [blame] | 1318 | haves_added = add_haves(negotiator, &req_buf, haves_to_send); |
| 1319 | *in_vain += haves_added; |
| 1320 | if (!haves_added || (seen_ack && *in_vain >= MAX_IN_VAIN)) { |
| 1321 | /* Send Done */ |
| 1322 | packet_buf_write(&req_buf, "done\n"); |
| 1323 | done_sent = 1; |
| 1324 | } |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1325 | |
| 1326 | /* Send request */ |
| 1327 | packet_buf_flush(&req_buf); |
Jeff King | 37c8001 | 2019-03-04 23:11:39 -0500 | [diff] [blame] | 1328 | if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0) |
| 1329 | die_errno(_("unable to write request to remote")); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1330 | |
| 1331 | strbuf_release(&req_buf); |
Jonathan Tan | 57c3451 | 2021-04-08 18:10:00 -0700 | [diff] [blame] | 1332 | return done_sent; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1333 | } |
| 1334 | |
| 1335 | /* |
| 1336 | * Processes a section header in a server's response and checks if it matches |
| 1337 | * `section`. If the value of `peek` is 1, the header line will be peeked (and |
| 1338 | * not consumed); if 0, the line will be consumed and the function will die if |
| 1339 | * the section header doesn't match what was expected. |
| 1340 | */ |
| 1341 | static int process_section_header(struct packet_reader *reader, |
| 1342 | const char *section, int peek) |
| 1343 | { |
| 1344 | int ret; |
| 1345 | |
| 1346 | if (packet_reader_peek(reader) != PACKET_READ_NORMAL) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1347 | die(_("error reading section header '%s'"), section); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1348 | |
| 1349 | ret = !strcmp(reader->line, section); |
| 1350 | |
| 1351 | if (!peek) { |
| 1352 | if (!ret) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1353 | die(_("expected '%s', received '%s'"), |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1354 | section, reader->line); |
| 1355 | packet_reader_read(reader); |
| 1356 | } |
| 1357 | |
| 1358 | return ret; |
| 1359 | } |
| 1360 | |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1361 | static int process_ack(struct fetch_negotiator *negotiator, |
| 1362 | struct packet_reader *reader, |
| 1363 | struct object_id *common_oid, |
| 1364 | int *received_ready) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1365 | { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1366 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
| 1367 | const char *arg; |
| 1368 | |
| 1369 | if (!strcmp(reader->line, "NAK")) |
| 1370 | continue; |
| 1371 | |
| 1372 | if (skip_prefix(reader->line, "ACK ", &arg)) { |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1373 | if (!get_oid_hex(arg, common_oid)) { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1374 | struct commit *commit; |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1375 | commit = lookup_commit(the_repository, common_oid); |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1376 | if (negotiator) |
| 1377 | negotiator->ack(negotiator, commit); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1378 | } |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1379 | return 1; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1380 | } |
| 1381 | |
| 1382 | if (!strcmp(reader->line, "ready")) { |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1383 | *received_ready = 1; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1384 | continue; |
| 1385 | } |
| 1386 | |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1387 | die(_("unexpected acknowledgment line: '%s'"), reader->line); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1388 | } |
| 1389 | |
| 1390 | if (reader->status != PACKET_READ_FLUSH && |
| 1391 | reader->status != PACKET_READ_DELIM) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1392 | die(_("error processing acks: %d"), reader->status); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1393 | |
Jonathan Tan | 5400b2a | 2018-10-19 15:54:04 -0700 | [diff] [blame] | 1394 | /* |
| 1395 | * If an "acknowledgments" section is sent, a packfile is sent if and |
| 1396 | * only if "ready" was sent in this section. The other sections |
| 1397 | * ("shallow-info" and "wanted-refs") are sent only if a packfile is |
| 1398 | * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH |
| 1399 | * otherwise. |
| 1400 | */ |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1401 | if (*received_ready && reader->status != PACKET_READ_DELIM) |
Jonathan Tan | 5400b2a | 2018-10-19 15:54:04 -0700 | [diff] [blame] | 1402 | die(_("expected packfile to be sent after 'ready'")); |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1403 | if (!*received_ready && reader->status != PACKET_READ_FLUSH) |
Jonathan Tan | 5400b2a | 2018-10-19 15:54:04 -0700 | [diff] [blame] | 1404 | die(_("expected no other sections to be sent after no 'ready'")); |
| 1405 | |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1406 | return 0; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1407 | } |
| 1408 | |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1409 | static void receive_shallow_info(struct fetch_pack_args *args, |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1410 | struct packet_reader *reader, |
| 1411 | struct oid_array *shallows, |
| 1412 | struct shallow_info *si) |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1413 | { |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1414 | int unshallow_received = 0; |
Jonathan Tan | bd0b42a | 2019-01-10 11:36:45 -0800 | [diff] [blame] | 1415 | |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1416 | process_section_header(reader, "shallow-info", 0); |
| 1417 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
| 1418 | const char *arg; |
| 1419 | struct object_id oid; |
| 1420 | |
| 1421 | if (skip_prefix(reader->line, "shallow ", &arg)) { |
| 1422 | if (get_oid_hex(arg, &oid)) |
| 1423 | die(_("invalid shallow line: %s"), reader->line); |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1424 | oid_array_append(shallows, &oid); |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1425 | continue; |
| 1426 | } |
| 1427 | if (skip_prefix(reader->line, "unshallow ", &arg)) { |
| 1428 | if (get_oid_hex(arg, &oid)) |
| 1429 | die(_("invalid unshallow line: %s"), reader->line); |
Jeff King | d0229ab | 2019-06-20 03:41:14 -0400 | [diff] [blame] | 1430 | if (!lookup_object(the_repository, &oid)) |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1431 | die(_("object not found: %s"), reader->line); |
| 1432 | /* make sure that it is parsed as shallow */ |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 1433 | if (!parse_object(the_repository, &oid)) |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1434 | die(_("error in object: %s"), reader->line); |
| 1435 | if (unregister_shallow(&oid)) |
| 1436 | die(_("no shallow found: %s"), reader->line); |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1437 | unshallow_received = 1; |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1438 | continue; |
| 1439 | } |
| 1440 | die(_("expected shallow/unshallow, got %s"), reader->line); |
| 1441 | } |
| 1442 | |
| 1443 | if (reader->status != PACKET_READ_FLUSH && |
| 1444 | reader->status != PACKET_READ_DELIM) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1445 | die(_("error processing shallow info: %d"), reader->status); |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1446 | |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1447 | if (args->deepen || unshallow_received) { |
| 1448 | /* |
| 1449 | * Treat these as shallow lines caused by our depth settings. |
| 1450 | * In v0, these lines cannot cause refs to be rejected; do the |
| 1451 | * same. |
| 1452 | */ |
| 1453 | int i; |
| 1454 | |
| 1455 | for (i = 0; i < shallows->nr; i++) |
| 1456 | register_shallow(the_repository, &shallows->oid[i]); |
Jonathan Tan | bd0b42a | 2019-01-10 11:36:45 -0800 | [diff] [blame] | 1457 | setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, |
| 1458 | NULL); |
| 1459 | args->deepen = 1; |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1460 | } else if (shallows->nr) { |
| 1461 | /* |
| 1462 | * Treat these as shallow lines caused by the remote being |
| 1463 | * shallow. In v0, remote refs that reach these objects are |
| 1464 | * rejected (unless --update-shallow is set); do the same. |
| 1465 | */ |
| 1466 | prepare_shallow_info(si, shallows); |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 1467 | if (si->nr_ours || si->nr_theirs) { |
| 1468 | if (args->reject_shallow_remote) |
| 1469 | die(_("source repository is shallow, reject to clone.")); |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1470 | alternate_shallow_file = |
| 1471 | setup_temporary_shallow(si->shallow); |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 1472 | } else |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1473 | alternate_shallow_file = NULL; |
brian m. carlson | 380ebab | 2019-02-06 23:59:37 +0000 | [diff] [blame] | 1474 | } else { |
| 1475 | alternate_shallow_file = NULL; |
Jonathan Tan | bd0b42a | 2019-01-10 11:36:45 -0800 | [diff] [blame] | 1476 | } |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1477 | } |
| 1478 | |
Jonathan Tan | b764300 | 2019-03-27 14:11:10 -0700 | [diff] [blame] | 1479 | static int cmp_name_ref(const void *name, const void *ref) |
| 1480 | { |
| 1481 | return strcmp(name, (*(struct ref **)ref)->name); |
| 1482 | } |
| 1483 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1484 | static void receive_wanted_refs(struct packet_reader *reader, |
| 1485 | struct ref **sought, int nr_sought) |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1486 | { |
| 1487 | process_section_header(reader, "wanted-refs", 0); |
| 1488 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
| 1489 | struct object_id oid; |
| 1490 | const char *end; |
Jonathan Tan | b764300 | 2019-03-27 14:11:10 -0700 | [diff] [blame] | 1491 | struct ref **found; |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1492 | |
| 1493 | if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ') |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1494 | die(_("expected wanted-ref, got '%s'"), reader->line); |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1495 | |
Jonathan Tan | b764300 | 2019-03-27 14:11:10 -0700 | [diff] [blame] | 1496 | found = bsearch(end, sought, nr_sought, sizeof(*sought), |
| 1497 | cmp_name_ref); |
| 1498 | if (!found) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1499 | die(_("unexpected wanted-ref: '%s'"), reader->line); |
Jonathan Tan | b764300 | 2019-03-27 14:11:10 -0700 | [diff] [blame] | 1500 | oidcpy(&(*found)->old_oid, &oid); |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1501 | } |
| 1502 | |
| 1503 | if (reader->status != PACKET_READ_DELIM) |
Brandon Williams | bbb19a8 | 2018-07-23 10:56:35 -0700 | [diff] [blame] | 1504 | die(_("error processing wanted refs: %d"), reader->status); |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1505 | } |
| 1506 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1507 | static void receive_packfile_uris(struct packet_reader *reader, |
| 1508 | struct string_list *uris) |
| 1509 | { |
| 1510 | process_section_header(reader, "packfile-uris", 0); |
| 1511 | while (packet_reader_read(reader) == PACKET_READ_NORMAL) { |
| 1512 | if (reader->pktlen < the_hash_algo->hexsz || |
| 1513 | reader->line[the_hash_algo->hexsz] != ' ') |
| 1514 | die("expected '<hash> <uri>', got: %s\n", reader->line); |
| 1515 | |
| 1516 | string_list_append(uris, reader->line); |
| 1517 | } |
| 1518 | if (reader->status != PACKET_READ_DELIM) |
| 1519 | die("expected DELIM"); |
| 1520 | } |
| 1521 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1522 | enum fetch_state { |
| 1523 | FETCH_CHECK_LOCAL = 0, |
| 1524 | FETCH_SEND_REQUEST, |
| 1525 | FETCH_PROCESS_ACKS, |
| 1526 | FETCH_GET_PACK, |
| 1527 | FETCH_DONE, |
| 1528 | }; |
| 1529 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1530 | static void do_check_stateless_delimiter(int stateless_rpc, |
Denton Liu | b0df0c1 | 2020-05-19 06:54:00 -0400 | [diff] [blame] | 1531 | struct packet_reader *reader) |
| 1532 | { |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1533 | check_stateless_delimiter(stateless_rpc, reader, |
Denton Liu | b0df0c1 | 2020-05-19 06:54:00 -0400 | [diff] [blame] | 1534 | _("git fetch-pack: expected response end packet")); |
| 1535 | } |
| 1536 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1537 | static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, |
| 1538 | int fd[2], |
| 1539 | const struct ref *orig_ref, |
| 1540 | struct ref **sought, int nr_sought, |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1541 | struct oid_array *shallows, |
| 1542 | struct shallow_info *si, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1543 | struct string_list *pack_lockfiles) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1544 | { |
Derrick Stolee | aaf633c | 2019-08-13 11:37:48 -0700 | [diff] [blame] | 1545 | struct repository *r = the_repository; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1546 | struct ref *ref = copy_ref_list(orig_ref); |
| 1547 | enum fetch_state state = FETCH_CHECK_LOCAL; |
| 1548 | struct oidset common = OIDSET_INIT; |
| 1549 | struct packet_reader reader; |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1550 | int in_vain = 0, negotiation_started = 0; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1551 | int haves_to_send = INITIAL_FLUSH; |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1552 | struct fetch_negotiator negotiator_alloc; |
| 1553 | struct fetch_negotiator *negotiator; |
Jonathan Tan | 4fa3f00 | 2020-04-27 17:01:09 -0700 | [diff] [blame] | 1554 | int seen_ack = 0; |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1555 | struct object_id common_oid; |
| 1556 | int received_ready = 0; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1557 | struct string_list packfile_uris = STRING_LIST_INIT_DUP; |
| 1558 | int i; |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 1559 | struct strvec index_pack_args = STRVEC_INIT; |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1560 | |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1561 | negotiator = &negotiator_alloc; |
| 1562 | fetch_negotiator_init(r, negotiator); |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1563 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1564 | packet_reader_init(&reader, fd[0], NULL, 0, |
Masaya Suzuki | 2d103c3 | 2018-12-29 13:19:15 -0800 | [diff] [blame] | 1565 | PACKET_READ_CHOMP_NEWLINE | |
| 1566 | PACKET_READ_DIE_ON_ERR_PACKET); |
Jonathan Tan | 07c3c2a | 2019-01-16 11:28:15 -0800 | [diff] [blame] | 1567 | if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) && |
| 1568 | server_supports_feature("fetch", "sideband-all", 0)) { |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1569 | reader.use_sideband = 1; |
| 1570 | reader.me = "fetch-pack"; |
| 1571 | } |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1572 | |
| 1573 | while (state != FETCH_DONE) { |
| 1574 | switch (state) { |
| 1575 | case FETCH_CHECK_LOCAL: |
| 1576 | sort_ref_list(&ref, ref_compare_name); |
| 1577 | QSORT(sought, nr_sought, cmp_ref_by_name); |
| 1578 | |
| 1579 | /* v2 supports these by default */ |
| 1580 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; |
| 1581 | use_sideband = 2; |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1582 | if (args->depth > 0 || args->deepen_since || args->deepen_not) |
| 1583 | args->deepen = 1; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1584 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1585 | /* Filter 'ref' by 'sought' and those that aren't local */ |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1586 | mark_complete_and_common_ref(negotiator, args, &ref); |
| 1587 | filter_refs(args, &ref, sought, nr_sought); |
| 1588 | if (everything_local(args, &ref)) |
| 1589 | state = FETCH_DONE; |
| 1590 | else |
Jonathan Tan | 12f19a9 | 2018-10-03 16:04:52 -0700 | [diff] [blame] | 1591 | state = FETCH_SEND_REQUEST; |
Jonathan Tan | 9dfa8db | 2020-08-17 21:01:37 -0700 | [diff] [blame] | 1592 | |
| 1593 | mark_tips(negotiator, args->negotiation_tips); |
| 1594 | for_each_cached_alternate(negotiator, |
| 1595 | insert_one_alternate_object); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1596 | break; |
| 1597 | case FETCH_SEND_REQUEST: |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1598 | if (!negotiation_started) { |
| 1599 | negotiation_started = 1; |
| 1600 | trace2_region_enter("fetch-pack", |
| 1601 | "negotiation_v2", |
| 1602 | the_repository); |
| 1603 | } |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1604 | if (send_fetch_request(negotiator, fd[1], args, ref, |
Jonathan Tan | ec06283 | 2018-06-14 15:54:28 -0700 | [diff] [blame] | 1605 | &common, |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1606 | &haves_to_send, &in_vain, |
Jonathan Tan | 4fa3f00 | 2020-04-27 17:01:09 -0700 | [diff] [blame] | 1607 | reader.use_sideband, |
| 1608 | seen_ack)) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1609 | state = FETCH_GET_PACK; |
| 1610 | else |
| 1611 | state = FETCH_PROCESS_ACKS; |
| 1612 | break; |
| 1613 | case FETCH_PROCESS_ACKS: |
| 1614 | /* Process ACKs/NAKs */ |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1615 | process_section_header(&reader, "acknowledgments", 0); |
| 1616 | while (process_ack(negotiator, &reader, &common_oid, |
| 1617 | &received_ready)) { |
| 1618 | in_vain = 0; |
| 1619 | seen_ack = 1; |
| 1620 | oidset_insert(&common, &common_oid); |
| 1621 | } |
| 1622 | if (received_ready) { |
Denton Liu | b0df0c1 | 2020-05-19 06:54:00 -0400 | [diff] [blame] | 1623 | /* |
| 1624 | * Don't check for response delimiter; get_pack() will |
| 1625 | * read the rest of this response. |
| 1626 | */ |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1627 | state = FETCH_GET_PACK; |
Jonathan Tan | 8102570 | 2021-04-08 18:09:59 -0700 | [diff] [blame] | 1628 | } else { |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1629 | do_check_stateless_delimiter(args->stateless_rpc, &reader); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1630 | state = FETCH_SEND_REQUEST; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1631 | } |
| 1632 | break; |
| 1633 | case FETCH_GET_PACK: |
Josh Steadmon | 5fc3118 | 2019-10-02 16:49:28 -0700 | [diff] [blame] | 1634 | trace2_region_leave("fetch-pack", |
| 1635 | "negotiation_v2", |
| 1636 | the_repository); |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1637 | /* Check for shallow-info section */ |
| 1638 | if (process_section_header(&reader, "shallow-info", 1)) |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1639 | receive_shallow_info(args, &reader, shallows, si); |
Brandon Williams | f7e2050 | 2018-03-15 10:31:29 -0700 | [diff] [blame] | 1640 | |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1641 | if (process_section_header(&reader, "wanted-refs", 1)) |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1642 | receive_wanted_refs(&reader, sought, nr_sought); |
Brandon Williams | 7330205 | 2018-06-27 15:30:23 -0700 | [diff] [blame] | 1643 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1644 | /* get the pack(s) */ |
| 1645 | if (process_section_header(&reader, "packfile-uris", 1)) |
| 1646 | receive_packfile_uris(&reader, &packfile_uris); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1647 | process_section_header(&reader, "packfile", 0); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1648 | if (get_pack(args, fd, pack_lockfiles, |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 1649 | packfile_uris.nr ? &index_pack_args : NULL, |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 1650 | sought, nr_sought, &fsck_options.gitmodules_found)) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1651 | die(_("git fetch-pack: fetch failed.")); |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1652 | do_check_stateless_delimiter(args->stateless_rpc, &reader); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1653 | |
| 1654 | state = FETCH_DONE; |
| 1655 | break; |
| 1656 | case FETCH_DONE: |
| 1657 | continue; |
| 1658 | } |
| 1659 | } |
| 1660 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1661 | for (i = 0; i < packfile_uris.nr; i++) { |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 1662 | int j; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1663 | struct child_process cmd = CHILD_PROCESS_INIT; |
| 1664 | char packname[GIT_MAX_HEXSZ + 1]; |
| 1665 | const char *uri = packfile_uris.items[i].string + |
| 1666 | the_hash_algo->hexsz + 1; |
| 1667 | |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 1668 | strvec_push(&cmd.args, "http-fetch"); |
| 1669 | strvec_pushf(&cmd.args, "--packfile=%.*s", |
Jeff King | f6d8942 | 2020-07-28 16:26:31 -0400 | [diff] [blame] | 1670 | (int) the_hash_algo->hexsz, |
| 1671 | packfile_uris.items[i].string); |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 1672 | for (j = 0; j < index_pack_args.nr; j++) |
| 1673 | strvec_pushf(&cmd.args, "--index-pack-arg=%s", |
| 1674 | index_pack_args.v[j]); |
Jeff King | ef8d7ac | 2020-07-28 16:24:53 -0400 | [diff] [blame] | 1675 | strvec_push(&cmd.args, uri); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1676 | cmd.git_cmd = 1; |
| 1677 | cmd.no_stdin = 1; |
| 1678 | cmd.out = -1; |
| 1679 | if (start_command(&cmd)) |
| 1680 | die("fetch-pack: unable to spawn http-fetch"); |
| 1681 | |
| 1682 | if (read_in_full(cmd.out, packname, 5) < 0 || |
| 1683 | memcmp(packname, "keep\t", 5)) |
| 1684 | die("fetch-pack: expected keep then TAB at start of http-fetch output"); |
| 1685 | |
| 1686 | if (read_in_full(cmd.out, packname, |
| 1687 | the_hash_algo->hexsz + 1) < 0 || |
| 1688 | packname[the_hash_algo->hexsz] != '\n') |
| 1689 | die("fetch-pack: expected hash then LF at end of http-fetch output"); |
| 1690 | |
| 1691 | packname[the_hash_algo->hexsz] = '\0'; |
| 1692 | |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 1693 | parse_gitmodules_oids(cmd.out, &fsck_options.gitmodules_found); |
Jonathan Tan | 5476e1e | 2021-02-22 11:20:09 -0800 | [diff] [blame] | 1694 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1695 | close(cmd.out); |
| 1696 | |
| 1697 | if (finish_command(&cmd)) |
| 1698 | die("fetch-pack: unable to finish http-fetch"); |
| 1699 | |
| 1700 | if (memcmp(packfile_uris.items[i].string, packname, |
| 1701 | the_hash_algo->hexsz)) |
| 1702 | die("fetch-pack: pack downloaded from %s does not match expected hash %.*s", |
| 1703 | uri, (int) the_hash_algo->hexsz, |
| 1704 | packfile_uris.items[i].string); |
| 1705 | |
| 1706 | string_list_append_nodup(pack_lockfiles, |
| 1707 | xstrfmt("%s/pack/pack-%s.keep", |
| 1708 | get_object_directory(), |
| 1709 | packname)); |
| 1710 | } |
| 1711 | string_list_clear(&packfile_uris, 0); |
Jonathan Tan | b664e9f | 2021-02-22 11:20:08 -0800 | [diff] [blame] | 1712 | strvec_clear(&index_pack_args); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1713 | |
Ævar Arnfjörð Bjarmason | 3745e26 | 2021-03-28 15:15:51 +0200 | [diff] [blame] | 1714 | if (fsck_finish(&fsck_options)) |
| 1715 | die("fsck failed"); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1716 | |
Jonathan Tan | 603960b | 2019-11-12 16:34:20 -0800 | [diff] [blame] | 1717 | if (negotiator) |
| 1718 | negotiator->release(negotiator); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1719 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1720 | oidset_clear(&common); |
| 1721 | return ref; |
| 1722 | } |
| 1723 | |
Ævar Arnfjörð Bjarmason | 1362df0 | 2018-07-27 14:37:17 +0000 | [diff] [blame] | 1724 | static int fetch_pack_config_cb(const char *var, const char *value, void *cb) |
| 1725 | { |
| 1726 | if (strcmp(var, "fetch.fsck.skiplist") == 0) { |
| 1727 | const char *path; |
| 1728 | |
| 1729 | if (git_config_pathname(&path, var, value)) |
| 1730 | return 1; |
| 1731 | strbuf_addf(&fsck_msg_types, "%cskiplist=%s", |
| 1732 | fsck_msg_types.len ? ',' : '=', path); |
| 1733 | free((char *)path); |
| 1734 | return 0; |
| 1735 | } |
| 1736 | |
| 1737 | if (skip_prefix(var, "fetch.fsck.", &var)) { |
| 1738 | if (is_valid_msg_type(var, value)) |
| 1739 | strbuf_addf(&fsck_msg_types, "%c%s=%s", |
| 1740 | fsck_msg_types.len ? ',' : '=', var, value); |
| 1741 | else |
| 1742 | warning("Skipping unknown msg id '%s'", var); |
| 1743 | return 0; |
| 1744 | } |
| 1745 | |
| 1746 | return git_default_config(var, value, cb); |
| 1747 | } |
| 1748 | |
Tanay Abhra | f44af51 | 2014-08-07 09:21:20 -0700 | [diff] [blame] | 1749 | static void fetch_pack_config(void) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1750 | { |
Tanay Abhra | f44af51 | 2014-08-07 09:21:20 -0700 | [diff] [blame] | 1751 | git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit); |
| 1752 | git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit); |
| 1753 | git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta); |
| 1754 | git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects); |
| 1755 | git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects); |
Josh Steadmon | 1e905bb | 2020-11-11 15:29:31 -0800 | [diff] [blame] | 1756 | git_config_get_bool("transfer.advertisesid", &advertise_sid); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1757 | if (!uri_protocols.nr) { |
| 1758 | char *str; |
| 1759 | |
| 1760 | if (!git_config_get_string("fetch.uriprotocols", &str) && str) { |
| 1761 | string_list_split(&uri_protocols, str, ',', -1); |
| 1762 | free(str); |
| 1763 | } |
| 1764 | } |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1765 | |
Ævar Arnfjörð Bjarmason | 1362df0 | 2018-07-27 14:37:17 +0000 | [diff] [blame] | 1766 | git_config(fetch_pack_config_cb, NULL); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1767 | } |
| 1768 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1769 | static void fetch_pack_setup(void) |
| 1770 | { |
| 1771 | static int did_setup; |
| 1772 | if (did_setup) |
| 1773 | return; |
Tanay Abhra | f44af51 | 2014-08-07 09:21:20 -0700 | [diff] [blame] | 1774 | fetch_pack_config(); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1775 | if (0 <= transfer_unpack_limit) |
| 1776 | unpack_limit = transfer_unpack_limit; |
| 1777 | else if (0 <= fetch_unpack_limit) |
| 1778 | unpack_limit = fetch_unpack_limit; |
| 1779 | did_setup = 1; |
| 1780 | } |
| 1781 | |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 1782 | static int remove_duplicates_in_refs(struct ref **ref, int nr) |
| 1783 | { |
| 1784 | struct string_list names = STRING_LIST_INIT_NODUP; |
| 1785 | int src, dst; |
| 1786 | |
| 1787 | for (src = dst = 0; src < nr; src++) { |
| 1788 | struct string_list_item *item; |
| 1789 | item = string_list_insert(&names, ref[src]->name); |
| 1790 | if (item->util) |
| 1791 | continue; /* already have it */ |
| 1792 | item->util = ref[src]; |
| 1793 | if (src != dst) |
| 1794 | ref[dst] = ref[src]; |
| 1795 | dst++; |
| 1796 | } |
| 1797 | for (src = dst; src < nr; src++) |
| 1798 | ref[src] = NULL; |
| 1799 | string_list_clear(&names, 0); |
| 1800 | return dst; |
| 1801 | } |
| 1802 | |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1803 | static void update_shallow(struct fetch_pack_args *args, |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1804 | struct ref **sought, int nr_sought, |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1805 | struct shallow_info *si) |
Nguyễn Thái Ngọc Duy | a796cce | 2013-12-05 20:02:37 +0700 | [diff] [blame] | 1806 | { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1807 | struct oid_array ref = OID_ARRAY_INIT; |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1808 | int *status; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1809 | int i; |
| 1810 | |
Nguyễn Thái Ngọc Duy | 79891cb | 2016-06-12 17:53:56 +0700 | [diff] [blame] | 1811 | if (args->deepen && alternate_shallow_file) { |
Nguyễn Thái Ngọc Duy | a796cce | 2013-12-05 20:02:37 +0700 | [diff] [blame] | 1812 | if (*alternate_shallow_file == '\0') { /* --unshallow */ |
Stefan Beller | 102de88 | 2018-05-17 15:51:51 -0700 | [diff] [blame] | 1813 | unlink_or_warn(git_path_shallow(the_repository)); |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 1814 | rollback_shallow_file(the_repository, &shallow_lock); |
Nguyễn Thái Ngọc Duy | a796cce | 2013-12-05 20:02:37 +0700 | [diff] [blame] | 1815 | } else |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 1816 | commit_shallow_file(the_repository, &shallow_lock); |
brian m. carlson | 23311f3 | 2019-02-04 00:06:50 +0000 | [diff] [blame] | 1817 | alternate_shallow_file = NULL; |
Nguyễn Thái Ngọc Duy | a796cce | 2013-12-05 20:02:37 +0700 | [diff] [blame] | 1818 | return; |
| 1819 | } |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1820 | |
| 1821 | if (!si->shallow || !si->shallow->nr) |
| 1822 | return; |
| 1823 | |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1824 | if (args->cloning) { |
| 1825 | /* |
| 1826 | * remote is shallow, but this is a clone, there are |
| 1827 | * no objects in repo to worry about. Accept any |
| 1828 | * shallow points that exist in the pack (iow in repo |
| 1829 | * after get_pack() and reprepare_packed_git()) |
| 1830 | */ |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1831 | struct oid_array extra = OID_ARRAY_INIT; |
brian m. carlson | ee3051b | 2017-03-26 16:01:37 +0000 | [diff] [blame] | 1832 | struct object_id *oid = si->shallow->oid; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1833 | for (i = 0; i < si->shallow->nr; i++) |
brian m. carlson | ee3051b | 2017-03-26 16:01:37 +0000 | [diff] [blame] | 1834 | if (has_object_file(&oid[i])) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1835 | oid_array_append(&extra, &oid[i]); |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1836 | if (extra.nr) { |
| 1837 | setup_alternate_shallow(&shallow_lock, |
| 1838 | &alternate_shallow_file, |
| 1839 | &extra); |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 1840 | commit_shallow_file(the_repository, &shallow_lock); |
brian m. carlson | 23311f3 | 2019-02-04 00:06:50 +0000 | [diff] [blame] | 1841 | alternate_shallow_file = NULL; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1842 | } |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1843 | oid_array_clear(&extra); |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1844 | return; |
| 1845 | } |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1846 | |
| 1847 | if (!si->nr_ours && !si->nr_theirs) |
| 1848 | return; |
| 1849 | |
| 1850 | remove_nonexistent_theirs_shallow(si); |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1851 | if (!si->nr_ours && !si->nr_theirs) |
| 1852 | return; |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1853 | for (i = 0; i < nr_sought; i++) |
| 1854 | oid_array_append(&ref, &sought[i]->old_oid); |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1855 | si->ref = &ref; |
| 1856 | |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1857 | if (args->update_shallow) { |
| 1858 | /* |
| 1859 | * remote is also shallow, .git/shallow may be updated |
| 1860 | * so all refs can be accepted. Make sure we only add |
| 1861 | * shallow roots that are actually reachable from new |
| 1862 | * refs. |
| 1863 | */ |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1864 | struct oid_array extra = OID_ARRAY_INIT; |
brian m. carlson | ee3051b | 2017-03-26 16:01:37 +0000 | [diff] [blame] | 1865 | struct object_id *oid = si->shallow->oid; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1866 | assign_shallow_commits_to_refs(si, NULL, NULL); |
| 1867 | if (!si->nr_ours && !si->nr_theirs) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1868 | oid_array_clear(&ref); |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1869 | return; |
| 1870 | } |
| 1871 | for (i = 0; i < si->nr_ours; i++) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1872 | oid_array_append(&extra, &oid[si->ours[i]]); |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1873 | for (i = 0; i < si->nr_theirs; i++) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1874 | oid_array_append(&extra, &oid[si->theirs[i]]); |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1875 | setup_alternate_shallow(&shallow_lock, |
| 1876 | &alternate_shallow_file, |
| 1877 | &extra); |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 1878 | commit_shallow_file(the_repository, &shallow_lock); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1879 | oid_array_clear(&extra); |
| 1880 | oid_array_clear(&ref); |
brian m. carlson | 23311f3 | 2019-02-04 00:06:50 +0000 | [diff] [blame] | 1881 | alternate_shallow_file = NULL; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 1882 | return; |
| 1883 | } |
| 1884 | |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1885 | /* |
| 1886 | * remote is also shallow, check what ref is safe to update |
| 1887 | * without updating .git/shallow |
| 1888 | */ |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 1889 | CALLOC_ARRAY(status, nr_sought); |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1890 | assign_shallow_commits_to_refs(si, NULL, status); |
| 1891 | if (si->nr_ours || si->nr_theirs) { |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1892 | for (i = 0; i < nr_sought; i++) |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1893 | if (status[i]) |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1894 | sought[i]->status = REF_STATUS_REJECT_SHALLOW; |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 1895 | } |
| 1896 | free(status); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1897 | oid_array_clear(&ref); |
Nguyễn Thái Ngọc Duy | a796cce | 2013-12-05 20:02:37 +0700 | [diff] [blame] | 1898 | } |
| 1899 | |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 1900 | static int iterate_ref_map(void *cb_data, struct object_id *oid) |
| 1901 | { |
| 1902 | struct ref **rm = cb_data; |
| 1903 | struct ref *ref = *rm; |
| 1904 | |
| 1905 | if (!ref) |
| 1906 | return -1; /* end of the list */ |
| 1907 | *rm = ref->next; |
| 1908 | oidcpy(oid, &ref->old_oid); |
| 1909 | return 0; |
| 1910 | } |
| 1911 | |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1912 | struct ref *fetch_pack(struct fetch_pack_args *args, |
Jeff King | 0f804b0 | 2019-03-20 04:16:14 -0400 | [diff] [blame] | 1913 | int fd[], |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1914 | const struct ref *ref, |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 1915 | struct ref **sought, int nr_sought, |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1916 | struct oid_array *shallow, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1917 | struct string_list *pack_lockfiles, |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1918 | enum protocol_version version) |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1919 | { |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1920 | struct ref *ref_cpy; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1921 | struct shallow_info si; |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1922 | struct oid_array shallows_scratch = OID_ARRAY_INIT; |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1923 | |
| 1924 | fetch_pack_setup(); |
Junio C Hamano | f2db854 | 2013-01-29 14:02:15 -0800 | [diff] [blame] | 1925 | if (nr_sought) |
| 1926 | nr_sought = remove_duplicates_in_refs(sought, nr_sought); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1927 | |
Jonathan Tan | 0177565 | 2018-09-27 12:24:05 -0700 | [diff] [blame] | 1928 | if (version != protocol_v2 && !ref) { |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1929 | packet_flush(fd[1]); |
Nguyễn Thái Ngọc Duy | 1dd73e2 | 2016-06-12 17:53:55 +0700 | [diff] [blame] | 1930 | die(_("no matching remote head")); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1931 | } |
Jonathan Tan | 1e7d440 | 2019-03-26 12:31:20 -0700 | [diff] [blame] | 1932 | if (version == protocol_v2) { |
| 1933 | if (shallow->nr) |
| 1934 | BUG("Protocol V2 does not provide shallows at this point in the fetch"); |
| 1935 | memset(&si, 0, sizeof(si)); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1936 | ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought, |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1937 | &shallows_scratch, &si, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1938 | pack_lockfiles); |
Jonathan Tan | 1e7d440 | 2019-03-26 12:31:20 -0700 | [diff] [blame] | 1939 | } else { |
| 1940 | prepare_shallow_info(&si, shallow); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1941 | ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1942 | &si, pack_lockfiles); |
Jonathan Tan | 1e7d440 | 2019-03-26 12:31:20 -0700 | [diff] [blame] | 1943 | } |
Stefan Beller | a49d283 | 2018-03-23 18:45:21 +0100 | [diff] [blame] | 1944 | reprepare_packed_git(the_repository); |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 1945 | |
| 1946 | if (!args->cloning && args->deepen) { |
| 1947 | struct check_connected_options opt = CHECK_CONNECTED_INIT; |
| 1948 | struct ref *iterator = ref_cpy; |
| 1949 | opt.shallow_file = alternate_shallow_file; |
| 1950 | if (args->deepen) |
| 1951 | opt.is_deepening_fetch = 1; |
| 1952 | if (check_connected(iterate_ref_map, &iterator, &opt)) { |
| 1953 | error(_("remote did not send all necessary objects")); |
| 1954 | free_refs(ref_cpy); |
| 1955 | ref_cpy = NULL; |
Taylor Blau | 37b9dca | 2020-04-22 18:25:45 -0600 | [diff] [blame] | 1956 | rollback_shallow_file(the_repository, &shallow_lock); |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 1957 | goto cleanup; |
| 1958 | } |
| 1959 | args->connectivity_checked = 1; |
| 1960 | } |
| 1961 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1962 | update_shallow(args, sought, nr_sought, &si); |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 1963 | cleanup: |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 1964 | clear_shallow_info(&si); |
Jonathan Tan | 1339078 | 2019-03-26 12:31:21 -0700 | [diff] [blame] | 1965 | oid_array_clear(&shallows_scratch); |
Nguyễn Thái Ngọc Duy | 745f7a8 | 2012-10-26 22:53:55 +0700 | [diff] [blame] | 1966 | return ref_cpy; |
| 1967 | } |
Matt McCutchen | e860d96 | 2017-02-22 11:01:22 -0500 | [diff] [blame] | 1968 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1969 | static int add_to_object_array(const struct object_id *oid, void *data) |
| 1970 | { |
| 1971 | struct object_array *a = data; |
| 1972 | |
| 1973 | add_object_array(lookup_object(the_repository, oid), "", a); |
| 1974 | return 0; |
| 1975 | } |
| 1976 | |
| 1977 | static void clear_common_flag(struct oidset *s) |
| 1978 | { |
| 1979 | struct oidset_iter iter; |
| 1980 | const struct object_id *oid; |
| 1981 | oidset_iter_init(s, &iter); |
| 1982 | |
| 1983 | while ((oid = oidset_iter_next(&iter))) { |
| 1984 | struct object *obj = lookup_object(the_repository, oid); |
| 1985 | obj->flags &= ~COMMON; |
| 1986 | } |
| 1987 | } |
| 1988 | |
| 1989 | void negotiate_using_fetch(const struct oid_array *negotiation_tips, |
| 1990 | const struct string_list *server_options, |
| 1991 | int stateless_rpc, |
| 1992 | int fd[], |
| 1993 | struct oidset *acked_commits) |
| 1994 | { |
| 1995 | struct fetch_negotiator negotiator; |
| 1996 | struct packet_reader reader; |
| 1997 | struct object_array nt_object_array = OBJECT_ARRAY_INIT; |
| 1998 | struct strbuf req_buf = STRBUF_INIT; |
| 1999 | int haves_to_send = INITIAL_FLUSH; |
| 2000 | int in_vain = 0; |
| 2001 | int seen_ack = 0; |
| 2002 | int last_iteration = 0; |
| 2003 | timestamp_t min_generation = GENERATION_NUMBER_INFINITY; |
| 2004 | |
| 2005 | fetch_negotiator_init(the_repository, &negotiator); |
| 2006 | mark_tips(&negotiator, negotiation_tips); |
| 2007 | |
| 2008 | packet_reader_init(&reader, fd[0], NULL, 0, |
| 2009 | PACKET_READ_CHOMP_NEWLINE | |
| 2010 | PACKET_READ_DIE_ON_ERR_PACKET); |
| 2011 | |
| 2012 | oid_array_for_each((struct oid_array *) negotiation_tips, |
| 2013 | add_to_object_array, |
| 2014 | &nt_object_array); |
| 2015 | |
| 2016 | while (!last_iteration) { |
| 2017 | int haves_added; |
| 2018 | struct object_id common_oid; |
| 2019 | int received_ready = 0; |
| 2020 | |
| 2021 | strbuf_reset(&req_buf); |
| 2022 | write_fetch_command_and_capabilities(&req_buf, server_options); |
| 2023 | |
| 2024 | packet_buf_write(&req_buf, "wait-for-done"); |
| 2025 | |
| 2026 | haves_added = add_haves(&negotiator, &req_buf, &haves_to_send); |
| 2027 | in_vain += haves_added; |
| 2028 | if (!haves_added || (seen_ack && in_vain >= MAX_IN_VAIN)) |
| 2029 | last_iteration = 1; |
| 2030 | |
| 2031 | /* Send request */ |
| 2032 | packet_buf_flush(&req_buf); |
| 2033 | if (write_in_full(fd[1], req_buf.buf, req_buf.len) < 0) |
| 2034 | die_errno(_("unable to write request to remote")); |
| 2035 | |
| 2036 | /* Process ACKs/NAKs */ |
| 2037 | process_section_header(&reader, "acknowledgments", 0); |
| 2038 | while (process_ack(&negotiator, &reader, &common_oid, |
| 2039 | &received_ready)) { |
| 2040 | struct commit *commit = lookup_commit(the_repository, |
| 2041 | &common_oid); |
| 2042 | if (commit) { |
| 2043 | timestamp_t generation; |
| 2044 | |
| 2045 | parse_commit_or_die(commit); |
| 2046 | commit->object.flags |= COMMON; |
| 2047 | generation = commit_graph_generation(commit); |
| 2048 | if (generation < min_generation) |
| 2049 | min_generation = generation; |
| 2050 | } |
| 2051 | in_vain = 0; |
| 2052 | seen_ack = 1; |
| 2053 | oidset_insert(acked_commits, &common_oid); |
| 2054 | } |
| 2055 | if (received_ready) |
| 2056 | die(_("unexpected 'ready' from remote")); |
| 2057 | else |
| 2058 | do_check_stateless_delimiter(stateless_rpc, &reader); |
| 2059 | if (can_all_from_reach_with_flag(&nt_object_array, COMMON, |
| 2060 | REACH_SCRATCH, 0, |
| 2061 | min_generation)) |
| 2062 | last_iteration = 1; |
| 2063 | } |
| 2064 | clear_common_flag(acked_commits); |
| 2065 | strbuf_release(&req_buf); |
| 2066 | } |
| 2067 | |
Matt McCutchen | e860d96 | 2017-02-22 11:01:22 -0500 | [diff] [blame] | 2068 | int report_unmatched_refs(struct ref **sought, int nr_sought) |
| 2069 | { |
| 2070 | int i, ret = 0; |
| 2071 | |
| 2072 | for (i = 0; i < nr_sought; i++) { |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 2073 | if (!sought[i]) |
Matt McCutchen | e860d96 | 2017-02-22 11:01:22 -0500 | [diff] [blame] | 2074 | continue; |
Matt McCutchen | d56583d | 2017-02-22 11:05:57 -0500 | [diff] [blame] | 2075 | switch (sought[i]->match_status) { |
| 2076 | case REF_MATCHED: |
| 2077 | continue; |
| 2078 | case REF_NOT_MATCHED: |
| 2079 | error(_("no such remote ref %s"), sought[i]->name); |
| 2080 | break; |
| 2081 | case REF_UNADVERTISED_NOT_ALLOWED: |
| 2082 | error(_("Server does not allow request for unadvertised object %s"), |
| 2083 | sought[i]->name); |
| 2084 | break; |
| 2085 | } |
Matt McCutchen | e860d96 | 2017-02-22 11:01:22 -0500 | [diff] [blame] | 2086 | ret = 1; |
| 2087 | } |
| 2088 | return ret; |
| 2089 | } |