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