]>
Commit | Line | Data |
---|---|---|
def88e9a LT |
1 | #include "cache.h" |
2 | #include "refs.h" | |
3 | #include "pkt-line.h" | |
958c24b1 | 4 | #include "sideband.h" |
f6b42a81 JH |
5 | #include "tag.h" |
6 | #include "object.h" | |
f0243f26 | 7 | #include "commit.h" |
77cb17e9 | 8 | #include "exec_cmd.h" |
9b8dc263 JS |
9 | #include "diff.h" |
10 | #include "revision.h" | |
11 | #include "list-objects.h" | |
cc41fa8d | 12 | #include "run-command.h" |
47a59185 | 13 | #include "connect.h" |
051e4005 | 14 | #include "sigchain.h" |
ff5effdf | 15 | #include "version.h" |
daebaa78 | 16 | #include "string-list.h" |
def88e9a | 17 | |
62b4698e | 18 | static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>"; |
def88e9a | 19 | |
208acbfb | 20 | /* Remember to update object flag allocation in object.h */ |
937a515a JH |
21 | #define THEY_HAVE (1u << 11) |
22 | #define OUR_REF (1u << 12) | |
23 | #define WANTED (1u << 13) | |
24 | #define COMMON_KNOWN (1u << 14) | |
25 | #define REACHABLE (1u << 15) | |
26 | ||
f53514bc JS |
27 | #define SHALLOW (1u << 16) |
28 | #define NOT_SHALLOW (1u << 17) | |
29 | #define CLIENT_SHALLOW (1u << 18) | |
390eb36b | 30 | #define HIDDEN_REF (1u << 19) |
f53514bc | 31 | |
3fbe2d54 | 32 | static unsigned long oldest_have; |
937a515a | 33 | |
3f1da57f | 34 | static int multi_ack; |
4e10cf9a | 35 | static int no_done; |
348e390b | 36 | static int use_thin_pack, use_ofs_delta, use_include_tag; |
9462e3f5 | 37 | static int no_progress, daemon_mode; |
7199c093 FM |
38 | /* Allow specifying sha1 if it is a ref tip. */ |
39 | #define ALLOW_TIP_SHA1 01 | |
68ee6289 FM |
40 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ |
41 | #define ALLOW_REACHABLE_SHA1 02 | |
7199c093 | 42 | static unsigned int allow_unadvertised_object_request; |
f0cea83f | 43 | static int shallow_nr; |
b1e9fff7 JH |
44 | static struct object_array have_obj; |
45 | static struct object_array want_obj; | |
6523078b | 46 | static struct object_array extra_edge_obj; |
96f1e58f | 47 | static unsigned int timeout; |
115dedd7 | 48 | static int keepalive = 5; |
d47f3db7 JH |
49 | /* 0 for no sideband, |
50 | * otherwise maximum packet size (up to 65520 bytes). | |
51 | */ | |
96f1e58f | 52 | static int use_sideband; |
42526b47 SP |
53 | static int advertise_refs; |
54 | static int stateless_rpc; | |
960deccb PA |
55 | |
56 | static void reset_timeout(void) | |
57 | { | |
58 | alarm(timeout); | |
59 | } | |
fb9040cc | 60 | |
583b7ea3 JH |
61 | static ssize_t send_client_data(int fd, const char *data, ssize_t sz) |
62 | { | |
958c24b1 | 63 | if (use_sideband) |
d47f3db7 | 64 | return send_sideband(1, fd, data, sz, use_sideband); |
958c24b1 JH |
65 | if (fd == 3) |
66 | /* emergency quit */ | |
67 | fd = 2; | |
68 | if (fd == 2) { | |
93822c22 | 69 | /* XXX: are we happy to lose stuff here? */ |
958c24b1 JH |
70 | xwrite(fd, data, sz); |
71 | return sz; | |
583b7ea3 | 72 | } |
cdf4fb8e JK |
73 | write_or_die(fd, data, sz); |
74 | return sz; | |
583b7ea3 JH |
75 | } |
76 | ||
b790e0f6 NTND |
77 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) |
78 | { | |
79 | FILE *fp = cb_data; | |
80 | if (graft->nr_parent == -1) | |
7683e2e6 | 81 | fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid)); |
b790e0f6 NTND |
82 | return 0; |
83 | } | |
84 | ||
fb9040cc LT |
85 | static void create_pack_file(void) |
86 | { | |
d3180279 | 87 | struct child_process pack_objects = CHILD_PROCESS_INIT; |
363b7817 | 88 | char data[8193], progress[128]; |
583b7ea3 JH |
89 | char abort_msg[] = "aborting due to possible repository " |
90 | "corruption on the remote side."; | |
b1c71b72 | 91 | int buffered = -1; |
1456b043 | 92 | ssize_t sz; |
2dacf26d | 93 | const char *argv[13]; |
cdab4858 NTND |
94 | int i, arg = 0; |
95 | FILE *pipe_fd; | |
75bfc6c2 | 96 | |
cdab4858 | 97 | if (shallow_nr) { |
cdab4858 | 98 | argv[arg++] = "--shallow-file"; |
b790e0f6 | 99 | argv[arg++] = ""; |
f0cea83f | 100 | } |
cdab4858 NTND |
101 | argv[arg++] = "pack-objects"; |
102 | argv[arg++] = "--revs"; | |
103 | if (use_thin_pack) | |
104 | argv[arg++] = "--thin"; | |
75bfc6c2 | 105 | |
cc41fa8d | 106 | argv[arg++] = "--stdout"; |
2dacf26d | 107 | if (shallow_nr) |
108 | argv[arg++] = "--shallow"; | |
cc41fa8d JS |
109 | if (!no_progress) |
110 | argv[arg++] = "--progress"; | |
111 | if (use_ofs_delta) | |
112 | argv[arg++] = "--delta-base-offset"; | |
348e390b SP |
113 | if (use_include_tag) |
114 | argv[arg++] = "--include-tag"; | |
cc41fa8d JS |
115 | argv[arg++] = NULL; |
116 | ||
b9612197 | 117 | pack_objects.in = -1; |
cc41fa8d JS |
118 | pack_objects.out = -1; |
119 | pack_objects.err = -1; | |
120 | pack_objects.git_cmd = 1; | |
121 | pack_objects.argv = argv; | |
21edd3f1 | 122 | |
4c324c00 | 123 | if (start_command(&pack_objects)) |
7e44c935 | 124 | die("git upload-pack: unable to fork git-pack-objects"); |
b1c71b72 | 125 | |
cdab4858 NTND |
126 | pipe_fd = xfdopen(pack_objects.in, "w"); |
127 | ||
b790e0f6 NTND |
128 | if (shallow_nr) |
129 | for_each_commit_graft(write_one_shallow, pipe_fd); | |
130 | ||
cdab4858 NTND |
131 | for (i = 0; i < want_obj.nr; i++) |
132 | fprintf(pipe_fd, "%s\n", | |
133 | sha1_to_hex(want_obj.objects[i].item->sha1)); | |
134 | fprintf(pipe_fd, "--not\n"); | |
135 | for (i = 0; i < have_obj.nr; i++) | |
136 | fprintf(pipe_fd, "%s\n", | |
137 | sha1_to_hex(have_obj.objects[i].item->sha1)); | |
138 | for (i = 0; i < extra_edge_obj.nr; i++) | |
139 | fprintf(pipe_fd, "%s\n", | |
140 | sha1_to_hex(extra_edge_obj.objects[i].item->sha1)); | |
141 | fprintf(pipe_fd, "\n"); | |
142 | fflush(pipe_fd); | |
143 | fclose(pipe_fd); | |
f0cea83f | 144 | |
cc41fa8d JS |
145 | /* We read from pack_objects.err to capture stderr output for |
146 | * progress bar, and pack_objects.out to capture the pack data. | |
b1c71b72 | 147 | */ |
b1c71b72 JH |
148 | |
149 | while (1) { | |
b1c71b72 | 150 | struct pollfd pfd[2]; |
363b7817 | 151 | int pe, pu, pollsize; |
05e95155 | 152 | int ret; |
b1c71b72 | 153 | |
0d516ada ML |
154 | reset_timeout(); |
155 | ||
b1c71b72 | 156 | pollsize = 0; |
363b7817 | 157 | pe = pu = -1; |
b1c71b72 | 158 | |
cc41fa8d JS |
159 | if (0 <= pack_objects.out) { |
160 | pfd[pollsize].fd = pack_objects.out; | |
b1c71b72 JH |
161 | pfd[pollsize].events = POLLIN; |
162 | pu = pollsize; | |
163 | pollsize++; | |
164 | } | |
cc41fa8d JS |
165 | if (0 <= pack_objects.err) { |
166 | pfd[pollsize].fd = pack_objects.err; | |
363b7817 JH |
167 | pfd[pollsize].events = POLLIN; |
168 | pe = pollsize; | |
169 | pollsize++; | |
170 | } | |
b1c71b72 | 171 | |
4c324c00 JS |
172 | if (!pollsize) |
173 | break; | |
174 | ||
6c71f8b0 ET |
175 | ret = poll(pfd, pollsize, |
176 | keepalive < 0 ? -1 : 1000 * keepalive); | |
177 | ||
05e95155 | 178 | if (ret < 0) { |
4c324c00 JS |
179 | if (errno != EINTR) { |
180 | error("poll failed, resuming: %s", | |
181 | strerror(errno)); | |
182 | sleep(1); | |
b1c71b72 | 183 | } |
4c324c00 JS |
184 | continue; |
185 | } | |
6b59f51b NP |
186 | if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) { |
187 | /* Status ready; we ship that in the side-band | |
188 | * or dump to the standard error. | |
189 | */ | |
190 | sz = xread(pack_objects.err, progress, | |
191 | sizeof(progress)); | |
192 | if (0 < sz) | |
193 | send_client_data(2, progress, sz); | |
194 | else if (sz == 0) { | |
195 | close(pack_objects.err); | |
196 | pack_objects.err = -1; | |
197 | } | |
198 | else | |
199 | goto fail; | |
200 | /* give priority to status messages */ | |
201 | continue; | |
202 | } | |
4c324c00 JS |
203 | if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { |
204 | /* Data ready; we keep the last byte to ourselves | |
205 | * in case we detect broken rev-list, so that we | |
206 | * can leave the stream corrupted. This is | |
207 | * unfortunate -- unpack-objects would happily | |
208 | * accept a valid packdata with trailing garbage, | |
209 | * so appending garbage after we pass all the | |
210 | * pack data is not good enough to signal | |
211 | * breakage to downstream. | |
212 | */ | |
213 | char *cp = data; | |
214 | ssize_t outsz = 0; | |
215 | if (0 <= buffered) { | |
216 | *cp++ = buffered; | |
217 | outsz++; | |
b1c71b72 | 218 | } |
4c324c00 JS |
219 | sz = xread(pack_objects.out, cp, |
220 | sizeof(data) - outsz); | |
221 | if (0 < sz) | |
1456b043 | 222 | ; |
4c324c00 JS |
223 | else if (sz == 0) { |
224 | close(pack_objects.out); | |
225 | pack_objects.out = -1; | |
363b7817 | 226 | } |
4c324c00 JS |
227 | else |
228 | goto fail; | |
229 | sz += outsz; | |
230 | if (1 < sz) { | |
231 | buffered = data[sz-1] & 0xFF; | |
232 | sz--; | |
b1c71b72 | 233 | } |
4c324c00 JS |
234 | else |
235 | buffered = -1; | |
236 | sz = send_client_data(1, data, sz); | |
237 | if (sz < 0) | |
b1c71b72 | 238 | goto fail; |
4c324c00 | 239 | } |
05e95155 JK |
240 | |
241 | /* | |
242 | * We hit the keepalive timeout without saying anything; send | |
243 | * an empty message on the data sideband just to let the other | |
244 | * side know we're still working on it, but don't have any data | |
245 | * yet. | |
246 | * | |
247 | * If we don't have a sideband channel, there's no room in the | |
248 | * protocol to say anything, so those clients are just out of | |
249 | * luck. | |
250 | */ | |
251 | if (!ret && use_sideband) { | |
252 | static const char buf[] = "0005\1"; | |
253 | write_or_die(1, buf, 5); | |
254 | } | |
4c324c00 | 255 | } |
b1c71b72 | 256 | |
4c324c00 | 257 | if (finish_command(&pack_objects)) { |
7e44c935 | 258 | error("git upload-pack: git-pack-objects died with error."); |
4c324c00 JS |
259 | goto fail; |
260 | } | |
b1c71b72 | 261 | |
4c324c00 JS |
262 | /* flush the data */ |
263 | if (0 <= buffered) { | |
264 | data[0] = buffered; | |
265 | sz = send_client_data(1, data, 1); | |
266 | if (sz < 0) | |
267 | goto fail; | |
268 | fprintf(stderr, "flushed.\n"); | |
b1c71b72 | 269 | } |
4c324c00 JS |
270 | if (use_sideband) |
271 | packet_flush(1); | |
272 | return; | |
273 | ||
b1c71b72 | 274 | fail: |
583b7ea3 | 275 | send_client_data(3, abort_msg, sizeof(abort_msg)); |
7e44c935 | 276 | die("git upload-pack: %s", abort_msg); |
fb9040cc LT |
277 | } |
278 | ||
def88e9a LT |
279 | static int got_sha1(char *hex, unsigned char *sha1) |
280 | { | |
b1e9fff7 | 281 | struct object *o; |
937a515a | 282 | int we_knew_they_have = 0; |
b1e9fff7 | 283 | |
def88e9a | 284 | if (get_sha1_hex(hex, sha1)) |
7e44c935 | 285 | die("git upload-pack: expected SHA1 object, got '%s'", hex); |
fb9040cc | 286 | if (!has_sha1_file(sha1)) |
937a515a | 287 | return -1; |
b1e9fff7 | 288 | |
a6eec126 | 289 | o = parse_object(sha1); |
b1e9fff7 JH |
290 | if (!o) |
291 | die("oops (%s)", sha1_to_hex(sha1)); | |
182a8dab | 292 | if (o->type == OBJ_COMMIT) { |
b1e9fff7 | 293 | struct commit_list *parents; |
937a515a | 294 | struct commit *commit = (struct commit *)o; |
b1e9fff7 | 295 | if (o->flags & THEY_HAVE) |
937a515a JH |
296 | we_knew_they_have = 1; |
297 | else | |
298 | o->flags |= THEY_HAVE; | |
299 | if (!oldest_have || (commit->date < oldest_have)) | |
300 | oldest_have = commit->date; | |
301 | for (parents = commit->parents; | |
b1e9fff7 JH |
302 | parents; |
303 | parents = parents->next) | |
304 | parents->item->object.flags |= THEY_HAVE; | |
fb9040cc | 305 | } |
937a515a JH |
306 | if (!we_knew_they_have) { |
307 | add_object_array(o, NULL, &have_obj); | |
308 | return 1; | |
309 | } | |
310 | return 0; | |
311 | } | |
312 | ||
313 | static int reachable(struct commit *want) | |
314 | { | |
315 | struct commit_list *work = NULL; | |
316 | ||
47e44ed1 | 317 | commit_list_insert_by_date(want, &work); |
937a515a JH |
318 | while (work) { |
319 | struct commit_list *list = work->next; | |
320 | struct commit *commit = work->item; | |
321 | free(work); | |
322 | work = list; | |
323 | ||
324 | if (commit->object.flags & THEY_HAVE) { | |
325 | want->object.flags |= COMMON_KNOWN; | |
326 | break; | |
327 | } | |
328 | if (!commit->object.parsed) | |
329 | parse_object(commit->object.sha1); | |
330 | if (commit->object.flags & REACHABLE) | |
331 | continue; | |
332 | commit->object.flags |= REACHABLE; | |
333 | if (commit->date < oldest_have) | |
334 | continue; | |
335 | for (list = commit->parents; list; list = list->next) { | |
336 | struct commit *parent = list->item; | |
337 | if (!(parent->object.flags & REACHABLE)) | |
47e44ed1 | 338 | commit_list_insert_by_date(parent, &work); |
937a515a JH |
339 | } |
340 | } | |
341 | want->object.flags |= REACHABLE; | |
342 | clear_commit_marks(want, REACHABLE); | |
343 | free_commit_list(work); | |
344 | return (want->object.flags & COMMON_KNOWN); | |
345 | } | |
346 | ||
347 | static int ok_to_give_up(void) | |
348 | { | |
349 | int i; | |
350 | ||
351 | if (!have_obj.nr) | |
352 | return 0; | |
353 | ||
354 | for (i = 0; i < want_obj.nr; i++) { | |
355 | struct object *want = want_obj.objects[i].item; | |
356 | ||
357 | if (want->flags & COMMON_KNOWN) | |
358 | continue; | |
359 | want = deref_tag(want, "a want line", 0); | |
360 | if (!want || want->type != OBJ_COMMIT) { | |
361 | /* no way to tell if this is reachable by | |
362 | * looking at the ancestry chain alone, so | |
363 | * leave a note to ourselves not to worry about | |
364 | * this object anymore. | |
365 | */ | |
366 | want_obj.objects[i].item->flags |= COMMON_KNOWN; | |
367 | continue; | |
368 | } | |
369 | if (!reachable((struct commit *)want)) | |
370 | return 0; | |
371 | } | |
fb9040cc | 372 | return 1; |
def88e9a LT |
373 | } |
374 | ||
375 | static int get_common_commits(void) | |
376 | { | |
c04c4e57 | 377 | unsigned char sha1[20]; |
78affc49 | 378 | char last_hex[41]; |
49bee717 SP |
379 | int got_common = 0; |
380 | int got_other = 0; | |
4e10cf9a | 381 | int sent_ready = 0; |
def88e9a | 382 | |
f0243f26 JS |
383 | save_commit_buffer = 0; |
384 | ||
eeefa7c9 | 385 | for (;;) { |
74543a04 | 386 | char *line = packet_read_line(0, NULL); |
960deccb | 387 | reset_timeout(); |
def88e9a | 388 | |
74543a04 | 389 | if (!line) { |
49bee717 | 390 | if (multi_ack == 2 && got_common |
4e10cf9a JH |
391 | && !got_other && ok_to_give_up()) { |
392 | sent_ready = 1; | |
49bee717 | 393 | packet_write(1, "ACK %s ready\n", last_hex); |
4e10cf9a | 394 | } |
b1e9fff7 | 395 | if (have_obj.nr == 0 || multi_ack) |
1bd8c8f0 | 396 | packet_write(1, "NAK\n"); |
4e10cf9a JH |
397 | |
398 | if (no_done && sent_ready) { | |
399 | packet_write(1, "ACK %s\n", last_hex); | |
400 | return 0; | |
401 | } | |
42526b47 SP |
402 | if (stateless_rpc) |
403 | exit(0); | |
49bee717 SP |
404 | got_common = 0; |
405 | got_other = 0; | |
def88e9a LT |
406 | continue; |
407 | } | |
59556548 | 408 | if (starts_with(line, "have ")) { |
937a515a JH |
409 | switch (got_sha1(line+5, sha1)) { |
410 | case -1: /* they have what we do not */ | |
49bee717 | 411 | got_other = 1; |
78affc49 SP |
412 | if (multi_ack && ok_to_give_up()) { |
413 | const char *hex = sha1_to_hex(sha1); | |
4e10cf9a JH |
414 | if (multi_ack == 2) { |
415 | sent_ready = 1; | |
78affc49 | 416 | packet_write(1, "ACK %s ready\n", hex); |
4e10cf9a | 417 | } else |
78affc49 SP |
418 | packet_write(1, "ACK %s continue\n", hex); |
419 | } | |
937a515a JH |
420 | break; |
421 | default: | |
49bee717 | 422 | got_common = 1; |
78affc49 SP |
423 | memcpy(last_hex, sha1_to_hex(sha1), 41); |
424 | if (multi_ack == 2) | |
425 | packet_write(1, "ACK %s common\n", last_hex); | |
426 | else if (multi_ack) | |
427 | packet_write(1, "ACK %s continue\n", last_hex); | |
c04c4e57 | 428 | else if (have_obj.nr == 1) |
78affc49 | 429 | packet_write(1, "ACK %s\n", last_hex); |
937a515a | 430 | break; |
af2d3aa4 | 431 | } |
def88e9a LT |
432 | continue; |
433 | } | |
434 | if (!strcmp(line, "done")) { | |
b1e9fff7 | 435 | if (have_obj.nr > 0) { |
1bd8c8f0 | 436 | if (multi_ack) |
c04c4e57 | 437 | packet_write(1, "ACK %s\n", last_hex); |
1bd8c8f0 JS |
438 | return 0; |
439 | } | |
def88e9a LT |
440 | packet_write(1, "NAK\n"); |
441 | return -1; | |
442 | } | |
7e44c935 | 443 | die("git upload-pack: expected SHA1 list, got '%s'", line); |
def88e9a | 444 | } |
def88e9a LT |
445 | } |
446 | ||
390eb36b JH |
447 | static int is_our_ref(struct object *o) |
448 | { | |
68ee6289 FM |
449 | int allow_hidden_ref = (allow_unadvertised_object_request & |
450 | (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); | |
7199c093 | 451 | return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF); |
390eb36b JH |
452 | } |
453 | ||
051e4005 JH |
454 | static void check_non_tip(void) |
455 | { | |
456 | static const char *argv[] = { | |
457 | "rev-list", "--stdin", NULL, | |
458 | }; | |
d3180279 | 459 | static struct child_process cmd = CHILD_PROCESS_INIT; |
051e4005 JH |
460 | struct object *o; |
461 | char namebuf[42]; /* ^ + SHA-1 + LF */ | |
462 | int i; | |
463 | ||
68ee6289 FM |
464 | /* |
465 | * In the normal in-process case without | |
466 | * uploadpack.allowReachableSHA1InWant, | |
467 | * non-tip requests can never happen. | |
468 | */ | |
469 | if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1)) | |
051e4005 JH |
470 | goto error; |
471 | ||
472 | cmd.argv = argv; | |
473 | cmd.git_cmd = 1; | |
474 | cmd.no_stderr = 1; | |
475 | cmd.in = -1; | |
476 | cmd.out = -1; | |
477 | ||
478 | if (start_command(&cmd)) | |
479 | goto error; | |
480 | ||
481 | /* | |
482 | * If rev-list --stdin encounters an unknown commit, it | |
483 | * terminates, which will cause SIGPIPE in the write loop | |
484 | * below. | |
485 | */ | |
486 | sigchain_push(SIGPIPE, SIG_IGN); | |
487 | ||
488 | namebuf[0] = '^'; | |
489 | namebuf[41] = '\n'; | |
490 | for (i = get_max_object_index(); 0 < i; ) { | |
491 | o = get_indexed_object(--i); | |
2a745324 BH |
492 | if (!o) |
493 | continue; | |
390eb36b | 494 | if (!is_our_ref(o)) |
051e4005 JH |
495 | continue; |
496 | memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40); | |
497 | if (write_in_full(cmd.in, namebuf, 42) < 0) | |
498 | goto error; | |
499 | } | |
500 | namebuf[40] = '\n'; | |
501 | for (i = 0; i < want_obj.nr; i++) { | |
502 | o = want_obj.objects[i].item; | |
390eb36b | 503 | if (is_our_ref(o)) |
051e4005 JH |
504 | continue; |
505 | memcpy(namebuf, sha1_to_hex(o->sha1), 40); | |
506 | if (write_in_full(cmd.in, namebuf, 41) < 0) | |
507 | goto error; | |
508 | } | |
509 | close(cmd.in); | |
510 | ||
511 | sigchain_pop(SIGPIPE); | |
512 | ||
513 | /* | |
514 | * The commits out of the rev-list are not ancestors of | |
515 | * our ref. | |
516 | */ | |
517 | i = read_in_full(cmd.out, namebuf, 1); | |
518 | if (i) | |
519 | goto error; | |
520 | close(cmd.out); | |
521 | ||
522 | /* | |
523 | * rev-list may have died by encountering a bad commit | |
524 | * in the history, in which case we do want to bail out | |
525 | * even when it showed no commit. | |
526 | */ | |
527 | if (finish_command(&cmd)) | |
528 | goto error; | |
529 | ||
530 | /* All the non-tip ones are ancestors of what we advertised */ | |
531 | return; | |
532 | ||
533 | error: | |
534 | /* Pick one of them (we know there at least is one) */ | |
535 | for (i = 0; i < want_obj.nr; i++) { | |
536 | o = want_obj.objects[i].item; | |
390eb36b | 537 | if (!is_our_ref(o)) |
051e4005 JH |
538 | die("git upload-pack: not our ref %s", |
539 | sha1_to_hex(o->sha1)); | |
540 | } | |
541 | } | |
542 | ||
b1e9fff7 | 543 | static void receive_needs(void) |
fb9040cc | 544 | { |
3cd47459 | 545 | struct object_array shallows = OBJECT_ARRAY_INIT; |
74543a04 | 546 | int depth = 0; |
051e4005 | 547 | int has_non_tip = 0; |
fb9040cc | 548 | |
f0cea83f | 549 | shallow_nr = 0; |
fb9040cc | 550 | for (;;) { |
565ebbf7 | 551 | struct object *o; |
f47182c8 | 552 | const char *features; |
6ece0d30 | 553 | unsigned char sha1_buf[20]; |
74543a04 | 554 | char *line = packet_read_line(0, NULL); |
960deccb | 555 | reset_timeout(); |
74543a04 | 556 | if (!line) |
ed09aef0 | 557 | break; |
e091eb93 | 558 | |
59556548 | 559 | if (starts_with(line, "shallow ")) { |
ed09aef0 JS |
560 | unsigned char sha1[20]; |
561 | struct object *object; | |
b7b02170 | 562 | if (get_sha1_hex(line + 8, sha1)) |
ed09aef0 JS |
563 | die("invalid shallow line: %s", line); |
564 | object = parse_object(sha1); | |
565 | if (!object) | |
af04fa2a | 566 | continue; |
6293ded3 NTND |
567 | if (object->type != OBJ_COMMIT) |
568 | die("invalid shallow object %s", sha1_to_hex(sha1)); | |
e58e57e4 JK |
569 | if (!(object->flags & CLIENT_SHALLOW)) { |
570 | object->flags |= CLIENT_SHALLOW; | |
571 | add_object_array(object, NULL, &shallows); | |
572 | } | |
ed09aef0 JS |
573 | continue; |
574 | } | |
59556548 | 575 | if (starts_with(line, "deepen ")) { |
016e6ccb JS |
576 | char *end; |
577 | depth = strtol(line + 7, &end, 0); | |
578 | if (end == line + 7 || depth <= 0) | |
579 | die("Invalid deepen: %s", line); | |
580 | continue; | |
581 | } | |
59556548 | 582 | if (!starts_with(line, "want ") || |
6ece0d30 | 583 | get_sha1_hex(line+5, sha1_buf)) |
7e44c935 | 584 | die("git upload-pack: protocol error, " |
e091eb93 | 585 | "expected to get sha, not '%s'", line); |
f47182c8 JH |
586 | |
587 | features = line + 45; | |
588 | ||
589 | if (parse_feature_request(features, "multi_ack_detailed")) | |
78affc49 | 590 | multi_ack = 2; |
f47182c8 | 591 | else if (parse_feature_request(features, "multi_ack")) |
1bd8c8f0 | 592 | multi_ack = 1; |
f47182c8 | 593 | if (parse_feature_request(features, "no-done")) |
4e10cf9a | 594 | no_done = 1; |
f47182c8 | 595 | if (parse_feature_request(features, "thin-pack")) |
b19696c2 | 596 | use_thin_pack = 1; |
f47182c8 | 597 | if (parse_feature_request(features, "ofs-delta")) |
e4fe4b8e | 598 | use_ofs_delta = 1; |
f47182c8 | 599 | if (parse_feature_request(features, "side-band-64k")) |
d47f3db7 | 600 | use_sideband = LARGE_PACKET_MAX; |
f47182c8 | 601 | else if (parse_feature_request(features, "side-band")) |
d47f3db7 | 602 | use_sideband = DEFAULT_PACKET_MAX; |
f47182c8 | 603 | if (parse_feature_request(features, "no-progress")) |
b0e90897 | 604 | no_progress = 1; |
f47182c8 | 605 | if (parse_feature_request(features, "include-tag")) |
348e390b | 606 | use_include_tag = 1; |
565ebbf7 | 607 | |
f59de5d1 | 608 | o = parse_object(sha1_buf); |
051e4005 | 609 | if (!o) |
9f9aa761 EN |
610 | die("git upload-pack: not our ref %s", |
611 | sha1_to_hex(sha1_buf)); | |
565ebbf7 JH |
612 | if (!(o->flags & WANTED)) { |
613 | o->flags |= WANTED; | |
390eb36b | 614 | if (!is_our_ref(o)) |
051e4005 | 615 | has_non_tip = 1; |
b1e9fff7 | 616 | add_object_array(o, NULL, &want_obj); |
565ebbf7 | 617 | } |
fb9040cc | 618 | } |
9462e3f5 | 619 | |
051e4005 JH |
620 | /* |
621 | * We have sent all our refs already, and the other end | |
622 | * should have chosen out of them. When we are operating | |
623 | * in the stateless RPC mode, however, their choice may | |
624 | * have been based on the set of older refs advertised | |
625 | * by another process that handled the initial request. | |
626 | */ | |
627 | if (has_non_tip) | |
628 | check_non_tip(); | |
629 | ||
9462e3f5 JS |
630 | if (!use_sideband && daemon_mode) |
631 | no_progress = 1; | |
632 | ||
f53514bc JS |
633 | if (depth == 0 && shallows.nr == 0) |
634 | return; | |
016e6ccb | 635 | if (depth > 0) { |
4dcb167f | 636 | struct commit_list *result = NULL, *backup = NULL; |
f53514bc | 637 | int i; |
79d3a236 | 638 | if (depth == INFINITE_DEPTH && !is_repository_shallow()) |
4dcb167f NTND |
639 | for (i = 0; i < shallows.nr; i++) { |
640 | struct object *object = shallows.objects[i].item; | |
641 | object->flags |= NOT_SHALLOW; | |
642 | } | |
643 | else | |
644 | backup = result = | |
645 | get_shallow_commits(&want_obj, depth, | |
646 | SHALLOW, NOT_SHALLOW); | |
016e6ccb | 647 | while (result) { |
f53514bc | 648 | struct object *object = &result->item->object; |
1f2de769 | 649 | if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { |
f53514bc JS |
650 | packet_write(1, "shallow %s", |
651 | sha1_to_hex(object->sha1)); | |
652 | register_shallow(object->sha1); | |
f0cea83f | 653 | shallow_nr++; |
f53514bc | 654 | } |
016e6ccb JS |
655 | result = result->next; |
656 | } | |
657 | free_commit_list(backup); | |
f53514bc JS |
658 | for (i = 0; i < shallows.nr; i++) { |
659 | struct object *object = shallows.objects[i].item; | |
660 | if (object->flags & NOT_SHALLOW) { | |
661 | struct commit_list *parents; | |
662 | packet_write(1, "unshallow %s", | |
663 | sha1_to_hex(object->sha1)); | |
664 | object->flags &= ~CLIENT_SHALLOW; | |
665 | /* make sure the real parents are parsed */ | |
666 | unregister_shallow(object->sha1); | |
176d45cb | 667 | object->parsed = 0; |
367068e0 | 668 | parse_commit_or_die((struct commit *)object); |
f53514bc JS |
669 | parents = ((struct commit *)object)->parents; |
670 | while (parents) { | |
671 | add_object_array(&parents->item->object, | |
672 | NULL, &want_obj); | |
673 | parents = parents->next; | |
674 | } | |
6523078b | 675 | add_object_array(object, NULL, &extra_edge_obj); |
f53514bc JS |
676 | } |
677 | /* make sure commit traversal conforms to client */ | |
678 | register_shallow(object->sha1); | |
679 | } | |
680 | packet_flush(1); | |
681 | } else | |
682 | if (shallows.nr > 0) { | |
683 | int i; | |
684 | for (i = 0; i < shallows.nr; i++) | |
685 | register_shallow(shallows.objects[i].item->sha1); | |
686 | } | |
f0cea83f NE |
687 | |
688 | shallow_nr += shallows.nr; | |
f53514bc | 689 | free(shallows.objects); |
fb9040cc LT |
690 | } |
691 | ||
daebaa78 | 692 | /* return non-zero if the ref is hidden, otherwise 0 */ |
363e98bf | 693 | static int mark_our_ref(const char *refname, const struct object_id *oid) |
cbbe50db | 694 | { |
363e98bf | 695 | struct object *o = lookup_unknown_object(oid->hash); |
daebaa78 | 696 | |
390eb36b JH |
697 | if (ref_is_hidden(refname)) { |
698 | o->flags |= HIDDEN_REF; | |
daebaa78 | 699 | return 1; |
390eb36b | 700 | } |
3f1da57f | 701 | o->flags |= OUR_REF; |
cbbe50db JH |
702 | return 0; |
703 | } | |
704 | ||
363e98bf MH |
705 | static int check_ref(const char *refname, const struct object_id *oid, |
706 | int flag, void *cb_data) | |
e172755b | 707 | { |
363e98bf | 708 | mark_our_ref(refname, oid); |
e172755b JK |
709 | return 0; |
710 | } | |
711 | ||
7171d8c1 JH |
712 | static void format_symref_info(struct strbuf *buf, struct string_list *symref) |
713 | { | |
714 | struct string_list_item *item; | |
715 | ||
716 | if (!symref->nr) | |
717 | return; | |
718 | for_each_string_list_item(item, symref) | |
719 | strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util); | |
720 | } | |
721 | ||
363e98bf MH |
722 | static int send_ref(const char *refname, const struct object_id *oid, |
723 | int flag, void *cb_data) | |
def88e9a | 724 | { |
ed09aef0 | 725 | static const char *capabilities = "multi_ack thin-pack side-band" |
348e390b | 726 | " side-band-64k ofs-delta shallow no-progress" |
78affc49 | 727 | " include-tag multi_ack_detailed"; |
6b01ecfe | 728 | const char *refname_nons = strip_namespace(refname); |
21758aff | 729 | struct object_id peeled; |
b5b16990 | 730 | |
363e98bf | 731 | if (mark_our_ref(refname, oid)) |
daebaa78 | 732 | return 0; |
cbbe50db | 733 | |
7171d8c1 JH |
734 | if (capabilities) { |
735 | struct strbuf symref_info = STRBUF_INIT; | |
736 | ||
737 | format_symref_info(&symref_info, cb_data); | |
68ee6289 | 738 | packet_write(1, "%s %s%c%s%s%s%s%s agent=%s\n", |
363e98bf | 739 | oid_to_hex(oid), refname_nons, |
cf2ad8e6 | 740 | 0, capabilities, |
7199c093 FM |
741 | (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ? |
742 | " allow-tip-sha1-in-want" : "", | |
68ee6289 FM |
743 | (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ? |
744 | " allow-reachable-sha1-in-want" : "", | |
ff5effdf | 745 | stateless_rpc ? " no-done" : "", |
7171d8c1 | 746 | symref_info.buf, |
ff5effdf | 747 | git_user_agent_sanitized()); |
7171d8c1 JH |
748 | strbuf_release(&symref_info); |
749 | } else { | |
363e98bf | 750 | packet_write(1, "%s %s\n", oid_to_hex(oid), refname_nons); |
7171d8c1 | 751 | } |
1f5881bb | 752 | capabilities = NULL; |
21758aff MH |
753 | if (!peel_ref(refname, peeled.hash)) |
754 | packet_write(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); | |
def88e9a LT |
755 | return 0; |
756 | } | |
757 | ||
7dabd056 MH |
758 | static int find_symref(const char *refname, const struct object_id *oid, |
759 | int flag, void *cb_data) | |
7171d8c1 JH |
760 | { |
761 | const char *symref_target; | |
762 | struct string_list_item *item; | |
e45a4949 | 763 | struct object_id unused; |
7171d8c1 JH |
764 | |
765 | if ((flag & REF_ISSYMREF) == 0) | |
766 | return 0; | |
e45a4949 | 767 | symref_target = resolve_ref_unsafe(refname, 0, unused.hash, &flag); |
7171d8c1 JH |
768 | if (!symref_target || (flag & REF_ISSYMREF) == 0) |
769 | die("'%s' is a symref but it is not?", refname); | |
770 | item = string_list_append(cb_data, refname); | |
771 | item->util = xstrdup(symref_target); | |
772 | return 0; | |
773 | } | |
774 | ||
59076eba | 775 | static void upload_pack(void) |
def88e9a | 776 | { |
7171d8c1 JH |
777 | struct string_list symref = STRING_LIST_INIT_DUP; |
778 | ||
779 | head_ref_namespaced(find_symref, &symref); | |
780 | ||
42526b47 SP |
781 | if (advertise_refs || !stateless_rpc) { |
782 | reset_timeout(); | |
7171d8c1 JH |
783 | head_ref_namespaced(send_ref, &symref); |
784 | for_each_namespaced_ref(send_ref, &symref); | |
ad491366 | 785 | advertise_shallow_grafts(1); |
42526b47 SP |
786 | packet_flush(1); |
787 | } else { | |
e172755b JK |
788 | head_ref_namespaced(check_ref, NULL); |
789 | for_each_namespaced_ref(check_ref, NULL); | |
42526b47 | 790 | } |
7171d8c1 | 791 | string_list_clear(&symref, 1); |
42526b47 SP |
792 | if (advertise_refs) |
793 | return; | |
794 | ||
b1e9fff7 | 795 | receive_needs(); |
59076eba DR |
796 | if (want_obj.nr) { |
797 | get_common_commits(); | |
798 | create_pack_file(); | |
799 | } | |
def88e9a LT |
800 | } |
801 | ||
daebaa78 JH |
802 | static int upload_pack_config(const char *var, const char *value, void *unused) |
803 | { | |
7199c093 FM |
804 | if (!strcmp("uploadpack.allowtipsha1inwant", var)) { |
805 | if (git_config_bool(var, value)) | |
806 | allow_unadvertised_object_request |= ALLOW_TIP_SHA1; | |
807 | else | |
808 | allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1; | |
68ee6289 FM |
809 | } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) { |
810 | if (git_config_bool(var, value)) | |
811 | allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; | |
812 | else | |
813 | allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1; | |
7199c093 | 814 | } else if (!strcmp("uploadpack.keepalive", var)) { |
05e95155 JK |
815 | keepalive = git_config_int(var, value); |
816 | if (!keepalive) | |
817 | keepalive = -1; | |
818 | } | |
daebaa78 JH |
819 | return parse_hide_refs_config(var, value, "uploadpack"); |
820 | } | |
821 | ||
def88e9a LT |
822 | int main(int argc, char **argv) |
823 | { | |
8d630132 | 824 | char *dir; |
960deccb PA |
825 | int i; |
826 | int strict = 0; | |
827 | ||
5e9637c6 ÆAB |
828 | git_setup_gettext(); |
829 | ||
bbc30f99 | 830 | packet_trace_identity("upload-pack"); |
2fb3f6db | 831 | git_extract_argv0_path(argv[0]); |
afc711b8 | 832 | check_replace_refs = 0; |
2fb3f6db | 833 | |
960deccb PA |
834 | for (i = 1; i < argc; i++) { |
835 | char *arg = argv[i]; | |
836 | ||
837 | if (arg[0] != '-') | |
838 | break; | |
42526b47 SP |
839 | if (!strcmp(arg, "--advertise-refs")) { |
840 | advertise_refs = 1; | |
841 | continue; | |
842 | } | |
843 | if (!strcmp(arg, "--stateless-rpc")) { | |
844 | stateless_rpc = 1; | |
845 | continue; | |
846 | } | |
960deccb PA |
847 | if (!strcmp(arg, "--strict")) { |
848 | strict = 1; | |
849 | continue; | |
850 | } | |
59556548 | 851 | if (starts_with(arg, "--timeout=")) { |
960deccb | 852 | timeout = atoi(arg+10); |
9462e3f5 | 853 | daemon_mode = 1; |
960deccb PA |
854 | continue; |
855 | } | |
856 | if (!strcmp(arg, "--")) { | |
857 | i++; | |
858 | break; | |
859 | } | |
860 | } | |
a6080a0a | 861 | |
960deccb | 862 | if (i != argc-1) |
def88e9a | 863 | usage(upload_pack_usage); |
04b33055 | 864 | |
e1464ca7 | 865 | setup_path(); |
04b33055 | 866 | |
960deccb | 867 | dir = argv[i]; |
113b9475 | 868 | |
8d630132 | 869 | if (!enter_repo(dir, strict)) |
05ac6b34 | 870 | die("'%s' does not appear to be a git repository", dir); |
ad491366 | 871 | |
daebaa78 | 872 | git_config(upload_pack_config, NULL); |
def88e9a LT |
873 | upload_pack(); |
874 | return 0; | |
875 | } |