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