Code

send-pack: tighten remote error reporting
[git.git] / builtin-send-pack.c
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",
16 };
18 /*
19  * Make a pack stream and spit it out into file descriptor fd
20  */
21 static int pack_objects(int fd, struct ref *refs)
22 {
23         /*
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.
27          */
28         const char *argv[] = {
29                 "pack-objects",
30                 "--all-progress",
31                 "--revs",
32                 "--stdout",
33                 NULL,
34                 NULL,
35         };
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));
48         /*
49          * We feed the pack-objects we just spawned with revision
50          * parameters by writing to the pipe.
51          */
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;
63                 }
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;
70                 }
71                 refs = refs->next;
72         }
74         if (finish_command(&po))
75                 return error("pack-objects died with strange error");
76         return 0;
77 }
79 static void unmark_and_free(struct commit_list *list, unsigned int mark)
80 {
81         while (list) {
82                 struct commit_list *temp = list;
83                 temp->item->object.flags &= ~mark;
84                 list = temp->next;
85                 free(temp);
86         }
87 }
89 static int ref_newer(const unsigned char *new_sha1,
90                      const unsigned char *old_sha1)
91 {
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.
99          */
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;
121                 }
122         }
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;
163         }
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;
176                 }
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;
193                 }
194                 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
195                         warning("remote reported status on unexpected ref: %s",
196                                         refname);
197                         continue;
198                 }
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;
205                 }
206                 if (msg)
207                         hint->remote_status = xstrdup(msg);
208                 /* start our next search from the next ref */
209                 hint = hint->next;
210         }
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);
234         }
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 :
244                 0);
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);
260         }
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;
294                 }
295                 strcat(quickref, status_abbrev(ref->new_sha1));
297                 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
298         }
301 static void print_push_status(const char *dest, struct ref *refs)
303         struct ref *ref;
304         int shown_dest = 0;
306         for (ref = refs; ref; ref = ref->next) {
307                 if (!ref->status)
308                         continue;
309                 if (ref->status == REF_STATUS_UPTODATE && !args.verbose)
310                         continue;
312                 if (!shown_dest) {
313                         fprintf(stderr, "To %s\n", dest);
314                         shown_dest = 1;
315                 }
317                 switch(ref->status) {
318                 case REF_STATUS_NONE:
319                         print_ref_status('X', "[no match]", ref, NULL, NULL);
320                         break;
321                 case REF_STATUS_REJECT_NODELETE:
322                         print_ref_status('!', "[rejected]", ref, NULL,
323                                         "remote does not support deleting refs");
324                         break;
325                 case REF_STATUS_UPTODATE:
326                         print_ref_status('=', "[up to date]", ref,
327                                         ref->peer_ref, NULL);
328                         break;
329                 case REF_STATUS_REJECT_NONFASTFORWARD:
330                         print_ref_status('!', "[rejected]", ref, ref->peer_ref,
331                                         "non-fast forward");
332                         break;
333                 case REF_STATUS_REMOTE_REJECT:
334                         print_ref_status('!', "[remote rejected]", ref,
335                                         ref->deletion ? NULL : ref->peer_ref,
336                                         ref->remote_status);
337                         break;
338                 case REF_STATUS_EXPECTING_REPORT:
339                         print_ref_status('!', "[remote failure]", ref,
340                                         ref->deletion ? NULL : ref->peer_ref,
341                                         "remote failed to report status");
342                         break;
343                 case REF_STATUS_OK:
344                         print_ok_ref_status(ref);
345                         break;
346                 }
347         }
350 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
352         struct ref *ref;
353         int new_refs;
354         int ask_for_status_report = 0;
355         int allow_deleting_refs = 0;
356         int expect_status_report = 0;
357         int flags = MATCH_REFS_NONE;
358         int ret;
360         if (args.send_all)
361                 flags |= MATCH_REFS_ALL;
362         if (args.send_mirror)
363                 flags |= MATCH_REFS_MIRROR;
365         /* No funny business with the matcher */
366         remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
367         get_local_heads();
369         /* Does the other end support the reporting? */
370         if (server_supports("report-status"))
371                 ask_for_status_report = 1;
372         if (server_supports("delete-refs"))
373                 allow_deleting_refs = 1;
375         /* match them up */
376         if (!remote_tail)
377                 remote_tail = &remote_refs;
378         if (match_refs(local_refs, remote_refs, &remote_tail,
379                                                nr_refspec, refspec, flags))
380                 return -1;
382         if (!remote_refs) {
383                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
384                         "Perhaps you should specify a branch such as 'master'.\n");
385                 return 0;
386         }
388         /*
389          * Finally, tell the other end!
390          */
391         new_refs = 0;
392         for (ref = remote_refs; ref; ref = ref->next) {
393                 const unsigned char *new_sha1;
395                 if (!ref->peer_ref) {
396                         if (!args.send_mirror)
397                                 continue;
398                         new_sha1 = null_sha1;
399                 }
400                 else
401                         new_sha1 = ref->peer_ref->new_sha1;
404                 ref->deletion = is_null_sha1(new_sha1);
405                 if (ref->deletion && !allow_deleting_refs) {
406                         ref->status = REF_STATUS_REJECT_NODELETE;
407                         continue;
408                 }
409                 if (!ref->deletion &&
410                     !hashcmp(ref->old_sha1, new_sha1)) {
411                         ref->status = REF_STATUS_UPTODATE;
412                         continue;
413                 }
415                 /* This part determines what can overwrite what.
416                  * The rules are:
417                  *
418                  * (0) you can always use --force or +A:B notation to
419                  *     selectively force individual ref pairs.
420                  *
421                  * (1) if the old thing does not exist, it is OK.
422                  *
423                  * (2) if you do not have the old thing, you are not allowed
424                  *     to overwrite it; you would not know what you are losing
425                  *     otherwise.
426                  *
427                  * (3) if both new and old are commit-ish, and new is a
428                  *     descendant of old, it is OK.
429                  *
430                  * (4) regardless of all of the above, removing :B is
431                  *     always allowed.
432                  */
434                 ref->nonfastforward =
435                     !ref->deletion &&
436                     !is_null_sha1(ref->old_sha1) &&
437                     (!has_sha1_file(ref->old_sha1)
438                       || !ref_newer(new_sha1, ref->old_sha1));
440                 if (ref->nonfastforward && !ref->force && !args.force_update) {
441                         ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
442                         continue;
443                 }
445                 hashcpy(ref->new_sha1, new_sha1);
446                 if (!ref->deletion)
447                         new_refs++;
449                 if (!args.dry_run) {
450                         char *old_hex = sha1_to_hex(ref->old_sha1);
451                         char *new_hex = sha1_to_hex(ref->new_sha1);
453                         if (ask_for_status_report) {
454                                 packet_write(out, "%s %s %s%c%s",
455                                         old_hex, new_hex, ref->name, 0,
456                                         "report-status");
457                                 ask_for_status_report = 0;
458                                 expect_status_report = 1;
459                         }
460                         else
461                                 packet_write(out, "%s %s %s",
462                                         old_hex, new_hex, ref->name);
463                 }
464                 ref->status = expect_status_report ?
465                         REF_STATUS_EXPECTING_REPORT :
466                         REF_STATUS_OK;
467         }
469         packet_flush(out);
470         if (new_refs && !args.dry_run) {
471                 if (pack_objects(out, remote_refs) < 0) {
472                         close(out);
473                         return -1;
474                 }
475         }
476         close(out);
478         if (expect_status_report)
479                 ret = receive_status(in, remote_refs);
480         else
481                 ret = 0;
483         print_push_status(dest, remote_refs);
485         if (!args.dry_run && remote) {
486                 for (ref = remote_refs; ref; ref = ref->next)
487                         update_tracking_ref(remote, ref);
488         }
490         if (!new_refs)
491                 fprintf(stderr, "Everything up-to-date\n");
492         if (ret < 0)
493                 return ret;
494         for (ref = remote_refs; ref; ref = ref->next) {
495                 switch (ref->status) {
496                 case REF_STATUS_NONE:
497                 case REF_STATUS_UPTODATE:
498                 case REF_STATUS_OK:
499                         break;
500                 default:
501                         return -1;
502                 }
503         }
504         return 0;
507 static void verify_remote_names(int nr_heads, const char **heads)
509         int i;
511         for (i = 0; i < nr_heads; i++) {
512                 const char *remote = strchr(heads[i], ':');
514                 remote = remote ? (remote + 1) : heads[i];
515                 switch (check_ref_format(remote)) {
516                 case 0: /* ok */
517                 case -2: /* ok but a single level -- that is fine for
518                           * a match pattern.
519                           */
520                 case -3: /* ok but ends with a pattern-match character */
521                         continue;
522                 }
523                 die("remote part of refspec is not a valid name in %s",
524                     heads[i]);
525         }
528 int cmd_send_pack(int argc, const char **argv, const char *prefix)
530         int i, nr_heads = 0;
531         const char **heads = NULL;
532         const char *remote_name = NULL;
533         struct remote *remote = NULL;
534         const char *dest = NULL;
536         argv++;
537         for (i = 1; i < argc; i++, argv++) {
538                 const char *arg = *argv;
540                 if (*arg == '-') {
541                         if (!prefixcmp(arg, "--receive-pack=")) {
542                                 args.receivepack = arg + 15;
543                                 continue;
544                         }
545                         if (!prefixcmp(arg, "--exec=")) {
546                                 args.receivepack = arg + 7;
547                                 continue;
548                         }
549                         if (!prefixcmp(arg, "--remote=")) {
550                                 remote_name = arg + 9;
551                                 continue;
552                         }
553                         if (!strcmp(arg, "--all")) {
554                                 args.send_all = 1;
555                                 continue;
556                         }
557                         if (!strcmp(arg, "--dry-run")) {
558                                 args.dry_run = 1;
559                                 continue;
560                         }
561                         if (!strcmp(arg, "--mirror")) {
562                                 args.send_mirror = 1;
563                                 continue;
564                         }
565                         if (!strcmp(arg, "--force")) {
566                                 args.force_update = 1;
567                                 continue;
568                         }
569                         if (!strcmp(arg, "--verbose")) {
570                                 args.verbose = 1;
571                                 continue;
572                         }
573                         if (!strcmp(arg, "--thin")) {
574                                 args.use_thin_pack = 1;
575                                 continue;
576                         }
577                         usage(send_pack_usage);
578                 }
579                 if (!dest) {
580                         dest = arg;
581                         continue;
582                 }
583                 heads = (const char **) argv;
584                 nr_heads = argc - i;
585                 break;
586         }
587         if (!dest)
588                 usage(send_pack_usage);
589         /*
590          * --all and --mirror are incompatible; neither makes sense
591          * with any refspecs.
592          */
593         if ((heads && (args.send_all || args.send_mirror)) ||
594                                         (args.send_all && args.send_mirror))
595                 usage(send_pack_usage);
597         if (remote_name) {
598                 remote = remote_get(remote_name);
599                 if (!remote_has_url(remote, dest)) {
600                         die("Destination %s is not a uri for %s",
601                             dest, remote_name);
602                 }
603         }
605         return send_pack(&args, dest, remote, nr_heads, heads);
608 int send_pack(struct send_pack_args *my_args,
609               const char *dest, struct remote *remote,
610               int nr_heads, const char **heads)
612         int fd[2], ret;
613         struct child_process *conn;
615         memcpy(&args, my_args, sizeof(args));
617         verify_remote_names(nr_heads, heads);
619         conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
620         ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
621         close(fd[0]);
622         close(fd[1]);
623         ret |= finish_connect(conn);
624         return !!ret;