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