Reallow git-rebase --interactive --continue if commit is unnecessary
[git/peff.git] / builtin-send-pack.c
blob25ae1fe860601e672575b545bbd2fdfa6ad7966c
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 if (finish_command(&po))
75 return error("pack-objects died with strange error");
76 return 0;
79 static void unmark_and_free(struct commit_list *list, unsigned int mark)
81 while (list) {
82 struct commit_list *temp = list;
83 temp->item->object.flags &= ~mark;
84 list = temp->next;
85 free(temp);
89 static int ref_newer(const unsigned char *new_sha1,
90 const unsigned char *old_sha1)
92 struct object *o;
93 struct commit *old, *new;
94 struct commit_list *list, *used;
95 int found = 0;
97 /* Both new and old must be commit-ish and new is descendant of
98 * old. Otherwise we require --force.
100 o = deref_tag(parse_object(old_sha1), NULL, 0);
101 if (!o || o->type != OBJ_COMMIT)
102 return 0;
103 old = (struct commit *) o;
105 o = deref_tag(parse_object(new_sha1), NULL, 0);
106 if (!o || o->type != OBJ_COMMIT)
107 return 0;
108 new = (struct commit *) o;
110 if (parse_commit(new) < 0)
111 return 0;
113 used = list = NULL;
114 commit_list_insert(new, &list);
115 while (list) {
116 new = pop_most_recent_commit(&list, 1);
117 commit_list_insert(new, &used);
118 if (new == old) {
119 found = 1;
120 break;
123 unmark_and_free(list, 1);
124 unmark_and_free(used, 1);
125 return found;
128 static struct ref *local_refs, **local_tail;
129 static struct ref *remote_refs, **remote_tail;
131 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
133 struct ref *ref;
134 int len = strlen(refname) + 1;
135 ref = xcalloc(1, sizeof(*ref) + len);
136 hashcpy(ref->new_sha1, sha1);
137 memcpy(ref->name, refname, len);
138 *local_tail = ref;
139 local_tail = &ref->next;
140 return 0;
143 static void get_local_heads(void)
145 local_tail = &local_refs;
146 for_each_ref(one_local_ref, NULL);
149 static int receive_status(int in, struct ref *refs)
151 struct ref *hint;
152 char line[1000];
153 int ret = 0;
154 int len = packet_read_line(in, line, sizeof(line));
155 if (len < 10 || memcmp(line, "unpack ", 7))
156 return error("did not receive remote status");
157 if (memcmp(line, "unpack ok\n", 10)) {
158 char *p = line + strlen(line) - 1;
159 if (*p == '\n')
160 *p = '\0';
161 error("unpack failed: %s", line + 7);
162 ret = -1;
164 hint = NULL;
165 while (1) {
166 char *refname;
167 char *msg;
168 len = packet_read_line(in, line, sizeof(line));
169 if (!len)
170 break;
171 if (len < 3 ||
172 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
173 fprintf(stderr, "protocol error: %s\n", line);
174 ret = -1;
175 break;
178 line[strlen(line)-1] = '\0';
179 refname = line + 3;
180 msg = strchr(refname, ' ');
181 if (msg)
182 *msg++ = '\0';
184 /* first try searching at our hint, falling back to all refs */
185 if (hint)
186 hint = find_ref_by_name(hint, refname);
187 if (!hint)
188 hint = find_ref_by_name(refs, refname);
189 if (!hint) {
190 warning("remote reported status on unknown ref: %s",
191 refname);
192 continue;
194 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
195 warning("remote reported status on unexpected ref: %s",
196 refname);
197 continue;
200 if (line[0] == 'o' && line[1] == 'k')
201 hint->status = REF_STATUS_OK;
202 else {
203 hint->status = REF_STATUS_REMOTE_REJECT;
204 ret = -1;
206 if (msg)
207 hint->remote_status = xstrdup(msg);
208 /* start our next search from the next ref */
209 hint = hint->next;
211 return ret;
214 static void update_tracking_ref(struct remote *remote, struct ref *ref)
216 struct refspec rs;
218 if (ref->status != REF_STATUS_OK)
219 return;
221 rs.src = ref->name;
222 rs.dst = NULL;
224 if (!remote_find_tracking(remote, &rs)) {
225 if (args.verbose)
226 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
227 if (ref->deletion) {
228 if (delete_ref(rs.dst, NULL))
229 error("Failed to delete");
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 const char *abbrev;
267 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
268 return abbrev ? abbrev : sha1_to_hex(sha1);
271 static void print_ok_ref_status(struct ref *ref)
273 if (ref->deletion)
274 print_ref_status('-', "[deleted]", ref, NULL, NULL);
275 else if (is_null_sha1(ref->old_sha1))
276 print_ref_status('*',
277 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
278 "[new branch]"),
279 ref, ref->peer_ref, NULL);
280 else {
281 char quickref[84];
282 char type;
283 const char *msg;
285 strcpy(quickref, status_abbrev(ref->old_sha1));
286 if (ref->nonfastforward) {
287 strcat(quickref, "...");
288 type = '+';
289 msg = "forced update";
290 } else {
291 strcat(quickref, "..");
292 type = ' ';
293 msg = NULL;
295 strcat(quickref, status_abbrev(ref->new_sha1));
297 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
301 static int print_one_push_status(struct ref *ref, const char *dest, int count)
303 if (!count)
304 fprintf(stderr, "To %s\n", dest);
306 switch(ref->status) {
307 case REF_STATUS_NONE:
308 print_ref_status('X', "[no match]", ref, NULL, NULL);
309 break;
310 case REF_STATUS_REJECT_NODELETE:
311 print_ref_status('!', "[rejected]", ref, NULL,
312 "remote does not support deleting refs");
313 break;
314 case REF_STATUS_UPTODATE:
315 print_ref_status('=', "[up to date]", ref,
316 ref->peer_ref, NULL);
317 break;
318 case REF_STATUS_REJECT_NONFASTFORWARD:
319 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
320 "non-fast forward");
321 break;
322 case REF_STATUS_REMOTE_REJECT:
323 print_ref_status('!', "[remote rejected]", ref,
324 ref->deletion ? NULL : ref->peer_ref,
325 ref->remote_status);
326 break;
327 case REF_STATUS_EXPECTING_REPORT:
328 print_ref_status('!', "[remote failure]", ref,
329 ref->deletion ? NULL : ref->peer_ref,
330 "remote failed to report status");
331 break;
332 case REF_STATUS_OK:
333 print_ok_ref_status(ref);
334 break;
337 return 1;
340 static void print_push_status(const char *dest, struct ref *refs)
342 struct ref *ref;
343 int n = 0;
345 if (args.verbose) {
346 for (ref = refs; ref; ref = ref->next)
347 if (ref->status == REF_STATUS_UPTODATE)
348 n += print_one_push_status(ref, dest, n);
351 for (ref = refs; ref; ref = ref->next)
352 if (ref->status == REF_STATUS_OK)
353 n += print_one_push_status(ref, dest, n);
355 for (ref = refs; ref; ref = ref->next) {
356 if (ref->status != REF_STATUS_NONE &&
357 ref->status != REF_STATUS_UPTODATE &&
358 ref->status != REF_STATUS_OK)
359 n += print_one_push_status(ref, dest, n);
363 static int refs_pushed(struct ref *ref)
365 for (; ref; ref = ref->next) {
366 switch(ref->status) {
367 case REF_STATUS_NONE:
368 case REF_STATUS_UPTODATE:
369 break;
370 default:
371 return 1;
374 return 0;
377 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
379 struct ref *ref;
380 int new_refs;
381 int ask_for_status_report = 0;
382 int allow_deleting_refs = 0;
383 int expect_status_report = 0;
384 int flags = MATCH_REFS_NONE;
385 int ret;
387 if (args.send_all)
388 flags |= MATCH_REFS_ALL;
389 if (args.send_mirror)
390 flags |= MATCH_REFS_MIRROR;
392 /* No funny business with the matcher */
393 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
394 get_local_heads();
396 /* Does the other end support the reporting? */
397 if (server_supports("report-status"))
398 ask_for_status_report = 1;
399 if (server_supports("delete-refs"))
400 allow_deleting_refs = 1;
402 /* match them up */
403 if (!remote_tail)
404 remote_tail = &remote_refs;
405 if (match_refs(local_refs, remote_refs, &remote_tail,
406 nr_refspec, refspec, flags))
407 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 return 0;
416 * Finally, tell the other end!
418 new_refs = 0;
419 for (ref = remote_refs; ref; ref = ref->next) {
420 const unsigned char *new_sha1;
422 if (!ref->peer_ref) {
423 if (!args.send_mirror)
424 continue;
425 new_sha1 = null_sha1;
427 else
428 new_sha1 = ref->peer_ref->new_sha1;
431 ref->deletion = is_null_sha1(new_sha1);
432 if (ref->deletion && !allow_deleting_refs) {
433 ref->status = REF_STATUS_REJECT_NODELETE;
434 continue;
436 if (!ref->deletion &&
437 !hashcmp(ref->old_sha1, new_sha1)) {
438 ref->status = REF_STATUS_UPTODATE;
439 continue;
442 /* This part determines what can overwrite what.
443 * The rules are:
445 * (0) you can always use --force or +A:B notation to
446 * selectively force individual ref pairs.
448 * (1) if the old thing does not exist, it is OK.
450 * (2) if you do not have the old thing, you are not allowed
451 * to overwrite it; you would not know what you are losing
452 * otherwise.
454 * (3) if both new and old are commit-ish, and new is a
455 * descendant of old, it is OK.
457 * (4) regardless of all of the above, removing :B is
458 * always allowed.
461 ref->nonfastforward =
462 !ref->deletion &&
463 !is_null_sha1(ref->old_sha1) &&
464 (!has_sha1_file(ref->old_sha1)
465 || !ref_newer(new_sha1, ref->old_sha1));
467 if (ref->nonfastforward && !ref->force && !args.force_update) {
468 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
469 continue;
472 hashcpy(ref->new_sha1, new_sha1);
473 if (!ref->deletion)
474 new_refs++;
476 if (!args.dry_run) {
477 char *old_hex = sha1_to_hex(ref->old_sha1);
478 char *new_hex = sha1_to_hex(ref->new_sha1);
480 if (ask_for_status_report) {
481 packet_write(out, "%s %s %s%c%s",
482 old_hex, new_hex, ref->name, 0,
483 "report-status");
484 ask_for_status_report = 0;
485 expect_status_report = 1;
487 else
488 packet_write(out, "%s %s %s",
489 old_hex, new_hex, ref->name);
491 ref->status = expect_status_report ?
492 REF_STATUS_EXPECTING_REPORT :
493 REF_STATUS_OK;
496 packet_flush(out);
497 if (new_refs && !args.dry_run) {
498 if (pack_objects(out, remote_refs) < 0) {
499 close(out);
500 return -1;
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 *remote = strchr(heads[i], ':');
541 remote = remote ? (remote + 1) : heads[i];
542 switch (check_ref_format(remote)) {
543 case 0: /* ok */
544 case -2: /* ok but a single level -- that is fine for
545 * a match pattern.
547 case -3: /* ok but ends with a pattern-match character */
548 continue;
550 die("remote part of refspec is not a valid name in %s",
551 heads[i]);
555 int cmd_send_pack(int argc, const char **argv, const char *prefix)
557 int i, nr_heads = 0;
558 const char **heads = NULL;
559 const char *remote_name = NULL;
560 struct remote *remote = NULL;
561 const char *dest = NULL;
563 argv++;
564 for (i = 1; i < argc; i++, argv++) {
565 const char *arg = *argv;
567 if (*arg == '-') {
568 if (!prefixcmp(arg, "--receive-pack=")) {
569 args.receivepack = arg + 15;
570 continue;
572 if (!prefixcmp(arg, "--exec=")) {
573 args.receivepack = arg + 7;
574 continue;
576 if (!prefixcmp(arg, "--remote=")) {
577 remote_name = arg + 9;
578 continue;
580 if (!strcmp(arg, "--all")) {
581 args.send_all = 1;
582 continue;
584 if (!strcmp(arg, "--dry-run")) {
585 args.dry_run = 1;
586 continue;
588 if (!strcmp(arg, "--mirror")) {
589 args.send_mirror = 1;
590 continue;
592 if (!strcmp(arg, "--force")) {
593 args.force_update = 1;
594 continue;
596 if (!strcmp(arg, "--verbose")) {
597 args.verbose = 1;
598 continue;
600 if (!strcmp(arg, "--thin")) {
601 args.use_thin_pack = 1;
602 continue;
604 usage(send_pack_usage);
606 if (!dest) {
607 dest = arg;
608 continue;
610 heads = (const char **) argv;
611 nr_heads = argc - i;
612 break;
614 if (!dest)
615 usage(send_pack_usage);
617 * --all and --mirror are incompatible; neither makes sense
618 * with any refspecs.
620 if ((heads && (args.send_all || args.send_mirror)) ||
621 (args.send_all && args.send_mirror))
622 usage(send_pack_usage);
624 if (remote_name) {
625 remote = remote_get(remote_name);
626 if (!remote_has_url(remote, dest)) {
627 die("Destination %s is not a uri for %s",
628 dest, remote_name);
632 return send_pack(&args, dest, remote, nr_heads, heads);
635 int send_pack(struct send_pack_args *my_args,
636 const char *dest, struct remote *remote,
637 int nr_heads, const char **heads)
639 int fd[2], ret;
640 struct child_process *conn;
642 memcpy(&args, my_args, sizeof(args));
644 verify_remote_names(nr_heads, heads);
646 conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
647 ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
648 close(fd[0]);
649 close(fd[1]);
650 ret |= finish_connect(conn);
651 return !!ret;