Merge branch 'rs/commit-list-sort-in-batch'
[git/mingw/j6t.git] / builtin / send-pack.c
blob9df341c793d58eff215805bf5ca5da383f4a99d9
1 #include "builtin.h"
2 #include "commit.h"
3 #include "refs.h"
4 #include "pkt-line.h"
5 #include "sideband.h"
6 #include "run-command.h"
7 #include "remote.h"
8 #include "send-pack.h"
9 #include "quote.h"
10 #include "transport.h"
12 static const char send_pack_usage[] =
13 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
14 " --all and explicit <ref> specification are mutually exclusive.";
16 static struct send_pack_args args;
18 static int feed_object(const unsigned char *sha1, int fd, int negative)
20 char buf[42];
22 if (negative && !has_sha1_file(sha1))
23 return 1;
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");
33 * Make a pack stream and spit it out into file descriptor fd
35 static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
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.
42 const char *argv[] = {
43 "pack-objects",
44 "--all-progress-implied",
45 "--revs",
46 "--stdout",
47 NULL,
48 NULL,
49 NULL,
50 NULL,
51 NULL,
53 struct child_process po;
54 int i;
56 i = 4;
57 if (args->use_thin_pack)
58 argv[i++] = "--thin";
59 if (args->use_ofs_delta)
60 argv[i++] = "--delta-base-offset";
61 if (args->quiet || !args->progress)
62 argv[i++] = "-q";
63 if (args->progress)
64 argv[i++] = "--progress";
65 memset(&po, 0, sizeof(po));
66 po.argv = argv;
67 po.in = -1;
68 po.out = args->stateless_rpc ? -1 : fd;
69 po.git_cmd = 1;
70 if (start_command(&po))
71 die_errno("git pack-objects failed");
74 * We feed the pack-objects we just spawned with revision
75 * parameters by writing to the pipe.
77 for (i = 0; i < extra->nr; i++)
78 if (!feed_object(extra->array[i], po.in, 1))
79 break;
81 while (refs) {
82 if (!is_null_sha1(refs->old_sha1) &&
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;
88 refs = refs->next;
91 close(po.in);
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);
101 free(buf);
102 close(po.out);
103 po.out = -1;
106 if (finish_command(&po))
107 return -1;
108 return 0;
111 static int receive_status(int in, struct ref *refs)
113 struct ref *hint;
114 char line[1000];
115 int ret = 0;
116 int len = packet_read_line(in, line, sizeof(line));
117 if (len < 10 || memcmp(line, "unpack ", 7))
118 return error("did not receive remote status");
119 if (memcmp(line, "unpack ok\n", 10)) {
120 char *p = line + strlen(line) - 1;
121 if (*p == '\n')
122 *p = '\0';
123 error("unpack failed: %s", line + 7);
124 ret = -1;
126 hint = NULL;
127 while (1) {
128 char *refname;
129 char *msg;
130 len = packet_read_line(in, line, sizeof(line));
131 if (!len)
132 break;
133 if (len < 3 ||
134 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
135 fprintf(stderr, "protocol error: %s\n", line);
136 ret = -1;
137 break;
140 line[strlen(line)-1] = '\0';
141 refname = line + 3;
142 msg = strchr(refname, ' ');
143 if (msg)
144 *msg++ = '\0';
146 /* first try searching at our hint, falling back to all refs */
147 if (hint)
148 hint = find_ref_by_name(hint, refname);
149 if (!hint)
150 hint = find_ref_by_name(refs, refname);
151 if (!hint) {
152 warning("remote reported status on unknown ref: %s",
153 refname);
154 continue;
156 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
157 warning("remote reported status on unexpected ref: %s",
158 refname);
159 continue;
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;
168 if (msg)
169 hint->remote_status = xstrdup(msg);
170 /* start our next search from the next ref */
171 hint = hint->next;
173 return ret;
176 static void print_helper_status(struct ref *ref)
178 struct strbuf buf = STRBUF_INIT;
180 for (; ref; ref = ref->next) {
181 const char *msg = NULL;
182 const char *res;
184 switch(ref->status) {
185 case REF_STATUS_NONE:
186 res = "error";
187 msg = "no match";
188 break;
190 case REF_STATUS_OK:
191 res = "ok";
192 break;
194 case REF_STATUS_UPTODATE:
195 res = "ok";
196 msg = "up to date";
197 break;
199 case REF_STATUS_REJECT_NONFASTFORWARD:
200 res = "error";
201 msg = "non-fast forward";
202 break;
204 case REF_STATUS_REJECT_NODELETE:
205 case REF_STATUS_REMOTE_REJECT:
206 res = "error";
207 break;
209 case REF_STATUS_EXPECTING_REPORT:
210 default:
211 continue;
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);
222 strbuf_addch(&buf, '\n');
224 safe_write(1, buf.buf, buf.len);
226 strbuf_release(&buf);
229 static int sideband_demux(int in, int out, void *data)
231 int *fd = data, ret;
232 #ifdef NO_PTHREADS
233 close(fd[1]);
234 #endif
235 ret = recv_sideband("send-pack", fd[0], out);
236 close(out);
237 return ret;
240 int send_pack(struct send_pack_args *args,
241 int fd[], struct child_process *conn,
242 struct ref *remote_refs,
243 struct extra_have_objects *extra_have)
245 int in = fd[0];
246 int out = fd[1];
247 struct strbuf req_buf = STRBUF_INIT;
248 struct ref *ref;
249 int new_refs;
250 int allow_deleting_refs = 0;
251 int status_report = 0;
252 int use_sideband = 0;
253 int quiet_supported = 0;
254 unsigned cmds_sent = 0;
255 int ret;
256 struct async demux;
258 /* Does the other end support the reporting? */
259 if (server_supports("report-status"))
260 status_report = 1;
261 if (server_supports("delete-refs"))
262 allow_deleting_refs = 1;
263 if (server_supports("ofs-delta"))
264 args->use_ofs_delta = 1;
265 if (server_supports("side-band-64k"))
266 use_sideband = 1;
267 if (server_supports("quiet"))
268 quiet_supported = 1;
270 if (!remote_refs) {
271 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
272 "Perhaps you should specify a branch such as 'master'.\n");
273 return 0;
277 * Finally, tell the other end!
279 new_refs = 0;
280 for (ref = remote_refs; ref; ref = ref->next) {
281 if (!ref->peer_ref && !args->send_mirror)
282 continue;
284 /* Check for statuses set by set_ref_status_for_push() */
285 switch (ref->status) {
286 case REF_STATUS_REJECT_NONFASTFORWARD:
287 case REF_STATUS_UPTODATE:
288 continue;
289 default:
290 ; /* do nothing */
293 if (ref->deletion && !allow_deleting_refs) {
294 ref->status = REF_STATUS_REJECT_NODELETE;
295 continue;
298 if (!ref->deletion)
299 new_refs++;
301 if (args->dry_run) {
302 ref->status = REF_STATUS_OK;
303 } else {
304 char *old_hex = sha1_to_hex(ref->old_sha1);
305 char *new_hex = sha1_to_hex(ref->new_sha1);
306 int quiet = quiet_supported && (args->quiet || !args->progress);
308 if (!cmds_sent && (status_report || use_sideband || args->quiet)) {
309 packet_buf_write(&req_buf, "%s %s %s%c%s%s%s",
310 old_hex, new_hex, ref->name, 0,
311 status_report ? " report-status" : "",
312 use_sideband ? " side-band-64k" : "",
313 quiet ? " quiet" : "");
315 else
316 packet_buf_write(&req_buf, "%s %s %s",
317 old_hex, new_hex, ref->name);
318 ref->status = status_report ?
319 REF_STATUS_EXPECTING_REPORT :
320 REF_STATUS_OK;
321 cmds_sent++;
325 if (args->stateless_rpc) {
326 if (!args->dry_run && cmds_sent) {
327 packet_buf_flush(&req_buf);
328 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
330 } else {
331 safe_write(out, req_buf.buf, req_buf.len);
332 packet_flush(out);
334 strbuf_release(&req_buf);
336 if (use_sideband && cmds_sent) {
337 memset(&demux, 0, sizeof(demux));
338 demux.proc = sideband_demux;
339 demux.data = fd;
340 demux.out = -1;
341 if (start_async(&demux))
342 die("send-pack: unable to fork off sideband demultiplexer");
343 in = demux.out;
346 if (new_refs && cmds_sent) {
347 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
348 for (ref = remote_refs; ref; ref = ref->next)
349 ref->status = REF_STATUS_NONE;
350 if (args->stateless_rpc)
351 close(out);
352 if (git_connection_is_socket(conn))
353 shutdown(fd[0], SHUT_WR);
354 if (use_sideband)
355 finish_async(&demux);
356 return -1;
359 if (args->stateless_rpc && cmds_sent)
360 packet_flush(out);
362 if (status_report && cmds_sent)
363 ret = receive_status(in, remote_refs);
364 else
365 ret = 0;
366 if (args->stateless_rpc)
367 packet_flush(out);
369 if (use_sideband && cmds_sent) {
370 if (finish_async(&demux)) {
371 error("error in sideband demultiplexer");
372 ret = -1;
374 close(demux.out);
377 if (ret < 0)
378 return ret;
380 if (args->porcelain)
381 return 0;
383 for (ref = remote_refs; ref; ref = ref->next) {
384 switch (ref->status) {
385 case REF_STATUS_NONE:
386 case REF_STATUS_UPTODATE:
387 case REF_STATUS_OK:
388 break;
389 default:
390 return -1;
393 return 0;
396 int cmd_send_pack(int argc, const char **argv, const char *prefix)
398 int i, nr_refspecs = 0;
399 const char **refspecs = NULL;
400 const char *remote_name = NULL;
401 struct remote *remote = NULL;
402 const char *dest = NULL;
403 int fd[2];
404 struct child_process *conn;
405 struct extra_have_objects extra_have;
406 struct ref *remote_refs, *local_refs;
407 int ret;
408 int helper_status = 0;
409 int send_all = 0;
410 const char *receivepack = "git-receive-pack";
411 int flags;
412 int nonfastforward = 0;
414 argv++;
415 for (i = 1; i < argc; i++, argv++) {
416 const char *arg = *argv;
418 if (*arg == '-') {
419 if (!prefixcmp(arg, "--receive-pack=")) {
420 receivepack = arg + 15;
421 continue;
423 if (!prefixcmp(arg, "--exec=")) {
424 receivepack = arg + 7;
425 continue;
427 if (!prefixcmp(arg, "--remote=")) {
428 remote_name = arg + 9;
429 continue;
431 if (!strcmp(arg, "--all")) {
432 send_all = 1;
433 continue;
435 if (!strcmp(arg, "--dry-run")) {
436 args.dry_run = 1;
437 continue;
439 if (!strcmp(arg, "--mirror")) {
440 args.send_mirror = 1;
441 continue;
443 if (!strcmp(arg, "--force")) {
444 args.force_update = 1;
445 continue;
447 if (!strcmp(arg, "--quiet")) {
448 args.quiet = 1;
449 continue;
451 if (!strcmp(arg, "--verbose")) {
452 args.verbose = 1;
453 continue;
455 if (!strcmp(arg, "--thin")) {
456 args.use_thin_pack = 1;
457 continue;
459 if (!strcmp(arg, "--stateless-rpc")) {
460 args.stateless_rpc = 1;
461 continue;
463 if (!strcmp(arg, "--helper-status")) {
464 helper_status = 1;
465 continue;
467 usage(send_pack_usage);
469 if (!dest) {
470 dest = arg;
471 continue;
473 refspecs = (const char **) argv;
474 nr_refspecs = argc - i;
475 break;
477 if (!dest)
478 usage(send_pack_usage);
480 * --all and --mirror are incompatible; neither makes sense
481 * with any refspecs.
483 if ((refspecs && (send_all || args.send_mirror)) ||
484 (send_all && args.send_mirror))
485 usage(send_pack_usage);
487 if (remote_name) {
488 remote = remote_get(remote_name);
489 if (!remote_has_url(remote, dest)) {
490 die("Destination %s is not a uri for %s",
491 dest, remote_name);
495 if (args.stateless_rpc) {
496 conn = NULL;
497 fd[0] = 0;
498 fd[1] = 1;
499 } else {
500 conn = git_connect(fd, dest, receivepack,
501 args.verbose ? CONNECT_VERBOSE : 0);
504 memset(&extra_have, 0, sizeof(extra_have));
506 get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
508 transport_verify_remote_names(nr_refspecs, refspecs);
510 local_refs = get_local_heads();
512 flags = MATCH_REFS_NONE;
514 if (send_all)
515 flags |= MATCH_REFS_ALL;
516 if (args.send_mirror)
517 flags |= MATCH_REFS_MIRROR;
519 /* match them up */
520 if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
521 return -1;
523 set_ref_status_for_push(remote_refs, args.send_mirror,
524 args.force_update);
526 ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
528 if (helper_status)
529 print_helper_status(remote_refs);
531 close(fd[1]);
532 close(fd[0]);
534 ret |= finish_connect(conn);
536 if (!helper_status)
537 transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward);
539 if (!args.dry_run && remote) {
540 struct ref *ref;
541 for (ref = remote_refs; ref; ref = ref->next)
542 transport_update_tracking_ref(remote, ref, args.verbose);
545 if (!ret && !transport_refs_pushed(remote_refs))
546 fprintf(stderr, "Everything up-to-date\n");
548 return ret;