]>
Commit | Line | Data |
---|---|---|
def88e9a | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
def88e9a LT |
3 | #include "refs.h" |
4 | #include "pkt-line.h" | |
958c24b1 | 5 | #include "sideband.h" |
109cd76d | 6 | #include "repository.h" |
cbd53a21 | 7 | #include "object-store.h" |
f6b42a81 JH |
8 | #include "tag.h" |
9 | #include "object.h" | |
f0243f26 | 10 | #include "commit.h" |
9b8dc263 JS |
11 | #include "diff.h" |
12 | #include "revision.h" | |
13 | #include "list-objects.h" | |
10ac85c7 JH |
14 | #include "list-objects-filter.h" |
15 | #include "list-objects-filter-options.h" | |
cc41fa8d | 16 | #include "run-command.h" |
47a59185 | 17 | #include "connect.h" |
051e4005 | 18 | #include "sigchain.h" |
ff5effdf | 19 | #include "version.h" |
daebaa78 | 20 | #include "string-list.h" |
dbbcd44f | 21 | #include "strvec.h" |
5411b10c | 22 | #include "prio-queue.h" |
aa9bab29 | 23 | #include "protocol.h" |
10ac85c7 | 24 | #include "quote.h" |
a3d6b53e | 25 | #include "upload-pack.h" |
3145ea95 | 26 | #include "serve.h" |
829a3215 | 27 | #include "commit-graph.h" |
ba3ca1ed | 28 | #include "commit-reach.h" |
120ad2b0 | 29 | #include "shallow.h" |
def88e9a | 30 | |
208acbfb | 31 | /* Remember to update object flag allocation in object.h */ |
937a515a JH |
32 | #define THEY_HAVE (1u << 11) |
33 | #define OUR_REF (1u << 12) | |
34 | #define WANTED (1u << 13) | |
35 | #define COMMON_KNOWN (1u << 14) | |
937a515a | 36 | |
f53514bc JS |
37 | #define SHALLOW (1u << 16) |
38 | #define NOT_SHALLOW (1u << 17) | |
39 | #define CLIENT_SHALLOW (1u << 18) | |
390eb36b | 40 | #define HIDDEN_REF (1u << 19) |
f53514bc | 41 | |
d1035cac JT |
42 | #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \ |
43 | NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF) | |
44 | ||
629060d9 CC |
45 | /* Enum for allowed unadvertised object request (UOR) */ |
46 | enum allow_uor { | |
47 | /* Allow specifying sha1 if it is a ref tip. */ | |
48 | ALLOW_TIP_SHA1 = 0x01, | |
49 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ | |
50 | ALLOW_REACHABLE_SHA1 = 0x02, | |
51 | /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */ | |
52 | ALLOW_ANY_SHA1 = 0x07 | |
53 | }; | |
960deccb | 54 | |
a8497288 CC |
55 | /* |
56 | * Please annotate, and if possible group together, fields used only | |
57 | * for protocol v0 or only for protocol v2. | |
58 | */ | |
e8498322 | 59 | struct upload_pack_data { |
a8497288 | 60 | struct string_list symref; /* v0 only */ |
e8498322 CC |
61 | struct object_array want_obj; |
62 | struct object_array have_obj; | |
a8497288 CC |
63 | struct oid_array haves; /* v2 only */ |
64 | struct string_list wanted_refs; /* v2 only */ | |
9b67eb6f | 65 | struct string_list hidden_refs; |
e8498322 CC |
66 | |
67 | struct object_array shallows; | |
68 | struct string_list deepen_not; | |
de0e9f74 | 69 | struct object_array extra_edge_obj; |
e8498322 CC |
70 | int depth; |
71 | timestamp_t deepen_since; | |
72 | int deepen_rev_list; | |
73 | int deepen_relative; | |
f203a88c | 74 | int keepalive; |
35b43a10 | 75 | int shallow_nr; |
f01c7916 | 76 | timestamp_t oldest_have; |
e8498322 | 77 | |
d40f04e0 | 78 | unsigned int timeout; /* v0 only */ |
e9d882b8 CC |
79 | enum { |
80 | NO_MULTI_ACK = 0, | |
81 | MULTI_ACK = 1, | |
82 | MULTI_ACK_DETAILED = 2 | |
83 | } multi_ack; /* v0 only */ | |
d40f04e0 | 84 | |
f8edd1ca CC |
85 | /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */ |
86 | int use_sideband; | |
87 | ||
dd4b732d | 88 | struct string_list uri_protocols; |
629060d9 | 89 | enum allow_uor allow_uor; |
f1514c6a | 90 | |
e8498322 | 91 | struct list_objects_filter_options filter_options; |
6dd3456a | 92 | struct string_list allowed_filters; |
e8498322 CC |
93 | |
94 | struct packet_writer writer; | |
95 | ||
339a9840 CC |
96 | const char *pack_objects_hook; |
97 | ||
a8497288 | 98 | unsigned stateless_rpc : 1; /* v0 only */ |
d40f04e0 CC |
99 | unsigned no_done : 1; /* v0 only */ |
100 | unsigned daemon_mode : 1; /* v0 only */ | |
59a90261 | 101 | unsigned filter_capability_requested : 1; /* v0 only */ |
e8498322 CC |
102 | |
103 | unsigned use_thin_pack : 1; | |
104 | unsigned use_ofs_delta : 1; | |
105 | unsigned no_progress : 1; | |
106 | unsigned use_include_tag : 1; | |
9c1e657a | 107 | unsigned wait_for_done : 1; |
59abe196 | 108 | unsigned allow_filter : 1; |
6dd3456a | 109 | unsigned allow_filter_fallback : 1; |
5b01a4e8 | 110 | unsigned long tree_filter_max_depth; |
a8497288 CC |
111 | |
112 | unsigned done : 1; /* v2 only */ | |
d1d7a945 | 113 | unsigned allow_ref_in_want : 1; /* v2 only */ |
e3835cd4 | 114 | unsigned allow_sideband_all : 1; /* v2 only */ |
791e1adf | 115 | unsigned advertise_sid : 1; |
e8498322 CC |
116 | }; |
117 | ||
118 | static void upload_pack_data_init(struct upload_pack_data *data) | |
119 | { | |
438528f6 | 120 | struct string_list symref = STRING_LIST_INIT_DUP; |
e8498322 | 121 | struct string_list wanted_refs = STRING_LIST_INIT_DUP; |
9b67eb6f | 122 | struct string_list hidden_refs = STRING_LIST_INIT_DUP; |
e8498322 CC |
123 | struct object_array want_obj = OBJECT_ARRAY_INIT; |
124 | struct object_array have_obj = OBJECT_ARRAY_INIT; | |
125 | struct oid_array haves = OID_ARRAY_INIT; | |
126 | struct object_array shallows = OBJECT_ARRAY_INIT; | |
127 | struct string_list deepen_not = STRING_LIST_INIT_DUP; | |
dd4b732d | 128 | struct string_list uri_protocols = STRING_LIST_INIT_DUP; |
de0e9f74 | 129 | struct object_array extra_edge_obj = OBJECT_ARRAY_INIT; |
6dd3456a | 130 | struct string_list allowed_filters = STRING_LIST_INIT_DUP; |
e8498322 CC |
131 | |
132 | memset(data, 0, sizeof(*data)); | |
438528f6 | 133 | data->symref = symref; |
e8498322 | 134 | data->wanted_refs = wanted_refs; |
9b67eb6f | 135 | data->hidden_refs = hidden_refs; |
e8498322 CC |
136 | data->want_obj = want_obj; |
137 | data->have_obj = have_obj; | |
138 | data->haves = haves; | |
139 | data->shallows = shallows; | |
140 | data->deepen_not = deepen_not; | |
dd4b732d | 141 | data->uri_protocols = uri_protocols; |
de0e9f74 | 142 | data->extra_edge_obj = extra_edge_obj; |
6dd3456a TB |
143 | data->allowed_filters = allowed_filters; |
144 | data->allow_filter_fallback = 1; | |
5b01a4e8 | 145 | data->tree_filter_max_depth = ULONG_MAX; |
e8498322 | 146 | packet_writer_init(&data->writer, 1); |
2a01bded | 147 | list_objects_filter_init(&data->filter_options); |
f203a88c CC |
148 | |
149 | data->keepalive = 5; | |
791e1adf | 150 | data->advertise_sid = 0; |
e8498322 CC |
151 | } |
152 | ||
153 | static void upload_pack_data_clear(struct upload_pack_data *data) | |
154 | { | |
438528f6 | 155 | string_list_clear(&data->symref, 1); |
e8498322 | 156 | string_list_clear(&data->wanted_refs, 1); |
9b67eb6f | 157 | string_list_clear(&data->hidden_refs, 0); |
e8498322 CC |
158 | object_array_clear(&data->want_obj); |
159 | object_array_clear(&data->have_obj); | |
160 | oid_array_clear(&data->haves); | |
161 | object_array_clear(&data->shallows); | |
162 | string_list_clear(&data->deepen_not, 0); | |
de0e9f74 | 163 | object_array_clear(&data->extra_edge_obj); |
e8498322 | 164 | list_objects_filter_release(&data->filter_options); |
8d133f50 | 165 | string_list_clear(&data->allowed_filters, 0); |
339a9840 CC |
166 | |
167 | free((char *)data->pack_objects_hook); | |
e8498322 CC |
168 | } |
169 | ||
d40f04e0 | 170 | static void reset_timeout(unsigned int timeout) |
960deccb PA |
171 | { |
172 | alarm(timeout); | |
173 | } | |
fb9040cc | 174 | |
f8edd1ca CC |
175 | static void send_client_data(int fd, const char *data, ssize_t sz, |
176 | int use_sideband) | |
583b7ea3 | 177 | { |
4c4b7d1d LF |
178 | if (use_sideband) { |
179 | send_sideband(1, fd, data, sz, use_sideband); | |
fcf0fe9e | 180 | return; |
4c4b7d1d | 181 | } |
958c24b1 JH |
182 | if (fd == 3) |
183 | /* emergency quit */ | |
184 | fd = 2; | |
185 | if (fd == 2) { | |
93822c22 | 186 | /* XXX: are we happy to lose stuff here? */ |
958c24b1 | 187 | xwrite(fd, data, sz); |
fcf0fe9e | 188 | return; |
583b7ea3 | 189 | } |
cdf4fb8e | 190 | write_or_die(fd, data, sz); |
583b7ea3 JH |
191 | } |
192 | ||
b790e0f6 NTND |
193 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) |
194 | { | |
195 | FILE *fp = cb_data; | |
196 | if (graft->nr_parent == -1) | |
7683e2e6 | 197 | fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid)); |
b790e0f6 NTND |
198 | return 0; |
199 | } | |
200 | ||
acaaca7d | 201 | struct output_state { |
55a9651d JV |
202 | /* |
203 | * We do writes no bigger than LARGE_PACKET_DATA_MAX - 1, because with | |
204 | * sideband-64k the band designator takes up 1 byte of space. Because | |
205 | * relay_pack_data keeps the last byte to itself, we make the buffer 1 | |
206 | * byte bigger than the intended maximum write size. | |
207 | */ | |
208 | char buffer[(LARGE_PACKET_DATA_MAX - 1) + 1]; | |
acaaca7d | 209 | int used; |
dd4b732d JT |
210 | unsigned packfile_uris_started : 1; |
211 | unsigned packfile_started : 1; | |
acaaca7d JT |
212 | }; |
213 | ||
214 | static int relay_pack_data(int pack_objects_out, struct output_state *os, | |
dd4b732d | 215 | int use_sideband, int write_packfile_line) |
acaaca7d JT |
216 | { |
217 | /* | |
218 | * We keep the last byte to ourselves | |
219 | * in case we detect broken rev-list, so that we | |
220 | * can leave the stream corrupted. This is | |
221 | * unfortunate -- unpack-objects would happily | |
222 | * accept a valid packdata with trailing garbage, | |
223 | * so appending garbage after we pass all the | |
224 | * pack data is not good enough to signal | |
225 | * breakage to downstream. | |
226 | */ | |
227 | ssize_t readsz; | |
228 | ||
229 | readsz = xread(pack_objects_out, os->buffer + os->used, | |
230 | sizeof(os->buffer) - os->used); | |
231 | if (readsz < 0) { | |
232 | return readsz; | |
233 | } | |
234 | os->used += readsz; | |
235 | ||
dd4b732d JT |
236 | while (!os->packfile_started) { |
237 | char *p; | |
238 | if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) { | |
239 | os->packfile_started = 1; | |
240 | if (write_packfile_line) { | |
241 | if (os->packfile_uris_started) | |
242 | packet_delim(1); | |
243 | packet_write_fmt(1, "\1packfile\n"); | |
244 | } | |
245 | break; | |
246 | } | |
247 | if ((p = memchr(os->buffer, '\n', os->used))) { | |
248 | if (!os->packfile_uris_started) { | |
249 | os->packfile_uris_started = 1; | |
250 | if (!write_packfile_line) | |
251 | BUG("packfile_uris requires sideband-all"); | |
252 | packet_write_fmt(1, "\1packfile-uris\n"); | |
253 | } | |
254 | *p = '\0'; | |
255 | packet_write_fmt(1, "\1%s\n", os->buffer); | |
256 | ||
257 | os->used -= p - os->buffer + 1; | |
258 | memmove(os->buffer, p + 1, os->used); | |
259 | } else { | |
260 | /* | |
261 | * Incomplete line. | |
262 | */ | |
263 | return readsz; | |
264 | } | |
265 | } | |
266 | ||
acaaca7d JT |
267 | if (os->used > 1) { |
268 | send_client_data(1, os->buffer, os->used - 1, use_sideband); | |
269 | os->buffer[0] = os->buffer[os->used - 1]; | |
270 | os->used = 1; | |
271 | } else { | |
272 | send_client_data(1, os->buffer, os->used, use_sideband); | |
273 | os->used = 0; | |
274 | } | |
275 | ||
276 | return readsz; | |
277 | } | |
278 | ||
dd4b732d JT |
279 | static void create_pack_file(struct upload_pack_data *pack_data, |
280 | const struct string_list *uri_protocols) | |
fb9040cc | 281 | { |
d3180279 | 282 | struct child_process pack_objects = CHILD_PROCESS_INIT; |
55a9651d | 283 | struct output_state *output_state = xcalloc(1, sizeof(struct output_state)); |
acaaca7d | 284 | char progress[128]; |
583b7ea3 JH |
285 | char abort_msg[] = "aborting due to possible repository " |
286 | "corruption on the remote side."; | |
1456b043 | 287 | ssize_t sz; |
65a3629e | 288 | int i; |
cdab4858 | 289 | FILE *pipe_fd; |
75bfc6c2 | 290 | |
339a9840 | 291 | if (!pack_data->pack_objects_hook) |
20b20a22 JK |
292 | pack_objects.git_cmd = 1; |
293 | else { | |
c972bf4c JK |
294 | strvec_push(&pack_objects.args, pack_data->pack_objects_hook); |
295 | strvec_push(&pack_objects.args, "git"); | |
20b20a22 JK |
296 | pack_objects.use_shell = 1; |
297 | } | |
298 | ||
35b43a10 | 299 | if (pack_data->shallow_nr) { |
c972bf4c JK |
300 | strvec_push(&pack_objects.args, "--shallow-file"); |
301 | strvec_push(&pack_objects.args, ""); | |
f0cea83f | 302 | } |
c972bf4c JK |
303 | strvec_push(&pack_objects.args, "pack-objects"); |
304 | strvec_push(&pack_objects.args, "--revs"); | |
b5a2068c | 305 | if (pack_data->use_thin_pack) |
c972bf4c | 306 | strvec_push(&pack_objects.args, "--thin"); |
75bfc6c2 | 307 | |
c972bf4c | 308 | strvec_push(&pack_objects.args, "--stdout"); |
35b43a10 | 309 | if (pack_data->shallow_nr) |
c972bf4c | 310 | strvec_push(&pack_objects.args, "--shallow"); |
b5a2068c | 311 | if (!pack_data->no_progress) |
c972bf4c | 312 | strvec_push(&pack_objects.args, "--progress"); |
b5a2068c | 313 | if (pack_data->use_ofs_delta) |
c972bf4c | 314 | strvec_push(&pack_objects.args, "--delta-base-offset"); |
b5a2068c | 315 | if (pack_data->use_include_tag) |
c972bf4c | 316 | strvec_push(&pack_objects.args, "--include-tag"); |
c9f03259 | 317 | if (pack_data->filter_options.choice) { |
cf9ceb5a | 318 | const char *spec = |
c9f03259 | 319 | expand_list_objects_filter_spec(&pack_data->filter_options); |
ad5df6b7 | 320 | strvec_pushf(&pack_objects.args, "--filter=%s", spec); |
10ac85c7 | 321 | } |
dd4b732d JT |
322 | if (uri_protocols) { |
323 | for (i = 0; i < uri_protocols->nr; i++) | |
c972bf4c | 324 | strvec_pushf(&pack_objects.args, "--uri-protocol=%s", |
dd4b732d JT |
325 | uri_protocols->items[i].string); |
326 | } | |
cc41fa8d | 327 | |
b9612197 | 328 | pack_objects.in = -1; |
cc41fa8d JS |
329 | pack_objects.out = -1; |
330 | pack_objects.err = -1; | |
309a4028 | 331 | pack_objects.clean_on_exit = 1; |
21edd3f1 | 332 | |
4c324c00 | 333 | if (start_command(&pack_objects)) |
7e44c935 | 334 | die("git upload-pack: unable to fork git-pack-objects"); |
b1c71b72 | 335 | |
cdab4858 NTND |
336 | pipe_fd = xfdopen(pack_objects.in, "w"); |
337 | ||
35b43a10 | 338 | if (pack_data->shallow_nr) |
b790e0f6 NTND |
339 | for_each_commit_graft(write_one_shallow, pipe_fd); |
340 | ||
c9f03259 | 341 | for (i = 0; i < pack_data->want_obj.nr; i++) |
cdab4858 | 342 | fprintf(pipe_fd, "%s\n", |
c9f03259 | 343 | oid_to_hex(&pack_data->want_obj.objects[i].item->oid)); |
cdab4858 | 344 | fprintf(pipe_fd, "--not\n"); |
c9f03259 | 345 | for (i = 0; i < pack_data->have_obj.nr; i++) |
cdab4858 | 346 | fprintf(pipe_fd, "%s\n", |
c9f03259 | 347 | oid_to_hex(&pack_data->have_obj.objects[i].item->oid)); |
de0e9f74 | 348 | for (i = 0; i < pack_data->extra_edge_obj.nr; i++) |
cdab4858 | 349 | fprintf(pipe_fd, "%s\n", |
de0e9f74 | 350 | oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid)); |
cdab4858 NTND |
351 | fprintf(pipe_fd, "\n"); |
352 | fflush(pipe_fd); | |
353 | fclose(pipe_fd); | |
f0cea83f | 354 | |
cc41fa8d JS |
355 | /* We read from pack_objects.err to capture stderr output for |
356 | * progress bar, and pack_objects.out to capture the pack data. | |
b1c71b72 | 357 | */ |
b1c71b72 JH |
358 | |
359 | while (1) { | |
b1c71b72 | 360 | struct pollfd pfd[2]; |
f203a88c | 361 | int pe, pu, pollsize, polltimeout; |
05e95155 | 362 | int ret; |
b1c71b72 | 363 | |
d40f04e0 | 364 | reset_timeout(pack_data->timeout); |
0d516ada | 365 | |
b1c71b72 | 366 | pollsize = 0; |
363b7817 | 367 | pe = pu = -1; |
b1c71b72 | 368 | |
cc41fa8d JS |
369 | if (0 <= pack_objects.out) { |
370 | pfd[pollsize].fd = pack_objects.out; | |
b1c71b72 JH |
371 | pfd[pollsize].events = POLLIN; |
372 | pu = pollsize; | |
373 | pollsize++; | |
374 | } | |
cc41fa8d JS |
375 | if (0 <= pack_objects.err) { |
376 | pfd[pollsize].fd = pack_objects.err; | |
363b7817 JH |
377 | pfd[pollsize].events = POLLIN; |
378 | pe = pollsize; | |
379 | pollsize++; | |
380 | } | |
b1c71b72 | 381 | |
4c324c00 JS |
382 | if (!pollsize) |
383 | break; | |
384 | ||
f203a88c CC |
385 | polltimeout = pack_data->keepalive < 0 |
386 | ? -1 | |
387 | : 1000 * pack_data->keepalive; | |
388 | ||
389 | ret = poll(pfd, pollsize, polltimeout); | |
6c71f8b0 | 390 | |
05e95155 | 391 | if (ret < 0) { |
4c324c00 | 392 | if (errno != EINTR) { |
d2b6afa2 | 393 | error_errno("poll failed, resuming"); |
4c324c00 | 394 | sleep(1); |
b1c71b72 | 395 | } |
4c324c00 JS |
396 | continue; |
397 | } | |
6b59f51b NP |
398 | if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) { |
399 | /* Status ready; we ship that in the side-band | |
400 | * or dump to the standard error. | |
401 | */ | |
402 | sz = xread(pack_objects.err, progress, | |
403 | sizeof(progress)); | |
404 | if (0 < sz) | |
f8edd1ca CC |
405 | send_client_data(2, progress, sz, |
406 | pack_data->use_sideband); | |
6b59f51b NP |
407 | else if (sz == 0) { |
408 | close(pack_objects.err); | |
409 | pack_objects.err = -1; | |
410 | } | |
411 | else | |
412 | goto fail; | |
413 | /* give priority to status messages */ | |
414 | continue; | |
415 | } | |
4c324c00 | 416 | if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { |
acaaca7d | 417 | int result = relay_pack_data(pack_objects.out, |
55a9651d | 418 | output_state, |
dd4b732d JT |
419 | pack_data->use_sideband, |
420 | !!uri_protocols); | |
acaaca7d JT |
421 | |
422 | if (result == 0) { | |
4c324c00 JS |
423 | close(pack_objects.out); |
424 | pack_objects.out = -1; | |
acaaca7d | 425 | } else if (result < 0) { |
4c324c00 | 426 | goto fail; |
b1c71b72 | 427 | } |
4c324c00 | 428 | } |
05e95155 JK |
429 | |
430 | /* | |
431 | * We hit the keepalive timeout without saying anything; send | |
432 | * an empty message on the data sideband just to let the other | |
433 | * side know we're still working on it, but don't have any data | |
434 | * yet. | |
435 | * | |
436 | * If we don't have a sideband channel, there's no room in the | |
437 | * protocol to say anything, so those clients are just out of | |
438 | * luck. | |
439 | */ | |
f8edd1ca | 440 | if (!ret && pack_data->use_sideband) { |
05e95155 JK |
441 | static const char buf[] = "0005\1"; |
442 | write_or_die(1, buf, 5); | |
443 | } | |
4c324c00 | 444 | } |
b1c71b72 | 445 | |
4c324c00 | 446 | if (finish_command(&pack_objects)) { |
7e44c935 | 447 | error("git upload-pack: git-pack-objects died with error."); |
4c324c00 JS |
448 | goto fail; |
449 | } | |
b1c71b72 | 450 | |
4c324c00 | 451 | /* flush the data */ |
55a9651d JV |
452 | if (output_state->used > 0) { |
453 | send_client_data(1, output_state->buffer, output_state->used, | |
f8edd1ca | 454 | pack_data->use_sideband); |
4c324c00 | 455 | fprintf(stderr, "flushed.\n"); |
b1c71b72 | 456 | } |
55a9651d | 457 | free(output_state); |
f8edd1ca | 458 | if (pack_data->use_sideband) |
4c324c00 JS |
459 | packet_flush(1); |
460 | return; | |
461 | ||
b1c71b72 | 462 | fail: |
c68d5dbc | 463 | free(output_state); |
f8edd1ca CC |
464 | send_client_data(3, abort_msg, sizeof(abort_msg), |
465 | pack_data->use_sideband); | |
7e44c935 | 466 | die("git upload-pack: %s", abort_msg); |
fb9040cc LT |
467 | } |
468 | ||
ea2c6e60 | 469 | static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid) |
def88e9a | 470 | { |
937a515a | 471 | int we_knew_they_have = 0; |
ea2c6e60 | 472 | struct object *o = parse_object(the_repository, oid); |
b1e9fff7 | 473 | |
b1e9fff7 | 474 | if (!o) |
cf93982f | 475 | die("oops (%s)", oid_to_hex(oid)); |
182a8dab | 476 | if (o->type == OBJ_COMMIT) { |
b1e9fff7 | 477 | struct commit_list *parents; |
937a515a | 478 | struct commit *commit = (struct commit *)o; |
b1e9fff7 | 479 | if (o->flags & THEY_HAVE) |
937a515a JH |
480 | we_knew_they_have = 1; |
481 | else | |
482 | o->flags |= THEY_HAVE; | |
f01c7916 CC |
483 | if (!data->oldest_have || (commit->date < data->oldest_have)) |
484 | data->oldest_have = commit->date; | |
937a515a | 485 | for (parents = commit->parents; |
b1e9fff7 JH |
486 | parents; |
487 | parents = parents->next) | |
488 | parents->item->object.flags |= THEY_HAVE; | |
fb9040cc | 489 | } |
937a515a | 490 | if (!we_knew_they_have) { |
460ed0d4 | 491 | add_object_array(o, NULL, &data->have_obj); |
937a515a JH |
492 | return 1; |
493 | } | |
494 | return 0; | |
495 | } | |
496 | ||
ea2c6e60 CC |
497 | static int got_oid(struct upload_pack_data *data, |
498 | const char *hex, struct object_id *oid) | |
499 | { | |
500 | if (get_oid_hex(hex, oid)) | |
501 | die("git upload-pack: expected SHA1 object, got '%s'", hex); | |
77aa0941 JT |
502 | if (!has_object_file_with_flags(oid, |
503 | OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) | |
ea2c6e60 CC |
504 | return -1; |
505 | return do_got_oid(data, oid); | |
506 | } | |
507 | ||
08667348 | 508 | static int ok_to_give_up(struct upload_pack_data *data) |
937a515a | 509 | { |
d7f92784 | 510 | timestamp_t min_generation = GENERATION_NUMBER_ZERO; |
937a515a | 511 | |
08667348 | 512 | if (!data->have_obj.nr) |
937a515a JH |
513 | return 0; |
514 | ||
08667348 | 515 | return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE, |
f01c7916 | 516 | COMMON_KNOWN, data->oldest_have, |
4fbcca4e | 517 | min_generation); |
def88e9a LT |
518 | } |
519 | ||
07977695 CC |
520 | static int get_common_commits(struct upload_pack_data *data, |
521 | struct packet_reader *reader) | |
def88e9a | 522 | { |
cf93982f | 523 | struct object_id oid; |
524 | char last_hex[GIT_MAX_HEXSZ + 1]; | |
49bee717 SP |
525 | int got_common = 0; |
526 | int got_other = 0; | |
4e10cf9a | 527 | int sent_ready = 0; |
def88e9a | 528 | |
f0243f26 JS |
529 | save_commit_buffer = 0; |
530 | ||
eeefa7c9 | 531 | for (;;) { |
8bf3b758 NTND |
532 | const char *arg; |
533 | ||
d40f04e0 | 534 | reset_timeout(data->timeout); |
def88e9a | 535 | |
01f9ec64 | 536 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) { |
e9d882b8 | 537 | if (data->multi_ack == MULTI_ACK_DETAILED |
07977695 CC |
538 | && got_common |
539 | && !got_other | |
08667348 | 540 | && ok_to_give_up(data)) { |
4e10cf9a | 541 | sent_ready = 1; |
81c634e9 | 542 | packet_write_fmt(1, "ACK %s ready\n", last_hex); |
4e10cf9a | 543 | } |
53d69506 | 544 | if (data->have_obj.nr == 0 || data->multi_ack) |
81c634e9 | 545 | packet_write_fmt(1, "NAK\n"); |
4e10cf9a | 546 | |
d40f04e0 | 547 | if (data->no_done && sent_ready) { |
81c634e9 | 548 | packet_write_fmt(1, "ACK %s\n", last_hex); |
4e10cf9a JH |
549 | return 0; |
550 | } | |
df654abc | 551 | if (data->stateless_rpc) |
42526b47 | 552 | exit(0); |
49bee717 SP |
553 | got_common = 0; |
554 | got_other = 0; | |
def88e9a LT |
555 | continue; |
556 | } | |
01f9ec64 | 557 | if (skip_prefix(reader->line, "have ", &arg)) { |
460ed0d4 | 558 | switch (got_oid(data, arg, &oid)) { |
937a515a | 559 | case -1: /* they have what we do not */ |
49bee717 | 560 | got_other = 1; |
53d69506 | 561 | if (data->multi_ack |
08667348 | 562 | && ok_to_give_up(data)) { |
cf93982f | 563 | const char *hex = oid_to_hex(&oid); |
e9d882b8 | 564 | if (data->multi_ack == MULTI_ACK_DETAILED) { |
4e10cf9a | 565 | sent_ready = 1; |
81c634e9 | 566 | packet_write_fmt(1, "ACK %s ready\n", hex); |
4e10cf9a | 567 | } else |
81c634e9 | 568 | packet_write_fmt(1, "ACK %s continue\n", hex); |
78affc49 | 569 | } |
937a515a JH |
570 | break; |
571 | default: | |
49bee717 | 572 | got_common = 1; |
55dc227d | 573 | oid_to_hex_r(last_hex, &oid); |
e9d882b8 | 574 | if (data->multi_ack == MULTI_ACK_DETAILED) |
81c634e9 | 575 | packet_write_fmt(1, "ACK %s common\n", last_hex); |
53d69506 | 576 | else if (data->multi_ack) |
81c634e9 | 577 | packet_write_fmt(1, "ACK %s continue\n", last_hex); |
07977695 | 578 | else if (data->have_obj.nr == 1) |
81c634e9 | 579 | packet_write_fmt(1, "ACK %s\n", last_hex); |
937a515a | 580 | break; |
af2d3aa4 | 581 | } |
def88e9a LT |
582 | continue; |
583 | } | |
01f9ec64 | 584 | if (!strcmp(reader->line, "done")) { |
07977695 | 585 | if (data->have_obj.nr > 0) { |
53d69506 | 586 | if (data->multi_ack) |
81c634e9 | 587 | packet_write_fmt(1, "ACK %s\n", last_hex); |
1bd8c8f0 JS |
588 | return 0; |
589 | } | |
81c634e9 | 590 | packet_write_fmt(1, "NAK\n"); |
def88e9a LT |
591 | return -1; |
592 | } | |
01f9ec64 | 593 | die("git upload-pack: expected SHA1 list, got '%s'", reader->line); |
def88e9a | 594 | } |
def88e9a LT |
595 | } |
596 | ||
629060d9 | 597 | static int is_our_ref(struct object *o, enum allow_uor allow_uor) |
390eb36b | 598 | { |
629060d9 CC |
599 | int allow_hidden_ref = (allow_uor & |
600 | (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); | |
7199c093 | 601 | return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF); |
390eb36b JH |
602 | } |
603 | ||
2997178e NTND |
604 | /* |
605 | * on successful case, it's up to the caller to close cmd->out | |
606 | */ | |
607 | static int do_reachable_revlist(struct child_process *cmd, | |
079aa97e | 608 | struct object_array *src, |
f1514c6a | 609 | struct object_array *reachable, |
629060d9 | 610 | enum allow_uor allow_uor) |
051e4005 | 611 | { |
051e4005 | 612 | struct object *o; |
a698d67b | 613 | FILE *cmd_in = NULL; |
051e4005 JH |
614 | int i; |
615 | ||
2b709893 | 616 | strvec_pushl(&cmd->args, "rev-list", "--stdin", NULL); |
2997178e NTND |
617 | cmd->git_cmd = 1; |
618 | cmd->no_stderr = 1; | |
619 | cmd->in = -1; | |
620 | cmd->out = -1; | |
051e4005 JH |
621 | |
622 | /* | |
7fcbd37f NTND |
623 | * If the next rev-list --stdin encounters an unknown commit, |
624 | * it terminates, which will cause SIGPIPE in the write loop | |
051e4005 JH |
625 | * below. |
626 | */ | |
627 | sigchain_push(SIGPIPE, SIG_IGN); | |
628 | ||
2997178e | 629 | if (start_command(cmd)) |
7fcbd37f NTND |
630 | goto error; |
631 | ||
a698d67b RS |
632 | cmd_in = xfdopen(cmd->in, "w"); |
633 | ||
051e4005 JH |
634 | for (i = get_max_object_index(); 0 < i; ) { |
635 | o = get_indexed_object(--i); | |
2a745324 BH |
636 | if (!o) |
637 | continue; | |
079aa97e NTND |
638 | if (reachable && o->type == OBJ_COMMIT) |
639 | o->flags &= ~TMP_MARK; | |
629060d9 | 640 | if (!is_our_ref(o, allow_uor)) |
051e4005 | 641 | continue; |
a698d67b | 642 | if (fprintf(cmd_in, "^%s\n", oid_to_hex(&o->oid)) < 0) |
051e4005 JH |
643 | goto error; |
644 | } | |
3f0f6624 NTND |
645 | for (i = 0; i < src->nr; i++) { |
646 | o = src->objects[i].item; | |
629060d9 | 647 | if (is_our_ref(o, allow_uor)) { |
079aa97e NTND |
648 | if (reachable) |
649 | add_object_array(o, NULL, reachable); | |
051e4005 | 650 | continue; |
079aa97e NTND |
651 | } |
652 | if (reachable && o->type == OBJ_COMMIT) | |
653 | o->flags |= TMP_MARK; | |
a698d67b | 654 | if (fprintf(cmd_in, "%s\n", oid_to_hex(&o->oid)) < 0) |
051e4005 JH |
655 | goto error; |
656 | } | |
a698d67b RS |
657 | if (ferror(cmd_in) || fflush(cmd_in)) |
658 | goto error; | |
659 | fclose(cmd_in); | |
2997178e NTND |
660 | cmd->in = -1; |
661 | sigchain_pop(SIGPIPE); | |
051e4005 | 662 | |
2997178e NTND |
663 | return 0; |
664 | ||
665 | error: | |
051e4005 JH |
666 | sigchain_pop(SIGPIPE); |
667 | ||
a698d67b RS |
668 | if (cmd_in) |
669 | fclose(cmd_in); | |
2997178e NTND |
670 | if (cmd->out >= 0) |
671 | close(cmd->out); | |
672 | return -1; | |
673 | } | |
674 | ||
f1514c6a | 675 | static int get_reachable_list(struct upload_pack_data *data, |
079aa97e NTND |
676 | struct object_array *reachable) |
677 | { | |
678 | struct child_process cmd = CHILD_PROCESS_INIT; | |
679 | int i; | |
680 | struct object *o; | |
55dc227d | 681 | char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ |
682 | const unsigned hexsz = the_hash_algo->hexsz; | |
079aa97e | 683 | |
f1514c6a | 684 | if (do_reachable_revlist(&cmd, &data->shallows, reachable, |
629060d9 | 685 | data->allow_uor) < 0) |
079aa97e NTND |
686 | return -1; |
687 | ||
55dc227d | 688 | while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) { |
62b89d43 | 689 | struct object_id oid; |
55dc227d | 690 | const char *p; |
079aa97e | 691 | |
62b89d43 | 692 | if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n') |
079aa97e NTND |
693 | break; |
694 | ||
d0229abd | 695 | o = lookup_object(the_repository, &oid); |
079aa97e NTND |
696 | if (o && o->type == OBJ_COMMIT) { |
697 | o->flags &= ~TMP_MARK; | |
698 | } | |
699 | } | |
700 | for (i = get_max_object_index(); 0 < i; i--) { | |
701 | o = get_indexed_object(i - 1); | |
702 | if (o && o->type == OBJ_COMMIT && | |
703 | (o->flags & TMP_MARK)) { | |
704 | add_object_array(o, NULL, reachable); | |
705 | o->flags &= ~TMP_MARK; | |
706 | } | |
707 | } | |
708 | close(cmd.out); | |
709 | ||
710 | if (finish_command(&cmd)) | |
711 | return -1; | |
712 | ||
713 | return 0; | |
714 | } | |
715 | ||
629060d9 | 716 | static int has_unreachable(struct object_array *src, enum allow_uor allow_uor) |
2997178e NTND |
717 | { |
718 | struct child_process cmd = CHILD_PROCESS_INIT; | |
719 | char buf[1]; | |
720 | int i; | |
721 | ||
629060d9 | 722 | if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0) |
2997178e | 723 | return 1; |
051e4005 JH |
724 | |
725 | /* | |
726 | * The commits out of the rev-list are not ancestors of | |
727 | * our ref. | |
728 | */ | |
2997178e | 729 | i = read_in_full(cmd.out, buf, 1); |
051e4005 JH |
730 | if (i) |
731 | goto error; | |
732 | close(cmd.out); | |
7fcbd37f | 733 | cmd.out = -1; |
051e4005 JH |
734 | |
735 | /* | |
736 | * rev-list may have died by encountering a bad commit | |
737 | * in the history, in which case we do want to bail out | |
738 | * even when it showed no commit. | |
739 | */ | |
740 | if (finish_command(&cmd)) | |
741 | goto error; | |
742 | ||
743 | /* All the non-tip ones are ancestors of what we advertised */ | |
3f0f6624 | 744 | return 0; |
051e4005 JH |
745 | |
746 | error: | |
7fcbd37f NTND |
747 | if (cmd.out >= 0) |
748 | close(cmd.out); | |
3f0f6624 NTND |
749 | return 1; |
750 | } | |
7fcbd37f | 751 | |
b08c9742 | 752 | static void check_non_tip(struct upload_pack_data *data) |
3f0f6624 NTND |
753 | { |
754 | int i; | |
755 | ||
756 | /* | |
757 | * In the normal in-process case without | |
758 | * uploadpack.allowReachableSHA1InWant, | |
759 | * non-tip requests can never happen. | |
760 | */ | |
629060d9 | 761 | if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1)) |
3f0f6624 | 762 | goto error; |
629060d9 | 763 | if (!has_unreachable(&data->want_obj, data->allow_uor)) |
3f0f6624 NTND |
764 | /* All the non-tip ones are ancestors of what we advertised */ |
765 | return; | |
051e4005 JH |
766 | |
767 | error: | |
768 | /* Pick one of them (we know there at least is one) */ | |
b08c9742 CC |
769 | for (i = 0; i < data->want_obj.nr; i++) { |
770 | struct object *o = data->want_obj.objects[i].item; | |
629060d9 | 771 | if (!is_our_ref(o, data->allow_uor)) { |
b08c9742 | 772 | packet_writer_error(&data->writer, |
014ade74 JK |
773 | "upload-pack: not our ref %s", |
774 | oid_to_hex(&o->oid)); | |
051e4005 | 775 | die("git upload-pack: not our ref %s", |
f2fd0760 | 776 | oid_to_hex(&o->oid)); |
014ade74 | 777 | } |
051e4005 JH |
778 | } |
779 | } | |
780 | ||
35b43a10 | 781 | static void send_shallow(struct upload_pack_data *data, |
bc2e795c | 782 | struct commit_list *result) |
5c24cdea NTND |
783 | { |
784 | while (result) { | |
785 | struct object *object = &result->item->object; | |
786 | if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { | |
35b43a10 | 787 | packet_writer_write(&data->writer, "shallow %s", |
bc2e795c | 788 | oid_to_hex(&object->oid)); |
19143f13 | 789 | register_shallow(the_repository, &object->oid); |
35b43a10 | 790 | data->shallow_nr++; |
5c24cdea NTND |
791 | } |
792 | result = result->next; | |
793 | } | |
794 | } | |
795 | ||
329f9960 | 796 | static void send_unshallow(struct upload_pack_data *data) |
e8e44de7 | 797 | { |
e8e44de7 | 798 | int i; |
873700c9 | 799 | |
329f9960 CC |
800 | for (i = 0; i < data->shallows.nr; i++) { |
801 | struct object *object = data->shallows.objects[i].item; | |
e8e44de7 NTND |
802 | if (object->flags & NOT_SHALLOW) { |
803 | struct commit_list *parents; | |
329f9960 | 804 | packet_writer_write(&data->writer, "unshallow %s", |
bc2e795c | 805 | oid_to_hex(&object->oid)); |
e8e44de7 | 806 | object->flags &= ~CLIENT_SHALLOW; |
873700c9 NTND |
807 | /* |
808 | * We want to _register_ "object" as shallow, but we | |
809 | * also need to traverse object's parents to deepen a | |
810 | * shallow clone. Unregister it for now so we can | |
811 | * parse and add the parents to the want list, then | |
812 | * re-register it. | |
813 | */ | |
e92b848c | 814 | unregister_shallow(&object->oid); |
e8e44de7 NTND |
815 | object->parsed = 0; |
816 | parse_commit_or_die((struct commit *)object); | |
817 | parents = ((struct commit *)object)->parents; | |
818 | while (parents) { | |
819 | add_object_array(&parents->item->object, | |
329f9960 | 820 | NULL, &data->want_obj); |
e8e44de7 NTND |
821 | parents = parents->next; |
822 | } | |
de0e9f74 | 823 | add_object_array(object, NULL, &data->extra_edge_obj); |
e8e44de7 NTND |
824 | } |
825 | /* make sure commit traversal conforms to client */ | |
19143f13 | 826 | register_shallow(the_repository, &object->oid); |
e8e44de7 | 827 | } |
873700c9 NTND |
828 | } |
829 | ||
5056cf4a JT |
830 | static int check_ref(const char *refname_full, const struct object_id *oid, |
831 | int flag, void *cb_data); | |
b1492f22 | 832 | static void deepen(struct upload_pack_data *data, int depth) |
873700c9 | 833 | { |
c8813487 | 834 | if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) { |
873700c9 NTND |
835 | int i; |
836 | ||
b1492f22 CC |
837 | for (i = 0; i < data->shallows.nr; i++) { |
838 | struct object *object = data->shallows.objects[i].item; | |
873700c9 NTND |
839 | object->flags |= NOT_SHALLOW; |
840 | } | |
b1492f22 | 841 | } else if (data->deepen_relative) { |
cccf74e2 NTND |
842 | struct object_array reachable_shallows = OBJECT_ARRAY_INIT; |
843 | struct commit_list *result; | |
844 | ||
5056cf4a JT |
845 | /* |
846 | * Checking for reachable shallows requires that our refs be | |
847 | * marked with OUR_REF. | |
848 | */ | |
9b67eb6f PS |
849 | head_ref_namespaced(check_ref, data); |
850 | for_each_namespaced_ref(check_ref, data); | |
5056cf4a | 851 | |
f1514c6a | 852 | get_reachable_list(data, &reachable_shallows); |
cccf74e2 NTND |
853 | result = get_shallow_commits(&reachable_shallows, |
854 | depth + 1, | |
855 | SHALLOW, NOT_SHALLOW); | |
35b43a10 | 856 | send_shallow(data, result); |
cccf74e2 NTND |
857 | free_commit_list(result); |
858 | object_array_clear(&reachable_shallows); | |
873700c9 NTND |
859 | } else { |
860 | struct commit_list *result; | |
861 | ||
b1492f22 | 862 | result = get_shallow_commits(&data->want_obj, depth, |
873700c9 | 863 | SHALLOW, NOT_SHALLOW); |
35b43a10 | 864 | send_shallow(data, result); |
873700c9 NTND |
865 | free_commit_list(result); |
866 | } | |
867 | ||
329f9960 | 868 | send_unshallow(data); |
e8e44de7 NTND |
869 | } |
870 | ||
446e42c5 CC |
871 | static void deepen_by_rev_list(struct upload_pack_data *data, |
872 | int ac, | |
873 | const char **av) | |
569e554b NTND |
874 | { |
875 | struct commit_list *result; | |
876 | ||
6abada18 | 877 | disable_commit_graph(the_repository); |
569e554b | 878 | result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); |
35b43a10 | 879 | send_shallow(data, result); |
569e554b | 880 | free_commit_list(result); |
329f9960 | 881 | send_unshallow(data); |
685fbd32 BW |
882 | } |
883 | ||
884 | /* Returns 1 if a shallow list is sent or 0 otherwise */ | |
ee703c8a | 885 | static int send_shallow_list(struct upload_pack_data *data) |
685fbd32 BW |
886 | { |
887 | int ret = 0; | |
888 | ||
ee703c8a | 889 | if (data->depth > 0 && data->deepen_rev_list) |
685fbd32 | 890 | die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together"); |
ee703c8a | 891 | if (data->depth > 0) { |
b1492f22 | 892 | deepen(data, data->depth); |
685fbd32 | 893 | ret = 1; |
ee703c8a | 894 | } else if (data->deepen_rev_list) { |
c972bf4c | 895 | struct strvec av = STRVEC_INIT; |
685fbd32 BW |
896 | int i; |
897 | ||
c972bf4c | 898 | strvec_push(&av, "rev-list"); |
ee703c8a | 899 | if (data->deepen_since) |
c972bf4c | 900 | strvec_pushf(&av, "--max-age=%"PRItime, data->deepen_since); |
ee703c8a | 901 | if (data->deepen_not.nr) { |
c972bf4c | 902 | strvec_push(&av, "--not"); |
ee703c8a CC |
903 | for (i = 0; i < data->deepen_not.nr; i++) { |
904 | struct string_list_item *s = data->deepen_not.items + i; | |
c972bf4c | 905 | strvec_push(&av, s->string); |
685fbd32 | 906 | } |
c972bf4c | 907 | strvec_push(&av, "--not"); |
685fbd32 | 908 | } |
ee703c8a CC |
909 | for (i = 0; i < data->want_obj.nr; i++) { |
910 | struct object *o = data->want_obj.objects[i].item; | |
c972bf4c | 911 | strvec_push(&av, oid_to_hex(&o->oid)); |
685fbd32 | 912 | } |
d70a9eb6 | 913 | deepen_by_rev_list(data, av.nr, av.v); |
c972bf4c | 914 | strvec_clear(&av); |
685fbd32 BW |
915 | ret = 1; |
916 | } else { | |
ee703c8a | 917 | if (data->shallows.nr > 0) { |
685fbd32 | 918 | int i; |
ee703c8a | 919 | for (i = 0; i < data->shallows.nr; i++) |
00624d60 | 920 | register_shallow(the_repository, |
ee703c8a | 921 | &data->shallows.objects[i].item->oid); |
685fbd32 BW |
922 | } |
923 | } | |
924 | ||
35b43a10 | 925 | data->shallow_nr += data->shallows.nr; |
685fbd32 | 926 | return ret; |
569e554b NTND |
927 | } |
928 | ||
ae2948f3 BW |
929 | static int process_shallow(const char *line, struct object_array *shallows) |
930 | { | |
931 | const char *arg; | |
932 | if (skip_prefix(line, "shallow ", &arg)) { | |
933 | struct object_id oid; | |
934 | struct object *object; | |
935 | if (get_oid_hex(arg, &oid)) | |
936 | die("invalid shallow line: %s", line); | |
109cd76d | 937 | object = parse_object(the_repository, &oid); |
ae2948f3 BW |
938 | if (!object) |
939 | return 1; | |
940 | if (object->type != OBJ_COMMIT) | |
941 | die("invalid shallow object %s", oid_to_hex(&oid)); | |
942 | if (!(object->flags & CLIENT_SHALLOW)) { | |
943 | object->flags |= CLIENT_SHALLOW; | |
944 | add_object_array(object, NULL, shallows); | |
945 | } | |
946 | return 1; | |
947 | } | |
948 | ||
949 | return 0; | |
950 | } | |
951 | ||
952 | static int process_deepen(const char *line, int *depth) | |
953 | { | |
954 | const char *arg; | |
955 | if (skip_prefix(line, "deepen ", &arg)) { | |
956 | char *end = NULL; | |
957 | *depth = (int)strtol(arg, &end, 0); | |
958 | if (!end || *end || *depth <= 0) | |
959 | die("Invalid deepen: %s", line); | |
960 | return 1; | |
961 | } | |
962 | ||
963 | return 0; | |
964 | } | |
965 | ||
966 | static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list) | |
967 | { | |
968 | const char *arg; | |
969 | if (skip_prefix(line, "deepen-since ", &arg)) { | |
970 | char *end = NULL; | |
971 | *deepen_since = parse_timestamp(arg, &end, 0); | |
972 | if (!end || *end || !deepen_since || | |
973 | /* revisions.c's max_age -1 is special */ | |
974 | *deepen_since == -1) | |
975 | die("Invalid deepen-since: %s", line); | |
976 | *deepen_rev_list = 1; | |
977 | return 1; | |
978 | } | |
979 | return 0; | |
980 | } | |
981 | ||
982 | static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list) | |
983 | { | |
984 | const char *arg; | |
985 | if (skip_prefix(line, "deepen-not ", &arg)) { | |
986 | char *ref = NULL; | |
987 | struct object_id oid; | |
0b1dbf53 | 988 | if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1) |
ae2948f3 BW |
989 | die("git upload-pack: ambiguous deepen-not: %s", line); |
990 | string_list_append(deepen_not, ref); | |
991 | free(ref); | |
992 | *deepen_rev_list = 1; | |
993 | return 1; | |
994 | } | |
995 | return 0; | |
569e554b NTND |
996 | } |
997 | ||
6dd3456a TB |
998 | NORETURN __attribute__((format(printf,2,3))) |
999 | static void send_err_and_die(struct upload_pack_data *data, | |
1000 | const char *fmt, ...) | |
1001 | { | |
1002 | struct strbuf buf = STRBUF_INIT; | |
1003 | va_list ap; | |
1004 | ||
1005 | va_start(ap, fmt); | |
1006 | strbuf_vaddf(&buf, fmt, ap); | |
1007 | va_end(ap); | |
1008 | ||
1009 | packet_writer_error(&data->writer, "%s", buf.buf); | |
1010 | die("%s", buf.buf); | |
1011 | } | |
1012 | ||
1013 | static void check_one_filter(struct upload_pack_data *data, | |
1014 | struct list_objects_filter_options *opts) | |
1015 | { | |
1016 | const char *key = list_object_filter_config_name(opts->choice); | |
1017 | struct string_list_item *item = string_list_lookup(&data->allowed_filters, | |
1018 | key); | |
1019 | int allowed; | |
1020 | ||
1021 | if (item) | |
1022 | allowed = (intptr_t)item->util; | |
1023 | else | |
1024 | allowed = data->allow_filter_fallback; | |
1025 | ||
1026 | if (!allowed) | |
1027 | send_err_and_die(data, "filter '%s' not supported", key); | |
5b01a4e8 TB |
1028 | |
1029 | if (opts->choice == LOFC_TREE_DEPTH && | |
1030 | opts->tree_exclude_depth > data->tree_filter_max_depth) | |
1031 | send_err_and_die(data, | |
1032 | "tree filter allows max depth %lu, but got %lu", | |
1033 | data->tree_filter_max_depth, | |
1034 | opts->tree_exclude_depth); | |
6dd3456a TB |
1035 | } |
1036 | ||
1037 | static void check_filter_recurse(struct upload_pack_data *data, | |
1038 | struct list_objects_filter_options *opts) | |
1039 | { | |
1040 | size_t i; | |
1041 | ||
1042 | check_one_filter(data, opts); | |
1043 | if (opts->choice != LOFC_COMBINE) | |
1044 | return; | |
1045 | ||
1046 | for (i = 0; i < opts->sub_nr; i++) | |
1047 | check_filter_recurse(data, &opts->sub[i]); | |
1048 | } | |
1049 | ||
1050 | static void die_if_using_banned_filter(struct upload_pack_data *data) | |
1051 | { | |
1052 | check_filter_recurse(data, &data->filter_options); | |
1053 | } | |
1054 | ||
d92ae2c0 CC |
1055 | static void receive_needs(struct upload_pack_data *data, |
1056 | struct packet_reader *reader) | |
fb9040cc | 1057 | { |
051e4005 | 1058 | int has_non_tip = 0; |
fb9040cc | 1059 | |
35b43a10 | 1060 | data->shallow_nr = 0; |
fb9040cc | 1061 | for (;;) { |
565ebbf7 | 1062 | struct object *o; |
f47182c8 | 1063 | const char *features; |
cf93982f | 1064 | struct object_id oid_buf; |
8bf3b758 | 1065 | const char *arg; |
82959467 | 1066 | int feature_len; |
8bf3b758 | 1067 | |
d40f04e0 | 1068 | reset_timeout(data->timeout); |
01f9ec64 | 1069 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
ed09aef0 | 1070 | break; |
e091eb93 | 1071 | |
7a516764 | 1072 | if (process_shallow(reader->line, &data->shallows)) |
ed09aef0 | 1073 | continue; |
7a516764 | 1074 | if (process_deepen(reader->line, &data->depth)) |
016e6ccb | 1075 | continue; |
7a516764 | 1076 | if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list)) |
569e554b | 1077 | continue; |
7a516764 | 1078 | if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list)) |
269a7a83 | 1079 | continue; |
ae2948f3 | 1080 | |
01f9ec64 | 1081 | if (skip_prefix(reader->line, "filter ", &arg)) { |
59a90261 | 1082 | if (!data->filter_capability_requested) |
10ac85c7 | 1083 | die("git upload-pack: filtering capability not negotiated"); |
d92ae2c0 CC |
1084 | list_objects_filter_die_if_populated(&data->filter_options); |
1085 | parse_list_objects_filter(&data->filter_options, arg); | |
6dd3456a | 1086 | die_if_using_banned_filter(data); |
10ac85c7 JH |
1087 | continue; |
1088 | } | |
9bfa0f9b | 1089 | |
01f9ec64 | 1090 | if (!skip_prefix(reader->line, "want ", &arg) || |
55dc227d | 1091 | parse_oid_hex(arg, &oid_buf, &features)) |
7e44c935 | 1092 | die("git upload-pack: protocol error, " |
01f9ec64 | 1093 | "expected to get object ID, not '%s'", reader->line); |
f47182c8 | 1094 | |
cccf74e2 | 1095 | if (parse_feature_request(features, "deepen-relative")) |
7a516764 | 1096 | data->deepen_relative = 1; |
f47182c8 | 1097 | if (parse_feature_request(features, "multi_ack_detailed")) |
e9d882b8 | 1098 | data->multi_ack = MULTI_ACK_DETAILED; |
f47182c8 | 1099 | else if (parse_feature_request(features, "multi_ack")) |
e9d882b8 | 1100 | data->multi_ack = MULTI_ACK; |
f47182c8 | 1101 | if (parse_feature_request(features, "no-done")) |
d40f04e0 | 1102 | data->no_done = 1; |
f47182c8 | 1103 | if (parse_feature_request(features, "thin-pack")) |
b5a2068c | 1104 | data->use_thin_pack = 1; |
f47182c8 | 1105 | if (parse_feature_request(features, "ofs-delta")) |
b5a2068c | 1106 | data->use_ofs_delta = 1; |
f47182c8 | 1107 | if (parse_feature_request(features, "side-band-64k")) |
f8edd1ca | 1108 | data->use_sideband = LARGE_PACKET_MAX; |
f47182c8 | 1109 | else if (parse_feature_request(features, "side-band")) |
f8edd1ca | 1110 | data->use_sideband = DEFAULT_PACKET_MAX; |
f47182c8 | 1111 | if (parse_feature_request(features, "no-progress")) |
b5a2068c | 1112 | data->no_progress = 1; |
f47182c8 | 1113 | if (parse_feature_request(features, "include-tag")) |
b5a2068c | 1114 | data->use_include_tag = 1; |
59abe196 CC |
1115 | if (data->allow_filter && |
1116 | parse_feature_request(features, "filter")) | |
59a90261 | 1117 | data->filter_capability_requested = 1; |
565ebbf7 | 1118 | |
82959467 JS |
1119 | arg = parse_feature_value(features, "session-id", &feature_len, NULL); |
1120 | if (arg) { | |
1121 | char *client_sid = xstrndup(arg, feature_len); | |
1122 | trace2_data_string("transfer", NULL, "client-sid", client_sid); | |
1123 | free(client_sid); | |
1124 | } | |
1125 | ||
109cd76d | 1126 | o = parse_object(the_repository, &oid_buf); |
bdb31ead | 1127 | if (!o) { |
4ace0283 | 1128 | packet_writer_error(&data->writer, |
bc2e795c JT |
1129 | "upload-pack: not our ref %s", |
1130 | oid_to_hex(&oid_buf)); | |
9f9aa761 | 1131 | die("git upload-pack: not our ref %s", |
cf93982f | 1132 | oid_to_hex(&oid_buf)); |
bdb31ead | 1133 | } |
565ebbf7 JH |
1134 | if (!(o->flags & WANTED)) { |
1135 | o->flags |= WANTED; | |
629060d9 CC |
1136 | if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 |
1137 | || is_our_ref(o, data->allow_uor))) | |
051e4005 | 1138 | has_non_tip = 1; |
d92ae2c0 | 1139 | add_object_array(o, NULL, &data->want_obj); |
565ebbf7 | 1140 | } |
fb9040cc | 1141 | } |
9462e3f5 | 1142 | |
051e4005 JH |
1143 | /* |
1144 | * We have sent all our refs already, and the other end | |
1145 | * should have chosen out of them. When we are operating | |
1146 | * in the stateless RPC mode, however, their choice may | |
1147 | * have been based on the set of older refs advertised | |
1148 | * by another process that handled the initial request. | |
1149 | */ | |
1150 | if (has_non_tip) | |
b08c9742 | 1151 | check_non_tip(data); |
051e4005 | 1152 | |
f8edd1ca | 1153 | if (!data->use_sideband && data->daemon_mode) |
b5a2068c | 1154 | data->no_progress = 1; |
9462e3f5 | 1155 | |
7a516764 | 1156 | if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0) |
f53514bc | 1157 | return; |
569e554b | 1158 | |
ee703c8a | 1159 | if (send_shallow_list(data)) |
685fbd32 | 1160 | packet_flush(1); |
fb9040cc LT |
1161 | } |
1162 | ||
daebaa78 | 1163 | /* return non-zero if the ref is hidden, otherwise 0 */ |
78a766ab | 1164 | static int mark_our_ref(const char *refname, const char *refname_full, |
9b67eb6f | 1165 | const struct object_id *oid, const struct string_list *hidden_refs) |
cbbe50db | 1166 | { |
45a187cc | 1167 | struct object *o = lookup_unknown_object(the_repository, oid); |
daebaa78 | 1168 | |
9b67eb6f | 1169 | if (ref_is_hidden(refname, refname_full, hidden_refs)) { |
390eb36b | 1170 | o->flags |= HIDDEN_REF; |
daebaa78 | 1171 | return 1; |
390eb36b | 1172 | } |
3f1da57f | 1173 | o->flags |= OUR_REF; |
cbbe50db JH |
1174 | return 0; |
1175 | } | |
1176 | ||
78a766ab | 1177 | static int check_ref(const char *refname_full, const struct object_id *oid, |
9b67eb6f | 1178 | int flag UNUSED, void *cb_data) |
e172755b | 1179 | { |
78a766ab | 1180 | const char *refname = strip_namespace(refname_full); |
9b67eb6f | 1181 | struct upload_pack_data *data = cb_data; |
78a766ab | 1182 | |
9b67eb6f | 1183 | mark_our_ref(refname, refname_full, oid, &data->hidden_refs); |
e172755b JK |
1184 | return 0; |
1185 | } | |
1186 | ||
7171d8c1 JH |
1187 | static void format_symref_info(struct strbuf *buf, struct string_list *symref) |
1188 | { | |
1189 | struct string_list_item *item; | |
1190 | ||
1191 | if (!symref->nr) | |
1192 | return; | |
1193 | for_each_string_list_item(item, symref) | |
1194 | strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util); | |
1195 | } | |
1196 | ||
791e1adf JS |
1197 | static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) { |
1198 | if (d->advertise_sid) | |
1199 | strbuf_addf(buf, " session-id=%s", trace2_session_id()); | |
1200 | } | |
1201 | ||
363e98bf | 1202 | static int send_ref(const char *refname, const struct object_id *oid, |
5cf88fd8 | 1203 | int flag UNUSED, void *cb_data) |
def88e9a | 1204 | { |
ed09aef0 | 1205 | static const char *capabilities = "multi_ack thin-pack side-band" |
cccf74e2 NTND |
1206 | " side-band-64k ofs-delta shallow deepen-since deepen-not" |
1207 | " deepen-relative no-progress include-tag multi_ack_detailed"; | |
6b01ecfe | 1208 | const char *refname_nons = strip_namespace(refname); |
21758aff | 1209 | struct object_id peeled; |
762f9276 | 1210 | struct upload_pack_data *data = cb_data; |
b5b16990 | 1211 | |
9b67eb6f | 1212 | if (mark_our_ref(refname_nons, refname, oid, &data->hidden_refs)) |
daebaa78 | 1213 | return 0; |
cbbe50db | 1214 | |
7171d8c1 JH |
1215 | if (capabilities) { |
1216 | struct strbuf symref_info = STRBUF_INIT; | |
791e1adf | 1217 | struct strbuf session_id = STRBUF_INIT; |
7171d8c1 | 1218 | |
762f9276 | 1219 | format_symref_info(&symref_info, &data->symref); |
791e1adf | 1220 | format_session_id(&session_id, data); |
70afef5c | 1221 | packet_fwrite_fmt(stdout, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n", |
363e98bf | 1222 | oid_to_hex(oid), refname_nons, |
cf2ad8e6 | 1223 | 0, capabilities, |
629060d9 | 1224 | (data->allow_uor & ALLOW_TIP_SHA1) ? |
7199c093 | 1225 | " allow-tip-sha1-in-want" : "", |
629060d9 | 1226 | (data->allow_uor & ALLOW_REACHABLE_SHA1) ? |
68ee6289 | 1227 | " allow-reachable-sha1-in-want" : "", |
f234da80 | 1228 | data->no_done ? " no-done" : "", |
7171d8c1 | 1229 | symref_info.buf, |
59abe196 | 1230 | data->allow_filter ? " filter" : "", |
791e1adf | 1231 | session_id.buf, |
bf30dbf8 | 1232 | the_hash_algo->name, |
ff5effdf | 1233 | git_user_agent_sanitized()); |
7171d8c1 | 1234 | strbuf_release(&symref_info); |
791e1adf | 1235 | strbuf_release(&session_id); |
7171d8c1 | 1236 | } else { |
70afef5c | 1237 | packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons); |
7171d8c1 | 1238 | } |
1f5881bb | 1239 | capabilities = NULL; |
36a31792 | 1240 | if (!peel_iterated_oid(oid, &peeled)) |
70afef5c | 1241 | packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); |
def88e9a LT |
1242 | return 0; |
1243 | } | |
1244 | ||
63e14ee2 | 1245 | static int find_symref(const char *refname, |
5cf88fd8 | 1246 | const struct object_id *oid UNUSED, |
7dabd056 | 1247 | int flag, void *cb_data) |
7171d8c1 JH |
1248 | { |
1249 | const char *symref_target; | |
1250 | struct string_list_item *item; | |
7171d8c1 JH |
1251 | |
1252 | if ((flag & REF_ISSYMREF) == 0) | |
1253 | return 0; | |
744c040b | 1254 | symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag); |
7171d8c1 JH |
1255 | if (!symref_target || (flag & REF_ISSYMREF) == 0) |
1256 | die("'%s' is a symref but it is not?", refname); | |
533e0882 JK |
1257 | item = string_list_append(cb_data, strip_namespace(refname)); |
1258 | item->util = xstrdup(strip_namespace(symref_target)); | |
7171d8c1 JH |
1259 | return 0; |
1260 | } | |
1261 | ||
6dd3456a TB |
1262 | static int parse_object_filter_config(const char *var, const char *value, |
1263 | struct upload_pack_data *data) | |
1264 | { | |
1265 | struct strbuf buf = STRBUF_INIT; | |
1266 | const char *sub, *key; | |
1267 | size_t sub_len; | |
1268 | ||
1269 | if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key)) | |
1270 | return 0; | |
1271 | ||
1272 | if (!sub) { | |
1273 | if (!strcmp(key, "allow")) | |
1274 | data->allow_filter_fallback = git_config_bool(var, value); | |
1275 | return 0; | |
1276 | } | |
1277 | ||
1278 | strbuf_add(&buf, sub, sub_len); | |
1279 | ||
1280 | if (!strcmp(key, "allow")) | |
1281 | string_list_insert(&data->allowed_filters, buf.buf)->util = | |
1282 | (void *)(intptr_t)git_config_bool(var, value); | |
5b01a4e8 TB |
1283 | else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) { |
1284 | if (!value) { | |
1285 | strbuf_release(&buf); | |
1286 | return config_error_nonbool(var); | |
1287 | } | |
1288 | string_list_insert(&data->allowed_filters, buf.buf)->util = | |
1289 | (void *)(intptr_t)1; | |
1290 | data->tree_filter_max_depth = git_config_ulong(var, value); | |
1291 | } | |
6dd3456a TB |
1292 | |
1293 | strbuf_release(&buf); | |
1294 | return 0; | |
1295 | } | |
1296 | ||
8a0e6f16 | 1297 | static int upload_pack_config(const char *var, const char *value, void *cb_data) |
daebaa78 | 1298 | { |
f203a88c CC |
1299 | struct upload_pack_data *data = cb_data; |
1300 | ||
7199c093 FM |
1301 | if (!strcmp("uploadpack.allowtipsha1inwant", var)) { |
1302 | if (git_config_bool(var, value)) | |
629060d9 | 1303 | data->allow_uor |= ALLOW_TIP_SHA1; |
7199c093 | 1304 | else |
629060d9 | 1305 | data->allow_uor &= ~ALLOW_TIP_SHA1; |
68ee6289 FM |
1306 | } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) { |
1307 | if (git_config_bool(var, value)) | |
629060d9 | 1308 | data->allow_uor |= ALLOW_REACHABLE_SHA1; |
68ee6289 | 1309 | else |
629060d9 | 1310 | data->allow_uor &= ~ALLOW_REACHABLE_SHA1; |
f8edeaa0 DT |
1311 | } else if (!strcmp("uploadpack.allowanysha1inwant", var)) { |
1312 | if (git_config_bool(var, value)) | |
629060d9 | 1313 | data->allow_uor |= ALLOW_ANY_SHA1; |
f8edeaa0 | 1314 | else |
629060d9 | 1315 | data->allow_uor &= ~ALLOW_ANY_SHA1; |
7199c093 | 1316 | } else if (!strcmp("uploadpack.keepalive", var)) { |
f203a88c CC |
1317 | data->keepalive = git_config_int(var, value); |
1318 | if (!data->keepalive) | |
1319 | data->keepalive = -1; | |
10ac85c7 | 1320 | } else if (!strcmp("uploadpack.allowfilter", var)) { |
59abe196 | 1321 | data->allow_filter = git_config_bool(var, value); |
516e2b76 | 1322 | } else if (!strcmp("uploadpack.allowrefinwant", var)) { |
d1d7a945 | 1323 | data->allow_ref_in_want = git_config_bool(var, value); |
0bbc0bc5 | 1324 | } else if (!strcmp("uploadpack.allowsidebandall", var)) { |
e3835cd4 | 1325 | data->allow_sideband_all = git_config_bool(var, value); |
8e712ef6 EN |
1326 | } else if (!strcmp("core.precomposeunicode", var)) { |
1327 | precomposed_unicode = git_config_bool(var, value); | |
791e1adf JS |
1328 | } else if (!strcmp("transfer.advertisesid", var)) { |
1329 | data->advertise_sid = git_config_bool(var, value); | |
05e95155 | 1330 | } |
aaaa8818 | 1331 | |
d43a21bd JK |
1332 | if (parse_object_filter_config(var, value, data) < 0) |
1333 | return -1; | |
6dd3456a | 1334 | |
9b67eb6f | 1335 | return parse_hide_refs_config(var, value, "uploadpack", &data->hidden_refs); |
daebaa78 JH |
1336 | } |
1337 | ||
5b3c6507 GC |
1338 | static int upload_pack_protected_config(const char *var, const char *value, void *cb_data) |
1339 | { | |
1340 | struct upload_pack_data *data = cb_data; | |
1341 | ||
1342 | if (!strcmp("uploadpack.packobjectshook", var)) | |
1343 | return git_config_string(&data->pack_objects_hook, var, value); | |
1344 | return 0; | |
1345 | } | |
1346 | ||
1347 | static void get_upload_pack_config(struct upload_pack_data *data) | |
1348 | { | |
1349 | git_config(upload_pack_config, data); | |
1350 | git_protected_config(upload_pack_protected_config, data); | |
1351 | } | |
1352 | ||
f234da80 ÆAB |
1353 | void upload_pack(const int advertise_refs, const int stateless_rpc, |
1354 | const int timeout) | |
def88e9a | 1355 | { |
01f9ec64 | 1356 | struct packet_reader reader; |
ebf8ebcc | 1357 | struct upload_pack_data data; |
960deccb | 1358 | |
ebf8ebcc | 1359 | upload_pack_data_init(&data); |
5b3c6507 | 1360 | get_upload_pack_config(&data); |
8a0e6f16 | 1361 | |
f234da80 ÆAB |
1362 | data.stateless_rpc = stateless_rpc; |
1363 | data.timeout = timeout; | |
1364 | if (data.timeout) | |
1365 | data.daemon_mode = 1; | |
df654abc | 1366 | |
438528f6 | 1367 | head_ref_namespaced(find_symref, &data.symref); |
a6080a0a | 1368 | |
f234da80 | 1369 | if (advertise_refs || !data.stateless_rpc) { |
d40f04e0 | 1370 | reset_timeout(data.timeout); |
f234da80 ÆAB |
1371 | if (advertise_refs) |
1372 | data.no_done = 1; | |
762f9276 CC |
1373 | head_ref_namespaced(send_ref, &data); |
1374 | for_each_namespaced_ref(send_ref, &data); | |
70afef5c JV |
1375 | /* |
1376 | * fflush stdout before calling advertise_shallow_grafts because send_ref | |
1377 | * uses stdio. | |
1378 | */ | |
1379 | fflush_or_die(stdout); | |
a3d6b53e BW |
1380 | advertise_shallow_grafts(1); |
1381 | packet_flush(1); | |
1382 | } else { | |
9b67eb6f PS |
1383 | head_ref_namespaced(check_ref, &data); |
1384 | for_each_namespaced_ref(check_ref, &data); | |
aa9bab29 | 1385 | } |
01f9ec64 | 1386 | |
f234da80 | 1387 | if (!advertise_refs) { |
ebf8ebcc CC |
1388 | packet_reader_init(&reader, 0, NULL, 0, |
1389 | PACKET_READ_CHOMP_NEWLINE | | |
1390 | PACKET_READ_DIE_ON_ERR_PACKET); | |
1391 | ||
d92ae2c0 | 1392 | receive_needs(&data, &reader); |
fb3d1a08 DD |
1393 | |
1394 | /* | |
1395 | * An EOF at this exact point in negotiation should be | |
1396 | * acceptable from stateless clients as they will consume the | |
1397 | * shallow list before doing subsequent rpc with haves/etc. | |
1398 | */ | |
1399 | if (data.stateless_rpc) | |
1400 | reader.options |= PACKET_READ_GENTLE_ON_EOF; | |
1401 | ||
1402 | if (data.want_obj.nr && | |
1403 | packet_reader_peek(&reader) != PACKET_READ_EOF) { | |
1404 | reader.options &= ~PACKET_READ_GENTLE_ON_EOF; | |
07977695 | 1405 | get_common_commits(&data, &reader); |
cae2ee10 | 1406 | create_pack_file(&data, NULL); |
ebf8ebcc | 1407 | } |
a3d6b53e | 1408 | } |
08450ef7 | 1409 | |
ebf8ebcc | 1410 | upload_pack_data_clear(&data); |
def88e9a | 1411 | } |
04b33055 | 1412 | |
bc2e795c JT |
1413 | static int parse_want(struct packet_writer *writer, const char *line, |
1414 | struct object_array *want_obj) | |
3145ea95 BW |
1415 | { |
1416 | const char *arg; | |
1417 | if (skip_prefix(line, "want ", &arg)) { | |
1418 | struct object_id oid; | |
1419 | struct object *o; | |
1420 | ||
1421 | if (get_oid_hex(arg, &oid)) | |
1422 | die("git upload-pack: protocol error, " | |
1423 | "expected to get oid, not '%s'", line); | |
1424 | ||
9a8c3c4a JK |
1425 | o = parse_object_with_flags(the_repository, &oid, |
1426 | PARSE_OBJECT_SKIP_HASH_CHECK); | |
4de65626 | 1427 | |
3145ea95 | 1428 | if (!o) { |
bc2e795c JT |
1429 | packet_writer_error(writer, |
1430 | "upload-pack: not our ref %s", | |
1431 | oid_to_hex(&oid)); | |
3145ea95 BW |
1432 | die("git upload-pack: not our ref %s", |
1433 | oid_to_hex(&oid)); | |
1434 | } | |
1435 | ||
1436 | if (!(o->flags & WANTED)) { | |
1437 | o->flags |= WANTED; | |
1d1243fe | 1438 | add_object_array(o, NULL, want_obj); |
3145ea95 BW |
1439 | } |
1440 | ||
1441 | return 1; | |
1442 | } | |
1443 | ||
1444 | return 0; | |
1445 | } | |
1446 | ||
bc2e795c JT |
1447 | static int parse_want_ref(struct packet_writer *writer, const char *line, |
1448 | struct string_list *wanted_refs, | |
9b67eb6f | 1449 | struct string_list *hidden_refs, |
1d1243fe | 1450 | struct object_array *want_obj) |
516e2b76 | 1451 | { |
39551406 KA |
1452 | const char *refname_nons; |
1453 | if (skip_prefix(line, "want-ref ", &refname_nons)) { | |
516e2b76 BW |
1454 | struct object_id oid; |
1455 | struct string_list_item *item; | |
4de65626 | 1456 | struct object *o = NULL; |
39551406 | 1457 | struct strbuf refname = STRBUF_INIT; |
516e2b76 | 1458 | |
39551406 | 1459 | strbuf_addf(&refname, "%s%s", get_git_namespace(), refname_nons); |
9b67eb6f | 1460 | if (ref_is_hidden(refname_nons, refname.buf, hidden_refs) || |
39551406 KA |
1461 | read_ref(refname.buf, &oid)) { |
1462 | packet_writer_error(writer, "unknown ref %s", refname_nons); | |
1463 | die("unknown ref %s", refname_nons); | |
516e2b76 | 1464 | } |
39551406 | 1465 | strbuf_release(&refname); |
516e2b76 | 1466 | |
39551406 | 1467 | item = string_list_append(wanted_refs, refname_nons); |
516e2b76 BW |
1468 | item->util = oiddup(&oid); |
1469 | ||
4de65626 PS |
1470 | if (!starts_with(refname_nons, "refs/tags/")) { |
1471 | struct commit *commit = lookup_commit_in_graph(the_repository, &oid); | |
1472 | if (commit) | |
1473 | o = &commit->object; | |
1474 | } | |
1475 | ||
1476 | if (!o) | |
1477 | o = parse_object_or_die(&oid, refname_nons); | |
1478 | ||
516e2b76 BW |
1479 | if (!(o->flags & WANTED)) { |
1480 | o->flags |= WANTED; | |
1d1243fe | 1481 | add_object_array(o, NULL, want_obj); |
516e2b76 BW |
1482 | } |
1483 | ||
1484 | return 1; | |
1485 | } | |
1486 | ||
1487 | return 0; | |
1488 | } | |
1489 | ||
3145ea95 BW |
1490 | static int parse_have(const char *line, struct oid_array *haves) |
1491 | { | |
1492 | const char *arg; | |
1493 | if (skip_prefix(line, "have ", &arg)) { | |
1494 | struct object_id oid; | |
1495 | ||
1496 | if (get_oid_hex(arg, &oid)) | |
1497 | die("git upload-pack: expected SHA1 object, got '%s'", arg); | |
1498 | oid_array_append(haves, &oid); | |
1499 | return 1; | |
aa9bab29 BW |
1500 | } |
1501 | ||
def88e9a LT |
1502 | return 0; |
1503 | } | |
3145ea95 BW |
1504 | |
1505 | static void process_args(struct packet_reader *request, | |
389f161a | 1506 | struct upload_pack_data *data) |
3145ea95 | 1507 | { |
4845b772 | 1508 | while (packet_reader_read(request) == PACKET_READ_NORMAL) { |
3145ea95 | 1509 | const char *arg = request->line; |
ba95710a | 1510 | const char *p; |
3145ea95 BW |
1511 | |
1512 | /* process want */ | |
389f161a | 1513 | if (parse_want(&data->writer, arg, &data->want_obj)) |
3145ea95 | 1514 | continue; |
d1d7a945 | 1515 | if (data->allow_ref_in_want && |
bc2e795c | 1516 | parse_want_ref(&data->writer, arg, &data->wanted_refs, |
9b67eb6f | 1517 | &data->hidden_refs, &data->want_obj)) |
516e2b76 | 1518 | continue; |
3145ea95 BW |
1519 | /* process have line */ |
1520 | if (parse_have(arg, &data->haves)) | |
1521 | continue; | |
1522 | ||
1523 | /* process args like thin-pack */ | |
1524 | if (!strcmp(arg, "thin-pack")) { | |
b5a2068c | 1525 | data->use_thin_pack = 1; |
3145ea95 BW |
1526 | continue; |
1527 | } | |
1528 | if (!strcmp(arg, "ofs-delta")) { | |
b5a2068c | 1529 | data->use_ofs_delta = 1; |
3145ea95 BW |
1530 | continue; |
1531 | } | |
1532 | if (!strcmp(arg, "no-progress")) { | |
b5a2068c | 1533 | data->no_progress = 1; |
3145ea95 BW |
1534 | continue; |
1535 | } | |
1536 | if (!strcmp(arg, "include-tag")) { | |
b5a2068c | 1537 | data->use_include_tag = 1; |
3145ea95 BW |
1538 | continue; |
1539 | } | |
1540 | if (!strcmp(arg, "done")) { | |
1541 | data->done = 1; | |
1542 | continue; | |
1543 | } | |
9c1e657a JT |
1544 | if (!strcmp(arg, "wait-for-done")) { |
1545 | data->wait_for_done = 1; | |
1546 | continue; | |
1547 | } | |
3145ea95 | 1548 | |
685fbd32 BW |
1549 | /* Shallow related arguments */ |
1550 | if (process_shallow(arg, &data->shallows)) | |
1551 | continue; | |
1552 | if (process_deepen(arg, &data->depth)) | |
1553 | continue; | |
1554 | if (process_deepen_since(arg, &data->deepen_since, | |
1555 | &data->deepen_rev_list)) | |
1556 | continue; | |
1557 | if (process_deepen_not(arg, &data->deepen_not, | |
1558 | &data->deepen_rev_list)) | |
1559 | continue; | |
1560 | if (!strcmp(arg, "deepen-relative")) { | |
1561 | data->deepen_relative = 1; | |
1562 | continue; | |
1563 | } | |
1564 | ||
59abe196 | 1565 | if (data->allow_filter && skip_prefix(arg, "filter ", &p)) { |
08450ef7 CC |
1566 | list_objects_filter_die_if_populated(&data->filter_options); |
1567 | parse_list_objects_filter(&data->filter_options, p); | |
6dd3456a | 1568 | die_if_using_banned_filter(data); |
ba95710a JT |
1569 | continue; |
1570 | } | |
1571 | ||
07c3c2aa | 1572 | if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || |
e3835cd4 | 1573 | data->allow_sideband_all) && |
07c3c2aa | 1574 | !strcmp(arg, "sideband-all")) { |
0bbc0bc5 JT |
1575 | data->writer.use_sideband = 1; |
1576 | continue; | |
1577 | } | |
1578 | ||
dd4b732d JT |
1579 | if (skip_prefix(arg, "packfile-uris ", &p)) { |
1580 | string_list_split(&data->uri_protocols, p, ',', -1); | |
1581 | continue; | |
1582 | } | |
1583 | ||
3145ea95 | 1584 | /* ignore unknown lines maybe? */ |
7cc6ed2d | 1585 | die("unexpected line: '%s'", arg); |
3145ea95 | 1586 | } |
4845b772 | 1587 | |
dd4b732d JT |
1588 | if (data->uri_protocols.nr && !data->writer.use_sideband) |
1589 | string_list_clear(&data->uri_protocols, 0); | |
1590 | ||
4845b772 JK |
1591 | if (request->status != PACKET_READ_FLUSH) |
1592 | die(_("expected flush after fetch arguments")); | |
3145ea95 BW |
1593 | } |
1594 | ||
8dcf2278 | 1595 | static int process_haves(struct upload_pack_data *data, struct oid_array *common) |
3145ea95 BW |
1596 | { |
1597 | int i; | |
1598 | ||
1599 | /* Process haves */ | |
8dcf2278 CC |
1600 | for (i = 0; i < data->haves.nr; i++) { |
1601 | const struct object_id *oid = &data->haves.oid[i]; | |
3145ea95 | 1602 | |
77aa0941 JT |
1603 | if (!has_object_file_with_flags(oid, |
1604 | OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) | |
3145ea95 BW |
1605 | continue; |
1606 | ||
1607 | oid_array_append(common, oid); | |
1608 | ||
ea2c6e60 | 1609 | do_got_oid(data, oid); |
3145ea95 BW |
1610 | } |
1611 | ||
1612 | return 0; | |
1613 | } | |
1614 | ||
6fbbc437 | 1615 | static int send_acks(struct upload_pack_data *data, struct oid_array *acks) |
3145ea95 BW |
1616 | { |
1617 | int i; | |
1618 | ||
6fbbc437 | 1619 | packet_writer_write(&data->writer, "acknowledgments\n"); |
3145ea95 BW |
1620 | |
1621 | /* Send Acks */ | |
1622 | if (!acks->nr) | |
6fbbc437 | 1623 | packet_writer_write(&data->writer, "NAK\n"); |
3145ea95 BW |
1624 | |
1625 | for (i = 0; i < acks->nr; i++) { | |
6fbbc437 | 1626 | packet_writer_write(&data->writer, "ACK %s\n", |
bc2e795c | 1627 | oid_to_hex(&acks->oid[i])); |
3145ea95 BW |
1628 | } |
1629 | ||
9c1e657a | 1630 | if (!data->wait_for_done && ok_to_give_up(data)) { |
3145ea95 | 1631 | /* Send Ready */ |
6fbbc437 | 1632 | packet_writer_write(&data->writer, "ready\n"); |
3145ea95 BW |
1633 | return 1; |
1634 | } | |
1635 | ||
1636 | return 0; | |
1637 | } | |
1638 | ||
389f161a | 1639 | static int process_haves_and_send_acks(struct upload_pack_data *data) |
3145ea95 BW |
1640 | { |
1641 | struct oid_array common = OID_ARRAY_INIT; | |
3145ea95 BW |
1642 | int ret = 0; |
1643 | ||
8dcf2278 | 1644 | process_haves(data, &common); |
3145ea95 BW |
1645 | if (data->done) { |
1646 | ret = 1; | |
6fbbc437 | 1647 | } else if (send_acks(data, &common)) { |
bc2e795c | 1648 | packet_writer_delim(&data->writer); |
3145ea95 BW |
1649 | ret = 1; |
1650 | } else { | |
1651 | /* Add Flush */ | |
bc2e795c | 1652 | packet_writer_flush(&data->writer); |
3145ea95 BW |
1653 | ret = 0; |
1654 | } | |
1655 | ||
3145ea95 BW |
1656 | oid_array_clear(&data->haves); |
1657 | oid_array_clear(&common); | |
1658 | return ret; | |
1659 | } | |
1660 | ||
516e2b76 BW |
1661 | static void send_wanted_ref_info(struct upload_pack_data *data) |
1662 | { | |
1663 | const struct string_list_item *item; | |
1664 | ||
1665 | if (!data->wanted_refs.nr) | |
1666 | return; | |
1667 | ||
bc2e795c | 1668 | packet_writer_write(&data->writer, "wanted-refs\n"); |
516e2b76 BW |
1669 | |
1670 | for_each_string_list_item(item, &data->wanted_refs) { | |
bc2e795c JT |
1671 | packet_writer_write(&data->writer, "%s %s\n", |
1672 | oid_to_hex(item->util), | |
1673 | item->string); | |
516e2b76 BW |
1674 | } |
1675 | ||
bc2e795c | 1676 | packet_writer_delim(&data->writer); |
516e2b76 BW |
1677 | } |
1678 | ||
389f161a | 1679 | static void send_shallow_info(struct upload_pack_data *data) |
685fbd32 BW |
1680 | { |
1681 | /* No shallow info needs to be sent */ | |
1682 | if (!data->depth && !data->deepen_rev_list && !data->shallows.nr && | |
00624d60 | 1683 | !is_repository_shallow(the_repository)) |
685fbd32 BW |
1684 | return; |
1685 | ||
bc2e795c | 1686 | packet_writer_write(&data->writer, "shallow-info\n"); |
685fbd32 | 1687 | |
ee703c8a | 1688 | if (!send_shallow_list(data) && |
00624d60 | 1689 | is_repository_shallow(the_repository)) |
b1492f22 | 1690 | deepen(data, INFINITE_DEPTH); |
685fbd32 BW |
1691 | |
1692 | packet_delim(1); | |
1693 | } | |
1694 | ||
3145ea95 BW |
1695 | enum fetch_state { |
1696 | FETCH_PROCESS_ARGS = 0, | |
1697 | FETCH_SEND_ACKS, | |
1698 | FETCH_SEND_PACK, | |
1699 | FETCH_DONE, | |
1700 | }; | |
1701 | ||
28a592e4 | 1702 | int upload_pack_v2(struct repository *r, struct packet_reader *request) |
3145ea95 BW |
1703 | { |
1704 | enum fetch_state state = FETCH_PROCESS_ARGS; | |
1705 | struct upload_pack_data data; | |
d1035cac JT |
1706 | |
1707 | clear_object_flags(ALL_FLAGS); | |
3145ea95 BW |
1708 | |
1709 | upload_pack_data_init(&data); | |
f8edd1ca | 1710 | data.use_sideband = LARGE_PACKET_MAX; |
5b3c6507 | 1711 | get_upload_pack_config(&data); |
8a0e6f16 | 1712 | |
3145ea95 BW |
1713 | while (state != FETCH_DONE) { |
1714 | switch (state) { | |
1715 | case FETCH_PROCESS_ARGS: | |
389f161a | 1716 | process_args(request, &data); |
3145ea95 | 1717 | |
9c1e657a | 1718 | if (!data.want_obj.nr && !data.wait_for_done) { |
3145ea95 | 1719 | /* |
9c1e657a JT |
1720 | * Request didn't contain any 'want' lines (and |
1721 | * the request does not contain | |
1722 | * "wait-for-done", in which it is reasonable | |
1723 | * to just send 'have's without 'want's); guess | |
1724 | * they didn't want anything. | |
3145ea95 BW |
1725 | */ |
1726 | state = FETCH_DONE; | |
1727 | } else if (data.haves.nr) { | |
1728 | /* | |
1729 | * Request had 'have' lines, so lets ACK them. | |
1730 | */ | |
1731 | state = FETCH_SEND_ACKS; | |
1732 | } else { | |
1733 | /* | |
1734 | * Request had 'want's but no 'have's so we can | |
1735 | * immedietly go to construct and send a pack. | |
1736 | */ | |
1737 | state = FETCH_SEND_PACK; | |
1738 | } | |
1739 | break; | |
1740 | case FETCH_SEND_ACKS: | |
389f161a | 1741 | if (process_haves_and_send_acks(&data)) |
3145ea95 BW |
1742 | state = FETCH_SEND_PACK; |
1743 | else | |
1744 | state = FETCH_DONE; | |
1745 | break; | |
1746 | case FETCH_SEND_PACK: | |
516e2b76 | 1747 | send_wanted_ref_info(&data); |
389f161a | 1748 | send_shallow_info(&data); |
685fbd32 | 1749 | |
dd4b732d JT |
1750 | if (data.uri_protocols.nr) { |
1751 | create_pack_file(&data, &data.uri_protocols); | |
1752 | } else { | |
1753 | packet_writer_write(&data.writer, "packfile\n"); | |
1754 | create_pack_file(&data, NULL); | |
1755 | } | |
3145ea95 BW |
1756 | state = FETCH_DONE; |
1757 | break; | |
1758 | case FETCH_DONE: | |
1759 | continue; | |
1760 | } | |
1761 | } | |
1762 | ||
1763 | upload_pack_data_clear(&data); | |
1764 | return 0; | |
1765 | } | |
685fbd32 BW |
1766 | |
1767 | int upload_pack_advertise(struct repository *r, | |
1768 | struct strbuf *value) | |
1769 | { | |
ba95710a JT |
1770 | if (value) { |
1771 | int allow_filter_value; | |
516e2b76 | 1772 | int allow_ref_in_want; |
0bbc0bc5 | 1773 | int allow_sideband_all_value; |
dd4b732d | 1774 | char *str = NULL; |
516e2b76 | 1775 | |
9c1e657a | 1776 | strbuf_addstr(value, "shallow wait-for-done"); |
516e2b76 | 1777 | |
ba95710a JT |
1778 | if (!repo_config_get_bool(the_repository, |
1779 | "uploadpack.allowfilter", | |
1780 | &allow_filter_value) && | |
1781 | allow_filter_value) | |
1782 | strbuf_addstr(value, " filter"); | |
516e2b76 BW |
1783 | |
1784 | if (!repo_config_get_bool(the_repository, | |
1785 | "uploadpack.allowrefinwant", | |
1786 | &allow_ref_in_want) && | |
1787 | allow_ref_in_want) | |
1788 | strbuf_addstr(value, " ref-in-want"); | |
0bbc0bc5 | 1789 | |
07c3c2aa JT |
1790 | if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || |
1791 | (!repo_config_get_bool(the_repository, | |
1792 | "uploadpack.allowsidebandall", | |
1793 | &allow_sideband_all_value) && | |
1794 | allow_sideband_all_value)) | |
0bbc0bc5 | 1795 | strbuf_addstr(value, " sideband-all"); |
dd4b732d JT |
1796 | |
1797 | if (!repo_config_get_string(the_repository, | |
1798 | "uploadpack.blobpackfileuri", | |
1799 | &str) && | |
1800 | str) { | |
1801 | strbuf_addstr(value, " packfile-uris"); | |
1802 | free(str); | |
1803 | } | |
ba95710a | 1804 | } |
516e2b76 | 1805 | |
685fbd32 BW |
1806 | return 1; |
1807 | } |