commit: Fix stripping of patch in verbose mode.
[git/ljr.git] / builtin-send-pack.c
blobe428eace2b2213750d4dfa0fe4da9c07bd656892
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;
137 /* we already know it starts with refs/ to get here */
138 if (check_ref_format(refname + 5))
139 return 0;
141 len = strlen(refname) + 1;
142 ref = xcalloc(1, sizeof(*ref) + len);
143 hashcpy(ref->new_sha1, sha1);
144 memcpy(ref->name, refname, len);
145 *local_tail = ref;
146 local_tail = &ref->next;
147 return 0;
150 static void get_local_heads(void)
152 local_tail = &local_refs;
153 for_each_ref(one_local_ref, NULL);
156 static int receive_status(int in, struct ref *refs)
158 struct ref *hint;
159 char line[1000];
160 int ret = 0;
161 int len = packet_read_line(in, line, sizeof(line));
162 if (len < 10 || memcmp(line, "unpack ", 7))
163 return error("did not receive remote status");
164 if (memcmp(line, "unpack ok\n", 10)) {
165 char *p = line + strlen(line) - 1;
166 if (*p == '\n')
167 *p = '\0';
168 error("unpack failed: %s", line + 7);
169 ret = -1;
171 hint = NULL;
172 while (1) {
173 char *refname;
174 char *msg;
175 len = packet_read_line(in, line, sizeof(line));
176 if (!len)
177 break;
178 if (len < 3 ||
179 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
180 fprintf(stderr, "protocol error: %s\n", line);
181 ret = -1;
182 break;
185 line[strlen(line)-1] = '\0';
186 refname = line + 3;
187 msg = strchr(refname, ' ');
188 if (msg)
189 *msg++ = '\0';
191 /* first try searching at our hint, falling back to all refs */
192 if (hint)
193 hint = find_ref_by_name(hint, refname);
194 if (!hint)
195 hint = find_ref_by_name(refs, refname);
196 if (!hint) {
197 warning("remote reported status on unknown ref: %s",
198 refname);
199 continue;
201 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
202 warning("remote reported status on unexpected ref: %s",
203 refname);
204 continue;
207 if (line[0] == 'o' && line[1] == 'k')
208 hint->status = REF_STATUS_OK;
209 else {
210 hint->status = REF_STATUS_REMOTE_REJECT;
211 ret = -1;
213 if (msg)
214 hint->remote_status = xstrdup(msg);
215 /* start our next search from the next ref */
216 hint = hint->next;
218 return ret;
221 static void update_tracking_ref(struct remote *remote, struct ref *ref)
223 struct refspec rs;
225 if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
226 return;
228 rs.src = ref->name;
229 rs.dst = NULL;
231 if (!remote_find_tracking(remote, &rs)) {
232 if (args.verbose)
233 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
234 if (ref->deletion) {
235 delete_ref(rs.dst, NULL, 0);
236 } else
237 update_ref("update by push", rs.dst,
238 ref->new_sha1, NULL, 0, 0);
239 free(rs.dst);
243 static const char *prettify_ref(const struct ref *ref)
245 const char *name = ref->name;
246 return name + (
247 !prefixcmp(name, "refs/heads/") ? 11 :
248 !prefixcmp(name, "refs/tags/") ? 10 :
249 !prefixcmp(name, "refs/remotes/") ? 13 :
253 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
255 static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
257 fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
258 if (from)
259 fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
260 else
261 fputs(prettify_ref(to), stderr);
262 if (msg) {
263 fputs(" (", stderr);
264 fputs(msg, stderr);
265 fputc(')', stderr);
267 fputc('\n', stderr);
270 static const char *status_abbrev(unsigned char sha1[20])
272 return find_unique_abbrev(sha1, DEFAULT_ABBREV);
275 static void print_ok_ref_status(struct ref *ref)
277 if (ref->deletion)
278 print_ref_status('-', "[deleted]", ref, NULL, NULL);
279 else if (is_null_sha1(ref->old_sha1))
280 print_ref_status('*',
281 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
282 "[new branch]"),
283 ref, ref->peer_ref, NULL);
284 else {
285 char quickref[84];
286 char type;
287 const char *msg;
289 strcpy(quickref, status_abbrev(ref->old_sha1));
290 if (ref->nonfastforward) {
291 strcat(quickref, "...");
292 type = '+';
293 msg = "forced update";
294 } else {
295 strcat(quickref, "..");
296 type = ' ';
297 msg = NULL;
299 strcat(quickref, status_abbrev(ref->new_sha1));
301 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
305 static int print_one_push_status(struct ref *ref, const char *dest, int count)
307 if (!count)
308 fprintf(stderr, "To %s\n", dest);
310 switch(ref->status) {
311 case REF_STATUS_NONE:
312 print_ref_status('X', "[no match]", ref, NULL, NULL);
313 break;
314 case REF_STATUS_REJECT_NODELETE:
315 print_ref_status('!', "[rejected]", ref, NULL,
316 "remote does not support deleting refs");
317 break;
318 case REF_STATUS_UPTODATE:
319 print_ref_status('=', "[up to date]", ref,
320 ref->peer_ref, NULL);
321 break;
322 case REF_STATUS_REJECT_NONFASTFORWARD:
323 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
324 "non-fast forward");
325 break;
326 case REF_STATUS_REMOTE_REJECT:
327 print_ref_status('!', "[remote rejected]", ref,
328 ref->deletion ? NULL : ref->peer_ref,
329 ref->remote_status);
330 break;
331 case REF_STATUS_EXPECTING_REPORT:
332 print_ref_status('!', "[remote failure]", ref,
333 ref->deletion ? NULL : ref->peer_ref,
334 "remote failed to report status");
335 break;
336 case REF_STATUS_OK:
337 print_ok_ref_status(ref);
338 break;
341 return 1;
344 static void print_push_status(const char *dest, struct ref *refs)
346 struct ref *ref;
347 int n = 0;
349 if (args.verbose) {
350 for (ref = refs; ref; ref = ref->next)
351 if (ref->status == REF_STATUS_UPTODATE)
352 n += print_one_push_status(ref, dest, n);
355 for (ref = refs; ref; ref = ref->next)
356 if (ref->status == REF_STATUS_OK)
357 n += print_one_push_status(ref, dest, n);
359 for (ref = refs; ref; ref = ref->next) {
360 if (ref->status != REF_STATUS_NONE &&
361 ref->status != REF_STATUS_UPTODATE &&
362 ref->status != REF_STATUS_OK)
363 n += print_one_push_status(ref, dest, n);
367 static int refs_pushed(struct ref *ref)
369 for (; ref; ref = ref->next) {
370 switch(ref->status) {
371 case REF_STATUS_NONE:
372 case REF_STATUS_UPTODATE:
373 break;
374 default:
375 return 1;
378 return 0;
381 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
383 struct ref *ref;
384 int new_refs;
385 int ask_for_status_report = 0;
386 int allow_deleting_refs = 0;
387 int expect_status_report = 0;
388 int flags = MATCH_REFS_NONE;
389 int ret;
391 if (args.send_all)
392 flags |= MATCH_REFS_ALL;
393 if (args.send_mirror)
394 flags |= MATCH_REFS_MIRROR;
396 /* No funny business with the matcher */
397 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
398 get_local_heads();
400 /* Does the other end support the reporting? */
401 if (server_supports("report-status"))
402 ask_for_status_report = 1;
403 if (server_supports("delete-refs"))
404 allow_deleting_refs = 1;
406 /* match them up */
407 if (!remote_tail)
408 remote_tail = &remote_refs;
409 if (match_refs(local_refs, remote_refs, &remote_tail,
410 nr_refspec, refspec, flags)) {
411 close(out);
412 return -1;
415 if (!remote_refs) {
416 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
417 "Perhaps you should specify a branch such as 'master'.\n");
418 close(out);
419 return 0;
423 * Finally, tell the other end!
425 new_refs = 0;
426 for (ref = remote_refs; ref; ref = ref->next) {
428 if (ref->peer_ref)
429 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
430 else if (!args.send_mirror)
431 continue;
433 ref->deletion = is_null_sha1(ref->new_sha1);
434 if (ref->deletion && !allow_deleting_refs) {
435 ref->status = REF_STATUS_REJECT_NODELETE;
436 continue;
438 if (!ref->deletion &&
439 !hashcmp(ref->old_sha1, ref->new_sha1)) {
440 ref->status = REF_STATUS_UPTODATE;
441 continue;
444 /* This part determines what can overwrite what.
445 * The rules are:
447 * (0) you can always use --force or +A:B notation to
448 * selectively force individual ref pairs.
450 * (1) if the old thing does not exist, it is OK.
452 * (2) if you do not have the old thing, you are not allowed
453 * to overwrite it; you would not know what you are losing
454 * otherwise.
456 * (3) if both new and old are commit-ish, and new is a
457 * descendant of old, it is OK.
459 * (4) regardless of all of the above, removing :B is
460 * always allowed.
463 ref->nonfastforward =
464 !ref->deletion &&
465 !is_null_sha1(ref->old_sha1) &&
466 (!has_sha1_file(ref->old_sha1)
467 || !ref_newer(ref->new_sha1, ref->old_sha1));
469 if (ref->nonfastforward && !ref->force && !args.force_update) {
470 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
471 continue;
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;