]>
Commit | Line | Data |
---|---|---|
61221472 | 1 | #include "cache.h" |
2a9c3fe8 | 2 | #include "commit.h" |
584c6cc9 | 3 | #include "refs.h" |
f3a3214e | 4 | #include "pkt-line.h" |
de1a2fdd | 5 | #include "sideband.h" |
38b1c662 | 6 | #include "run-command.h" |
6b62816c | 7 | #include "remote.h" |
96249c04 | 8 | #include "send-pack.h" |
de1a2fdd | 9 | #include "quote.h" |
f1863d0d | 10 | #include "transport.h" |
61221472 | 11 | |
2a245013 | 12 | static const char send_pack_usage[] = |
1b1dd23f | 13 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n" |
18bd8821 | 14 | " --all and explicit <ref> specification are mutually exclusive."; |
96249c04 | 15 | |
6828f72f | 16 | static struct send_pack_args args; |
61221472 | 17 | |
02322e16 JH |
18 | static int feed_object(const unsigned char *sha1, int fd, int negative) |
19 | { | |
20 | char buf[42]; | |
21 | ||
22 | if (negative && !has_sha1_file(sha1)) | |
23 | return 1; | |
24 | ||
25 | memcpy(buf + negative, sha1_to_hex(sha1), 40); | |
26 | if (negative) | |
27 | buf[0] = '^'; | |
28 | buf[40 + negative] = '\n'; | |
29 | return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs"); | |
30 | } | |
31 | ||
c727fe2a | 32 | /* |
0ae5f98c | 33 | * Make a pack stream and spit it out into file descriptor fd |
c727fe2a | 34 | */ |
64fcef2d | 35 | static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args) |
c727fe2a | 36 | { |
38b1c662 SP |
37 | /* |
38 | * The child becomes pack-objects --revs; we feed | |
39 | * the revision parameters to it via its stdin and | |
40 | * let its stdout go back to the other end. | |
41 | */ | |
96249c04 | 42 | const char *argv[] = { |
38b1c662 | 43 | "pack-objects", |
4f366275 | 44 | "--all-progress-implied", |
38b1c662 SP |
45 | "--revs", |
46 | "--stdout", | |
47 | NULL, | |
48 | NULL, | |
b74fce16 | 49 | NULL, |
12070329 | 50 | NULL, |
38b1c662 SP |
51 | }; |
52 | struct child_process po; | |
40c155ff | 53 | int i; |
c727fe2a | 54 | |
b74fce16 | 55 | i = 4; |
64fcef2d | 56 | if (args->use_thin_pack) |
b74fce16 NP |
57 | argv[i++] = "--thin"; |
58 | if (args->use_ofs_delta) | |
59 | argv[i++] = "--delta-base-offset"; | |
12070329 JK |
60 | if (args->quiet) |
61 | argv[i++] = "-q"; | |
38b1c662 | 62 | memset(&po, 0, sizeof(po)); |
96249c04 | 63 | po.argv = argv; |
38b1c662 | 64 | po.in = -1; |
de1a2fdd | 65 | po.out = args->stateless_rpc ? -1 : fd; |
38b1c662 SP |
66 | po.git_cmd = 1; |
67 | if (start_command(&po)) | |
d824cbba | 68 | die_errno("git pack-objects failed"); |
c727fe2a | 69 | |
0ae5f98c JH |
70 | /* |
71 | * We feed the pack-objects we just spawned with revision | |
72 | * parameters by writing to the pipe. | |
c727fe2a | 73 | */ |
02322e16 JH |
74 | for (i = 0; i < extra->nr; i++) |
75 | if (!feed_object(extra->array[i], po.in, 1)) | |
40c155ff | 76 | break; |
c727fe2a | 77 | |
40c155ff | 78 | while (refs) { |
c727fe2a | 79 | if (!is_null_sha1(refs->old_sha1) && |
02322e16 JH |
80 | !feed_object(refs->old_sha1, po.in, 1)) |
81 | break; | |
82 | if (!is_null_sha1(refs->new_sha1) && | |
83 | !feed_object(refs->new_sha1, po.in, 0)) | |
84 | break; | |
c727fe2a AW |
85 | refs = refs->next; |
86 | } | |
c727fe2a | 87 | |
e72ae288 | 88 | close(po.in); |
de1a2fdd SP |
89 | |
90 | if (args->stateless_rpc) { | |
91 | char *buf = xmalloc(LARGE_PACKET_MAX); | |
92 | while (1) { | |
93 | ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX); | |
94 | if (n <= 0) | |
95 | break; | |
96 | send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX); | |
97 | } | |
98 | free(buf); | |
99 | close(po.out); | |
100 | po.out = -1; | |
101 | } | |
102 | ||
38b1c662 SP |
103 | if (finish_command(&po)) |
104 | return error("pack-objects died with strange error"); | |
105 | return 0; | |
94fdb7aa | 106 | } |
e4b5c7ff | 107 | |
ca74c458 JK |
108 | static int receive_status(int in, struct ref *refs) |
109 | { | |
110 | struct ref *hint; | |
cfee10a7 JH |
111 | char line[1000]; |
112 | int ret = 0; | |
113 | int len = packet_read_line(in, line, sizeof(line)); | |
2a0fe89a JK |
114 | if (len < 10 || memcmp(line, "unpack ", 7)) |
115 | return error("did not receive remote status"); | |
cfee10a7 | 116 | if (memcmp(line, "unpack ok\n", 10)) { |
2a0fe89a JK |
117 | char *p = line + strlen(line) - 1; |
118 | if (*p == '\n') | |
119 | *p = '\0'; | |
120 | error("unpack failed: %s", line + 7); | |
cfee10a7 JH |
121 | ret = -1; |
122 | } | |
ca74c458 | 123 | hint = NULL; |
cfee10a7 | 124 | while (1) { |
2a0fe89a JK |
125 | char *refname; |
126 | char *msg; | |
cfee10a7 JH |
127 | len = packet_read_line(in, line, sizeof(line)); |
128 | if (!len) | |
129 | break; | |
130 | if (len < 3 || | |
2a0fe89a | 131 | (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) { |
cfee10a7 JH |
132 | fprintf(stderr, "protocol error: %s\n", line); |
133 | ret = -1; | |
134 | break; | |
135 | } | |
2a0fe89a JK |
136 | |
137 | line[strlen(line)-1] = '\0'; | |
138 | refname = line + 3; | |
139 | msg = strchr(refname, ' '); | |
140 | if (msg) | |
141 | *msg++ = '\0'; | |
142 | ||
143 | /* first try searching at our hint, falling back to all refs */ | |
ca74c458 | 144 | if (hint) |
2a0fe89a | 145 | hint = find_ref_by_name(hint, refname); |
ca74c458 | 146 | if (!hint) |
2a0fe89a JK |
147 | hint = find_ref_by_name(refs, refname); |
148 | if (!hint) { | |
149 | warning("remote reported status on unknown ref: %s", | |
150 | refname); | |
151 | continue; | |
152 | } | |
153 | if (hint->status != REF_STATUS_EXPECTING_REPORT) { | |
154 | warning("remote reported status on unexpected ref: %s", | |
155 | refname); | |
156 | continue; | |
157 | } | |
158 | ||
159 | if (line[0] == 'o' && line[1] == 'k') | |
160 | hint->status = REF_STATUS_OK; | |
161 | else { | |
162 | hint->status = REF_STATUS_REMOTE_REJECT; | |
163 | ret = -1; | |
164 | } | |
165 | if (msg) | |
166 | hint->remote_status = xstrdup(msg); | |
167 | /* start our next search from the next ref */ | |
168 | hint = hint->next; | |
cfee10a7 JH |
169 | } |
170 | return ret; | |
171 | } | |
172 | ||
de1a2fdd SP |
173 | static void print_helper_status(struct ref *ref) |
174 | { | |
175 | struct strbuf buf = STRBUF_INIT; | |
176 | ||
177 | for (; ref; ref = ref->next) { | |
178 | const char *msg = NULL; | |
179 | const char *res; | |
180 | ||
181 | switch(ref->status) { | |
182 | case REF_STATUS_NONE: | |
183 | res = "error"; | |
184 | msg = "no match"; | |
185 | break; | |
186 | ||
187 | case REF_STATUS_OK: | |
188 | res = "ok"; | |
189 | break; | |
190 | ||
191 | case REF_STATUS_UPTODATE: | |
192 | res = "ok"; | |
193 | msg = "up to date"; | |
194 | break; | |
195 | ||
196 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
197 | res = "error"; | |
198 | msg = "non-fast forward"; | |
199 | break; | |
200 | ||
201 | case REF_STATUS_REJECT_NODELETE: | |
202 | case REF_STATUS_REMOTE_REJECT: | |
203 | res = "error"; | |
204 | break; | |
205 | ||
206 | case REF_STATUS_EXPECTING_REPORT: | |
207 | default: | |
208 | continue; | |
209 | } | |
210 | ||
211 | strbuf_reset(&buf); | |
212 | strbuf_addf(&buf, "%s %s", res, ref->name); | |
213 | if (ref->remote_status) | |
214 | msg = ref->remote_status; | |
215 | if (msg) { | |
216 | strbuf_addch(&buf, ' '); | |
217 | quote_two_c_style(&buf, "", msg, 0); | |
218 | } | |
219 | strbuf_addch(&buf, '\n'); | |
220 | ||
221 | safe_write(1, buf.buf, buf.len); | |
222 | } | |
223 | strbuf_release(&buf); | |
224 | } | |
225 | ||
0c499ea6 SP |
226 | static int sideband_demux(int in, int out, void *data) |
227 | { | |
228 | int *fd = data; | |
229 | int ret = recv_sideband("send-pack", fd[0], out); | |
230 | close(out); | |
231 | return ret; | |
232 | } | |
233 | ||
64fcef2d DB |
234 | int send_pack(struct send_pack_args *args, |
235 | int fd[], struct child_process *conn, | |
236 | struct ref *remote_refs, | |
237 | struct extra_have_objects *extra_have) | |
61221472 | 238 | { |
64fcef2d DB |
239 | int in = fd[0]; |
240 | int out = fd[1]; | |
de1a2fdd | 241 | struct strbuf req_buf = STRBUF_INIT; |
64fcef2d | 242 | struct ref *ref; |
584c6cc9 | 243 | int new_refs; |
d4f694ba | 244 | int allow_deleting_refs = 0; |
0c499ea6 SP |
245 | int status_report = 0; |
246 | int use_sideband = 0; | |
247 | unsigned cmds_sent = 0; | |
ca74c458 | 248 | int ret; |
0c499ea6 | 249 | struct async demux; |
584c6cc9 | 250 | |
cfee10a7 JH |
251 | /* Does the other end support the reporting? */ |
252 | if (server_supports("report-status")) | |
0c499ea6 | 253 | status_report = 1; |
d4f694ba JH |
254 | if (server_supports("delete-refs")) |
255 | allow_deleting_refs = 1; | |
b74fce16 NP |
256 | if (server_supports("ofs-delta")) |
257 | args->use_ofs_delta = 1; | |
0c499ea6 SP |
258 | if (server_supports("side-band-64k")) |
259 | use_sideband = 1; | |
cfee10a7 | 260 | |
4c353e89 | 261 | if (!remote_refs) { |
7e23b06d AC |
262 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n" |
263 | "Perhaps you should specify a branch such as 'master'.\n"); | |
4c353e89 DB |
264 | return 0; |
265 | } | |
266 | ||
584c6cc9 | 267 | /* |
f88395ac | 268 | * Finally, tell the other end! |
584c6cc9 | 269 | */ |
f88395ac JH |
270 | new_refs = 0; |
271 | for (ref = remote_refs; ref; ref = ref->next) { | |
20e8b465 | 272 | if (!ref->peer_ref && !args->send_mirror) |
16ed2f48 | 273 | continue; |
28b9d6e5 | 274 | |
20e8b465 TRC |
275 | /* Check for statuses set by set_ref_status_for_push() */ |
276 | switch (ref->status) { | |
277 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
278 | case REF_STATUS_UPTODATE: | |
37fde874 | 279 | continue; |
20e8b465 TRC |
280 | default: |
281 | ; /* do nothing */ | |
37fde874 JH |
282 | } |
283 | ||
20e8b465 TRC |
284 | if (ref->deletion && !allow_deleting_refs) { |
285 | ref->status = REF_STATUS_REJECT_NODELETE; | |
8736a848 | 286 | continue; |
e4b5c7ff | 287 | } |
8736a848 | 288 | |
8736a848 | 289 | if (!ref->deletion) |
d4f694ba | 290 | new_refs++; |
cfee10a7 | 291 | |
0c499ea6 SP |
292 | if (args->dry_run) { |
293 | ref->status = REF_STATUS_OK; | |
294 | } else { | |
8736a848 JK |
295 | char *old_hex = sha1_to_hex(ref->old_sha1); |
296 | char *new_hex = sha1_to_hex(ref->new_sha1); | |
297 | ||
0c499ea6 SP |
298 | if (!cmds_sent && (status_report || use_sideband)) { |
299 | packet_buf_write(&req_buf, "%s %s %s%c%s%s", | |
a63103ae | 300 | old_hex, new_hex, ref->name, 0, |
0c499ea6 SP |
301 | status_report ? " report-status" : "", |
302 | use_sideband ? " side-band-64k" : ""); | |
a63103ae BE |
303 | } |
304 | else | |
de1a2fdd | 305 | packet_buf_write(&req_buf, "%s %s %s", |
a63103ae | 306 | old_hex, new_hex, ref->name); |
0c499ea6 SP |
307 | ref->status = status_report ? |
308 | REF_STATUS_EXPECTING_REPORT : | |
309 | REF_STATUS_OK; | |
310 | cmds_sent++; | |
cfee10a7 | 311 | } |
61221472 | 312 | } |
f88395ac | 313 | |
de1a2fdd | 314 | if (args->stateless_rpc) { |
0c499ea6 | 315 | if (!args->dry_run && cmds_sent) { |
de1a2fdd SP |
316 | packet_buf_flush(&req_buf); |
317 | send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX); | |
318 | } | |
319 | } else { | |
320 | safe_write(out, req_buf.buf, req_buf.len); | |
321 | packet_flush(out); | |
322 | } | |
323 | strbuf_release(&req_buf); | |
324 | ||
0c499ea6 SP |
325 | if (use_sideband && cmds_sent) { |
326 | memset(&demux, 0, sizeof(demux)); | |
327 | demux.proc = sideband_demux; | |
328 | demux.data = fd; | |
329 | demux.out = -1; | |
330 | if (start_async(&demux)) | |
331 | die("receive-pack: unable to fork off sideband demultiplexer"); | |
332 | in = demux.out; | |
333 | } | |
334 | ||
335 | if (new_refs && cmds_sent) { | |
64fcef2d DB |
336 | if (pack_objects(out, remote_refs, extra_have, args) < 0) { |
337 | for (ref = remote_refs; ref; ref = ref->next) | |
338 | ref->status = REF_STATUS_NONE; | |
0c499ea6 SP |
339 | if (use_sideband) |
340 | finish_async(&demux); | |
8736a848 | 341 | return -1; |
64fcef2d | 342 | } |
8736a848 | 343 | } |
0c499ea6 | 344 | if (args->stateless_rpc && cmds_sent) |
de1a2fdd | 345 | packet_flush(out); |
cfee10a7 | 346 | |
0c499ea6 | 347 | if (status_report && cmds_sent) |
ca74c458 | 348 | ret = receive_status(in, remote_refs); |
ca74c458 JK |
349 | else |
350 | ret = 0; | |
de1a2fdd SP |
351 | if (args->stateless_rpc) |
352 | packet_flush(out); | |
ca74c458 | 353 | |
0c499ea6 SP |
354 | if (use_sideband && cmds_sent) { |
355 | if (finish_async(&demux)) { | |
356 | error("error in sideband demultiplexer"); | |
357 | ret = -1; | |
358 | } | |
359 | close(demux.out); | |
360 | } | |
361 | ||
ca74c458 JK |
362 | if (ret < 0) |
363 | return ret; | |
8736a848 JK |
364 | for (ref = remote_refs; ref; ref = ref->next) { |
365 | switch (ref->status) { | |
366 | case REF_STATUS_NONE: | |
367 | case REF_STATUS_UPTODATE: | |
368 | case REF_STATUS_OK: | |
369 | break; | |
370 | default: | |
371 | return -1; | |
372 | } | |
373 | } | |
374 | return 0; | |
61221472 LT |
375 | } |
376 | ||
96249c04 | 377 | int cmd_send_pack(int argc, const char **argv, const char *prefix) |
61221472 | 378 | { |
64fcef2d DB |
379 | int i, nr_refspecs = 0; |
380 | const char **refspecs = NULL; | |
96249c04 | 381 | const char *remote_name = NULL; |
b516968f | 382 | struct remote *remote = NULL; |
96249c04 | 383 | const char *dest = NULL; |
64fcef2d DB |
384 | int fd[2]; |
385 | struct child_process *conn; | |
386 | struct extra_have_objects extra_have; | |
6d2bf96e | 387 | struct ref *remote_refs, *local_refs; |
64fcef2d | 388 | int ret; |
de1a2fdd | 389 | int helper_status = 0; |
64fcef2d DB |
390 | int send_all = 0; |
391 | const char *receivepack = "git-receive-pack"; | |
392 | int flags; | |
f1863d0d | 393 | int nonfastforward = 0; |
84a9b58c | 394 | |
61221472 | 395 | argv++; |
d089391c | 396 | for (i = 1; i < argc; i++, argv++) { |
96249c04 | 397 | const char *arg = *argv; |
61221472 LT |
398 | |
399 | if (*arg == '-') { | |
cc44c765 | 400 | if (!prefixcmp(arg, "--receive-pack=")) { |
64fcef2d | 401 | receivepack = arg + 15; |
d23842fd UKK |
402 | continue; |
403 | } | |
cc44c765 | 404 | if (!prefixcmp(arg, "--exec=")) { |
64fcef2d | 405 | receivepack = arg + 7; |
61221472 LT |
406 | continue; |
407 | } | |
b516968f DB |
408 | if (!prefixcmp(arg, "--remote=")) { |
409 | remote_name = arg + 9; | |
410 | continue; | |
411 | } | |
d089391c | 412 | if (!strcmp(arg, "--all")) { |
64fcef2d | 413 | send_all = 1; |
d089391c LT |
414 | continue; |
415 | } | |
a63103ae | 416 | if (!strcmp(arg, "--dry-run")) { |
96249c04 | 417 | args.dry_run = 1; |
a63103ae BE |
418 | continue; |
419 | } | |
28b9d6e5 AW |
420 | if (!strcmp(arg, "--mirror")) { |
421 | args.send_mirror = 1; | |
422 | continue; | |
423 | } | |
2a9c3fe8 | 424 | if (!strcmp(arg, "--force")) { |
96249c04 | 425 | args.force_update = 1; |
2a9c3fe8 LT |
426 | continue; |
427 | } | |
41f93a2c | 428 | if (!strcmp(arg, "--verbose")) { |
96249c04 | 429 | args.verbose = 1; |
41f93a2c LT |
430 | continue; |
431 | } | |
2245be3e | 432 | if (!strcmp(arg, "--thin")) { |
96249c04 | 433 | args.use_thin_pack = 1; |
2245be3e JH |
434 | continue; |
435 | } | |
de1a2fdd SP |
436 | if (!strcmp(arg, "--stateless-rpc")) { |
437 | args.stateless_rpc = 1; | |
438 | continue; | |
439 | } | |
440 | if (!strcmp(arg, "--helper-status")) { | |
441 | helper_status = 1; | |
442 | continue; | |
443 | } | |
61221472 LT |
444 | usage(send_pack_usage); |
445 | } | |
d089391c LT |
446 | if (!dest) { |
447 | dest = arg; | |
448 | continue; | |
449 | } | |
64fcef2d DB |
450 | refspecs = (const char **) argv; |
451 | nr_refspecs = argc - i; | |
61221472 LT |
452 | break; |
453 | } | |
454 | if (!dest) | |
455 | usage(send_pack_usage); | |
28b9d6e5 AW |
456 | /* |
457 | * --all and --mirror are incompatible; neither makes sense | |
458 | * with any refspecs. | |
459 | */ | |
64fcef2d DB |
460 | if ((refspecs && (send_all || args.send_mirror)) || |
461 | (send_all && args.send_mirror)) | |
0bc3cdfc | 462 | usage(send_pack_usage); |
37adac76 | 463 | |
b516968f DB |
464 | if (remote_name) { |
465 | remote = remote_get(remote_name); | |
28b91f8a | 466 | if (!remote_has_url(remote, dest)) { |
b516968f DB |
467 | die("Destination %s is not a uri for %s", |
468 | dest, remote_name); | |
469 | } | |
470 | } | |
471 | ||
de1a2fdd SP |
472 | if (args.stateless_rpc) { |
473 | conn = NULL; | |
474 | fd[0] = 0; | |
475 | fd[1] = 1; | |
476 | } else { | |
477 | conn = git_connect(fd, dest, receivepack, | |
478 | args.verbose ? CONNECT_VERBOSE : 0); | |
479 | } | |
96249c04 | 480 | |
64fcef2d DB |
481 | memset(&extra_have, 0, sizeof(extra_have)); |
482 | ||
483 | get_remote_heads(fd[0], &remote_refs, 0, NULL, REF_NORMAL, | |
484 | &extra_have); | |
485 | ||
f1863d0d | 486 | transport_verify_remote_names(nr_refspecs, refspecs); |
64fcef2d DB |
487 | |
488 | local_refs = get_local_heads(); | |
96249c04 | 489 | |
64fcef2d DB |
490 | flags = MATCH_REFS_NONE; |
491 | ||
492 | if (send_all) | |
493 | flags |= MATCH_REFS_ALL; | |
494 | if (args.send_mirror) | |
495 | flags |= MATCH_REFS_MIRROR; | |
496 | ||
497 | /* match them up */ | |
6d2bf96e | 498 | if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags)) |
64fcef2d | 499 | return -1; |
96249c04 | 500 | |
20e8b465 TRC |
501 | set_ref_status_for_push(remote_refs, args.send_mirror, |
502 | args.force_update); | |
503 | ||
64fcef2d | 504 | ret = send_pack(&args, fd, conn, remote_refs, &extra_have); |
96249c04 | 505 | |
de1a2fdd SP |
506 | if (helper_status) |
507 | print_helper_status(remote_refs); | |
508 | ||
64fcef2d | 509 | close(fd[1]); |
7f8e9828 | 510 | close(fd[0]); |
64fcef2d | 511 | |
98158e9c | 512 | ret |= finish_connect(conn); |
64fcef2d | 513 | |
de1a2fdd | 514 | if (!helper_status) |
f1863d0d | 515 | transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward); |
64fcef2d DB |
516 | |
517 | if (!args.dry_run && remote) { | |
518 | struct ref *ref; | |
519 | for (ref = remote_refs; ref; ref = ref->next) | |
f1863d0d | 520 | transport_update_tracking_ref(remote, ref, args.verbose); |
64fcef2d DB |
521 | } |
522 | ||
f1863d0d | 523 | if (!ret && !transport_refs_pushed(remote_refs)) |
64fcef2d DB |
524 | fprintf(stderr, "Everything up-to-date\n"); |
525 | ||
526 | return ret; | |
61221472 | 527 | } |