Git 1.7.2-rc0
[tgit.git] / builtin / send-pack.c
blob481602d8ae73612226bcc758f2aedea7f964779c
1 #include "cache.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,
52 struct child_process po;
53 int i;
55 i = 4;
56 if (args->use_thin_pack)
57 argv[i++] = "--thin";
58 if (args->use_ofs_delta)
59 argv[i++] = "--delta-base-offset";
60 if (args->quiet)
61 argv[i++] = "-q";
62 memset(&po, 0, sizeof(po));
63 po.argv = argv;
64 po.in = -1;
65 po.out = args->stateless_rpc ? -1 : fd;
66 po.git_cmd = 1;
67 if (start_command(&po))
68 die_errno("git pack-objects failed");
71 * We feed the pack-objects we just spawned with revision
72 * parameters by writing to the pipe.
74 for (i = 0; i < extra->nr; i++)
75 if (!feed_object(extra->array[i], po.in, 1))
76 break;
78 while (refs) {
79 if (!is_null_sha1(refs->old_sha1) &&
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;
85 refs = refs->next;
88 close(po.in);
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);
98 free(buf);
99 close(po.out);
100 po.out = -1;
103 if (finish_command(&po))
104 return error("pack-objects died with strange error");
105 return 0;
108 static int receive_status(int in, struct ref *refs)
110 struct ref *hint;
111 char line[1000];
112 int ret = 0;
113 int len = packet_read_line(in, line, sizeof(line));
114 if (len < 10 || memcmp(line, "unpack ", 7))
115 return error("did not receive remote status");
116 if (memcmp(line, "unpack ok\n", 10)) {
117 char *p = line + strlen(line) - 1;
118 if (*p == '\n')
119 *p = '\0';
120 error("unpack failed: %s", line + 7);
121 ret = -1;
123 hint = NULL;
124 while (1) {
125 char *refname;
126 char *msg;
127 len = packet_read_line(in, line, sizeof(line));
128 if (!len)
129 break;
130 if (len < 3 ||
131 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
132 fprintf(stderr, "protocol error: %s\n", line);
133 ret = -1;
134 break;
137 line[strlen(line)-1] = '\0';
138 refname = line + 3;
139 msg = strchr(refname, ' ');
140 if (msg)
141 *msg++ = '\0';
143 /* first try searching at our hint, falling back to all refs */
144 if (hint)
145 hint = find_ref_by_name(hint, refname);
146 if (!hint)
147 hint = find_ref_by_name(refs, refname);
148 if (!hint) {
149 warning("remote reported status on unknown ref: %s",
150 refname);
151 continue;
153 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
154 warning("remote reported status on unexpected ref: %s",
155 refname);
156 continue;
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;
165 if (msg)
166 hint->remote_status = xstrdup(msg);
167 /* start our next search from the next ref */
168 hint = hint->next;
170 return ret;
173 static void print_helper_status(struct ref *ref)
175 struct strbuf buf = STRBUF_INIT;
177 for (; ref; ref = ref->next) {
178 const char *msg = NULL;
179 const char *res;
181 switch(ref->status) {
182 case REF_STATUS_NONE:
183 res = "error";
184 msg = "no match";
185 break;
187 case REF_STATUS_OK:
188 res = "ok";
189 break;
191 case REF_STATUS_UPTODATE:
192 res = "ok";
193 msg = "up to date";
194 break;
196 case REF_STATUS_REJECT_NONFASTFORWARD:
197 res = "error";
198 msg = "non-fast forward";
199 break;
201 case REF_STATUS_REJECT_NODELETE:
202 case REF_STATUS_REMOTE_REJECT:
203 res = "error";
204 break;
206 case REF_STATUS_EXPECTING_REPORT:
207 default:
208 continue;
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);
219 strbuf_addch(&buf, '\n');
221 safe_write(1, buf.buf, buf.len);
223 strbuf_release(&buf);
226 static int sideband_demux(int in, int out, void *data)
228 int *fd = data;
229 int ret = recv_sideband("send-pack", fd[0], out);
230 close(out);
231 return ret;
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)
239 int in = fd[0];
240 int out = fd[1];
241 struct strbuf req_buf = STRBUF_INIT;
242 struct ref *ref;
243 int new_refs;
244 int allow_deleting_refs = 0;
245 int status_report = 0;
246 int use_sideband = 0;
247 unsigned cmds_sent = 0;
248 int ret;
249 struct async demux;
251 /* Does the other end support the reporting? */
252 if (server_supports("report-status"))
253 status_report = 1;
254 if (server_supports("delete-refs"))
255 allow_deleting_refs = 1;
256 if (server_supports("ofs-delta"))
257 args->use_ofs_delta = 1;
258 if (server_supports("side-band-64k"))
259 use_sideband = 1;
261 if (!remote_refs) {
262 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
263 "Perhaps you should specify a branch such as 'master'.\n");
264 return 0;
268 * Finally, tell the other end!
270 new_refs = 0;
271 for (ref = remote_refs; ref; ref = ref->next) {
272 if (!ref->peer_ref && !args->send_mirror)
273 continue;
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:
279 continue;
280 default:
281 ; /* do nothing */
284 if (ref->deletion && !allow_deleting_refs) {
285 ref->status = REF_STATUS_REJECT_NODELETE;
286 continue;
289 if (!ref->deletion)
290 new_refs++;
292 if (args->dry_run) {
293 ref->status = REF_STATUS_OK;
294 } else {
295 char *old_hex = sha1_to_hex(ref->old_sha1);
296 char *new_hex = sha1_to_hex(ref->new_sha1);
298 if (!cmds_sent && (status_report || use_sideband)) {
299 packet_buf_write(&req_buf, "%s %s %s%c%s%s",
300 old_hex, new_hex, ref->name, 0,
301 status_report ? " report-status" : "",
302 use_sideband ? " side-band-64k" : "");
304 else
305 packet_buf_write(&req_buf, "%s %s %s",
306 old_hex, new_hex, ref->name);
307 ref->status = status_report ?
308 REF_STATUS_EXPECTING_REPORT :
309 REF_STATUS_OK;
310 cmds_sent++;
314 if (args->stateless_rpc) {
315 if (!args->dry_run && cmds_sent) {
316 packet_buf_flush(&req_buf);
317 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
319 } else {
320 safe_write(out, req_buf.buf, req_buf.len);
321 packet_flush(out);
323 strbuf_release(&req_buf);
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;
335 if (new_refs && cmds_sent) {
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;
339 if (use_sideband)
340 finish_async(&demux);
341 return -1;
344 if (args->stateless_rpc && cmds_sent)
345 packet_flush(out);
347 if (status_report && cmds_sent)
348 ret = receive_status(in, remote_refs);
349 else
350 ret = 0;
351 if (args->stateless_rpc)
352 packet_flush(out);
354 if (use_sideband && cmds_sent) {
355 if (finish_async(&demux)) {
356 error("error in sideband demultiplexer");
357 ret = -1;
359 close(demux.out);
362 if (ret < 0)
363 return ret;
365 if (args->porcelain)
366 return 0;
368 for (ref = remote_refs; ref; ref = ref->next) {
369 switch (ref->status) {
370 case REF_STATUS_NONE:
371 case REF_STATUS_UPTODATE:
372 case REF_STATUS_OK:
373 break;
374 default:
375 return -1;
378 return 0;
381 int cmd_send_pack(int argc, const char **argv, const char *prefix)
383 int i, nr_refspecs = 0;
384 const char **refspecs = NULL;
385 const char *remote_name = NULL;
386 struct remote *remote = NULL;
387 const char *dest = NULL;
388 int fd[2];
389 struct child_process *conn;
390 struct extra_have_objects extra_have;
391 struct ref *remote_refs, *local_refs;
392 int ret;
393 int helper_status = 0;
394 int send_all = 0;
395 const char *receivepack = "git-receive-pack";
396 int flags;
397 int nonfastforward = 0;
399 argv++;
400 for (i = 1; i < argc; i++, argv++) {
401 const char *arg = *argv;
403 if (*arg == '-') {
404 if (!prefixcmp(arg, "--receive-pack=")) {
405 receivepack = arg + 15;
406 continue;
408 if (!prefixcmp(arg, "--exec=")) {
409 receivepack = arg + 7;
410 continue;
412 if (!prefixcmp(arg, "--remote=")) {
413 remote_name = arg + 9;
414 continue;
416 if (!strcmp(arg, "--all")) {
417 send_all = 1;
418 continue;
420 if (!strcmp(arg, "--dry-run")) {
421 args.dry_run = 1;
422 continue;
424 if (!strcmp(arg, "--mirror")) {
425 args.send_mirror = 1;
426 continue;
428 if (!strcmp(arg, "--force")) {
429 args.force_update = 1;
430 continue;
432 if (!strcmp(arg, "--verbose")) {
433 args.verbose = 1;
434 continue;
436 if (!strcmp(arg, "--thin")) {
437 args.use_thin_pack = 1;
438 continue;
440 if (!strcmp(arg, "--stateless-rpc")) {
441 args.stateless_rpc = 1;
442 continue;
444 if (!strcmp(arg, "--helper-status")) {
445 helper_status = 1;
446 continue;
448 usage(send_pack_usage);
450 if (!dest) {
451 dest = arg;
452 continue;
454 refspecs = (const char **) argv;
455 nr_refspecs = argc - i;
456 break;
458 if (!dest)
459 usage(send_pack_usage);
461 * --all and --mirror are incompatible; neither makes sense
462 * with any refspecs.
464 if ((refspecs && (send_all || args.send_mirror)) ||
465 (send_all && args.send_mirror))
466 usage(send_pack_usage);
468 if (remote_name) {
469 remote = remote_get(remote_name);
470 if (!remote_has_url(remote, dest)) {
471 die("Destination %s is not a uri for %s",
472 dest, remote_name);
476 if (args.stateless_rpc) {
477 conn = NULL;
478 fd[0] = 0;
479 fd[1] = 1;
480 } else {
481 conn = git_connect(fd, dest, receivepack,
482 args.verbose ? CONNECT_VERBOSE : 0);
485 memset(&extra_have, 0, sizeof(extra_have));
487 get_remote_heads(fd[0], &remote_refs, 0, NULL, REF_NORMAL,
488 &extra_have);
490 transport_verify_remote_names(nr_refspecs, refspecs);
492 local_refs = get_local_heads();
494 flags = MATCH_REFS_NONE;
496 if (send_all)
497 flags |= MATCH_REFS_ALL;
498 if (args.send_mirror)
499 flags |= MATCH_REFS_MIRROR;
501 /* match them up */
502 if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
503 return -1;
505 set_ref_status_for_push(remote_refs, args.send_mirror,
506 args.force_update);
508 ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
510 if (helper_status)
511 print_helper_status(remote_refs);
513 close(fd[1]);
514 close(fd[0]);
516 ret |= finish_connect(conn);
518 if (!helper_status)
519 transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward);
521 if (!args.dry_run && remote) {
522 struct ref *ref;
523 for (ref = remote_refs; ref; ref = ref->next)
524 transport_update_tracking_ref(remote, ref, args.verbose);
527 if (!ret && !transport_refs_pushed(remote_refs))
528 fprintf(stderr, "Everything up-to-date\n");
530 return ret;