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