builtin-send-pack.con commit Merge branch 'jk/terse-push' into aw/mirror-push (1496553)
   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] [--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 char *name)
 211{
 212        return name + (
 213                !prefixcmp(name, "refs/heads/") ? 11 :
 214                !prefixcmp(name, "refs/tags/") ? 10 :
 215                !prefixcmp(name, "refs/remotes/") ? 13 :
 216                0);
 217}
 218
 219#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 220
 221static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
 222{
 223        struct ref *ref;
 224        int new_refs;
 225        int ret = 0;
 226        int ask_for_status_report = 0;
 227        int allow_deleting_refs = 0;
 228        int expect_status_report = 0;
 229        int shown_dest = 0;
 230
 231        /* No funny business with the matcher */
 232        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
 233        get_local_heads();
 234
 235        /* Does the other end support the reporting? */
 236        if (server_supports("report-status"))
 237                ask_for_status_report = 1;
 238        if (server_supports("delete-refs"))
 239                allow_deleting_refs = 1;
 240
 241        /* match them up */
 242        if (!remote_tail)
 243                remote_tail = &remote_refs;
 244        if (match_refs(local_refs, remote_refs, &remote_tail,
 245                       nr_refspec, refspec, args.send_all))
 246                return -1;
 247
 248        if (!remote_refs) {
 249                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 250                        "Perhaps you should specify a branch such as 'master'.\n");
 251                return 0;
 252        }
 253
 254        /*
 255         * Finally, tell the other end!
 256         */
 257        new_refs = 0;
 258        for (ref = remote_refs; ref; ref = ref->next) {
 259                char old_hex[60], *new_hex;
 260                int will_delete_ref;
 261                const char *pretty_ref;
 262                const char *pretty_peer;
 263
 264                if (!ref->peer_ref)
 265                        continue;
 266
 267                if (!shown_dest) {
 268                        fprintf(stderr, "To %s\n", dest);
 269                        shown_dest = 1;
 270                }
 271
 272                pretty_ref = prettify_ref(ref->name);
 273                pretty_peer = prettify_ref(ref->peer_ref->name);
 274
 275                will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
 276                if (will_delete_ref && !allow_deleting_refs) {
 277                        fprintf(stderr, " ! %-*s %s (remote does not support deleting refs)\n",
 278                                        SUMMARY_WIDTH, "[rejected]", pretty_ref);
 279                        ret = -2;
 280                        continue;
 281                }
 282                if (!will_delete_ref &&
 283                    !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
 284                        if (args.verbose)
 285                                fprintf(stderr, " = %-*s %s -> %s\n",
 286                                        SUMMARY_WIDTH, "[up to date]",
 287                                        pretty_peer, pretty_ref);
 288                        continue;
 289                }
 290
 291                /* This part determines what can overwrite what.
 292                 * The rules are:
 293                 *
 294                 * (0) you can always use --force or +A:B notation to
 295                 *     selectively force individual ref pairs.
 296                 *
 297                 * (1) if the old thing does not exist, it is OK.
 298                 *
 299                 * (2) if you do not have the old thing, you are not allowed
 300                 *     to overwrite it; you would not know what you are losing
 301                 *     otherwise.
 302                 *
 303                 * (3) if both new and old are commit-ish, and new is a
 304                 *     descendant of old, it is OK.
 305                 *
 306                 * (4) regardless of all of the above, removing :B is
 307                 *     always allowed.
 308                 */
 309
 310                if (!args.force_update &&
 311                    !will_delete_ref &&
 312                    !is_null_sha1(ref->old_sha1) &&
 313                    !ref->force) {
 314                        if (!has_sha1_file(ref->old_sha1) ||
 315                            !ref_newer(ref->peer_ref->new_sha1,
 316                                       ref->old_sha1)) {
 317                                /* We do not have the remote ref, or
 318                                 * we know that the remote ref is not
 319                                 * an ancestor of what we are trying to
 320                                 * push.  Either way this can be losing
 321                                 * commits at the remote end and likely
 322                                 * we were not up to date to begin with.
 323                                 */
 324                                fprintf(stderr, " ! %-*s %s -> %s (non-fast forward)\n",
 325                                                SUMMARY_WIDTH, "[rejected]",
 326                                                pretty_peer, pretty_ref);
 327                                ret = -2;
 328                                continue;
 329                        }
 330                }
 331                hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
 332                if (!will_delete_ref)
 333                        new_refs++;
 334                strcpy(old_hex, sha1_to_hex(ref->old_sha1));
 335                new_hex = sha1_to_hex(ref->new_sha1);
 336
 337                if (!args.dry_run) {
 338                        if (ask_for_status_report) {
 339                                packet_write(out, "%s %s %s%c%s",
 340                                        old_hex, new_hex, ref->name, 0,
 341                                        "report-status");
 342                                ask_for_status_report = 0;
 343                                expect_status_report = 1;
 344                        }
 345                        else
 346                                packet_write(out, "%s %s %s",
 347                                        old_hex, new_hex, ref->name);
 348                }
 349                if (will_delete_ref)
 350                        fprintf(stderr, " - %-*s %s\n",
 351                                SUMMARY_WIDTH, "[deleting]",
 352                                pretty_ref);
 353                else if (is_null_sha1(ref->old_sha1)) {
 354                        const char *msg;
 355
 356                        if (!prefixcmp(ref->name, "refs/tags/"))
 357                                msg = "[new tag]";
 358                        else
 359                                msg = "[new branch]";
 360                        fprintf(stderr, " * %-*s %s -> %s\n",
 361                                SUMMARY_WIDTH, msg,
 362                                pretty_peer, pretty_ref);
 363                }
 364                else {
 365                        char quickref[83];
 366                        char type = ' ';
 367                        const char *msg = "";
 368                        const char *old_abb;
 369                        old_abb = find_unique_abbrev(ref->old_sha1, DEFAULT_ABBREV);
 370                        strcpy(quickref, old_abb ? old_abb : old_hex);
 371                        if (ref_newer(ref->peer_ref->new_sha1, ref->old_sha1))
 372                                strcat(quickref, "..");
 373                        else {
 374                                strcat(quickref, "...");
 375                                type = '+';
 376                                msg = " (forced update)";
 377                        }
 378                        strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
 379
 380                        fprintf(stderr, " %c %-*s %s -> %s%s\n",
 381                                type,
 382                                SUMMARY_WIDTH, quickref,
 383                                pretty_peer, pretty_ref,
 384                                msg);
 385                }
 386        }
 387
 388        packet_flush(out);
 389        if (new_refs && !args.dry_run)
 390                ret = pack_objects(out, remote_refs);
 391        close(out);
 392
 393        if (expect_status_report) {
 394                if (receive_status(in))
 395                        ret = -4;
 396        }
 397
 398        if (!args.dry_run && remote && ret == 0) {
 399                for (ref = remote_refs; ref; ref = ref->next)
 400                        update_tracking_ref(remote, ref);
 401        }
 402
 403        if (!new_refs && ret == 0)
 404                fprintf(stderr, "Everything up-to-date\n");
 405        return ret;
 406}
 407
 408static void verify_remote_names(int nr_heads, const char **heads)
 409{
 410        int i;
 411
 412        for (i = 0; i < nr_heads; i++) {
 413                const char *remote = strchr(heads[i], ':');
 414
 415                remote = remote ? (remote + 1) : heads[i];
 416                switch (check_ref_format(remote)) {
 417                case 0: /* ok */
 418                case -2: /* ok but a single level -- that is fine for
 419                          * a match pattern.
 420                          */
 421                case -3: /* ok but ends with a pattern-match character */
 422                        continue;
 423                }
 424                die("remote part of refspec is not a valid name in %s",
 425                    heads[i]);
 426        }
 427}
 428
 429int cmd_send_pack(int argc, const char **argv, const char *prefix)
 430{
 431        int i, nr_heads = 0;
 432        const char **heads = NULL;
 433        const char *remote_name = NULL;
 434        struct remote *remote = NULL;
 435        const char *dest = NULL;
 436
 437        argv++;
 438        for (i = 1; i < argc; i++, argv++) {
 439                const char *arg = *argv;
 440
 441                if (*arg == '-') {
 442                        if (!prefixcmp(arg, "--receive-pack=")) {
 443                                args.receivepack = arg + 15;
 444                                continue;
 445                        }
 446                        if (!prefixcmp(arg, "--exec=")) {
 447                                args.receivepack = arg + 7;
 448                                continue;
 449                        }
 450                        if (!prefixcmp(arg, "--remote=")) {
 451                                remote_name = arg + 9;
 452                                continue;
 453                        }
 454                        if (!strcmp(arg, "--all")) {
 455                                args.send_all = 1;
 456                                continue;
 457                        }
 458                        if (!strcmp(arg, "--dry-run")) {
 459                                args.dry_run = 1;
 460                                continue;
 461                        }
 462                        if (!strcmp(arg, "--force")) {
 463                                args.force_update = 1;
 464                                continue;
 465                        }
 466                        if (!strcmp(arg, "--verbose")) {
 467                                args.verbose = 1;
 468                                continue;
 469                        }
 470                        if (!strcmp(arg, "--thin")) {
 471                                args.use_thin_pack = 1;
 472                                continue;
 473                        }
 474                        usage(send_pack_usage);
 475                }
 476                if (!dest) {
 477                        dest = arg;
 478                        continue;
 479                }
 480                heads = (const char **) argv;
 481                nr_heads = argc - i;
 482                break;
 483        }
 484        if (!dest)
 485                usage(send_pack_usage);
 486        if (heads && args.send_all)
 487                usage(send_pack_usage);
 488
 489        if (remote_name) {
 490                remote = remote_get(remote_name);
 491                if (!remote_has_url(remote, dest)) {
 492                        die("Destination %s is not a uri for %s",
 493                            dest, remote_name);
 494                }
 495        }
 496
 497        return send_pack(&args, dest, remote, nr_heads, heads);
 498}
 499
 500int send_pack(struct send_pack_args *my_args,
 501              const char *dest, struct remote *remote,
 502              int nr_heads, const char **heads)
 503{
 504        int fd[2], ret;
 505        struct child_process *conn;
 506
 507        memcpy(&args, my_args, sizeof(args));
 508
 509        verify_remote_names(nr_heads, heads);
 510
 511        conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
 512        ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
 513        close(fd[0]);
 514        close(fd[1]);
 515        ret |= finish_connect(conn);
 516        return !!ret;
 517}