upload-pack.con commit Teach upload-pack to log the received need lines to an fd (49aaddd)
   1#include "cache.h"
   2#include "refs.h"
   3#include "pkt-line.h"
   4#include "sideband.h"
   5#include "tag.h"
   6#include "object.h"
   7#include "commit.h"
   8#include "exec_cmd.h"
   9#include "diff.h"
  10#include "revision.h"
  11#include "list-objects.h"
  12#include "run-command.h"
  13
  14static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
  15
  16/* bits #0..7 in revision.h, #8..10 in commit.c */
  17#define THEY_HAVE       (1u << 11)
  18#define OUR_REF         (1u << 12)
  19#define WANTED          (1u << 13)
  20#define COMMON_KNOWN    (1u << 14)
  21#define REACHABLE       (1u << 15)
  22
  23#define SHALLOW         (1u << 16)
  24#define NOT_SHALLOW     (1u << 17)
  25#define CLIENT_SHALLOW  (1u << 18)
  26
  27static unsigned long oldest_have;
  28
  29static int multi_ack, nr_our_refs;
  30static int use_thin_pack, use_ofs_delta, no_progress;
  31static struct object_array have_obj;
  32static struct object_array want_obj;
  33static unsigned int timeout;
  34/* 0 for no sideband,
  35 * otherwise maximum packet size (up to 65520 bytes).
  36 */
  37static int use_sideband;
  38static int debug_fd;
  39
  40static void reset_timeout(void)
  41{
  42        alarm(timeout);
  43}
  44
  45static int strip(char *line, int len)
  46{
  47        if (len && line[len-1] == '\n')
  48                line[--len] = 0;
  49        return len;
  50}
  51
  52static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
  53{
  54        if (use_sideband)
  55                return send_sideband(1, fd, data, sz, use_sideband);
  56        if (fd == 3)
  57                /* emergency quit */
  58                fd = 2;
  59        if (fd == 2) {
  60                /* XXX: are we happy to lose stuff here? */
  61                xwrite(fd, data, sz);
  62                return sz;
  63        }
  64        return safe_write(fd, data, sz);
  65}
  66
  67static FILE *pack_pipe = NULL;
  68static void show_commit(struct commit *commit)
  69{
  70        if (commit->object.flags & BOUNDARY)
  71                fputc('-', pack_pipe);
  72        if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
  73                die("broken output pipe");
  74        fputc('\n', pack_pipe);
  75        fflush(pack_pipe);
  76        free(commit->buffer);
  77        commit->buffer = NULL;
  78}
  79
  80static void show_object(struct object_array_entry *p)
  81{
  82        /* An object with name "foo\n0000000..." can be used to
  83         * confuse downstream git-pack-objects very badly.
  84         */
  85        const char *ep = strchr(p->name, '\n');
  86        if (ep) {
  87                fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(p->item->sha1),
  88                       (int) (ep - p->name),
  89                       p->name);
  90        }
  91        else
  92                fprintf(pack_pipe, "%s %s\n",
  93                                sha1_to_hex(p->item->sha1), p->name);
  94}
  95
  96static void show_edge(struct commit *commit)
  97{
  98        fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
  99}
 100
 101static int do_rev_list(int fd, void *create_full_pack)
 102{
 103        int i;
 104        struct rev_info revs;
 105
 106        pack_pipe = fdopen(fd, "w");
 107        if (create_full_pack)
 108                use_thin_pack = 0; /* no point doing it */
 109        init_revisions(&revs, NULL);
 110        revs.tag_objects = 1;
 111        revs.tree_objects = 1;
 112        revs.blob_objects = 1;
 113        if (use_thin_pack)
 114                revs.edge_hint = 1;
 115
 116        if (create_full_pack) {
 117                const char *args[] = {"rev-list", "--all", NULL};
 118                setup_revisions(2, args, &revs, NULL);
 119        } else {
 120                for (i = 0; i < want_obj.nr; i++) {
 121                        struct object *o = want_obj.objects[i].item;
 122                        /* why??? */
 123                        o->flags &= ~UNINTERESTING;
 124                        add_pending_object(&revs, o, NULL);
 125                }
 126                for (i = 0; i < have_obj.nr; i++) {
 127                        struct object *o = have_obj.objects[i].item;
 128                        o->flags |= UNINTERESTING;
 129                        add_pending_object(&revs, o, NULL);
 130                }
 131                setup_revisions(0, NULL, &revs, NULL);
 132        }
 133        if (prepare_revision_walk(&revs))
 134                die("revision walk setup failed");
 135        mark_edges_uninteresting(revs.commits, &revs, show_edge);
 136        traverse_commit_list(&revs, show_commit, show_object);
 137        return 0;
 138}
 139
 140static void create_pack_file(void)
 141{
 142        struct async rev_list;
 143        struct child_process pack_objects;
 144        int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
 145        char data[8193], progress[128];
 146        char abort_msg[] = "aborting due to possible repository "
 147                "corruption on the remote side.";
 148        int buffered = -1;
 149        ssize_t sz;
 150        const char *argv[10];
 151        int arg = 0;
 152
 153        rev_list.proc = do_rev_list;
 154        /* .data is just a boolean: any non-NULL value will do */
 155        rev_list.data = create_full_pack ? &rev_list : NULL;
 156        if (start_async(&rev_list))
 157                die("git-upload-pack: unable to fork git-rev-list");
 158
 159        argv[arg++] = "pack-objects";
 160        argv[arg++] = "--stdout";
 161        if (!no_progress)
 162                argv[arg++] = "--progress";
 163        if (use_ofs_delta)
 164                argv[arg++] = "--delta-base-offset";
 165        argv[arg++] = NULL;
 166
 167        memset(&pack_objects, 0, sizeof(pack_objects));
 168        pack_objects.in = rev_list.out; /* start_command closes it */
 169        pack_objects.out = -1;
 170        pack_objects.err = -1;
 171        pack_objects.git_cmd = 1;
 172        pack_objects.argv = argv;
 173
 174        if (start_command(&pack_objects))
 175                die("git-upload-pack: unable to fork git-pack-objects");
 176
 177        /* We read from pack_objects.err to capture stderr output for
 178         * progress bar, and pack_objects.out to capture the pack data.
 179         */
 180
 181        while (1) {
 182                struct pollfd pfd[2];
 183                int pe, pu, pollsize;
 184
 185                reset_timeout();
 186
 187                pollsize = 0;
 188                pe = pu = -1;
 189
 190                if (0 <= pack_objects.out) {
 191                        pfd[pollsize].fd = pack_objects.out;
 192                        pfd[pollsize].events = POLLIN;
 193                        pu = pollsize;
 194                        pollsize++;
 195                }
 196                if (0 <= pack_objects.err) {
 197                        pfd[pollsize].fd = pack_objects.err;
 198                        pfd[pollsize].events = POLLIN;
 199                        pe = pollsize;
 200                        pollsize++;
 201                }
 202
 203                if (!pollsize)
 204                        break;
 205
 206                if (poll(pfd, pollsize, -1) < 0) {
 207                        if (errno != EINTR) {
 208                                error("poll failed, resuming: %s",
 209                                      strerror(errno));
 210                                sleep(1);
 211                        }
 212                        continue;
 213                }
 214                if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
 215                        /* Data ready; we keep the last byte to ourselves
 216                         * in case we detect broken rev-list, so that we
 217                         * can leave the stream corrupted.  This is
 218                         * unfortunate -- unpack-objects would happily
 219                         * accept a valid packdata with trailing garbage,
 220                         * so appending garbage after we pass all the
 221                         * pack data is not good enough to signal
 222                         * breakage to downstream.
 223                         */
 224                        char *cp = data;
 225                        ssize_t outsz = 0;
 226                        if (0 <= buffered) {
 227                                *cp++ = buffered;
 228                                outsz++;
 229                        }
 230                        sz = xread(pack_objects.out, cp,
 231                                  sizeof(data) - outsz);
 232                        if (0 < sz)
 233                                        ;
 234                        else if (sz == 0) {
 235                                close(pack_objects.out);
 236                                pack_objects.out = -1;
 237                        }
 238                        else
 239                                goto fail;
 240                        sz += outsz;
 241                        if (1 < sz) {
 242                                buffered = data[sz-1] & 0xFF;
 243                                sz--;
 244                        }
 245                        else
 246                                buffered = -1;
 247                        sz = send_client_data(1, data, sz);
 248                        if (sz < 0)
 249                                goto fail;
 250                }
 251                if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
 252                        /* Status ready; we ship that in the side-band
 253                         * or dump to the standard error.
 254                         */
 255                        sz = xread(pack_objects.err, progress,
 256                                  sizeof(progress));
 257                        if (0 < sz)
 258                                send_client_data(2, progress, sz);
 259                        else if (sz == 0) {
 260                                close(pack_objects.err);
 261                                pack_objects.err = -1;
 262                        }
 263                        else
 264                                goto fail;
 265                }
 266        }
 267
 268        if (finish_command(&pack_objects)) {
 269                error("git-upload-pack: git-pack-objects died with error.");
 270                goto fail;
 271        }
 272        if (finish_async(&rev_list))
 273                goto fail;      /* error was already reported */
 274
 275        /* flush the data */
 276        if (0 <= buffered) {
 277                data[0] = buffered;
 278                sz = send_client_data(1, data, 1);
 279                if (sz < 0)
 280                        goto fail;
 281                fprintf(stderr, "flushed.\n");
 282        }
 283        if (use_sideband)
 284                packet_flush(1);
 285        return;
 286
 287 fail:
 288        send_client_data(3, abort_msg, sizeof(abort_msg));
 289        die("git-upload-pack: %s", abort_msg);
 290}
 291
 292static int got_sha1(char *hex, unsigned char *sha1)
 293{
 294        struct object *o;
 295        int we_knew_they_have = 0;
 296
 297        if (get_sha1_hex(hex, sha1))
 298                die("git-upload-pack: expected SHA1 object, got '%s'", hex);
 299        if (!has_sha1_file(sha1))
 300                return -1;
 301
 302        o = lookup_object(sha1);
 303        if (!(o && o->parsed))
 304                o = parse_object(sha1);
 305        if (!o)
 306                die("oops (%s)", sha1_to_hex(sha1));
 307        if (o->type == OBJ_COMMIT) {
 308                struct commit_list *parents;
 309                struct commit *commit = (struct commit *)o;
 310                if (o->flags & THEY_HAVE)
 311                        we_knew_they_have = 1;
 312                else
 313                        o->flags |= THEY_HAVE;
 314                if (!oldest_have || (commit->date < oldest_have))
 315                        oldest_have = commit->date;
 316                for (parents = commit->parents;
 317                     parents;
 318                     parents = parents->next)
 319                        parents->item->object.flags |= THEY_HAVE;
 320        }
 321        if (!we_knew_they_have) {
 322                add_object_array(o, NULL, &have_obj);
 323                return 1;
 324        }
 325        return 0;
 326}
 327
 328static int reachable(struct commit *want)
 329{
 330        struct commit_list *work = NULL;
 331
 332        insert_by_date(want, &work);
 333        while (work) {
 334                struct commit_list *list = work->next;
 335                struct commit *commit = work->item;
 336                free(work);
 337                work = list;
 338
 339                if (commit->object.flags & THEY_HAVE) {
 340                        want->object.flags |= COMMON_KNOWN;
 341                        break;
 342                }
 343                if (!commit->object.parsed)
 344                        parse_object(commit->object.sha1);
 345                if (commit->object.flags & REACHABLE)
 346                        continue;
 347                commit->object.flags |= REACHABLE;
 348                if (commit->date < oldest_have)
 349                        continue;
 350                for (list = commit->parents; list; list = list->next) {
 351                        struct commit *parent = list->item;
 352                        if (!(parent->object.flags & REACHABLE))
 353                                insert_by_date(parent, &work);
 354                }
 355        }
 356        want->object.flags |= REACHABLE;
 357        clear_commit_marks(want, REACHABLE);
 358        free_commit_list(work);
 359        return (want->object.flags & COMMON_KNOWN);
 360}
 361
 362static int ok_to_give_up(void)
 363{
 364        int i;
 365
 366        if (!have_obj.nr)
 367                return 0;
 368
 369        for (i = 0; i < want_obj.nr; i++) {
 370                struct object *want = want_obj.objects[i].item;
 371
 372                if (want->flags & COMMON_KNOWN)
 373                        continue;
 374                want = deref_tag(want, "a want line", 0);
 375                if (!want || want->type != OBJ_COMMIT) {
 376                        /* no way to tell if this is reachable by
 377                         * looking at the ancestry chain alone, so
 378                         * leave a note to ourselves not to worry about
 379                         * this object anymore.
 380                         */
 381                        want_obj.objects[i].item->flags |= COMMON_KNOWN;
 382                        continue;
 383                }
 384                if (!reachable((struct commit *)want))
 385                        return 0;
 386        }
 387        return 1;
 388}
 389
 390static int get_common_commits(void)
 391{
 392        static char line[1000];
 393        unsigned char sha1[20];
 394        char hex[41], last_hex[41];
 395        int len;
 396
 397        save_commit_buffer = 0;
 398
 399        for(;;) {
 400                len = packet_read_line(0, line, sizeof(line));
 401                reset_timeout();
 402
 403                if (!len) {
 404                        if (have_obj.nr == 0 || multi_ack)
 405                                packet_write(1, "NAK\n");
 406                        continue;
 407                }
 408                len = strip(line, len);
 409                if (!prefixcmp(line, "have ")) {
 410                        switch (got_sha1(line+5, sha1)) {
 411                        case -1: /* they have what we do not */
 412                                if (multi_ack && ok_to_give_up())
 413                                        packet_write(1, "ACK %s continue\n",
 414                                                     sha1_to_hex(sha1));
 415                                break;
 416                        default:
 417                                memcpy(hex, sha1_to_hex(sha1), 41);
 418                                if (multi_ack) {
 419                                        const char *msg = "ACK %s continue\n";
 420                                        packet_write(1, msg, hex);
 421                                        memcpy(last_hex, hex, 41);
 422                                }
 423                                else if (have_obj.nr == 1)
 424                                        packet_write(1, "ACK %s\n", hex);
 425                                break;
 426                        }
 427                        continue;
 428                }
 429                if (!strcmp(line, "done")) {
 430                        if (have_obj.nr > 0) {
 431                                if (multi_ack)
 432                                        packet_write(1, "ACK %s\n", last_hex);
 433                                return 0;
 434                        }
 435                        packet_write(1, "NAK\n");
 436                        return -1;
 437                }
 438                die("git-upload-pack: expected SHA1 list, got '%s'", line);
 439        }
 440}
 441
 442static void receive_needs(void)
 443{
 444        struct object_array shallows = {0, 0, NULL};
 445        static char line[1000];
 446        int len, depth = 0;
 447
 448        if (debug_fd)
 449                write_in_full(debug_fd, "#S\n", 3);
 450        for (;;) {
 451                struct object *o;
 452                unsigned char sha1_buf[20];
 453                len = packet_read_line(0, line, sizeof(line));
 454                reset_timeout();
 455                if (!len)
 456                        break;
 457                if (debug_fd)
 458                        write_in_full(debug_fd, line, len);
 459
 460                if (!prefixcmp(line, "shallow ")) {
 461                        unsigned char sha1[20];
 462                        struct object *object;
 463                        use_thin_pack = 0;
 464                        if (get_sha1(line + 8, sha1))
 465                                die("invalid shallow line: %s", line);
 466                        object = parse_object(sha1);
 467                        if (!object)
 468                                die("did not find object for %s", line);
 469                        object->flags |= CLIENT_SHALLOW;
 470                        add_object_array(object, NULL, &shallows);
 471                        continue;
 472                }
 473                if (!prefixcmp(line, "deepen ")) {
 474                        char *end;
 475                        use_thin_pack = 0;
 476                        depth = strtol(line + 7, &end, 0);
 477                        if (end == line + 7 || depth <= 0)
 478                                die("Invalid deepen: %s", line);
 479                        continue;
 480                }
 481                if (prefixcmp(line, "want ") ||
 482                    get_sha1_hex(line+5, sha1_buf))
 483                        die("git-upload-pack: protocol error, "
 484                            "expected to get sha, not '%s'", line);
 485                if (strstr(line+45, "multi_ack"))
 486                        multi_ack = 1;
 487                if (strstr(line+45, "thin-pack"))
 488                        use_thin_pack = 1;
 489                if (strstr(line+45, "ofs-delta"))
 490                        use_ofs_delta = 1;
 491                if (strstr(line+45, "side-band-64k"))
 492                        use_sideband = LARGE_PACKET_MAX;
 493                else if (strstr(line+45, "side-band"))
 494                        use_sideband = DEFAULT_PACKET_MAX;
 495                if (strstr(line+45, "no-progress"))
 496                        no_progress = 1;
 497
 498                /* We have sent all our refs already, and the other end
 499                 * should have chosen out of them; otherwise they are
 500                 * asking for nonsense.
 501                 *
 502                 * Hmph.  We may later want to allow "want" line that
 503                 * asks for something like "master~10" (symbolic)...
 504                 * would it make sense?  I don't know.
 505                 */
 506                o = lookup_object(sha1_buf);
 507                if (!o || !(o->flags & OUR_REF))
 508                        die("git-upload-pack: not our ref %s", line+5);
 509                if (!(o->flags & WANTED)) {
 510                        o->flags |= WANTED;
 511                        add_object_array(o, NULL, &want_obj);
 512                }
 513        }
 514        if (debug_fd)
 515                write_in_full(debug_fd, "#E\n", 3);
 516        if (depth == 0 && shallows.nr == 0)
 517                return;
 518        if (depth > 0) {
 519                struct commit_list *result, *backup;
 520                int i;
 521                backup = result = get_shallow_commits(&want_obj, depth,
 522                        SHALLOW, NOT_SHALLOW);
 523                while (result) {
 524                        struct object *object = &result->item->object;
 525                        if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
 526                                packet_write(1, "shallow %s",
 527                                                sha1_to_hex(object->sha1));
 528                                register_shallow(object->sha1);
 529                        }
 530                        result = result->next;
 531                }
 532                free_commit_list(backup);
 533                for (i = 0; i < shallows.nr; i++) {
 534                        struct object *object = shallows.objects[i].item;
 535                        if (object->flags & NOT_SHALLOW) {
 536                                struct commit_list *parents;
 537                                packet_write(1, "unshallow %s",
 538                                        sha1_to_hex(object->sha1));
 539                                object->flags &= ~CLIENT_SHALLOW;
 540                                /* make sure the real parents are parsed */
 541                                unregister_shallow(object->sha1);
 542                                object->parsed = 0;
 543                                if (parse_commit((struct commit *)object))
 544                                        die("invalid commit");
 545                                parents = ((struct commit *)object)->parents;
 546                                while (parents) {
 547                                        add_object_array(&parents->item->object,
 548                                                        NULL, &want_obj);
 549                                        parents = parents->next;
 550                                }
 551                        }
 552                        /* make sure commit traversal conforms to client */
 553                        register_shallow(object->sha1);
 554                }
 555                packet_flush(1);
 556        } else
 557                if (shallows.nr > 0) {
 558                        int i;
 559                        for (i = 0; i < shallows.nr; i++)
 560                                register_shallow(shallows.objects[i].item->sha1);
 561                }
 562        free(shallows.objects);
 563}
 564
 565static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 566{
 567        static const char *capabilities = "multi_ack thin-pack side-band"
 568                " side-band-64k ofs-delta shallow no-progress";
 569        struct object *o = parse_object(sha1);
 570
 571        if (!o)
 572                die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
 573
 574        if (capabilities)
 575                packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
 576                        0, capabilities);
 577        else
 578                packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
 579        capabilities = NULL;
 580        if (!(o->flags & OUR_REF)) {
 581                o->flags |= OUR_REF;
 582                nr_our_refs++;
 583        }
 584        if (o->type == OBJ_TAG) {
 585                o = deref_tag(o, refname, 0);
 586                if (o)
 587                        packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
 588        }
 589        return 0;
 590}
 591
 592static void upload_pack(void)
 593{
 594        reset_timeout();
 595        head_ref(send_ref, NULL);
 596        for_each_ref(send_ref, NULL);
 597        packet_flush(1);
 598        receive_needs();
 599        if (want_obj.nr) {
 600                get_common_commits();
 601                create_pack_file();
 602        }
 603}
 604
 605int main(int argc, char **argv)
 606{
 607        char *dir;
 608        int i;
 609        int strict = 0;
 610
 611        for (i = 1; i < argc; i++) {
 612                char *arg = argv[i];
 613
 614                if (arg[0] != '-')
 615                        break;
 616                if (!strcmp(arg, "--strict")) {
 617                        strict = 1;
 618                        continue;
 619                }
 620                if (!prefixcmp(arg, "--timeout=")) {
 621                        timeout = atoi(arg+10);
 622                        continue;
 623                }
 624                if (!strcmp(arg, "--")) {
 625                        i++;
 626                        break;
 627                }
 628        }
 629
 630        if (i != argc-1)
 631                usage(upload_pack_usage);
 632
 633        setup_path(NULL);
 634
 635        dir = argv[i];
 636
 637        if (!enter_repo(dir, strict))
 638                die("'%s': unable to chdir or not a git archive", dir);
 639        if (is_repository_shallow())
 640                die("attempt to fetch/clone from a shallow repository");
 641        if (getenv("GIT_DEBUG_SEND_PACK"))
 642                debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
 643        upload_pack();
 644        return 0;
 645}