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