builtin / send-pack.con commit send-pack: fix capability-sending logic (ca8e127)
   1#include "builtin.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#include "transport.h"
  11#include "version.h"
  12
  13static const char send_pack_usage[] =
  14"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
  15"  --all and explicit <ref> specification are mutually exclusive.";
  16
  17static struct send_pack_args args;
  18
  19static int feed_object(const unsigned char *sha1, int fd, int negative)
  20{
  21        char buf[42];
  22
  23        if (negative && !has_sha1_file(sha1))
  24                return 1;
  25
  26        memcpy(buf + negative, sha1_to_hex(sha1), 40);
  27        if (negative)
  28                buf[0] = '^';
  29        buf[40 + negative] = '\n';
  30        return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
  31}
  32
  33/*
  34 * Make a pack stream and spit it out into file descriptor fd
  35 */
  36static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
  37{
  38        /*
  39         * The child becomes pack-objects --revs; we feed
  40         * the revision parameters to it via its stdin and
  41         * let its stdout go back to the other end.
  42         */
  43        const char *argv[] = {
  44                "pack-objects",
  45                "--all-progress-implied",
  46                "--revs",
  47                "--stdout",
  48                NULL,
  49                NULL,
  50                NULL,
  51                NULL,
  52                NULL,
  53        };
  54        struct child_process po;
  55        int i;
  56
  57        i = 4;
  58        if (args->use_thin_pack)
  59                argv[i++] = "--thin";
  60        if (args->use_ofs_delta)
  61                argv[i++] = "--delta-base-offset";
  62        if (args->quiet || !args->progress)
  63                argv[i++] = "-q";
  64        if (args->progress)
  65                argv[i++] = "--progress";
  66        memset(&po, 0, sizeof(po));
  67        po.argv = argv;
  68        po.in = -1;
  69        po.out = args->stateless_rpc ? -1 : fd;
  70        po.git_cmd = 1;
  71        if (start_command(&po))
  72                die_errno("git pack-objects failed");
  73
  74        /*
  75         * We feed the pack-objects we just spawned with revision
  76         * parameters by writing to the pipe.
  77         */
  78        for (i = 0; i < extra->nr; i++)
  79                if (!feed_object(extra->array[i], po.in, 1))
  80                        break;
  81
  82        while (refs) {
  83                if (!is_null_sha1(refs->old_sha1) &&
  84                    !feed_object(refs->old_sha1, po.in, 1))
  85                        break;
  86                if (!is_null_sha1(refs->new_sha1) &&
  87                    !feed_object(refs->new_sha1, po.in, 0))
  88                        break;
  89                refs = refs->next;
  90        }
  91
  92        close(po.in);
  93
  94        if (args->stateless_rpc) {
  95                char *buf = xmalloc(LARGE_PACKET_MAX);
  96                while (1) {
  97                        ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
  98                        if (n <= 0)
  99                                break;
 100                        send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
 101                }
 102                free(buf);
 103                close(po.out);
 104                po.out = -1;
 105        }
 106
 107        if (finish_command(&po))
 108                return -1;
 109        return 0;
 110}
 111
 112static int receive_status(int in, struct ref *refs)
 113{
 114        struct ref *hint;
 115        char line[1000];
 116        int ret = 0;
 117        int len = packet_read_line(in, line, sizeof(line));
 118        if (len < 10 || memcmp(line, "unpack ", 7))
 119                return error("did not receive remote status");
 120        if (memcmp(line, "unpack ok\n", 10)) {
 121                char *p = line + strlen(line) - 1;
 122                if (*p == '\n')
 123                        *p = '\0';
 124                error("unpack failed: %s", line + 7);
 125                ret = -1;
 126        }
 127        hint = NULL;
 128        while (1) {
 129                char *refname;
 130                char *msg;
 131                len = packet_read_line(in, line, sizeof(line));
 132                if (!len)
 133                        break;
 134                if (len < 3 ||
 135                    (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
 136                        fprintf(stderr, "protocol error: %s\n", line);
 137                        ret = -1;
 138                        break;
 139                }
 140
 141                line[strlen(line)-1] = '\0';
 142                refname = line + 3;
 143                msg = strchr(refname, ' ');
 144                if (msg)
 145                        *msg++ = '\0';
 146
 147                /* first try searching at our hint, falling back to all refs */
 148                if (hint)
 149                        hint = find_ref_by_name(hint, refname);
 150                if (!hint)
 151                        hint = find_ref_by_name(refs, refname);
 152                if (!hint) {
 153                        warning("remote reported status on unknown ref: %s",
 154                                        refname);
 155                        continue;
 156                }
 157                if (hint->status != REF_STATUS_EXPECTING_REPORT) {
 158                        warning("remote reported status on unexpected ref: %s",
 159                                        refname);
 160                        continue;
 161                }
 162
 163                if (line[0] == 'o' && line[1] == 'k')
 164                        hint->status = REF_STATUS_OK;
 165                else {
 166                        hint->status = REF_STATUS_REMOTE_REJECT;
 167                        ret = -1;
 168                }
 169                if (msg)
 170                        hint->remote_status = xstrdup(msg);
 171                /* start our next search from the next ref */
 172                hint = hint->next;
 173        }
 174        return ret;
 175}
 176
 177static void print_helper_status(struct ref *ref)
 178{
 179        struct strbuf buf = STRBUF_INIT;
 180
 181        for (; ref; ref = ref->next) {
 182                const char *msg = NULL;
 183                const char *res;
 184
 185                switch(ref->status) {
 186                case REF_STATUS_NONE:
 187                        res = "error";
 188                        msg = "no match";
 189                        break;
 190
 191                case REF_STATUS_OK:
 192                        res = "ok";
 193                        break;
 194
 195                case REF_STATUS_UPTODATE:
 196                        res = "ok";
 197                        msg = "up to date";
 198                        break;
 199
 200                case REF_STATUS_REJECT_NONFASTFORWARD:
 201                        res = "error";
 202                        msg = "non-fast forward";
 203                        break;
 204
 205                case REF_STATUS_REJECT_NODELETE:
 206                case REF_STATUS_REMOTE_REJECT:
 207                        res = "error";
 208                        break;
 209
 210                case REF_STATUS_EXPECTING_REPORT:
 211                default:
 212                        continue;
 213                }
 214
 215                strbuf_reset(&buf);
 216                strbuf_addf(&buf, "%s %s", res, ref->name);
 217                if (ref->remote_status)
 218                        msg = ref->remote_status;
 219                if (msg) {
 220                        strbuf_addch(&buf, ' ');
 221                        quote_two_c_style(&buf, "", msg, 0);
 222                }
 223                strbuf_addch(&buf, '\n');
 224
 225                safe_write(1, buf.buf, buf.len);
 226        }
 227        strbuf_release(&buf);
 228}
 229
 230static int sideband_demux(int in, int out, void *data)
 231{
 232        int *fd = data, ret;
 233#ifdef NO_PTHREADS
 234        close(fd[1]);
 235#endif
 236        ret = recv_sideband("send-pack", fd[0], out);
 237        close(out);
 238        return ret;
 239}
 240
 241int send_pack(struct send_pack_args *args,
 242              int fd[], struct child_process *conn,
 243              struct ref *remote_refs,
 244              struct extra_have_objects *extra_have)
 245{
 246        int in = fd[0];
 247        int out = fd[1];
 248        struct strbuf req_buf = STRBUF_INIT;
 249        struct ref *ref;
 250        int new_refs;
 251        int allow_deleting_refs = 0;
 252        int status_report = 0;
 253        int use_sideband = 0;
 254        int quiet_supported = 0;
 255        unsigned cmds_sent = 0;
 256        int ret;
 257        struct async demux;
 258
 259        /* Does the other end support the reporting? */
 260        if (server_supports("report-status"))
 261                status_report = 1;
 262        if (server_supports("delete-refs"))
 263                allow_deleting_refs = 1;
 264        if (server_supports("ofs-delta"))
 265                args->use_ofs_delta = 1;
 266        if (server_supports("side-band-64k"))
 267                use_sideband = 1;
 268        if (server_supports("quiet"))
 269                quiet_supported = 1;
 270
 271        if (!remote_refs) {
 272                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 273                        "Perhaps you should specify a branch such as 'master'.\n");
 274                return 0;
 275        }
 276
 277        /*
 278         * Finally, tell the other end!
 279         */
 280        new_refs = 0;
 281        for (ref = remote_refs; ref; ref = ref->next) {
 282                if (!ref->peer_ref && !args->send_mirror)
 283                        continue;
 284
 285                /* Check for statuses set by set_ref_status_for_push() */
 286                switch (ref->status) {
 287                case REF_STATUS_REJECT_NONFASTFORWARD:
 288                case REF_STATUS_UPTODATE:
 289                        continue;
 290                default:
 291                        ; /* do nothing */
 292                }
 293
 294                if (ref->deletion && !allow_deleting_refs) {
 295                        ref->status = REF_STATUS_REJECT_NODELETE;
 296                        continue;
 297                }
 298
 299                if (!ref->deletion)
 300                        new_refs++;
 301
 302                if (args->dry_run) {
 303                        ref->status = REF_STATUS_OK;
 304                } else {
 305                        char *old_hex = sha1_to_hex(ref->old_sha1);
 306                        char *new_hex = sha1_to_hex(ref->new_sha1);
 307                        int quiet = quiet_supported && (args->quiet || !args->progress);
 308
 309                        if (!cmds_sent && (status_report || use_sideband || quiet)) {
 310                                packet_buf_write(&req_buf,
 311                                                 "%s %s %s%c%s%s%s agent=%s",
 312                                                 old_hex, new_hex, ref->name, 0,
 313                                                 status_report ? " report-status" : "",
 314                                                 use_sideband ? " side-band-64k" : "",
 315                                                 quiet ? " quiet" : "",
 316                                                 git_user_agent_sanitized());
 317                        }
 318                        else
 319                                packet_buf_write(&req_buf, "%s %s %s",
 320                                                 old_hex, new_hex, ref->name);
 321                        ref->status = status_report ?
 322                                REF_STATUS_EXPECTING_REPORT :
 323                                REF_STATUS_OK;
 324                        cmds_sent++;
 325                }
 326        }
 327
 328        if (args->stateless_rpc) {
 329                if (!args->dry_run && cmds_sent) {
 330                        packet_buf_flush(&req_buf);
 331                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
 332                }
 333        } else {
 334                safe_write(out, req_buf.buf, req_buf.len);
 335                packet_flush(out);
 336        }
 337        strbuf_release(&req_buf);
 338
 339        if (use_sideband && cmds_sent) {
 340                memset(&demux, 0, sizeof(demux));
 341                demux.proc = sideband_demux;
 342                demux.data = fd;
 343                demux.out = -1;
 344                if (start_async(&demux))
 345                        die("send-pack: unable to fork off sideband demultiplexer");
 346                in = demux.out;
 347        }
 348
 349        if (new_refs && cmds_sent) {
 350                if (pack_objects(out, remote_refs, extra_have, args) < 0) {
 351                        for (ref = remote_refs; ref; ref = ref->next)
 352                                ref->status = REF_STATUS_NONE;
 353                        if (args->stateless_rpc)
 354                                close(out);
 355                        if (git_connection_is_socket(conn))
 356                                shutdown(fd[0], SHUT_WR);
 357                        if (use_sideband)
 358                                finish_async(&demux);
 359                        return -1;
 360                }
 361        }
 362        if (args->stateless_rpc && cmds_sent)
 363                packet_flush(out);
 364
 365        if (status_report && cmds_sent)
 366                ret = receive_status(in, remote_refs);
 367        else
 368                ret = 0;
 369        if (args->stateless_rpc)
 370                packet_flush(out);
 371
 372        if (use_sideband && cmds_sent) {
 373                if (finish_async(&demux)) {
 374                        error("error in sideband demultiplexer");
 375                        ret = -1;
 376                }
 377                close(demux.out);
 378        }
 379
 380        if (ret < 0)
 381                return ret;
 382
 383        if (args->porcelain)
 384                return 0;
 385
 386        for (ref = remote_refs; ref; ref = ref->next) {
 387                switch (ref->status) {
 388                case REF_STATUS_NONE:
 389                case REF_STATUS_UPTODATE:
 390                case REF_STATUS_OK:
 391                        break;
 392                default:
 393                        return -1;
 394                }
 395        }
 396        return 0;
 397}
 398
 399int cmd_send_pack(int argc, const char **argv, const char *prefix)
 400{
 401        int i, nr_refspecs = 0;
 402        const char **refspecs = NULL;
 403        const char *remote_name = NULL;
 404        struct remote *remote = NULL;
 405        const char *dest = NULL;
 406        int fd[2];
 407        struct child_process *conn;
 408        struct extra_have_objects extra_have;
 409        struct ref *remote_refs, *local_refs;
 410        int ret;
 411        int helper_status = 0;
 412        int send_all = 0;
 413        const char *receivepack = "git-receive-pack";
 414        int flags;
 415        int nonfastforward = 0;
 416        int progress = -1;
 417
 418        argv++;
 419        for (i = 1; i < argc; i++, argv++) {
 420                const char *arg = *argv;
 421
 422                if (*arg == '-') {
 423                        if (!prefixcmp(arg, "--receive-pack=")) {
 424                                receivepack = arg + 15;
 425                                continue;
 426                        }
 427                        if (!prefixcmp(arg, "--exec=")) {
 428                                receivepack = arg + 7;
 429                                continue;
 430                        }
 431                        if (!prefixcmp(arg, "--remote=")) {
 432                                remote_name = arg + 9;
 433                                continue;
 434                        }
 435                        if (!strcmp(arg, "--all")) {
 436                                send_all = 1;
 437                                continue;
 438                        }
 439                        if (!strcmp(arg, "--dry-run")) {
 440                                args.dry_run = 1;
 441                                continue;
 442                        }
 443                        if (!strcmp(arg, "--mirror")) {
 444                                args.send_mirror = 1;
 445                                continue;
 446                        }
 447                        if (!strcmp(arg, "--force")) {
 448                                args.force_update = 1;
 449                                continue;
 450                        }
 451                        if (!strcmp(arg, "--quiet")) {
 452                                args.quiet = 1;
 453                                continue;
 454                        }
 455                        if (!strcmp(arg, "--verbose")) {
 456                                args.verbose = 1;
 457                                continue;
 458                        }
 459                        if (!strcmp(arg, "--progress")) {
 460                                progress = 1;
 461                                continue;
 462                        }
 463                        if (!strcmp(arg, "--no-progress")) {
 464                                progress = 0;
 465                                continue;
 466                        }
 467                        if (!strcmp(arg, "--thin")) {
 468                                args.use_thin_pack = 1;
 469                                continue;
 470                        }
 471                        if (!strcmp(arg, "--stateless-rpc")) {
 472                                args.stateless_rpc = 1;
 473                                continue;
 474                        }
 475                        if (!strcmp(arg, "--helper-status")) {
 476                                helper_status = 1;
 477                                continue;
 478                        }
 479                        usage(send_pack_usage);
 480                }
 481                if (!dest) {
 482                        dest = arg;
 483                        continue;
 484                }
 485                refspecs = (const char **) argv;
 486                nr_refspecs = argc - i;
 487                break;
 488        }
 489        if (!dest)
 490                usage(send_pack_usage);
 491        /*
 492         * --all and --mirror are incompatible; neither makes sense
 493         * with any refspecs.
 494         */
 495        if ((refspecs && (send_all || args.send_mirror)) ||
 496            (send_all && args.send_mirror))
 497                usage(send_pack_usage);
 498
 499        if (remote_name) {
 500                remote = remote_get(remote_name);
 501                if (!remote_has_url(remote, dest)) {
 502                        die("Destination %s is not a uri for %s",
 503                            dest, remote_name);
 504                }
 505        }
 506
 507        if (progress == -1)
 508                progress = !args.quiet && isatty(2);
 509        args.progress = progress;
 510
 511        if (args.stateless_rpc) {
 512                conn = NULL;
 513                fd[0] = 0;
 514                fd[1] = 1;
 515        } else {
 516                conn = git_connect(fd, dest, receivepack,
 517                        args.verbose ? CONNECT_VERBOSE : 0);
 518        }
 519
 520        memset(&extra_have, 0, sizeof(extra_have));
 521
 522        get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
 523
 524        transport_verify_remote_names(nr_refspecs, refspecs);
 525
 526        local_refs = get_local_heads();
 527
 528        flags = MATCH_REFS_NONE;
 529
 530        if (send_all)
 531                flags |= MATCH_REFS_ALL;
 532        if (args.send_mirror)
 533                flags |= MATCH_REFS_MIRROR;
 534
 535        /* match them up */
 536        if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
 537                return -1;
 538
 539        set_ref_status_for_push(remote_refs, args.send_mirror,
 540                args.force_update);
 541
 542        ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
 543
 544        if (helper_status)
 545                print_helper_status(remote_refs);
 546
 547        close(fd[1]);
 548        close(fd[0]);
 549
 550        ret |= finish_connect(conn);
 551
 552        if (!helper_status)
 553                transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward);
 554
 555        if (!args.dry_run && remote) {
 556                struct ref *ref;
 557                for (ref = remote_refs; ref; ref = ref->next)
 558                        transport_update_tracking_ref(remote, ref, args.verbose);
 559        }
 560
 561        if (!ret && !transport_refs_pushed(remote_refs))
 562                fprintf(stderr, "Everything up-to-date\n");
 563
 564        return ret;
 565}