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