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