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