Merge 1.5.5.3 in
[git/gitweb-caching.git] / builtin-send-pack.c
blobd76260c09eef064d8a2862b5d6f0e826d968d643
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 if (delete_ref(rs.dst, NULL))
230 error("Failed to delete");
231 } else
232 update_ref("update by push", rs.dst,
233 ref->new_sha1, NULL, 0, 0);
234 free(rs.dst);
238 static const char *prettify_ref(const struct ref *ref)
240 const char *name = ref->name;
241 return name + (
242 !prefixcmp(name, "refs/heads/") ? 11 :
243 !prefixcmp(name, "refs/tags/") ? 10 :
244 !prefixcmp(name, "refs/remotes/") ? 13 :
248 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
250 static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
252 fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
253 if (from)
254 fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
255 else
256 fputs(prettify_ref(to), stderr);
257 if (msg) {
258 fputs(" (", stderr);
259 fputs(msg, stderr);
260 fputc(')', stderr);
262 fputc('\n', stderr);
265 static const char *status_abbrev(unsigned char sha1[20])
267 return find_unique_abbrev(sha1, DEFAULT_ABBREV);
270 static void print_ok_ref_status(struct ref *ref)
272 if (ref->deletion)
273 print_ref_status('-', "[deleted]", ref, NULL, NULL);
274 else if (is_null_sha1(ref->old_sha1))
275 print_ref_status('*',
276 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
277 "[new branch]"),
278 ref, ref->peer_ref, NULL);
279 else {
280 char quickref[84];
281 char type;
282 const char *msg;
284 strcpy(quickref, status_abbrev(ref->old_sha1));
285 if (ref->nonfastforward) {
286 strcat(quickref, "...");
287 type = '+';
288 msg = "forced update";
289 } else {
290 strcat(quickref, "..");
291 type = ' ';
292 msg = NULL;
294 strcat(quickref, status_abbrev(ref->new_sha1));
296 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
300 static int print_one_push_status(struct ref *ref, const char *dest, int count)
302 if (!count)
303 fprintf(stderr, "To %s\n", dest);
305 switch(ref->status) {
306 case REF_STATUS_NONE:
307 print_ref_status('X', "[no match]", ref, NULL, NULL);
308 break;
309 case REF_STATUS_REJECT_NODELETE:
310 print_ref_status('!', "[rejected]", ref, NULL,
311 "remote does not support deleting refs");
312 break;
313 case REF_STATUS_UPTODATE:
314 print_ref_status('=', "[up to date]", ref,
315 ref->peer_ref, NULL);
316 break;
317 case REF_STATUS_REJECT_NONFASTFORWARD:
318 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
319 "non-fast forward");
320 break;
321 case REF_STATUS_REMOTE_REJECT:
322 print_ref_status('!', "[remote rejected]", ref,
323 ref->deletion ? NULL : ref->peer_ref,
324 ref->remote_status);
325 break;
326 case REF_STATUS_EXPECTING_REPORT:
327 print_ref_status('!', "[remote failure]", ref,
328 ref->deletion ? NULL : ref->peer_ref,
329 "remote failed to report status");
330 break;
331 case REF_STATUS_OK:
332 print_ok_ref_status(ref);
333 break;
336 return 1;
339 static void print_push_status(const char *dest, struct ref *refs)
341 struct ref *ref;
342 int n = 0;
344 if (args.verbose) {
345 for (ref = refs; ref; ref = ref->next)
346 if (ref->status == REF_STATUS_UPTODATE)
347 n += print_one_push_status(ref, dest, n);
350 for (ref = refs; ref; ref = ref->next)
351 if (ref->status == REF_STATUS_OK)
352 n += print_one_push_status(ref, dest, n);
354 for (ref = refs; ref; ref = ref->next) {
355 if (ref->status != REF_STATUS_NONE &&
356 ref->status != REF_STATUS_UPTODATE &&
357 ref->status != REF_STATUS_OK)
358 n += print_one_push_status(ref, dest, n);
362 static int refs_pushed(struct ref *ref)
364 for (; ref; ref = ref->next) {
365 switch(ref->status) {
366 case REF_STATUS_NONE:
367 case REF_STATUS_UPTODATE:
368 break;
369 default:
370 return 1;
373 return 0;
376 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
378 struct ref *ref;
379 int new_refs;
380 int ask_for_status_report = 0;
381 int allow_deleting_refs = 0;
382 int expect_status_report = 0;
383 int flags = MATCH_REFS_NONE;
384 int ret;
386 if (args.send_all)
387 flags |= MATCH_REFS_ALL;
388 if (args.send_mirror)
389 flags |= MATCH_REFS_MIRROR;
391 /* No funny business with the matcher */
392 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
393 get_local_heads();
395 /* Does the other end support the reporting? */
396 if (server_supports("report-status"))
397 ask_for_status_report = 1;
398 if (server_supports("delete-refs"))
399 allow_deleting_refs = 1;
401 /* match them up */
402 if (!remote_tail)
403 remote_tail = &remote_refs;
404 if (match_refs(local_refs, remote_refs, &remote_tail,
405 nr_refspec, refspec, flags)) {
406 close(out);
407 return -1;
410 if (!remote_refs) {
411 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
412 "Perhaps you should specify a branch such as 'master'.\n");
413 close(out);
414 return 0;
418 * Finally, tell the other end!
420 new_refs = 0;
421 for (ref = remote_refs; ref; ref = ref->next) {
422 const unsigned char *new_sha1;
424 if (!ref->peer_ref) {
425 if (!args.send_mirror)
426 continue;
427 new_sha1 = null_sha1;
429 else
430 new_sha1 = ref->peer_ref->new_sha1;
433 ref->deletion = is_null_sha1(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, 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(new_sha1, ref->old_sha1));
469 if (ref->nonfastforward && !ref->force && !args.force_update) {
470 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
471 continue;
474 hashcpy(ref->new_sha1, new_sha1);
475 if (!ref->deletion)
476 new_refs++;
478 if (!args.dry_run) {
479 char *old_hex = sha1_to_hex(ref->old_sha1);
480 char *new_hex = sha1_to_hex(ref->new_sha1);
482 if (ask_for_status_report) {
483 packet_write(out, "%s %s %s%c%s",
484 old_hex, new_hex, ref->name, 0,
485 "report-status");
486 ask_for_status_report = 0;
487 expect_status_report = 1;
489 else
490 packet_write(out, "%s %s %s",
491 old_hex, new_hex, ref->name);
493 ref->status = expect_status_report ?
494 REF_STATUS_EXPECTING_REPORT :
495 REF_STATUS_OK;
498 packet_flush(out);
499 if (new_refs && !args.dry_run) {
500 if (pack_objects(out, remote_refs) < 0)
501 return -1;
503 else
504 close(out);
506 if (expect_status_report)
507 ret = receive_status(in, remote_refs);
508 else
509 ret = 0;
511 print_push_status(dest, remote_refs);
513 if (!args.dry_run && remote) {
514 for (ref = remote_refs; ref; ref = ref->next)
515 update_tracking_ref(remote, ref);
518 if (!refs_pushed(remote_refs))
519 fprintf(stderr, "Everything up-to-date\n");
520 if (ret < 0)
521 return ret;
522 for (ref = remote_refs; ref; ref = ref->next) {
523 switch (ref->status) {
524 case REF_STATUS_NONE:
525 case REF_STATUS_UPTODATE:
526 case REF_STATUS_OK:
527 break;
528 default:
529 return -1;
532 return 0;
535 static void verify_remote_names(int nr_heads, const char **heads)
537 int i;
539 for (i = 0; i < nr_heads; i++) {
540 const char *local = heads[i];
541 const char *remote = strrchr(heads[i], ':');
543 if (*local == '+')
544 local++;
546 /* A matching refspec is okay. */
547 if (remote == local && remote[1] == '\0')
548 continue;
550 remote = remote ? (remote + 1) : local;
551 switch (check_ref_format(remote)) {
552 case 0: /* ok */
553 case CHECK_REF_FORMAT_ONELEVEL:
554 /* ok but a single level -- that is fine for
555 * a match pattern.
557 case CHECK_REF_FORMAT_WILDCARD:
558 /* ok but ends with a pattern-match character */
559 continue;
561 die("remote part of refspec is not a valid name in %s",
562 heads[i]);
566 int cmd_send_pack(int argc, const char **argv, const char *prefix)
568 int i, nr_heads = 0;
569 const char **heads = NULL;
570 const char *remote_name = NULL;
571 struct remote *remote = NULL;
572 const char *dest = NULL;
574 argv++;
575 for (i = 1; i < argc; i++, argv++) {
576 const char *arg = *argv;
578 if (*arg == '-') {
579 if (!prefixcmp(arg, "--receive-pack=")) {
580 args.receivepack = arg + 15;
581 continue;
583 if (!prefixcmp(arg, "--exec=")) {
584 args.receivepack = arg + 7;
585 continue;
587 if (!prefixcmp(arg, "--remote=")) {
588 remote_name = arg + 9;
589 continue;
591 if (!strcmp(arg, "--all")) {
592 args.send_all = 1;
593 continue;
595 if (!strcmp(arg, "--dry-run")) {
596 args.dry_run = 1;
597 continue;
599 if (!strcmp(arg, "--mirror")) {
600 args.send_mirror = 1;
601 continue;
603 if (!strcmp(arg, "--force")) {
604 args.force_update = 1;
605 continue;
607 if (!strcmp(arg, "--verbose")) {
608 args.verbose = 1;
609 continue;
611 if (!strcmp(arg, "--thin")) {
612 args.use_thin_pack = 1;
613 continue;
615 usage(send_pack_usage);
617 if (!dest) {
618 dest = arg;
619 continue;
621 heads = (const char **) argv;
622 nr_heads = argc - i;
623 break;
625 if (!dest)
626 usage(send_pack_usage);
628 * --all and --mirror are incompatible; neither makes sense
629 * with any refspecs.
631 if ((heads && (args.send_all || args.send_mirror)) ||
632 (args.send_all && args.send_mirror))
633 usage(send_pack_usage);
635 if (remote_name) {
636 remote = remote_get(remote_name);
637 if (!remote_has_url(remote, dest)) {
638 die("Destination %s is not a uri for %s",
639 dest, remote_name);
643 return send_pack(&args, dest, remote, nr_heads, heads);
646 int send_pack(struct send_pack_args *my_args,
647 const char *dest, struct remote *remote,
648 int nr_heads, const char **heads)
650 int fd[2], ret;
651 struct child_process *conn;
653 memcpy(&args, my_args, sizeof(args));
655 verify_remote_names(nr_heads, heads);
657 conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
658 ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
659 close(fd[0]);
660 /* do_send_pack always closes fd[1] */
661 ret |= finish_connect(conn);
662 return !!ret;