Andrew's git / gitweb.git / builtin-send-pack.c
?
builtin-send-pack.con commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1#include "cache.h"
   2#include "commit.h"
   3#include "refs.h"
   4#include "pkt-line.h"
   5#include "sideband.h"
   6#include "run-command.h"
   7#include "remote.h"
   8#include "send-pack.h"
   9#include "quote.h"
  10
  11static const char send_pack_usage[] =
  12"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
  13"  --all and explicit <ref> specification are mutually exclusive.";
  14
  15static struct send_pack_args args;
  16
  17static int feed_object(const unsigned char *sha1, int fd, int negative)
  18{
  19        char buf[42];
  20
  21        if (negative && !has_sha1_file(sha1))
  22                return 1;
  23
  24        memcpy(buf + negative, sha1_to_hex(sha1), 40);
  25        if (negative)
  26                buf[0] = '^';
  27        buf[40 + negative] = '\n';
  28        return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
  29}
  30
  31/*
  32 * Make a pack stream and spit it out into file descriptor fd
  33 */
  34static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
  35{
  36        /*
  37         * The child becomes pack-objects --revs; we feed
  38         * the revision parameters to it via its stdin and
  39         * let its stdout go back to the other end.
  40         */
  41        const char *argv[] = {
  42                "pack-objects",
  43                "--all-progress-implied",
  44                "--revs",
  45                "--stdout",
  46                NULL,
  47                NULL,
  48                NULL,
  49                NULL,
  50        };
  51        struct child_process po;
  52        int i;
  53
  54        i = 4;
  55        if (args->use_thin_pack)
  56                argv[i++] = "--thin";
  57        if (args->use_ofs_delta)
  58                argv[i++] = "--delta-base-offset";
  59        if (args->quiet)
  60                argv[i++] = "-q";
  61        memset(&po, 0, sizeof(po));
  62        po.argv = argv;
  63        po.in = -1;
  64        po.out = args->stateless_rpc ? -1 : fd;
  65        po.git_cmd = 1;
  66        if (start_command(&po))
  67                die_errno("git pack-objects failed");
  68
  69        /*
  70         * We feed the pack-objects we just spawned with revision
  71         * parameters by writing to the pipe.
  72         */
  73        for (i = 0; i < extra->nr; i++)
  74                if (!feed_object(extra->array[i], po.in, 1))
  75                        break;
  76
  77        while (refs) {
  78                if (!is_null_sha1(refs->old_sha1) &&
  79                    !feed_object(refs->old_sha1, po.in, 1))
  80                        break;
  81                if (!is_null_sha1(refs->new_sha1) &&
  82                    !feed_object(refs->new_sha1, po.in, 0))
  83                        break;
  84                refs = refs->next;
  85        }
  86
  87        close(po.in);
  88
  89        if (args->stateless_rpc) {
  90                char *buf = xmalloc(LARGE_PACKET_MAX);
  91                while (1) {
  92                        ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
  93                        if (n <= 0)
  94                                break;
  95                        send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
  96                }
  97                free(buf);
  98                close(po.out);
  99                po.out = -1;
 100        }
 101
 102        if (finish_command(&po))
 103                return error("pack-objects died with strange error");
 104        return 0;
 105}
 106
 107static int receive_status(int in, struct ref *refs)
 108{
 109        struct ref *hint;
 110        char line[1000];
 111        int ret = 0;
 112        int len = packet_read_line(in, line, sizeof(line));
 113        if (len < 10 || memcmp(line, "unpack ", 7))
 114                return error("did not receive remote status");
 115        if (memcmp(line, "unpack ok\n", 10)) {
 116                char *p = line + strlen(line) - 1;
 117                if (*p == '\n')
 118                        *p = '\0';
 119                error("unpack failed: %s", line + 7);
 120                ret = -1;
 121        }
 122        hint = NULL;
 123        while (1) {
 124                char *refname;
 125                char *msg;
 126                len = packet_read_line(in, line, sizeof(line));
 127                if (!len)
 128                        break;
 129                if (len < 3 ||
 130                    (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
 131                        fprintf(stderr, "protocol error: %s\n", line);
 132                        ret = -1;
 133                        break;
 134                }
 135
 136                line[strlen(line)-1] = '\0';
 137                refname = line + 3;
 138                msg = strchr(refname, ' ');
 139                if (msg)
 140                        *msg++ = '\0';
 141
 142                /* first try searching at our hint, falling back to all refs */
 143                if (hint)
 144                        hint = find_ref_by_name(hint, refname);
 145                if (!hint)
 146                        hint = find_ref_by_name(refs, refname);
 147                if (!hint) {
 148                        warning("remote reported status on unknown ref: %s",
 149                                        refname);
 150                        continue;
 151                }
 152                if (hint->status != REF_STATUS_EXPECTING_REPORT) {
 153                        warning("remote reported status on unexpected ref: %s",
 154                                        refname);
 155                        continue;
 156                }
 157
 158                if (line[0] == 'o' && line[1] == 'k')
 159                        hint->status = REF_STATUS_OK;
 160                else {
 161                        hint->status = REF_STATUS_REMOTE_REJECT;
 162                        ret = -1;
 163                }
 164                if (msg)
 165                        hint->remote_status = xstrdup(msg);
 166                /* start our next search from the next ref */
 167                hint = hint->next;
 168        }
 169        return ret;
 170}
 171
 172static void update_tracking_ref(struct remote *remote, struct ref *ref)
 173{
 174        struct refspec rs;
 175
 176        if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
 177                return;
 178
 179        rs.src = ref->name;
 180        rs.dst = NULL;
 181
 182        if (!remote_find_tracking(remote, &rs)) {
 183                if (args.verbose)
 184                        fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
 185                if (ref->deletion) {
 186                        delete_ref(rs.dst, NULL, 0);
 187                } else
 188                        update_ref("update by push", rs.dst,
 189                                        ref->new_sha1, NULL, 0, 0);
 190                free(rs.dst);
 191        }
 192}
 193
 194#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 195
 196static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
 197{
 198        fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
 199        if (from)
 200                fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
 201        else
 202                fputs(prettify_refname(to->name), stderr);
 203        if (msg) {
 204                fputs(" (", stderr);
 205                fputs(msg, stderr);
 206                fputc(')', stderr);
 207        }
 208        fputc('\n', stderr);
 209}
 210
 211static const char *status_abbrev(unsigned char sha1[20])
 212{
 213        return find_unique_abbrev(sha1, DEFAULT_ABBREV);
 214}
 215
 216static void print_ok_ref_status(struct ref *ref)
 217{
 218        if (ref->deletion)
 219                print_ref_status('-', "[deleted]", ref, NULL, NULL);
 220        else if (is_null_sha1(ref->old_sha1))
 221                print_ref_status('*',
 222                        (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
 223                          "[new branch]"),
 224                        ref, ref->peer_ref, NULL);
 225        else {
 226                char quickref[84];
 227                char type;
 228                const char *msg;
 229
 230                strcpy(quickref, status_abbrev(ref->old_sha1));
 231                if (ref->nonfastforward) {
 232                        strcat(quickref, "...");
 233                        type = '+';
 234                        msg = "forced update";
 235                } else {
 236                        strcat(quickref, "..");
 237                        type = ' ';
 238                        msg = NULL;
 239                }
 240                strcat(quickref, status_abbrev(ref->new_sha1));
 241
 242                print_ref_status(type, quickref, ref, ref->peer_ref, msg);
 243        }
 244}
 245
 246static int print_one_push_status(struct ref *ref, const char *dest, int count)
 247{
 248        if (!count)
 249                fprintf(stderr, "To %s\n", dest);
 250
 251        switch(ref->status) {
 252        case REF_STATUS_NONE:
 253                print_ref_status('X', "[no match]", ref, NULL, NULL);
 254                break;
 255        case REF_STATUS_REJECT_NODELETE:
 256                print_ref_status('!', "[rejected]", ref, NULL,
 257                                "remote does not support deleting refs");
 258                break;
 259        case REF_STATUS_UPTODATE:
 260                print_ref_status('=', "[up to date]", ref,
 261                                ref->peer_ref, NULL);
 262                break;
 263        case REF_STATUS_REJECT_NONFASTFORWARD:
 264                print_ref_status('!', "[rejected]", ref, ref->peer_ref,
 265                                "non-fast-forward");
 266                break;
 267        case REF_STATUS_REMOTE_REJECT:
 268                print_ref_status('!', "[remote rejected]", ref,
 269                                ref->deletion ? NULL : ref->peer_ref,
 270                                ref->remote_status);
 271                break;
 272        case REF_STATUS_EXPECTING_REPORT:
 273                print_ref_status('!', "[remote failure]", ref,
 274                                ref->deletion ? NULL : ref->peer_ref,
 275                                "remote failed to report status");
 276                break;
 277        case REF_STATUS_OK:
 278                print_ok_ref_status(ref);
 279                break;
 280        }
 281
 282        return 1;
 283}
 284
 285static void print_push_status(const char *dest, struct ref *refs)
 286{
 287        struct ref *ref;
 288        int n = 0;
 289
 290        if (args.verbose) {
 291                for (ref = refs; ref; ref = ref->next)
 292                        if (ref->status == REF_STATUS_UPTODATE)
 293                                n += print_one_push_status(ref, dest, n);
 294        }
 295
 296        for (ref = refs; ref; ref = ref->next)
 297                if (ref->status == REF_STATUS_OK)
 298                        n += print_one_push_status(ref, dest, n);
 299
 300        for (ref = refs; ref; ref = ref->next) {
 301                if (ref->status != REF_STATUS_NONE &&
 302                    ref->status != REF_STATUS_UPTODATE &&
 303                    ref->status != REF_STATUS_OK)
 304                        n += print_one_push_status(ref, dest, n);
 305        }
 306}
 307
 308static int refs_pushed(struct ref *ref)
 309{
 310        for (; ref; ref = ref->next) {
 311                switch(ref->status) {
 312                case REF_STATUS_NONE:
 313                case REF_STATUS_UPTODATE:
 314                        break;
 315                default:
 316                        return 1;
 317                }
 318        }
 319        return 0;
 320}
 321
 322static void print_helper_status(struct ref *ref)
 323{
 324        struct strbuf buf = STRBUF_INIT;
 325
 326        for (; ref; ref = ref->next) {
 327                const char *msg = NULL;
 328                const char *res;
 329
 330                switch(ref->status) {
 331                case REF_STATUS_NONE:
 332                        res = "error";
 333                        msg = "no match";
 334                        break;
 335
 336                case REF_STATUS_OK:
 337                        res = "ok";
 338                        break;
 339
 340                case REF_STATUS_UPTODATE:
 341                        res = "ok";
 342                        msg = "up to date";
 343                        break;
 344
 345                case REF_STATUS_REJECT_NONFASTFORWARD:
 346                        res = "error";
 347                        msg = "non-fast forward";
 348                        break;
 349
 350                case REF_STATUS_REJECT_NODELETE:
 351                case REF_STATUS_REMOTE_REJECT:
 352                        res = "error";
 353                        break;
 354
 355                case REF_STATUS_EXPECTING_REPORT:
 356                default:
 357                        continue;
 358                }
 359
 360                strbuf_reset(&buf);
 361                strbuf_addf(&buf, "%s %s", res, ref->name);
 362                if (ref->remote_status)
 363                        msg = ref->remote_status;
 364                if (msg) {
 365                        strbuf_addch(&buf, ' ');
 366                        quote_two_c_style(&buf, "", msg, 0);
 367                }
 368                strbuf_addch(&buf, '\n');
 369
 370                safe_write(1, buf.buf, buf.len);
 371        }
 372        strbuf_release(&buf);
 373}
 374
 375int send_pack(struct send_pack_args *args,
 376              int fd[], struct child_process *conn,
 377              struct ref *remote_refs,
 378              struct extra_have_objects *extra_have)
 379{
 380        int in = fd[0];
 381        int out = fd[1];
 382        struct strbuf req_buf = STRBUF_INIT;
 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 ret;
 389
 390        /* Does the other end support the reporting? */
 391        if (server_supports("report-status"))
 392                ask_for_status_report = 1;
 393        if (server_supports("delete-refs"))
 394                allow_deleting_refs = 1;
 395        if (server_supports("ofs-delta"))
 396                args->use_ofs_delta = 1;
 397
 398        if (!remote_refs) {
 399                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 400                        "Perhaps you should specify a branch such as 'master'.\n");
 401                return 0;
 402        }
 403
 404        /*
 405         * Finally, tell the other end!
 406         */
 407        new_refs = 0;
 408        for (ref = remote_refs; ref; ref = ref->next) {
 409
 410                if (ref->peer_ref)
 411                        hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
 412                else if (!args->send_mirror)
 413                        continue;
 414
 415                ref->deletion = is_null_sha1(ref->new_sha1);
 416                if (ref->deletion && !allow_deleting_refs) {
 417                        ref->status = REF_STATUS_REJECT_NODELETE;
 418                        continue;
 419                }
 420                if (!ref->deletion &&
 421                    !hashcmp(ref->old_sha1, ref->new_sha1)) {
 422                        ref->status = REF_STATUS_UPTODATE;
 423                        continue;
 424                }
 425
 426                /* This part determines what can overwrite what.
 427                 * The rules are:
 428                 *
 429                 * (0) you can always use --force or +A:B notation to
 430                 *     selectively force individual ref pairs.
 431                 *
 432                 * (1) if the old thing does not exist, it is OK.
 433                 *
 434                 * (2) if you do not have the old thing, you are not allowed
 435                 *     to overwrite it; you would not know what you are losing
 436                 *     otherwise.
 437                 *
 438                 * (3) if both new and old are commit-ish, and new is a
 439                 *     descendant of old, it is OK.
 440                 *
 441                 * (4) regardless of all of the above, removing :B is
 442                 *     always allowed.
 443                 */
 444
 445                ref->nonfastforward =
 446                    !ref->deletion &&
 447                    !is_null_sha1(ref->old_sha1) &&
 448                    (!has_sha1_file(ref->old_sha1)
 449                      || !ref_newer(ref->new_sha1, ref->old_sha1));
 450
 451                if (ref->nonfastforward && !ref->force && !args->force_update) {
 452                        ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
 453                        continue;
 454                }
 455
 456                if (!ref->deletion)
 457                        new_refs++;
 458
 459                if (!args->dry_run) {
 460                        char *old_hex = sha1_to_hex(ref->old_sha1);
 461                        char *new_hex = sha1_to_hex(ref->new_sha1);
 462
 463                        if (ask_for_status_report) {
 464                                packet_buf_write(&req_buf, "%s %s %s%c%s",
 465                                        old_hex, new_hex, ref->name, 0,
 466                                        "report-status");
 467                                ask_for_status_report = 0;
 468                                expect_status_report = 1;
 469                        }
 470                        else
 471                                packet_buf_write(&req_buf, "%s %s %s",
 472                                        old_hex, new_hex, ref->name);
 473                }
 474                ref->status = expect_status_report ?
 475                        REF_STATUS_EXPECTING_REPORT :
 476                        REF_STATUS_OK;
 477        }
 478
 479        if (args->stateless_rpc) {
 480                if (!args->dry_run) {
 481                        packet_buf_flush(&req_buf);
 482                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
 483                }
 484        } else {
 485                safe_write(out, req_buf.buf, req_buf.len);
 486                packet_flush(out);
 487        }
 488        strbuf_release(&req_buf);
 489
 490        if (new_refs && !args->dry_run) {
 491                if (pack_objects(out, remote_refs, extra_have, args) < 0) {
 492                        for (ref = remote_refs; ref; ref = ref->next)
 493                                ref->status = REF_STATUS_NONE;
 494                        return -1;
 495                }
 496        }
 497        if (args->stateless_rpc && !args->dry_run)
 498                packet_flush(out);
 499
 500        if (expect_status_report)
 501                ret = receive_status(in, remote_refs);
 502        else
 503                ret = 0;
 504        if (args->stateless_rpc)
 505                packet_flush(out);
 506
 507        if (ret < 0)
 508                return ret;
 509        for (ref = remote_refs; ref; ref = ref->next) {
 510                switch (ref->status) {
 511                case REF_STATUS_NONE:
 512                case REF_STATUS_UPTODATE:
 513                case REF_STATUS_OK:
 514                        break;
 515                default:
 516                        return -1;
 517                }
 518        }
 519        return 0;
 520}
 521
 522static void verify_remote_names(int nr_heads, const char **heads)
 523{
 524        int i;
 525
 526        for (i = 0; i < nr_heads; i++) {
 527                const char *local = heads[i];
 528                const char *remote = strrchr(heads[i], ':');
 529
 530                if (*local == '+')
 531                        local++;
 532
 533                /* A matching refspec is okay.  */
 534                if (remote == local && remote[1] == '\0')
 535                        continue;
 536
 537                remote = remote ? (remote + 1) : local;
 538                switch (check_ref_format(remote)) {
 539                case 0: /* ok */
 540                case CHECK_REF_FORMAT_ONELEVEL:
 541                        /* ok but a single level -- that is fine for
 542                         * a match pattern.
 543                         */
 544                case CHECK_REF_FORMAT_WILDCARD:
 545                        /* ok but ends with a pattern-match character */
 546                        continue;
 547                }
 548                die("remote part of refspec is not a valid name in %s",
 549                    heads[i]);
 550        }
 551}
 552
 553int cmd_send_pack(int argc, const char **argv, const char *prefix)
 554{
 555        int i, nr_refspecs = 0;
 556        const char **refspecs = NULL;
 557        const char *remote_name = NULL;
 558        struct remote *remote = NULL;
 559        const char *dest = NULL;
 560        int fd[2];
 561        struct child_process *conn;
 562        struct extra_have_objects extra_have;
 563        struct ref *remote_refs, *local_refs;
 564        int ret;
 565        int helper_status = 0;
 566        int send_all = 0;
 567        const char *receivepack = "git-receive-pack";
 568        int flags;
 569
 570        argv++;
 571        for (i = 1; i < argc; i++, argv++) {
 572                const char *arg = *argv;
 573
 574                if (*arg == '-') {
 575                        if (!prefixcmp(arg, "--receive-pack=")) {
 576                                receivepack = arg + 15;
 577                                continue;
 578                        }
 579                        if (!prefixcmp(arg, "--exec=")) {
 580                                receivepack = arg + 7;
 581                                continue;
 582                        }
 583                        if (!prefixcmp(arg, "--remote=")) {
 584                                remote_name = arg + 9;
 585                                continue;
 586                        }
 587                        if (!strcmp(arg, "--all")) {
 588                                send_all = 1;
 589                                continue;
 590                        }
 591                        if (!strcmp(arg, "--dry-run")) {
 592                                args.dry_run = 1;
 593                                continue;
 594                        }
 595                        if (!strcmp(arg, "--mirror")) {
 596                                args.send_mirror = 1;
 597                                continue;
 598                        }
 599                        if (!strcmp(arg, "--force")) {
 600                                args.force_update = 1;
 601                                continue;
 602                        }
 603                        if (!strcmp(arg, "--verbose")) {
 604                                args.verbose = 1;
 605                                continue;
 606                        }
 607                        if (!strcmp(arg, "--thin")) {
 608                                args.use_thin_pack = 1;
 609                                continue;
 610                        }
 611                        if (!strcmp(arg, "--stateless-rpc")) {
 612                                args.stateless_rpc = 1;
 613                                continue;
 614                        }
 615                        if (!strcmp(arg, "--helper-status")) {
 616                                helper_status = 1;
 617                                continue;
 618                        }
 619                        usage(send_pack_usage);
 620                }
 621                if (!dest) {
 622                        dest = arg;
 623                        continue;
 624                }
 625                refspecs = (const char **) argv;
 626                nr_refspecs = argc - i;
 627                break;
 628        }
 629        if (!dest)
 630                usage(send_pack_usage);
 631        /*
 632         * --all and --mirror are incompatible; neither makes sense
 633         * with any refspecs.
 634         */
 635        if ((refspecs && (send_all || args.send_mirror)) ||
 636            (send_all && args.send_mirror))
 637                usage(send_pack_usage);
 638
 639        if (remote_name) {
 640                remote = remote_get(remote_name);
 641                if (!remote_has_url(remote, dest)) {
 642                        die("Destination %s is not a uri for %s",
 643                            dest, remote_name);
 644                }
 645        }
 646
 647        if (args.stateless_rpc) {
 648                conn = NULL;
 649                fd[0] = 0;
 650                fd[1] = 1;
 651        } else {
 652                conn = git_connect(fd, dest, receivepack,
 653                        args.verbose ? CONNECT_VERBOSE : 0);
 654        }
 655
 656        memset(&extra_have, 0, sizeof(extra_have));
 657
 658        get_remote_heads(fd[0], &remote_refs, 0, NULL, REF_NORMAL,
 659                         &extra_have);
 660
 661        verify_remote_names(nr_refspecs, refspecs);
 662
 663        local_refs = get_local_heads();
 664
 665        flags = MATCH_REFS_NONE;
 666
 667        if (send_all)
 668                flags |= MATCH_REFS_ALL;
 669        if (args.send_mirror)
 670                flags |= MATCH_REFS_MIRROR;
 671
 672        /* match them up */
 673        if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
 674                return -1;
 675
 676        ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
 677
 678        if (helper_status)
 679                print_helper_status(remote_refs);
 680
 681        close(fd[1]);
 682        close(fd[0]);
 683
 684        ret |= finish_connect(conn);
 685
 686        if (!helper_status)
 687                print_push_status(dest, remote_refs);
 688
 689        if (!args.dry_run && remote) {
 690                struct ref *ref;
 691                for (ref = remote_refs; ref; ref = ref->next)
 692                        update_tracking_ref(remote, ref);
 693        }
 694
 695        if (!ret && !refs_pushed(remote_refs))
 696                fprintf(stderr, "Everything up-to-date\n");
 697
 698        return ret;
 699}