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