Andrew's git / gitweb.git / builtin-send-pack.c
?
builtin-send-pack.con commit Merge branch 'js/branch-track' (60b188a)
   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        close(po.in);
  75        if (finish_command(&po))
  76                return error("pack-objects died with strange error");
  77        return 0;
  78}
  79
  80static void unmark_and_free(struct commit_list *list, unsigned int mark)
  81{
  82        while (list) {
  83                struct commit_list *temp = list;
  84                temp->item->object.flags &= ~mark;
  85                list = temp->next;
  86                free(temp);
  87        }
  88}
  89
  90static int ref_newer(const unsigned char *new_sha1,
  91                     const unsigned char *old_sha1)
  92{
  93        struct object *o;
  94        struct commit *old, *new;
  95        struct commit_list *list, *used;
  96        int found = 0;
  97
  98        /* Both new and old must be commit-ish and new is descendant of
  99         * old.  Otherwise we require --force.
 100         */
 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;
 105
 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;
 110
 111        if (parse_commit(new) < 0)
 112                return 0;
 113
 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;
 122                }
 123        }
 124        unmark_and_free(list, 1);
 125        unmark_and_free(used, 1);
 126        return found;
 127}
 128
 129static struct ref *local_refs, **local_tail;
 130static struct ref *remote_refs, **remote_tail;
 131
 132static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 133{
 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;
 142}
 143
 144static void get_local_heads(void)
 145{
 146        local_tail = &local_refs;
 147        for_each_ref(one_local_ref, NULL);
 148}
 149
 150static int receive_status(int in, struct ref *refs)
 151{
 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;
 164        }
 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;
 177                }
 178
 179                line[strlen(line)-1] = '\0';
 180                refname = line + 3;
 181                msg = strchr(refname, ' ');
 182                if (msg)
 183                        *msg++ = '\0';
 184
 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;
 194                }
 195                if (hint->status != REF_STATUS_EXPECTING_REPORT) {
 196                        warning("remote reported status on unexpected ref: %s",
 197                                        refname);
 198                        continue;
 199                }
 200
 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;
 206                }
 207                if (msg)
 208                        hint->remote_status = xstrdup(msg);
 209                /* start our next search from the next ref */
 210                hint = hint->next;
 211        }
 212        return ret;
 213}
 214
 215static void update_tracking_ref(struct remote *remote, struct ref *ref)
 216{
 217        struct refspec rs;
 218
 219        if (ref->status != REF_STATUS_OK)
 220                return;
 221
 222        rs.src = ref->name;
 223        rs.dst = NULL;
 224
 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);
 235        }
 236}
 237
 238static const char *prettify_ref(const struct ref *ref)
 239{
 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 :
 245                0);
 246}
 247
 248#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 249
 250static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
 251{
 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);
 261        }
 262        fputc('\n', stderr);
 263}
 264
 265static const char *status_abbrev(unsigned char sha1[20])
 266{
 267        const char *abbrev;
 268        abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
 269        return abbrev ? abbrev : sha1_to_hex(sha1);
 270}
 271
 272static void print_ok_ref_status(struct ref *ref)
 273{
 274        if (ref->deletion)
 275                print_ref_status('-', "[deleted]", ref, NULL, NULL);
 276        else if (is_null_sha1(ref->old_sha1))
 277                print_ref_status('*',
 278                        (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
 279                          "[new branch]"),
 280                        ref, ref->peer_ref, NULL);
 281        else {
 282                char quickref[84];
 283                char type;
 284                const char *msg;
 285
 286                strcpy(quickref, status_abbrev(ref->old_sha1));
 287                if (ref->nonfastforward) {
 288                        strcat(quickref, "...");
 289                        type = '+';
 290                        msg = "forced update";
 291                } else {
 292                        strcat(quickref, "..");
 293                        type = ' ';
 294                        msg = NULL;
 295                }
 296                strcat(quickref, status_abbrev(ref->new_sha1));
 297
 298                print_ref_status(type, quickref, ref, ref->peer_ref, msg);
 299        }
 300}
 301
 302static int print_one_push_status(struct ref *ref, const char *dest, int count)
 303{
 304        if (!count)
 305                fprintf(stderr, "To %s\n", dest);
 306
 307        switch(ref->status) {
 308        case REF_STATUS_NONE:
 309                print_ref_status('X', "[no match]", ref, NULL, NULL);
 310                break;
 311        case REF_STATUS_REJECT_NODELETE:
 312                print_ref_status('!', "[rejected]", ref, NULL,
 313                                "remote does not support deleting refs");
 314                break;
 315        case REF_STATUS_UPTODATE:
 316                print_ref_status('=', "[up to date]", ref,
 317                                ref->peer_ref, NULL);
 318                break;
 319        case REF_STATUS_REJECT_NONFASTFORWARD:
 320                print_ref_status('!', "[rejected]", ref, ref->peer_ref,
 321                                "non-fast forward");
 322                break;
 323        case REF_STATUS_REMOTE_REJECT:
 324                print_ref_status('!', "[remote rejected]", ref,
 325                                ref->deletion ? NULL : ref->peer_ref,
 326                                ref->remote_status);
 327                break;
 328        case REF_STATUS_EXPECTING_REPORT:
 329                print_ref_status('!', "[remote failure]", ref,
 330                                ref->deletion ? NULL : ref->peer_ref,
 331                                "remote failed to report status");
 332                break;
 333        case REF_STATUS_OK:
 334                print_ok_ref_status(ref);
 335                break;
 336        }
 337
 338        return 1;
 339}
 340
 341static void print_push_status(const char *dest, struct ref *refs)
 342{
 343        struct ref *ref;
 344        int n = 0;
 345
 346        if (args.verbose) {
 347                for (ref = refs; ref; ref = ref->next)
 348                        if (ref->status == REF_STATUS_UPTODATE)
 349                                n += print_one_push_status(ref, dest, n);
 350        }
 351
 352        for (ref = refs; ref; ref = ref->next)
 353                if (ref->status == REF_STATUS_OK)
 354                        n += print_one_push_status(ref, dest, n);
 355
 356        for (ref = refs; ref; ref = ref->next) {
 357                if (ref->status != REF_STATUS_NONE &&
 358                    ref->status != REF_STATUS_UPTODATE &&
 359                    ref->status != REF_STATUS_OK)
 360                        n += print_one_push_status(ref, dest, n);
 361        }
 362}
 363
 364static int refs_pushed(struct ref *ref)
 365{
 366        for (; ref; ref = ref->next) {
 367                switch(ref->status) {
 368                case REF_STATUS_NONE:
 369                case REF_STATUS_UPTODATE:
 370                        break;
 371                default:
 372                        return 1;
 373                }
 374        }
 375        return 0;
 376}
 377
 378static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
 379{
 380        struct ref *ref;
 381        int new_refs;
 382        int ask_for_status_report = 0;
 383        int allow_deleting_refs = 0;
 384        int expect_status_report = 0;
 385        int flags = MATCH_REFS_NONE;
 386        int ret;
 387
 388        if (args.send_all)
 389                flags |= MATCH_REFS_ALL;
 390        if (args.send_mirror)
 391                flags |= MATCH_REFS_MIRROR;
 392
 393        /* No funny business with the matcher */
 394        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
 395        get_local_heads();
 396
 397        /* Does the other end support the reporting? */
 398        if (server_supports("report-status"))
 399                ask_for_status_report = 1;
 400        if (server_supports("delete-refs"))
 401                allow_deleting_refs = 1;
 402
 403        /* match them up */
 404        if (!remote_tail)
 405                remote_tail = &remote_refs;
 406        if (match_refs(local_refs, remote_refs, &remote_tail,
 407                       nr_refspec, refspec, flags)) {
 408                close(out);
 409                return -1;
 410        }
 411
 412        if (!remote_refs) {
 413                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 414                        "Perhaps you should specify a branch such as 'master'.\n");
 415                close(out);
 416                return 0;
 417        }
 418
 419        /*
 420         * Finally, tell the other end!
 421         */
 422        new_refs = 0;
 423        for (ref = remote_refs; ref; ref = ref->next) {
 424                const unsigned char *new_sha1;
 425
 426                if (!ref->peer_ref) {
 427                        if (!args.send_mirror)
 428                                continue;
 429                        new_sha1 = null_sha1;
 430                }
 431                else
 432                        new_sha1 = ref->peer_ref->new_sha1;
 433
 434
 435                ref->deletion = is_null_sha1(new_sha1);
 436                if (ref->deletion && !allow_deleting_refs) {
 437                        ref->status = REF_STATUS_REJECT_NODELETE;
 438                        continue;
 439                }
 440                if (!ref->deletion &&
 441                    !hashcmp(ref->old_sha1, new_sha1)) {
 442                        ref->status = REF_STATUS_UPTODATE;
 443                        continue;
 444                }
 445
 446                /* This part determines what can overwrite what.
 447                 * The rules are:
 448                 *
 449                 * (0) you can always use --force or +A:B notation to
 450                 *     selectively force individual ref pairs.
 451                 *
 452                 * (1) if the old thing does not exist, it is OK.
 453                 *
 454                 * (2) if you do not have the old thing, you are not allowed
 455                 *     to overwrite it; you would not know what you are losing
 456                 *     otherwise.
 457                 *
 458                 * (3) if both new and old are commit-ish, and new is a
 459                 *     descendant of old, it is OK.
 460                 *
 461                 * (4) regardless of all of the above, removing :B is
 462                 *     always allowed.
 463                 */
 464
 465                ref->nonfastforward =
 466                    !ref->deletion &&
 467                    !is_null_sha1(ref->old_sha1) &&
 468                    (!has_sha1_file(ref->old_sha1)
 469                      || !ref_newer(new_sha1, ref->old_sha1));
 470
 471                if (ref->nonfastforward && !ref->force && !args.force_update) {
 472                        ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
 473                        continue;
 474                }
 475
 476                hashcpy(ref->new_sha1, new_sha1);
 477                if (!ref->deletion)
 478                        new_refs++;
 479
 480                if (!args.dry_run) {
 481                        char *old_hex = sha1_to_hex(ref->old_sha1);
 482                        char *new_hex = sha1_to_hex(ref->new_sha1);
 483
 484                        if (ask_for_status_report) {
 485                                packet_write(out, "%s %s %s%c%s",
 486                                        old_hex, new_hex, ref->name, 0,
 487                                        "report-status");
 488                                ask_for_status_report = 0;
 489                                expect_status_report = 1;
 490                        }
 491                        else
 492                                packet_write(out, "%s %s %s",
 493                                        old_hex, new_hex, ref->name);
 494                }
 495                ref->status = expect_status_report ?
 496                        REF_STATUS_EXPECTING_REPORT :
 497                        REF_STATUS_OK;
 498        }
 499
 500        packet_flush(out);
 501        if (new_refs && !args.dry_run) {
 502                if (pack_objects(out, remote_refs) < 0)
 503                        return -1;
 504        }
 505        else
 506                close(out);
 507
 508        if (expect_status_report)
 509                ret = receive_status(in, remote_refs);
 510        else
 511                ret = 0;
 512
 513        print_push_status(dest, remote_refs);
 514
 515        if (!args.dry_run && remote) {
 516                for (ref = remote_refs; ref; ref = ref->next)
 517                        update_tracking_ref(remote, ref);
 518        }
 519
 520        if (!refs_pushed(remote_refs))
 521                fprintf(stderr, "Everything up-to-date\n");
 522        if (ret < 0)
 523                return ret;
 524        for (ref = remote_refs; ref; ref = ref->next) {
 525                switch (ref->status) {
 526                case REF_STATUS_NONE:
 527                case REF_STATUS_UPTODATE:
 528                case REF_STATUS_OK:
 529                        break;
 530                default:
 531                        return -1;
 532                }
 533        }
 534        return 0;
 535}
 536
 537static void verify_remote_names(int nr_heads, const char **heads)
 538{
 539        int i;
 540
 541        for (i = 0; i < nr_heads; i++) {
 542                const char *remote = strchr(heads[i], ':');
 543
 544                remote = remote ? (remote + 1) : heads[i];
 545                switch (check_ref_format(remote)) {
 546                case 0: /* ok */
 547                case CHECK_REF_FORMAT_ONELEVEL:
 548                        /* ok but a single level -- that is fine for
 549                         * a match pattern.
 550                         */
 551                case CHECK_REF_FORMAT_WILDCARD:
 552                        /* ok but ends with a pattern-match character */
 553                        continue;
 554                }
 555                die("remote part of refspec is not a valid name in %s",
 556                    heads[i]);
 557        }
 558}
 559
 560int cmd_send_pack(int argc, const char **argv, const char *prefix)
 561{
 562        int i, nr_heads = 0;
 563        const char **heads = NULL;
 564        const char *remote_name = NULL;
 565        struct remote *remote = NULL;
 566        const char *dest = NULL;
 567
 568        argv++;
 569        for (i = 1; i < argc; i++, argv++) {
 570                const char *arg = *argv;
 571
 572                if (*arg == '-') {
 573                        if (!prefixcmp(arg, "--receive-pack=")) {
 574                                args.receivepack = arg + 15;
 575                                continue;
 576                        }
 577                        if (!prefixcmp(arg, "--exec=")) {
 578                                args.receivepack = arg + 7;
 579                                continue;
 580                        }
 581                        if (!prefixcmp(arg, "--remote=")) {
 582                                remote_name = arg + 9;
 583                                continue;
 584                        }
 585                        if (!strcmp(arg, "--all")) {
 586                                args.send_all = 1;
 587                                continue;
 588                        }
 589                        if (!strcmp(arg, "--dry-run")) {
 590                                args.dry_run = 1;
 591                                continue;
 592                        }
 593                        if (!strcmp(arg, "--mirror")) {
 594                                args.send_mirror = 1;
 595                                continue;
 596                        }
 597                        if (!strcmp(arg, "--force")) {
 598                                args.force_update = 1;
 599                                continue;
 600                        }
 601                        if (!strcmp(arg, "--verbose")) {
 602                                args.verbose = 1;
 603                                continue;
 604                        }
 605                        if (!strcmp(arg, "--thin")) {
 606                                args.use_thin_pack = 1;
 607                                continue;
 608                        }
 609                        usage(send_pack_usage);
 610                }
 611                if (!dest) {
 612                        dest = arg;
 613                        continue;
 614                }
 615                heads = (const char **) argv;
 616                nr_heads = argc - i;
 617                break;
 618        }
 619        if (!dest)
 620                usage(send_pack_usage);
 621        /*
 622         * --all and --mirror are incompatible; neither makes sense
 623         * with any refspecs.
 624         */
 625        if ((heads && (args.send_all || args.send_mirror)) ||
 626                                        (args.send_all && args.send_mirror))
 627                usage(send_pack_usage);
 628
 629        if (remote_name) {
 630                remote = remote_get(remote_name);
 631                if (!remote_has_url(remote, dest)) {
 632                        die("Destination %s is not a uri for %s",
 633                            dest, remote_name);
 634                }
 635        }
 636
 637        return send_pack(&args, dest, remote, nr_heads, heads);
 638}
 639
 640int send_pack(struct send_pack_args *my_args,
 641              const char *dest, struct remote *remote,
 642              int nr_heads, const char **heads)
 643{
 644        int fd[2], ret;
 645        struct child_process *conn;
 646
 647        memcpy(&args, my_args, sizeof(args));
 648
 649        verify_remote_names(nr_heads, heads);
 650
 651        conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
 652        ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
 653        close(fd[0]);
 654        /* do_send_pack always closes fd[1] */
 655        ret |= finish_connect(conn);
 656        return !!ret;
 657}