builtin-send-pack.con commit send-pack: assign remote errors to each ref (ca74c45)
   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"
   9
  10static 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.";
  13
  14static struct send_pack_args args = {
  15        /* .receivepack = */ "git-receive-pack",
  16};
  17
  18/*
  19 * Make a pack stream and spit it out into file descriptor fd
  20 */
  21static 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;
  37
  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));
  47
  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];
  54
  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        }
  73
  74        if (finish_command(&po))
  75                return error("pack-objects died with strange error");
  76        return 0;
  77}
  78
  79static 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}
  88
  89static 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;
  96
  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;
 104
 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;
 109
 110        if (parse_commit(new) < 0)
 111                return 0;
 112
 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;
 126}
 127
 128static struct ref *local_refs, **local_tail;
 129static struct ref *remote_refs, **remote_tail;
 130
 131static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 132{
 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;
 141}
 142
 143static void get_local_heads(void)
 144{
 145        local_tail = &local_refs;
 146        for_each_ref(one_local_ref, NULL);
 147}
 148
 149static struct ref *set_ref_error(struct ref *refs, const char *line)
 150{
 151        struct ref *ref;
 152
 153        for (ref = refs; ref; ref = ref->next) {
 154                const char *msg;
 155                if (prefixcmp(line, ref->name))
 156                        continue;
 157                msg = line + strlen(ref->name);
 158                if (*msg++ != ' ')
 159                        continue;
 160                ref->status = REF_STATUS_REMOTE_REJECT;
 161                ref->error = xstrdup(msg);
 162                ref->error[strlen(ref->error)-1] = '\0';
 163                return ref;
 164        }
 165        return NULL;
 166}
 167
 168/* a return value of -1 indicates that an error occurred,
 169 * but we were able to set individual ref errors. A return
 170 * value of -2 means we couldn't even get that far. */
 171static int receive_status(int in, struct ref *refs)
 172{
 173        struct ref *hint;
 174        char line[1000];
 175        int ret = 0;
 176        int len = packet_read_line(in, line, sizeof(line));
 177        if (len < 10 || memcmp(line, "unpack ", 7)) {
 178                fprintf(stderr, "did not receive status back\n");
 179                return -2;
 180        }
 181        if (memcmp(line, "unpack ok\n", 10)) {
 182                fputs(line, stderr);
 183                ret = -1;
 184        }
 185        hint = NULL;
 186        while (1) {
 187                len = packet_read_line(in, line, sizeof(line));
 188                if (!len)
 189                        break;
 190                if (len < 3 ||
 191                    (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) {
 192                        fprintf(stderr, "protocol error: %s\n", line);
 193                        ret = -1;
 194                        break;
 195                }
 196                if (!memcmp(line, "ok", 2))
 197                        continue;
 198                if (hint)
 199                        hint = set_ref_error(hint, line + 3);
 200                if (!hint)
 201                        hint = set_ref_error(refs, line + 3);
 202                ret = -1;
 203        }
 204        return ret;
 205}
 206
 207static void update_tracking_ref(struct remote *remote, struct ref *ref)
 208{
 209        struct refspec rs;
 210
 211        if (ref->status != REF_STATUS_OK)
 212                return;
 213
 214        rs.src = ref->name;
 215        rs.dst = NULL;
 216
 217        if (!remote_find_tracking(remote, &rs)) {
 218                if (args.verbose)
 219                        fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
 220                if (ref->deletion) {
 221                        if (delete_ref(rs.dst, NULL))
 222                                error("Failed to delete");
 223                } else
 224                        update_ref("update by push", rs.dst,
 225                                        ref->new_sha1, NULL, 0, 0);
 226                free(rs.dst);
 227        }
 228}
 229
 230static const char *prettify_ref(const struct ref *ref)
 231{
 232        const char *name = ref->name;
 233        return name + (
 234                !prefixcmp(name, "refs/heads/") ? 11 :
 235                !prefixcmp(name, "refs/tags/") ? 10 :
 236                !prefixcmp(name, "refs/remotes/") ? 13 :
 237                0);
 238}
 239
 240#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 241
 242static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
 243{
 244        fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
 245        if (from)
 246                fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
 247        else
 248                fputs(prettify_ref(to), stderr);
 249        if (msg) {
 250                fputs(" (", stderr);
 251                fputs(msg, stderr);
 252                fputc(')', stderr);
 253        }
 254        fputc('\n', stderr);
 255}
 256
 257static const char *status_abbrev(unsigned char sha1[20])
 258{
 259        const char *abbrev;
 260        abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
 261        return abbrev ? abbrev : sha1_to_hex(sha1);
 262}
 263
 264static void print_ok_ref_status(struct ref *ref)
 265{
 266        if (ref->deletion)
 267                print_ref_status('-', "[deleted]", ref, NULL, NULL);
 268        else if (is_null_sha1(ref->old_sha1))
 269                print_ref_status('*',
 270                        (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
 271                          "[new branch]"),
 272                        ref, ref->peer_ref, NULL);
 273        else {
 274                char quickref[84];
 275                char type;
 276                const char *msg;
 277
 278                strcpy(quickref, status_abbrev(ref->old_sha1));
 279                if (ref->nonfastforward) {
 280                        strcat(quickref, "...");
 281                        type = '+';
 282                        msg = "forced update";
 283                } else {
 284                        strcat(quickref, "..");
 285                        type = ' ';
 286                        msg = NULL;
 287                }
 288                strcat(quickref, status_abbrev(ref->new_sha1));
 289
 290                print_ref_status(type, quickref, ref, ref->peer_ref, msg);
 291        }
 292}
 293
 294static void print_push_status(const char *dest, struct ref *refs)
 295{
 296        struct ref *ref;
 297        int shown_dest = 0;
 298
 299        for (ref = refs; ref; ref = ref->next) {
 300                if (!ref->status)
 301                        continue;
 302                if (ref->status == REF_STATUS_UPTODATE && !args.verbose)
 303                        continue;
 304
 305                if (!shown_dest) {
 306                        fprintf(stderr, "To %s\n", dest);
 307                        shown_dest = 1;
 308                }
 309
 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                        if (ref->deletion)
 328                                print_ref_status('!', "[remote rejected]", ref, NULL, ref->error);
 329                        else
 330                                print_ref_status('!', "[remote rejected]", ref, ref->peer_ref, ref->error);
 331                        break;
 332                case REF_STATUS_OK:
 333                        print_ok_ref_status(ref);
 334                        break;
 335                }
 336        }
 337}
 338
 339static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
 340{
 341        struct ref *ref;
 342        int new_refs;
 343        int ask_for_status_report = 0;
 344        int allow_deleting_refs = 0;
 345        int expect_status_report = 0;
 346        int flags = MATCH_REFS_NONE;
 347        int ret;
 348
 349        if (args.send_all)
 350                flags |= MATCH_REFS_ALL;
 351        if (args.send_mirror)
 352                flags |= MATCH_REFS_MIRROR;
 353
 354        /* No funny business with the matcher */
 355        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
 356        get_local_heads();
 357
 358        /* Does the other end support the reporting? */
 359        if (server_supports("report-status"))
 360                ask_for_status_report = 1;
 361        if (server_supports("delete-refs"))
 362                allow_deleting_refs = 1;
 363
 364        /* match them up */
 365        if (!remote_tail)
 366                remote_tail = &remote_refs;
 367        if (match_refs(local_refs, remote_refs, &remote_tail,
 368                                               nr_refspec, refspec, flags))
 369                return -1;
 370
 371        if (!remote_refs) {
 372                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 373                        "Perhaps you should specify a branch such as 'master'.\n");
 374                return 0;
 375        }
 376
 377        /*
 378         * Finally, tell the other end!
 379         */
 380        new_refs = 0;
 381        for (ref = remote_refs; ref; ref = ref->next) {
 382                const unsigned char *new_sha1;
 383
 384                if (!ref->peer_ref) {
 385                        if (!args.send_mirror)
 386                                continue;
 387                        new_sha1 = null_sha1;
 388                }
 389                else
 390                        new_sha1 = ref->peer_ref->new_sha1;
 391
 392
 393                ref->deletion = is_null_sha1(new_sha1);
 394                if (ref->deletion && !allow_deleting_refs) {
 395                        ref->status = REF_STATUS_REJECT_NODELETE;
 396                        continue;
 397                }
 398                if (!ref->deletion &&
 399                    !hashcmp(ref->old_sha1, new_sha1)) {
 400                        ref->status = REF_STATUS_UPTODATE;
 401                        continue;
 402                }
 403
 404                /* This part determines what can overwrite what.
 405                 * The rules are:
 406                 *
 407                 * (0) you can always use --force or +A:B notation to
 408                 *     selectively force individual ref pairs.
 409                 *
 410                 * (1) if the old thing does not exist, it is OK.
 411                 *
 412                 * (2) if you do not have the old thing, you are not allowed
 413                 *     to overwrite it; you would not know what you are losing
 414                 *     otherwise.
 415                 *
 416                 * (3) if both new and old are commit-ish, and new is a
 417                 *     descendant of old, it is OK.
 418                 *
 419                 * (4) regardless of all of the above, removing :B is
 420                 *     always allowed.
 421                 */
 422
 423                ref->nonfastforward =
 424                    !ref->deletion &&
 425                    !is_null_sha1(ref->old_sha1) &&
 426                    (!has_sha1_file(ref->old_sha1)
 427                      || !ref_newer(new_sha1, ref->old_sha1));
 428
 429                if (ref->nonfastforward && !ref->force && !args.force_update) {
 430                        ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
 431                        continue;
 432                }
 433
 434                hashcpy(ref->new_sha1, new_sha1);
 435                if (!ref->deletion)
 436                        new_refs++;
 437                ref->status = REF_STATUS_OK;
 438
 439                if (!args.dry_run) {
 440                        char *old_hex = sha1_to_hex(ref->old_sha1);
 441                        char *new_hex = sha1_to_hex(ref->new_sha1);
 442
 443                        if (ask_for_status_report) {
 444                                packet_write(out, "%s %s %s%c%s",
 445                                        old_hex, new_hex, ref->name, 0,
 446                                        "report-status");
 447                                ask_for_status_report = 0;
 448                                expect_status_report = 1;
 449                        }
 450                        else
 451                                packet_write(out, "%s %s %s",
 452                                        old_hex, new_hex, ref->name);
 453                }
 454        }
 455
 456        packet_flush(out);
 457        if (new_refs && !args.dry_run) {
 458                if (pack_objects(out, remote_refs) < 0) {
 459                        close(out);
 460                        return -1;
 461                }
 462        }
 463        close(out);
 464
 465        if (expect_status_report) {
 466                ret = receive_status(in, remote_refs);
 467                if (ret == -2)
 468                        return -1;
 469        }
 470        else
 471                ret = 0;
 472
 473        print_push_status(dest, remote_refs);
 474
 475        if (!args.dry_run && remote) {
 476                for (ref = remote_refs; ref; ref = ref->next)
 477                        update_tracking_ref(remote, ref);
 478        }
 479
 480        if (!new_refs)
 481                fprintf(stderr, "Everything up-to-date\n");
 482        if (ret < 0)
 483                return ret;
 484        for (ref = remote_refs; ref; ref = ref->next) {
 485                switch (ref->status) {
 486                case REF_STATUS_NONE:
 487                case REF_STATUS_UPTODATE:
 488                case REF_STATUS_OK:
 489                        break;
 490                default:
 491                        return -1;
 492                }
 493        }
 494        return 0;
 495}
 496
 497static void verify_remote_names(int nr_heads, const char **heads)
 498{
 499        int i;
 500
 501        for (i = 0; i < nr_heads; i++) {
 502                const char *remote = strchr(heads[i], ':');
 503
 504                remote = remote ? (remote + 1) : heads[i];
 505                switch (check_ref_format(remote)) {
 506                case 0: /* ok */
 507                case -2: /* ok but a single level -- that is fine for
 508                          * a match pattern.
 509                          */
 510                case -3: /* ok but ends with a pattern-match character */
 511                        continue;
 512                }
 513                die("remote part of refspec is not a valid name in %s",
 514                    heads[i]);
 515        }
 516}
 517
 518int cmd_send_pack(int argc, const char **argv, const char *prefix)
 519{
 520        int i, nr_heads = 0;
 521        const char **heads = NULL;
 522        const char *remote_name = NULL;
 523        struct remote *remote = NULL;
 524        const char *dest = NULL;
 525
 526        argv++;
 527        for (i = 1; i < argc; i++, argv++) {
 528                const char *arg = *argv;
 529
 530                if (*arg == '-') {
 531                        if (!prefixcmp(arg, "--receive-pack=")) {
 532                                args.receivepack = arg + 15;
 533                                continue;
 534                        }
 535                        if (!prefixcmp(arg, "--exec=")) {
 536                                args.receivepack = arg + 7;
 537                                continue;
 538                        }
 539                        if (!prefixcmp(arg, "--remote=")) {
 540                                remote_name = arg + 9;
 541                                continue;
 542                        }
 543                        if (!strcmp(arg, "--all")) {
 544                                args.send_all = 1;
 545                                continue;
 546                        }
 547                        if (!strcmp(arg, "--dry-run")) {
 548                                args.dry_run = 1;
 549                                continue;
 550                        }
 551                        if (!strcmp(arg, "--mirror")) {
 552                                args.send_mirror = 1;
 553                                continue;
 554                        }
 555                        if (!strcmp(arg, "--force")) {
 556                                args.force_update = 1;
 557                                continue;
 558                        }
 559                        if (!strcmp(arg, "--verbose")) {
 560                                args.verbose = 1;
 561                                continue;
 562                        }
 563                        if (!strcmp(arg, "--thin")) {
 564                                args.use_thin_pack = 1;
 565                                continue;
 566                        }
 567                        usage(send_pack_usage);
 568                }
 569                if (!dest) {
 570                        dest = arg;
 571                        continue;
 572                }
 573                heads = (const char **) argv;
 574                nr_heads = argc - i;
 575                break;
 576        }
 577        if (!dest)
 578                usage(send_pack_usage);
 579        /*
 580         * --all and --mirror are incompatible; neither makes sense
 581         * with any refspecs.
 582         */
 583        if ((heads && (args.send_all || args.send_mirror)) ||
 584                                        (args.send_all && args.send_mirror))
 585                usage(send_pack_usage);
 586
 587        if (remote_name) {
 588                remote = remote_get(remote_name);
 589                if (!remote_has_url(remote, dest)) {
 590                        die("Destination %s is not a uri for %s",
 591                            dest, remote_name);
 592                }
 593        }
 594
 595        return send_pack(&args, dest, remote, nr_heads, heads);
 596}
 597
 598int send_pack(struct send_pack_args *my_args,
 599              const char *dest, struct remote *remote,
 600              int nr_heads, const char **heads)
 601{
 602        int fd[2], ret;
 603        struct child_process *conn;
 604
 605        memcpy(&args, my_args, sizeof(args));
 606
 607        verify_remote_names(nr_heads, heads);
 608
 609        conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
 610        ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
 611        close(fd[0]);
 612        close(fd[1]);
 613        ret |= finish_connect(conn);
 614        return !!ret;
 615}