builtin-bundle: add a --basis option that specifies a basis
[git/pieter.git] / builtin-send-pack.c
blob7588d22885d0af24ae80f1d687ccd097fe365021
1 #include "cache.h"
2 #include "commit.h"
3 #include "tag.h"
4 #include "refs.h"
5 #include "pkt-line.h"
6 #include "run-command.h"
7 #include "remote.h"
8 #include "send-pack.h"
10 static const char send_pack_usage[] =
11 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
12 " --all and explicit <ref> specification are mutually exclusive.";
14 static struct send_pack_args args = {
15 /* .receivepack = */ "git-receive-pack",
19 * Make a pack stream and spit it out into file descriptor fd
21 static int pack_objects(int fd, struct ref *refs)
24 * The child becomes pack-objects --revs; we feed
25 * the revision parameters to it via its stdin and
26 * let its stdout go back to the other end.
28 const char *argv[] = {
29 "pack-objects",
30 "--all-progress",
31 "--revs",
32 "--stdout",
33 NULL,
34 NULL,
36 struct child_process po;
38 if (args.use_thin_pack)
39 argv[4] = "--thin";
40 memset(&po, 0, sizeof(po));
41 po.argv = argv;
42 po.in = -1;
43 po.out = fd;
44 po.git_cmd = 1;
45 if (start_command(&po))
46 die("git-pack-objects failed (%s)", strerror(errno));
49 * We feed the pack-objects we just spawned with revision
50 * parameters by writing to the pipe.
52 while (refs) {
53 char buf[42];
55 if (!is_null_sha1(refs->old_sha1) &&
56 has_sha1_file(refs->old_sha1)) {
57 memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
58 buf[0] = '^';
59 buf[41] = '\n';
60 if (!write_or_whine(po.in, buf, 42,
61 "send-pack: send refs"))
62 break;
64 if (!is_null_sha1(refs->new_sha1)) {
65 memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
66 buf[40] = '\n';
67 if (!write_or_whine(po.in, buf, 41,
68 "send-pack: send refs"))
69 break;
71 refs = refs->next;
74 close(po.in);
75 if (finish_command(&po))
76 return error("pack-objects died with strange error");
77 return 0;
80 static void unmark_and_free(struct commit_list *list, unsigned int mark)
82 while (list) {
83 struct commit_list *temp = list;
84 temp->item->object.flags &= ~mark;
85 list = temp->next;
86 free(temp);
90 static int ref_newer(const unsigned char *new_sha1,
91 const unsigned char *old_sha1)
93 struct object *o;
94 struct commit *old, *new;
95 struct commit_list *list, *used;
96 int found = 0;
98 /* Both new and old must be commit-ish and new is descendant of
99 * old. Otherwise we require --force.
101 o = deref_tag(parse_object(old_sha1), NULL, 0);
102 if (!o || o->type != OBJ_COMMIT)
103 return 0;
104 old = (struct commit *) o;
106 o = deref_tag(parse_object(new_sha1), NULL, 0);
107 if (!o || o->type != OBJ_COMMIT)
108 return 0;
109 new = (struct commit *) o;
111 if (parse_commit(new) < 0)
112 return 0;
114 used = list = NULL;
115 commit_list_insert(new, &list);
116 while (list) {
117 new = pop_most_recent_commit(&list, 1);
118 commit_list_insert(new, &used);
119 if (new == old) {
120 found = 1;
121 break;
124 unmark_and_free(list, 1);
125 unmark_and_free(used, 1);
126 return found;
129 static struct ref *local_refs, **local_tail;
130 static struct ref *remote_refs, **remote_tail;
132 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
134 struct ref *ref;
135 int len = strlen(refname) + 1;
136 ref = xcalloc(1, sizeof(*ref) + len);
137 hashcpy(ref->new_sha1, sha1);
138 memcpy(ref->name, refname, len);
139 *local_tail = ref;
140 local_tail = &ref->next;
141 return 0;
144 static void get_local_heads(void)
146 local_tail = &local_refs;
147 for_each_ref(one_local_ref, NULL);
150 static int receive_status(int in, struct ref *refs)
152 struct ref *hint;
153 char line[1000];
154 int ret = 0;
155 int len = packet_read_line(in, line, sizeof(line));
156 if (len < 10 || memcmp(line, "unpack ", 7))
157 return error("did not receive remote status");
158 if (memcmp(line, "unpack ok\n", 10)) {
159 char *p = line + strlen(line) - 1;
160 if (*p == '\n')
161 *p = '\0';
162 error("unpack failed: %s", line + 7);
163 ret = -1;
165 hint = NULL;
166 while (1) {
167 char *refname;
168 char *msg;
169 len = packet_read_line(in, line, sizeof(line));
170 if (!len)
171 break;
172 if (len < 3 ||
173 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
174 fprintf(stderr, "protocol error: %s\n", line);
175 ret = -1;
176 break;
179 line[strlen(line)-1] = '\0';
180 refname = line + 3;
181 msg = strchr(refname, ' ');
182 if (msg)
183 *msg++ = '\0';
185 /* first try searching at our hint, falling back to all refs */
186 if (hint)
187 hint = find_ref_by_name(hint, refname);
188 if (!hint)
189 hint = find_ref_by_name(refs, refname);
190 if (!hint) {
191 warning("remote reported status on unknown ref: %s",
192 refname);
193 continue;
195 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
196 warning("remote reported status on unexpected ref: %s",
197 refname);
198 continue;
201 if (line[0] == 'o' && line[1] == 'k')
202 hint->status = REF_STATUS_OK;
203 else {
204 hint->status = REF_STATUS_REMOTE_REJECT;
205 ret = -1;
207 if (msg)
208 hint->remote_status = xstrdup(msg);
209 /* start our next search from the next ref */
210 hint = hint->next;
212 return ret;
215 static void update_tracking_ref(struct remote *remote, struct ref *ref)
217 struct refspec rs;
219 if (ref->status != REF_STATUS_OK)
220 return;
222 rs.src = ref->name;
223 rs.dst = NULL;
225 if (!remote_find_tracking(remote, &rs)) {
226 if (args.verbose)
227 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
228 if (ref->deletion) {
229 delete_ref(rs.dst, NULL);
230 } else
231 update_ref("update by push", rs.dst,
232 ref->new_sha1, NULL, 0, 0);
233 free(rs.dst);
237 static const char *prettify_ref(const struct ref *ref)
239 const char *name = ref->name;
240 return name + (
241 !prefixcmp(name, "refs/heads/") ? 11 :
242 !prefixcmp(name, "refs/tags/") ? 10 :
243 !prefixcmp(name, "refs/remotes/") ? 13 :
247 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
249 static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
251 fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
252 if (from)
253 fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
254 else
255 fputs(prettify_ref(to), stderr);
256 if (msg) {
257 fputs(" (", stderr);
258 fputs(msg, stderr);
259 fputc(')', stderr);
261 fputc('\n', stderr);
264 static const char *status_abbrev(unsigned char sha1[20])
266 return find_unique_abbrev(sha1, DEFAULT_ABBREV);
269 static void print_ok_ref_status(struct ref *ref)
271 if (ref->deletion)
272 print_ref_status('-', "[deleted]", ref, NULL, NULL);
273 else if (is_null_sha1(ref->old_sha1))
274 print_ref_status('*',
275 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
276 "[new branch]"),
277 ref, ref->peer_ref, NULL);
278 else {
279 char quickref[84];
280 char type;
281 const char *msg;
283 strcpy(quickref, status_abbrev(ref->old_sha1));
284 if (ref->nonfastforward) {
285 strcat(quickref, "...");
286 type = '+';
287 msg = "forced update";
288 } else {
289 strcat(quickref, "..");
290 type = ' ';
291 msg = NULL;
293 strcat(quickref, status_abbrev(ref->new_sha1));
295 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
299 static int print_one_push_status(struct ref *ref, const char *dest, int count)
301 if (!count)
302 fprintf(stderr, "To %s\n", dest);
304 switch(ref->status) {
305 case REF_STATUS_NONE:
306 print_ref_status('X', "[no match]", ref, NULL, NULL);
307 break;
308 case REF_STATUS_REJECT_NODELETE:
309 print_ref_status('!', "[rejected]", ref, NULL,
310 "remote does not support deleting refs");
311 break;
312 case REF_STATUS_UPTODATE:
313 print_ref_status('=', "[up to date]", ref,
314 ref->peer_ref, NULL);
315 break;
316 case REF_STATUS_REJECT_NONFASTFORWARD:
317 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
318 "non-fast forward");
319 break;
320 case REF_STATUS_REMOTE_REJECT:
321 print_ref_status('!', "[remote rejected]", ref,
322 ref->deletion ? NULL : ref->peer_ref,
323 ref->remote_status);
324 break;
325 case REF_STATUS_EXPECTING_REPORT:
326 print_ref_status('!', "[remote failure]", ref,
327 ref->deletion ? NULL : ref->peer_ref,
328 "remote failed to report status");
329 break;
330 case REF_STATUS_OK:
331 print_ok_ref_status(ref);
332 break;
335 return 1;
338 static void print_push_status(const char *dest, struct ref *refs)
340 struct ref *ref;
341 int n = 0;
343 if (args.verbose) {
344 for (ref = refs; ref; ref = ref->next)
345 if (ref->status == REF_STATUS_UPTODATE)
346 n += print_one_push_status(ref, dest, n);
349 for (ref = refs; ref; ref = ref->next)
350 if (ref->status == REF_STATUS_OK)
351 n += print_one_push_status(ref, dest, n);
353 for (ref = refs; ref; ref = ref->next) {
354 if (ref->status != REF_STATUS_NONE &&
355 ref->status != REF_STATUS_UPTODATE &&
356 ref->status != REF_STATUS_OK)
357 n += print_one_push_status(ref, dest, n);
361 static int refs_pushed(struct ref *ref)
363 for (; ref; ref = ref->next) {
364 switch(ref->status) {
365 case REF_STATUS_NONE:
366 case REF_STATUS_UPTODATE:
367 break;
368 default:
369 return 1;
372 return 0;
375 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
377 struct ref *ref;
378 int new_refs;
379 int ask_for_status_report = 0;
380 int allow_deleting_refs = 0;
381 int expect_status_report = 0;
382 int flags = MATCH_REFS_NONE;
383 int ret;
385 if (args.send_all)
386 flags |= MATCH_REFS_ALL;
387 if (args.send_mirror)
388 flags |= MATCH_REFS_MIRROR;
390 /* No funny business with the matcher */
391 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
392 get_local_heads();
394 /* Does the other end support the reporting? */
395 if (server_supports("report-status"))
396 ask_for_status_report = 1;
397 if (server_supports("delete-refs"))
398 allow_deleting_refs = 1;
400 /* match them up */
401 if (!remote_tail)
402 remote_tail = &remote_refs;
403 if (match_refs(local_refs, remote_refs, &remote_tail,
404 nr_refspec, refspec, flags)) {
405 close(out);
406 return -1;
409 if (!remote_refs) {
410 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
411 "Perhaps you should specify a branch such as 'master'.\n");
412 close(out);
413 return 0;
417 * Finally, tell the other end!
419 new_refs = 0;
420 for (ref = remote_refs; ref; ref = ref->next) {
421 const unsigned char *new_sha1;
423 if (!ref->peer_ref) {
424 if (!args.send_mirror)
425 continue;
426 new_sha1 = null_sha1;
428 else
429 new_sha1 = ref->peer_ref->new_sha1;
432 ref->deletion = is_null_sha1(new_sha1);
433 if (ref->deletion && !allow_deleting_refs) {
434 ref->status = REF_STATUS_REJECT_NODELETE;
435 continue;
437 if (!ref->deletion &&
438 !hashcmp(ref->old_sha1, new_sha1)) {
439 ref->status = REF_STATUS_UPTODATE;
440 continue;
443 /* This part determines what can overwrite what.
444 * The rules are:
446 * (0) you can always use --force or +A:B notation to
447 * selectively force individual ref pairs.
449 * (1) if the old thing does not exist, it is OK.
451 * (2) if you do not have the old thing, you are not allowed
452 * to overwrite it; you would not know what you are losing
453 * otherwise.
455 * (3) if both new and old are commit-ish, and new is a
456 * descendant of old, it is OK.
458 * (4) regardless of all of the above, removing :B is
459 * always allowed.
462 ref->nonfastforward =
463 !ref->deletion &&
464 !is_null_sha1(ref->old_sha1) &&
465 (!has_sha1_file(ref->old_sha1)
466 || !ref_newer(new_sha1, ref->old_sha1));
468 if (ref->nonfastforward && !ref->force && !args.force_update) {
469 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
470 continue;
473 hashcpy(ref->new_sha1, new_sha1);
474 if (!ref->deletion)
475 new_refs++;
477 if (!args.dry_run) {
478 char *old_hex = sha1_to_hex(ref->old_sha1);
479 char *new_hex = sha1_to_hex(ref->new_sha1);
481 if (ask_for_status_report) {
482 packet_write(out, "%s %s %s%c%s",
483 old_hex, new_hex, ref->name, 0,
484 "report-status");
485 ask_for_status_report = 0;
486 expect_status_report = 1;
488 else
489 packet_write(out, "%s %s %s",
490 old_hex, new_hex, ref->name);
492 ref->status = expect_status_report ?
493 REF_STATUS_EXPECTING_REPORT :
494 REF_STATUS_OK;
497 packet_flush(out);
498 if (new_refs && !args.dry_run) {
499 if (pack_objects(out, remote_refs) < 0)
500 return -1;
502 else
503 close(out);
505 if (expect_status_report)
506 ret = receive_status(in, remote_refs);
507 else
508 ret = 0;
510 print_push_status(dest, remote_refs);
512 if (!args.dry_run && remote) {
513 for (ref = remote_refs; ref; ref = ref->next)
514 update_tracking_ref(remote, ref);
517 if (!refs_pushed(remote_refs))
518 fprintf(stderr, "Everything up-to-date\n");
519 if (ret < 0)
520 return ret;
521 for (ref = remote_refs; ref; ref = ref->next) {
522 switch (ref->status) {
523 case REF_STATUS_NONE:
524 case REF_STATUS_UPTODATE:
525 case REF_STATUS_OK:
526 break;
527 default:
528 return -1;
531 return 0;
534 static void verify_remote_names(int nr_heads, const char **heads)
536 int i;
538 for (i = 0; i < nr_heads; i++) {
539 const char *local = heads[i];
540 const char *remote = strrchr(heads[i], ':');
542 if (*local == '+')
543 local++;
545 /* A matching refspec is okay. */
546 if (remote == local && remote[1] == '\0')
547 continue;
549 remote = remote ? (remote + 1) : local;
550 switch (check_ref_format(remote)) {
551 case 0: /* ok */
552 case CHECK_REF_FORMAT_ONELEVEL:
553 /* ok but a single level -- that is fine for
554 * a match pattern.
556 case CHECK_REF_FORMAT_WILDCARD:
557 /* ok but ends with a pattern-match character */
558 continue;
560 die("remote part of refspec is not a valid name in %s",
561 heads[i]);
565 int cmd_send_pack(int argc, const char **argv, const char *prefix)
567 int i, nr_heads = 0;
568 const char **heads = NULL;
569 const char *remote_name = NULL;
570 struct remote *remote = NULL;
571 const char *dest = NULL;
573 argv++;
574 for (i = 1; i < argc; i++, argv++) {
575 const char *arg = *argv;
577 if (*arg == '-') {
578 if (!prefixcmp(arg, "--receive-pack=")) {
579 args.receivepack = arg + 15;
580 continue;
582 if (!prefixcmp(arg, "--exec=")) {
583 args.receivepack = arg + 7;
584 continue;
586 if (!prefixcmp(arg, "--remote=")) {
587 remote_name = arg + 9;
588 continue;
590 if (!strcmp(arg, "--all")) {
591 args.send_all = 1;
592 continue;
594 if (!strcmp(arg, "--dry-run")) {
595 args.dry_run = 1;
596 continue;
598 if (!strcmp(arg, "--mirror")) {
599 args.send_mirror = 1;
600 continue;
602 if (!strcmp(arg, "--force")) {
603 args.force_update = 1;
604 continue;
606 if (!strcmp(arg, "--verbose")) {
607 args.verbose = 1;
608 continue;
610 if (!strcmp(arg, "--thin")) {
611 args.use_thin_pack = 1;
612 continue;
614 usage(send_pack_usage);
616 if (!dest) {
617 dest = arg;
618 continue;
620 heads = (const char **) argv;
621 nr_heads = argc - i;
622 break;
624 if (!dest)
625 usage(send_pack_usage);
627 * --all and --mirror are incompatible; neither makes sense
628 * with any refspecs.
630 if ((heads && (args.send_all || args.send_mirror)) ||
631 (args.send_all && args.send_mirror))
632 usage(send_pack_usage);
634 if (remote_name) {
635 remote = remote_get(remote_name);
636 if (!remote_has_url(remote, dest)) {
637 die("Destination %s is not a uri for %s",
638 dest, remote_name);
642 return send_pack(&args, dest, remote, nr_heads, heads);
645 int send_pack(struct send_pack_args *my_args,
646 const char *dest, struct remote *remote,
647 int nr_heads, const char **heads)
649 int fd[2], ret;
650 struct child_process *conn;
652 memcpy(&args, my_args, sizeof(args));
654 verify_remote_names(nr_heads, heads);
656 conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
657 ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
658 close(fd[0]);
659 /* do_send_pack always closes fd[1] */
660 ret |= finish_connect(conn);
661 return !!ret;