fast-import.con commit Bisect: refactor "bisect_{bad,good,skip}" into "bisect_state". (155fc79)
   1/*
   2Format of STDIN stream:
   3
   4  stream ::= cmd*;
   5
   6  cmd ::= new_blob
   7        | new_commit
   8        | new_tag
   9        | reset_branch
  10        | checkpoint
  11        | progress
  12        ;
  13
  14  new_blob ::= 'blob' lf
  15    mark?
  16    file_content;
  17  file_content ::= data;
  18
  19  new_commit ::= 'commit' sp ref_str lf
  20    mark?
  21    ('author' sp name '<' email '>' when lf)?
  22    'committer' sp name '<' email '>' when lf
  23    commit_msg
  24    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
  25    ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
  26    file_change*
  27    lf?;
  28  commit_msg ::= data;
  29
  30  file_change ::= file_clr
  31    | file_del
  32    | file_rnm
  33    | file_cpy
  34    | file_obm
  35    | file_inm;
  36  file_clr ::= 'deleteall' lf;
  37  file_del ::= 'D' sp path_str lf;
  38  file_rnm ::= 'R' sp path_str sp path_str lf;
  39  file_cpy ::= 'C' sp path_str sp path_str lf;
  40  file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
  41  file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
  42    data;
  43
  44  new_tag ::= 'tag' sp tag_str lf
  45    'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
  46    'tagger' sp name '<' email '>' when lf
  47    tag_msg;
  48  tag_msg ::= data;
  49
  50  reset_branch ::= 'reset' sp ref_str lf
  51    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
  52    lf?;
  53
  54  checkpoint ::= 'checkpoint' lf
  55    lf?;
  56
  57  progress ::= 'progress' sp not_lf* lf
  58    lf?;
  59
  60     # note: the first idnum in a stream should be 1 and subsequent
  61     # idnums should not have gaps between values as this will cause
  62     # the stream parser to reserve space for the gapped values.  An
  63     # idnum can be updated in the future to a new object by issuing
  64     # a new mark directive with the old idnum.
  65     #
  66  mark ::= 'mark' sp idnum lf;
  67  data ::= (delimited_data | exact_data)
  68    lf?;
  69
  70    # note: delim may be any string but must not contain lf.
  71    # data_line may contain any data but must not be exactly
  72    # delim.
  73  delimited_data ::= 'data' sp '<<' delim lf
  74    (data_line lf)*
  75    delim lf;
  76
  77     # note: declen indicates the length of binary_data in bytes.
  78     # declen does not include the lf preceeding the binary data.
  79     #
  80  exact_data ::= 'data' sp declen lf
  81    binary_data;
  82
  83     # note: quoted strings are C-style quoting supporting \c for
  84     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
  85     # is the signed byte value in octal.  Note that the only
  86     # characters which must actually be escaped to protect the
  87     # stream formatting is: \, " and LF.  Otherwise these values
  88     # are UTF8.
  89     #
  90  ref_str     ::= ref;
  91  sha1exp_str ::= sha1exp;
  92  tag_str     ::= tag;
  93  path_str    ::= path    | '"' quoted(path)    '"' ;
  94  mode        ::= '100644' | '644'
  95                | '100755' | '755'
  96                | '120000'
  97                ;
  98
  99  declen ::= # unsigned 32 bit value, ascii base10 notation;
 100  bigint ::= # unsigned integer value, ascii base10 notation;
 101  binary_data ::= # file content, not interpreted;
 102
 103  when         ::= raw_when | rfc2822_when;
 104  raw_when     ::= ts sp tz;
 105  rfc2822_when ::= # Valid RFC 2822 date and time;
 106
 107  sp ::= # ASCII space character;
 108  lf ::= # ASCII newline (LF) character;
 109
 110     # note: a colon (':') must precede the numerical value assigned to
 111     # an idnum.  This is to distinguish it from a ref or tag name as
 112     # GIT does not permit ':' in ref or tag strings.
 113     #
 114  idnum   ::= ':' bigint;
 115  path    ::= # GIT style file path, e.g. "a/b/c";
 116  ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
 117  tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
 118  sha1exp ::= # Any valid GIT SHA1 expression;
 119  hexsha1 ::= # SHA1 in hexadecimal format;
 120
 121     # note: name and email are UTF8 strings, however name must not
 122     # contain '<' or lf and email must not contain any of the
 123     # following: '<', '>', lf.
 124     #
 125  name  ::= # valid GIT author/committer name;
 126  email ::= # valid GIT author/committer email;
 127  ts    ::= # time since the epoch in seconds, ascii base10 notation;
 128  tz    ::= # GIT style timezone;
 129
 130     # note: comments may appear anywhere in the input, except
 131     # within a data command.  Any form of the data command
 132     # always escapes the related input from comment processing.
 133     #
 134     # In case it is not clear, the '#' that starts the comment
 135     # must be the first character on that the line (an lf have
 136     # preceeded it).
 137     #
 138  comment ::= '#' not_lf* lf;
 139  not_lf  ::= # Any byte that is not ASCII newline (LF);
 140*/
 141
 142#include "builtin.h"
 143#include "cache.h"
 144#include "object.h"
 145#include "blob.h"
 146#include "tree.h"
 147#include "commit.h"
 148#include "delta.h"
 149#include "pack.h"
 150#include "refs.h"
 151#include "csum-file.h"
 152#include "quote.h"
 153
 154#define PACK_ID_BITS 16
 155#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
 156
 157struct object_entry
 158{
 159        struct object_entry *next;
 160        uint32_t offset;
 161        unsigned type : TYPE_BITS;
 162        unsigned pack_id : PACK_ID_BITS;
 163        unsigned char sha1[20];
 164};
 165
 166struct object_entry_pool
 167{
 168        struct object_entry_pool *next_pool;
 169        struct object_entry *next_free;
 170        struct object_entry *end;
 171        struct object_entry entries[FLEX_ARRAY]; /* more */
 172};
 173
 174struct mark_set
 175{
 176        union {
 177                struct object_entry *marked[1024];
 178                struct mark_set *sets[1024];
 179        } data;
 180        unsigned int shift;
 181};
 182
 183struct last_object
 184{
 185        struct strbuf data;
 186        uint32_t offset;
 187        unsigned int depth;
 188        unsigned no_swap : 1;
 189};
 190
 191struct mem_pool
 192{
 193        struct mem_pool *next_pool;
 194        char *next_free;
 195        char *end;
 196        char space[FLEX_ARRAY]; /* more */
 197};
 198
 199struct atom_str
 200{
 201        struct atom_str *next_atom;
 202        unsigned short str_len;
 203        char str_dat[FLEX_ARRAY]; /* more */
 204};
 205
 206struct tree_content;
 207struct tree_entry
 208{
 209        struct tree_content *tree;
 210        struct atom_str* name;
 211        struct tree_entry_ms
 212        {
 213                uint16_t mode;
 214                unsigned char sha1[20];
 215        } versions[2];
 216};
 217
 218struct tree_content
 219{
 220        unsigned int entry_capacity; /* must match avail_tree_content */
 221        unsigned int entry_count;
 222        unsigned int delta_depth;
 223        struct tree_entry *entries[FLEX_ARRAY]; /* more */
 224};
 225
 226struct avail_tree_content
 227{
 228        unsigned int entry_capacity; /* must match tree_content */
 229        struct avail_tree_content *next_avail;
 230};
 231
 232struct branch
 233{
 234        struct branch *table_next_branch;
 235        struct branch *active_next_branch;
 236        const char *name;
 237        struct tree_entry branch_tree;
 238        uintmax_t last_commit;
 239        unsigned active : 1;
 240        unsigned pack_id : PACK_ID_BITS;
 241        unsigned char sha1[20];
 242};
 243
 244struct tag
 245{
 246        struct tag *next_tag;
 247        const char *name;
 248        unsigned int pack_id;
 249        unsigned char sha1[20];
 250};
 251
 252struct hash_list
 253{
 254        struct hash_list *next;
 255        unsigned char sha1[20];
 256};
 257
 258typedef enum {
 259        WHENSPEC_RAW = 1,
 260        WHENSPEC_RFC2822,
 261        WHENSPEC_NOW,
 262} whenspec_type;
 263
 264struct recent_command
 265{
 266        struct recent_command *prev;
 267        struct recent_command *next;
 268        char *buf;
 269};
 270
 271/* Configured limits on output */
 272static unsigned long max_depth = 10;
 273static off_t max_packsize = (1LL << 32) - 1;
 274static int force_update;
 275
 276/* Stats and misc. counters */
 277static uintmax_t alloc_count;
 278static uintmax_t marks_set_count;
 279static uintmax_t object_count_by_type[1 << TYPE_BITS];
 280static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
 281static uintmax_t delta_count_by_type[1 << TYPE_BITS];
 282static unsigned long object_count;
 283static unsigned long branch_count;
 284static unsigned long branch_load_count;
 285static int failure;
 286static FILE *pack_edges;
 287
 288/* Memory pools */
 289static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
 290static size_t total_allocd;
 291static struct mem_pool *mem_pool;
 292
 293/* Atom management */
 294static unsigned int atom_table_sz = 4451;
 295static unsigned int atom_cnt;
 296static struct atom_str **atom_table;
 297
 298/* The .pack file being generated */
 299static unsigned int pack_id;
 300static struct packed_git *pack_data;
 301static struct packed_git **all_packs;
 302static unsigned long pack_size;
 303
 304/* Table of objects we've written. */
 305static unsigned int object_entry_alloc = 5000;
 306static struct object_entry_pool *blocks;
 307static struct object_entry *object_table[1 << 16];
 308static struct mark_set *marks;
 309static const char* mark_file;
 310
 311/* Our last blob */
 312static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
 313
 314/* Tree management */
 315static unsigned int tree_entry_alloc = 1000;
 316static void *avail_tree_entry;
 317static unsigned int avail_tree_table_sz = 100;
 318static struct avail_tree_content **avail_tree_table;
 319static struct strbuf old_tree = STRBUF_INIT;
 320static struct strbuf new_tree = STRBUF_INIT;
 321
 322/* Branch data */
 323static unsigned long max_active_branches = 5;
 324static unsigned long cur_active_branches;
 325static unsigned long branch_table_sz = 1039;
 326static struct branch **branch_table;
 327static struct branch *active_branches;
 328
 329/* Tag data */
 330static struct tag *first_tag;
 331static struct tag *last_tag;
 332
 333/* Input stream parsing */
 334static whenspec_type whenspec = WHENSPEC_RAW;
 335static struct strbuf command_buf = STRBUF_INIT;
 336static int unread_command_buf;
 337static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
 338static struct recent_command *cmd_tail = &cmd_hist;
 339static struct recent_command *rc_free;
 340static unsigned int cmd_save = 100;
 341static uintmax_t next_mark;
 342static struct strbuf new_data = STRBUF_INIT;
 343
 344static void write_branch_report(FILE *rpt, struct branch *b)
 345{
 346        fprintf(rpt, "%s:\n", b->name);
 347
 348        fprintf(rpt, "  status      :");
 349        if (b->active)
 350                fputs(" active", rpt);
 351        if (b->branch_tree.tree)
 352                fputs(" loaded", rpt);
 353        if (is_null_sha1(b->branch_tree.versions[1].sha1))
 354                fputs(" dirty", rpt);
 355        fputc('\n', rpt);
 356
 357        fprintf(rpt, "  tip commit  : %s\n", sha1_to_hex(b->sha1));
 358        fprintf(rpt, "  old tree    : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
 359        fprintf(rpt, "  cur tree    : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
 360        fprintf(rpt, "  commit clock: %" PRIuMAX "\n", b->last_commit);
 361
 362        fputs("  last pack   : ", rpt);
 363        if (b->pack_id < MAX_PACK_ID)
 364                fprintf(rpt, "%u", b->pack_id);
 365        fputc('\n', rpt);
 366
 367        fputc('\n', rpt);
 368}
 369
 370static void write_crash_report(const char *err)
 371{
 372        char *loc = git_path("fast_import_crash_%d", getpid());
 373        FILE *rpt = fopen(loc, "w");
 374        struct branch *b;
 375        unsigned long lu;
 376        struct recent_command *rc;
 377
 378        if (!rpt) {
 379                error("can't write crash report %s: %s", loc, strerror(errno));
 380                return;
 381        }
 382
 383        fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
 384
 385        fprintf(rpt, "fast-import crash report:\n");
 386        fprintf(rpt, "    fast-import process: %d\n", getpid());
 387        fprintf(rpt, "    parent process     : %d\n", getppid());
 388        fprintf(rpt, "    at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
 389        fputc('\n', rpt);
 390
 391        fputs("fatal: ", rpt);
 392        fputs(err, rpt);
 393        fputc('\n', rpt);
 394
 395        fputc('\n', rpt);
 396        fputs("Most Recent Commands Before Crash\n", rpt);
 397        fputs("---------------------------------\n", rpt);
 398        for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
 399                if (rc->next == &cmd_hist)
 400                        fputs("* ", rpt);
 401                else
 402                        fputs("  ", rpt);
 403                fputs(rc->buf, rpt);
 404                fputc('\n', rpt);
 405        }
 406
 407        fputc('\n', rpt);
 408        fputs("Active Branch LRU\n", rpt);
 409        fputs("-----------------\n", rpt);
 410        fprintf(rpt, "    active_branches = %lu cur, %lu max\n",
 411                cur_active_branches,
 412                max_active_branches);
 413        fputc('\n', rpt);
 414        fputs("  pos  clock name\n", rpt);
 415        fputs("  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
 416        for (b = active_branches, lu = 0; b; b = b->active_next_branch)
 417                fprintf(rpt, "  %2lu) %6" PRIuMAX" %s\n",
 418                        ++lu, b->last_commit, b->name);
 419
 420        fputc('\n', rpt);
 421        fputs("Inactive Branches\n", rpt);
 422        fputs("-----------------\n", rpt);
 423        for (lu = 0; lu < branch_table_sz; lu++) {
 424                for (b = branch_table[lu]; b; b = b->table_next_branch)
 425                        write_branch_report(rpt, b);
 426        }
 427
 428        fputc('\n', rpt);
 429        fputs("-------------------\n", rpt);
 430        fputs("END OF CRASH REPORT\n", rpt);
 431        fclose(rpt);
 432}
 433
 434static NORETURN void die_nicely(const char *err, va_list params)
 435{
 436        static int zombie;
 437        char message[2 * PATH_MAX];
 438
 439        vsnprintf(message, sizeof(message), err, params);
 440        fputs("fatal: ", stderr);
 441        fputs(message, stderr);
 442        fputc('\n', stderr);
 443
 444        if (!zombie) {
 445                zombie = 1;
 446                write_crash_report(message);
 447        }
 448        exit(128);
 449}
 450
 451static void alloc_objects(unsigned int cnt)
 452{
 453        struct object_entry_pool *b;
 454
 455        b = xmalloc(sizeof(struct object_entry_pool)
 456                + cnt * sizeof(struct object_entry));
 457        b->next_pool = blocks;
 458        b->next_free = b->entries;
 459        b->end = b->entries + cnt;
 460        blocks = b;
 461        alloc_count += cnt;
 462}
 463
 464static struct object_entry *new_object(unsigned char *sha1)
 465{
 466        struct object_entry *e;
 467
 468        if (blocks->next_free == blocks->end)
 469                alloc_objects(object_entry_alloc);
 470
 471        e = blocks->next_free++;
 472        hashcpy(e->sha1, sha1);
 473        return e;
 474}
 475
 476static struct object_entry *find_object(unsigned char *sha1)
 477{
 478        unsigned int h = sha1[0] << 8 | sha1[1];
 479        struct object_entry *e;
 480        for (e = object_table[h]; e; e = e->next)
 481                if (!hashcmp(sha1, e->sha1))
 482                        return e;
 483        return NULL;
 484}
 485
 486static struct object_entry *insert_object(unsigned char *sha1)
 487{
 488        unsigned int h = sha1[0] << 8 | sha1[1];
 489        struct object_entry *e = object_table[h];
 490        struct object_entry *p = NULL;
 491
 492        while (e) {
 493                if (!hashcmp(sha1, e->sha1))
 494                        return e;
 495                p = e;
 496                e = e->next;
 497        }
 498
 499        e = new_object(sha1);
 500        e->next = NULL;
 501        e->offset = 0;
 502        if (p)
 503                p->next = e;
 504        else
 505                object_table[h] = e;
 506        return e;
 507}
 508
 509static unsigned int hc_str(const char *s, size_t len)
 510{
 511        unsigned int r = 0;
 512        while (len-- > 0)
 513                r = r * 31 + *s++;
 514        return r;
 515}
 516
 517static void *pool_alloc(size_t len)
 518{
 519        struct mem_pool *p;
 520        void *r;
 521
 522        for (p = mem_pool; p; p = p->next_pool)
 523                if ((p->end - p->next_free >= len))
 524                        break;
 525
 526        if (!p) {
 527                if (len >= (mem_pool_alloc/2)) {
 528                        total_allocd += len;
 529                        return xmalloc(len);
 530                }
 531                total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
 532                p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
 533                p->next_pool = mem_pool;
 534                p->next_free = p->space;
 535                p->end = p->next_free + mem_pool_alloc;
 536                mem_pool = p;
 537        }
 538
 539        r = p->next_free;
 540        /* round out to a pointer alignment */
 541        if (len & (sizeof(void*) - 1))
 542                len += sizeof(void*) - (len & (sizeof(void*) - 1));
 543        p->next_free += len;
 544        return r;
 545}
 546
 547static void *pool_calloc(size_t count, size_t size)
 548{
 549        size_t len = count * size;
 550        void *r = pool_alloc(len);
 551        memset(r, 0, len);
 552        return r;
 553}
 554
 555static char *pool_strdup(const char *s)
 556{
 557        char *r = pool_alloc(strlen(s) + 1);
 558        strcpy(r, s);
 559        return r;
 560}
 561
 562static void insert_mark(uintmax_t idnum, struct object_entry *oe)
 563{
 564        struct mark_set *s = marks;
 565        while ((idnum >> s->shift) >= 1024) {
 566                s = pool_calloc(1, sizeof(struct mark_set));
 567                s->shift = marks->shift + 10;
 568                s->data.sets[0] = marks;
 569                marks = s;
 570        }
 571        while (s->shift) {
 572                uintmax_t i = idnum >> s->shift;
 573                idnum -= i << s->shift;
 574                if (!s->data.sets[i]) {
 575                        s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
 576                        s->data.sets[i]->shift = s->shift - 10;
 577                }
 578                s = s->data.sets[i];
 579        }
 580        if (!s->data.marked[idnum])
 581                marks_set_count++;
 582        s->data.marked[idnum] = oe;
 583}
 584
 585static struct object_entry *find_mark(uintmax_t idnum)
 586{
 587        uintmax_t orig_idnum = idnum;
 588        struct mark_set *s = marks;
 589        struct object_entry *oe = NULL;
 590        if ((idnum >> s->shift) < 1024) {
 591                while (s && s->shift) {
 592                        uintmax_t i = idnum >> s->shift;
 593                        idnum -= i << s->shift;
 594                        s = s->data.sets[i];
 595                }
 596                if (s)
 597                        oe = s->data.marked[idnum];
 598        }
 599        if (!oe)
 600                die("mark :%" PRIuMAX " not declared", orig_idnum);
 601        return oe;
 602}
 603
 604static struct atom_str *to_atom(const char *s, unsigned short len)
 605{
 606        unsigned int hc = hc_str(s, len) % atom_table_sz;
 607        struct atom_str *c;
 608
 609        for (c = atom_table[hc]; c; c = c->next_atom)
 610                if (c->str_len == len && !strncmp(s, c->str_dat, len))
 611                        return c;
 612
 613        c = pool_alloc(sizeof(struct atom_str) + len + 1);
 614        c->str_len = len;
 615        strncpy(c->str_dat, s, len);
 616        c->str_dat[len] = 0;
 617        c->next_atom = atom_table[hc];
 618        atom_table[hc] = c;
 619        atom_cnt++;
 620        return c;
 621}
 622
 623static struct branch *lookup_branch(const char *name)
 624{
 625        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 626        struct branch *b;
 627
 628        for (b = branch_table[hc]; b; b = b->table_next_branch)
 629                if (!strcmp(name, b->name))
 630                        return b;
 631        return NULL;
 632}
 633
 634static struct branch *new_branch(const char *name)
 635{
 636        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 637        struct branch* b = lookup_branch(name);
 638
 639        if (b)
 640                die("Invalid attempt to create duplicate branch: %s", name);
 641        switch (check_ref_format(name)) {
 642        case  0: break; /* its valid */
 643        case -2: break; /* valid, but too few '/', allow anyway */
 644        default:
 645                die("Branch name doesn't conform to GIT standards: %s", name);
 646        }
 647
 648        b = pool_calloc(1, sizeof(struct branch));
 649        b->name = pool_strdup(name);
 650        b->table_next_branch = branch_table[hc];
 651        b->branch_tree.versions[0].mode = S_IFDIR;
 652        b->branch_tree.versions[1].mode = S_IFDIR;
 653        b->active = 0;
 654        b->pack_id = MAX_PACK_ID;
 655        branch_table[hc] = b;
 656        branch_count++;
 657        return b;
 658}
 659
 660static unsigned int hc_entries(unsigned int cnt)
 661{
 662        cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
 663        return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
 664}
 665
 666static struct tree_content *new_tree_content(unsigned int cnt)
 667{
 668        struct avail_tree_content *f, *l = NULL;
 669        struct tree_content *t;
 670        unsigned int hc = hc_entries(cnt);
 671
 672        for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
 673                if (f->entry_capacity >= cnt)
 674                        break;
 675
 676        if (f) {
 677                if (l)
 678                        l->next_avail = f->next_avail;
 679                else
 680                        avail_tree_table[hc] = f->next_avail;
 681        } else {
 682                cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
 683                f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
 684                f->entry_capacity = cnt;
 685        }
 686
 687        t = (struct tree_content*)f;
 688        t->entry_count = 0;
 689        t->delta_depth = 0;
 690        return t;
 691}
 692
 693static void release_tree_entry(struct tree_entry *e);
 694static void release_tree_content(struct tree_content *t)
 695{
 696        struct avail_tree_content *f = (struct avail_tree_content*)t;
 697        unsigned int hc = hc_entries(f->entry_capacity);
 698        f->next_avail = avail_tree_table[hc];
 699        avail_tree_table[hc] = f;
 700}
 701
 702static void release_tree_content_recursive(struct tree_content *t)
 703{
 704        unsigned int i;
 705        for (i = 0; i < t->entry_count; i++)
 706                release_tree_entry(t->entries[i]);
 707        release_tree_content(t);
 708}
 709
 710static struct tree_content *grow_tree_content(
 711        struct tree_content *t,
 712        int amt)
 713{
 714        struct tree_content *r = new_tree_content(t->entry_count + amt);
 715        r->entry_count = t->entry_count;
 716        r->delta_depth = t->delta_depth;
 717        memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
 718        release_tree_content(t);
 719        return r;
 720}
 721
 722static struct tree_entry *new_tree_entry(void)
 723{
 724        struct tree_entry *e;
 725
 726        if (!avail_tree_entry) {
 727                unsigned int n = tree_entry_alloc;
 728                total_allocd += n * sizeof(struct tree_entry);
 729                avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
 730                while (n-- > 1) {
 731                        *((void**)e) = e + 1;
 732                        e++;
 733                }
 734                *((void**)e) = NULL;
 735        }
 736
 737        e = avail_tree_entry;
 738        avail_tree_entry = *((void**)e);
 739        return e;
 740}
 741
 742static void release_tree_entry(struct tree_entry *e)
 743{
 744        if (e->tree)
 745                release_tree_content_recursive(e->tree);
 746        *((void**)e) = avail_tree_entry;
 747        avail_tree_entry = e;
 748}
 749
 750static struct tree_content *dup_tree_content(struct tree_content *s)
 751{
 752        struct tree_content *d;
 753        struct tree_entry *a, *b;
 754        unsigned int i;
 755
 756        if (!s)
 757                return NULL;
 758        d = new_tree_content(s->entry_count);
 759        for (i = 0; i < s->entry_count; i++) {
 760                a = s->entries[i];
 761                b = new_tree_entry();
 762                memcpy(b, a, sizeof(*a));
 763                if (a->tree && is_null_sha1(b->versions[1].sha1))
 764                        b->tree = dup_tree_content(a->tree);
 765                else
 766                        b->tree = NULL;
 767                d->entries[i] = b;
 768        }
 769        d->entry_count = s->entry_count;
 770        d->delta_depth = s->delta_depth;
 771
 772        return d;
 773}
 774
 775static void start_packfile(void)
 776{
 777        static char tmpfile[PATH_MAX];
 778        struct packed_git *p;
 779        struct pack_header hdr;
 780        int pack_fd;
 781
 782        snprintf(tmpfile, sizeof(tmpfile),
 783                "%s/tmp_pack_XXXXXX", get_object_directory());
 784        pack_fd = xmkstemp(tmpfile);
 785        p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
 786        strcpy(p->pack_name, tmpfile);
 787        p->pack_fd = pack_fd;
 788
 789        hdr.hdr_signature = htonl(PACK_SIGNATURE);
 790        hdr.hdr_version = htonl(2);
 791        hdr.hdr_entries = 0;
 792        write_or_die(p->pack_fd, &hdr, sizeof(hdr));
 793
 794        pack_data = p;
 795        pack_size = sizeof(hdr);
 796        object_count = 0;
 797
 798        all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
 799        all_packs[pack_id] = p;
 800}
 801
 802static int oecmp (const void *a_, const void *b_)
 803{
 804        struct object_entry *a = *((struct object_entry**)a_);
 805        struct object_entry *b = *((struct object_entry**)b_);
 806        return hashcmp(a->sha1, b->sha1);
 807}
 808
 809static char *create_index(void)
 810{
 811        static char tmpfile[PATH_MAX];
 812        SHA_CTX ctx;
 813        struct sha1file *f;
 814        struct object_entry **idx, **c, **last, *e;
 815        struct object_entry_pool *o;
 816        uint32_t array[256];
 817        int i, idx_fd;
 818
 819        /* Build the sorted table of object IDs. */
 820        idx = xmalloc(object_count * sizeof(struct object_entry*));
 821        c = idx;
 822        for (o = blocks; o; o = o->next_pool)
 823                for (e = o->next_free; e-- != o->entries;)
 824                        if (pack_id == e->pack_id)
 825                                *c++ = e;
 826        last = idx + object_count;
 827        if (c != last)
 828                die("internal consistency error creating the index");
 829        qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
 830
 831        /* Generate the fan-out array. */
 832        c = idx;
 833        for (i = 0; i < 256; i++) {
 834                struct object_entry **next = c;;
 835                while (next < last) {
 836                        if ((*next)->sha1[0] != i)
 837                                break;
 838                        next++;
 839                }
 840                array[i] = htonl(next - idx);
 841                c = next;
 842        }
 843
 844        snprintf(tmpfile, sizeof(tmpfile),
 845                "%s/tmp_idx_XXXXXX", get_object_directory());
 846        idx_fd = xmkstemp(tmpfile);
 847        f = sha1fd(idx_fd, tmpfile);
 848        sha1write(f, array, 256 * sizeof(int));
 849        SHA1_Init(&ctx);
 850        for (c = idx; c != last; c++) {
 851                uint32_t offset = htonl((*c)->offset);
 852                sha1write(f, &offset, 4);
 853                sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
 854                SHA1_Update(&ctx, (*c)->sha1, 20);
 855        }
 856        sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
 857        sha1close(f, NULL, 1);
 858        free(idx);
 859        SHA1_Final(pack_data->sha1, &ctx);
 860        return tmpfile;
 861}
 862
 863static char *keep_pack(char *curr_index_name)
 864{
 865        static char name[PATH_MAX];
 866        static const char *keep_msg = "fast-import";
 867        int keep_fd;
 868
 869        chmod(pack_data->pack_name, 0444);
 870        chmod(curr_index_name, 0444);
 871
 872        snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
 873                 get_object_directory(), sha1_to_hex(pack_data->sha1));
 874        keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
 875        if (keep_fd < 0)
 876                die("cannot create keep file");
 877        write(keep_fd, keep_msg, strlen(keep_msg));
 878        close(keep_fd);
 879
 880        snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
 881                 get_object_directory(), sha1_to_hex(pack_data->sha1));
 882        if (move_temp_to_file(pack_data->pack_name, name))
 883                die("cannot store pack file");
 884
 885        snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
 886                 get_object_directory(), sha1_to_hex(pack_data->sha1));
 887        if (move_temp_to_file(curr_index_name, name))
 888                die("cannot store index file");
 889        return name;
 890}
 891
 892static void unkeep_all_packs(void)
 893{
 894        static char name[PATH_MAX];
 895        int k;
 896
 897        for (k = 0; k < pack_id; k++) {
 898                struct packed_git *p = all_packs[k];
 899                snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
 900                         get_object_directory(), sha1_to_hex(p->sha1));
 901                unlink(name);
 902        }
 903}
 904
 905static void end_packfile(void)
 906{
 907        struct packed_git *old_p = pack_data, *new_p;
 908
 909        if (object_count) {
 910                char *idx_name;
 911                int i;
 912                struct branch *b;
 913                struct tag *t;
 914
 915                fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
 916                                    pack_data->pack_name, object_count);
 917                close(pack_data->pack_fd);
 918                idx_name = keep_pack(create_index());
 919
 920                /* Register the packfile with core git's machinary. */
 921                new_p = add_packed_git(idx_name, strlen(idx_name), 1);
 922                if (!new_p)
 923                        die("core git rejected index %s", idx_name);
 924                new_p->windows = old_p->windows;
 925                all_packs[pack_id] = new_p;
 926                install_packed_git(new_p);
 927
 928                /* Print the boundary */
 929                if (pack_edges) {
 930                        fprintf(pack_edges, "%s:", new_p->pack_name);
 931                        for (i = 0; i < branch_table_sz; i++) {
 932                                for (b = branch_table[i]; b; b = b->table_next_branch) {
 933                                        if (b->pack_id == pack_id)
 934                                                fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
 935                                }
 936                        }
 937                        for (t = first_tag; t; t = t->next_tag) {
 938                                if (t->pack_id == pack_id)
 939                                        fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
 940                        }
 941                        fputc('\n', pack_edges);
 942                        fflush(pack_edges);
 943                }
 944
 945                pack_id++;
 946        }
 947        else
 948                unlink(old_p->pack_name);
 949        free(old_p);
 950
 951        /* We can't carry a delta across packfiles. */
 952        strbuf_release(&last_blob.data);
 953        last_blob.offset = 0;
 954        last_blob.depth = 0;
 955}
 956
 957static void cycle_packfile(void)
 958{
 959        end_packfile();
 960        start_packfile();
 961}
 962
 963static size_t encode_header(
 964        enum object_type type,
 965        size_t size,
 966        unsigned char *hdr)
 967{
 968        int n = 1;
 969        unsigned char c;
 970
 971        if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
 972                die("bad type %d", type);
 973
 974        c = (type << 4) | (size & 15);
 975        size >>= 4;
 976        while (size) {
 977                *hdr++ = c | 0x80;
 978                c = size & 0x7f;
 979                size >>= 7;
 980                n++;
 981        }
 982        *hdr = c;
 983        return n;
 984}
 985
 986static int store_object(
 987        enum object_type type,
 988        struct strbuf *dat,
 989        struct last_object *last,
 990        unsigned char *sha1out,
 991        uintmax_t mark)
 992{
 993        void *out, *delta;
 994        struct object_entry *e;
 995        unsigned char hdr[96];
 996        unsigned char sha1[20];
 997        unsigned long hdrlen, deltalen;
 998        SHA_CTX c;
 999        z_stream s;
1000
1001        hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1002                (unsigned long)dat->len) + 1;
1003        SHA1_Init(&c);
1004        SHA1_Update(&c, hdr, hdrlen);
1005        SHA1_Update(&c, dat->buf, dat->len);
1006        SHA1_Final(sha1, &c);
1007        if (sha1out)
1008                hashcpy(sha1out, sha1);
1009
1010        e = insert_object(sha1);
1011        if (mark)
1012                insert_mark(mark, e);
1013        if (e->offset) {
1014                duplicate_count_by_type[type]++;
1015                return 1;
1016        } else if (find_sha1_pack(sha1, packed_git)) {
1017                e->type = type;
1018                e->pack_id = MAX_PACK_ID;
1019                e->offset = 1; /* just not zero! */
1020                duplicate_count_by_type[type]++;
1021                return 1;
1022        }
1023
1024        if (last && last->data.buf && last->depth < max_depth) {
1025                delta = diff_delta(last->data.buf, last->data.len,
1026                        dat->buf, dat->len,
1027                        &deltalen, 0);
1028                if (delta && deltalen >= dat->len) {
1029                        free(delta);
1030                        delta = NULL;
1031                }
1032        } else
1033                delta = NULL;
1034
1035        memset(&s, 0, sizeof(s));
1036        deflateInit(&s, zlib_compression_level);
1037        if (delta) {
1038                s.next_in = delta;
1039                s.avail_in = deltalen;
1040        } else {
1041                s.next_in = (void *)dat->buf;
1042                s.avail_in = dat->len;
1043        }
1044        s.avail_out = deflateBound(&s, s.avail_in);
1045        s.next_out = out = xmalloc(s.avail_out);
1046        while (deflate(&s, Z_FINISH) == Z_OK)
1047                /* nothing */;
1048        deflateEnd(&s);
1049
1050        /* Determine if we should auto-checkpoint. */
1051        if ((pack_size + 60 + s.total_out) > max_packsize
1052                || (pack_size + 60 + s.total_out) < pack_size) {
1053
1054                /* This new object needs to *not* have the current pack_id. */
1055                e->pack_id = pack_id + 1;
1056                cycle_packfile();
1057
1058                /* We cannot carry a delta into the new pack. */
1059                if (delta) {
1060                        free(delta);
1061                        delta = NULL;
1062
1063                        memset(&s, 0, sizeof(s));
1064                        deflateInit(&s, zlib_compression_level);
1065                        s.next_in = (void *)dat->buf;
1066                        s.avail_in = dat->len;
1067                        s.avail_out = deflateBound(&s, s.avail_in);
1068                        s.next_out = out = xrealloc(out, s.avail_out);
1069                        while (deflate(&s, Z_FINISH) == Z_OK)
1070                                /* nothing */;
1071                        deflateEnd(&s);
1072                }
1073        }
1074
1075        e->type = type;
1076        e->pack_id = pack_id;
1077        e->offset = pack_size;
1078        object_count++;
1079        object_count_by_type[type]++;
1080
1081        if (delta) {
1082                unsigned long ofs = e->offset - last->offset;
1083                unsigned pos = sizeof(hdr) - 1;
1084
1085                delta_count_by_type[type]++;
1086                last->depth++;
1087
1088                hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1089                write_or_die(pack_data->pack_fd, hdr, hdrlen);
1090                pack_size += hdrlen;
1091
1092                hdr[pos] = ofs & 127;
1093                while (ofs >>= 7)
1094                        hdr[--pos] = 128 | (--ofs & 127);
1095                write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1096                pack_size += sizeof(hdr) - pos;
1097        } else {
1098                if (last)
1099                        last->depth = 0;
1100                hdrlen = encode_header(type, dat->len, hdr);
1101                write_or_die(pack_data->pack_fd, hdr, hdrlen);
1102                pack_size += hdrlen;
1103        }
1104
1105        write_or_die(pack_data->pack_fd, out, s.total_out);
1106        pack_size += s.total_out;
1107
1108        free(out);
1109        free(delta);
1110        if (last) {
1111                if (last->no_swap) {
1112                        last->data = *dat;
1113                } else {
1114                        strbuf_swap(&last->data, dat);
1115                }
1116                last->offset = e->offset;
1117        }
1118        return 0;
1119}
1120
1121static void *gfi_unpack_entry(
1122        struct object_entry *oe,
1123        unsigned long *sizep)
1124{
1125        enum object_type type;
1126        struct packed_git *p = all_packs[oe->pack_id];
1127        if (p == pack_data)
1128                p->pack_size = pack_size + 20;
1129        return unpack_entry(p, oe->offset, &type, sizep);
1130}
1131
1132static const char *get_mode(const char *str, uint16_t *modep)
1133{
1134        unsigned char c;
1135        uint16_t mode = 0;
1136
1137        while ((c = *str++) != ' ') {
1138                if (c < '0' || c > '7')
1139                        return NULL;
1140                mode = (mode << 3) + (c - '0');
1141        }
1142        *modep = mode;
1143        return str;
1144}
1145
1146static void load_tree(struct tree_entry *root)
1147{
1148        unsigned char* sha1 = root->versions[1].sha1;
1149        struct object_entry *myoe;
1150        struct tree_content *t;
1151        unsigned long size;
1152        char *buf;
1153        const char *c;
1154
1155        root->tree = t = new_tree_content(8);
1156        if (is_null_sha1(sha1))
1157                return;
1158
1159        myoe = find_object(sha1);
1160        if (myoe && myoe->pack_id != MAX_PACK_ID) {
1161                if (myoe->type != OBJ_TREE)
1162                        die("Not a tree: %s", sha1_to_hex(sha1));
1163                t->delta_depth = 0;
1164                buf = gfi_unpack_entry(myoe, &size);
1165        } else {
1166                enum object_type type;
1167                buf = read_sha1_file(sha1, &type, &size);
1168                if (!buf || type != OBJ_TREE)
1169                        die("Can't load tree %s", sha1_to_hex(sha1));
1170        }
1171
1172        c = buf;
1173        while (c != (buf + size)) {
1174                struct tree_entry *e = new_tree_entry();
1175
1176                if (t->entry_count == t->entry_capacity)
1177                        root->tree = t = grow_tree_content(t, t->entry_count);
1178                t->entries[t->entry_count++] = e;
1179
1180                e->tree = NULL;
1181                c = get_mode(c, &e->versions[1].mode);
1182                if (!c)
1183                        die("Corrupt mode in %s", sha1_to_hex(sha1));
1184                e->versions[0].mode = e->versions[1].mode;
1185                e->name = to_atom(c, strlen(c));
1186                c += e->name->str_len + 1;
1187                hashcpy(e->versions[0].sha1, (unsigned char*)c);
1188                hashcpy(e->versions[1].sha1, (unsigned char*)c);
1189                c += 20;
1190        }
1191        free(buf);
1192}
1193
1194static int tecmp0 (const void *_a, const void *_b)
1195{
1196        struct tree_entry *a = *((struct tree_entry**)_a);
1197        struct tree_entry *b = *((struct tree_entry**)_b);
1198        return base_name_compare(
1199                a->name->str_dat, a->name->str_len, a->versions[0].mode,
1200                b->name->str_dat, b->name->str_len, b->versions[0].mode);
1201}
1202
1203static int tecmp1 (const void *_a, const void *_b)
1204{
1205        struct tree_entry *a = *((struct tree_entry**)_a);
1206        struct tree_entry *b = *((struct tree_entry**)_b);
1207        return base_name_compare(
1208                a->name->str_dat, a->name->str_len, a->versions[1].mode,
1209                b->name->str_dat, b->name->str_len, b->versions[1].mode);
1210}
1211
1212static void mktree(struct tree_content *t, int v, struct strbuf *b)
1213{
1214        size_t maxlen = 0;
1215        unsigned int i;
1216
1217        if (!v)
1218                qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1219        else
1220                qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1221
1222        for (i = 0; i < t->entry_count; i++) {
1223                if (t->entries[i]->versions[v].mode)
1224                        maxlen += t->entries[i]->name->str_len + 34;
1225        }
1226
1227        strbuf_reset(b);
1228        strbuf_grow(b, maxlen);
1229        for (i = 0; i < t->entry_count; i++) {
1230                struct tree_entry *e = t->entries[i];
1231                if (!e->versions[v].mode)
1232                        continue;
1233                strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1234                                        e->name->str_dat, '\0');
1235                strbuf_add(b, e->versions[v].sha1, 20);
1236        }
1237}
1238
1239static void store_tree(struct tree_entry *root)
1240{
1241        struct tree_content *t = root->tree;
1242        unsigned int i, j, del;
1243        struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1244        struct object_entry *le;
1245
1246        if (!is_null_sha1(root->versions[1].sha1))
1247                return;
1248
1249        for (i = 0; i < t->entry_count; i++) {
1250                if (t->entries[i]->tree)
1251                        store_tree(t->entries[i]);
1252        }
1253
1254        le = find_object(root->versions[0].sha1);
1255        if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1256                mktree(t, 0, &old_tree);
1257                lo.data = old_tree;
1258                lo.offset = le->offset;
1259                lo.depth = t->delta_depth;
1260        }
1261
1262        mktree(t, 1, &new_tree);
1263        store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1264
1265        t->delta_depth = lo.depth;
1266        for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1267                struct tree_entry *e = t->entries[i];
1268                if (e->versions[1].mode) {
1269                        e->versions[0].mode = e->versions[1].mode;
1270                        hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1271                        t->entries[j++] = e;
1272                } else {
1273                        release_tree_entry(e);
1274                        del++;
1275                }
1276        }
1277        t->entry_count -= del;
1278}
1279
1280static int tree_content_set(
1281        struct tree_entry *root,
1282        const char *p,
1283        const unsigned char *sha1,
1284        const uint16_t mode,
1285        struct tree_content *subtree)
1286{
1287        struct tree_content *t = root->tree;
1288        const char *slash1;
1289        unsigned int i, n;
1290        struct tree_entry *e;
1291
1292        slash1 = strchr(p, '/');
1293        if (slash1)
1294                n = slash1 - p;
1295        else
1296                n = strlen(p);
1297        if (!n)
1298                die("Empty path component found in input");
1299        if (!slash1 && !S_ISDIR(mode) && subtree)
1300                die("Non-directories cannot have subtrees");
1301
1302        for (i = 0; i < t->entry_count; i++) {
1303                e = t->entries[i];
1304                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1305                        if (!slash1) {
1306                                if (!S_ISDIR(mode)
1307                                                && e->versions[1].mode == mode
1308                                                && !hashcmp(e->versions[1].sha1, sha1))
1309                                        return 0;
1310                                e->versions[1].mode = mode;
1311                                hashcpy(e->versions[1].sha1, sha1);
1312                                if (e->tree)
1313                                        release_tree_content_recursive(e->tree);
1314                                e->tree = subtree;
1315                                hashclr(root->versions[1].sha1);
1316                                return 1;
1317                        }
1318                        if (!S_ISDIR(e->versions[1].mode)) {
1319                                e->tree = new_tree_content(8);
1320                                e->versions[1].mode = S_IFDIR;
1321                        }
1322                        if (!e->tree)
1323                                load_tree(e);
1324                        if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1325                                hashclr(root->versions[1].sha1);
1326                                return 1;
1327                        }
1328                        return 0;
1329                }
1330        }
1331
1332        if (t->entry_count == t->entry_capacity)
1333                root->tree = t = grow_tree_content(t, t->entry_count);
1334        e = new_tree_entry();
1335        e->name = to_atom(p, n);
1336        e->versions[0].mode = 0;
1337        hashclr(e->versions[0].sha1);
1338        t->entries[t->entry_count++] = e;
1339        if (slash1) {
1340                e->tree = new_tree_content(8);
1341                e->versions[1].mode = S_IFDIR;
1342                tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1343        } else {
1344                e->tree = subtree;
1345                e->versions[1].mode = mode;
1346                hashcpy(e->versions[1].sha1, sha1);
1347        }
1348        hashclr(root->versions[1].sha1);
1349        return 1;
1350}
1351
1352static int tree_content_remove(
1353        struct tree_entry *root,
1354        const char *p,
1355        struct tree_entry *backup_leaf)
1356{
1357        struct tree_content *t = root->tree;
1358        const char *slash1;
1359        unsigned int i, n;
1360        struct tree_entry *e;
1361
1362        slash1 = strchr(p, '/');
1363        if (slash1)
1364                n = slash1 - p;
1365        else
1366                n = strlen(p);
1367
1368        for (i = 0; i < t->entry_count; i++) {
1369                e = t->entries[i];
1370                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1371                        if (!slash1 || !S_ISDIR(e->versions[1].mode))
1372                                goto del_entry;
1373                        if (!e->tree)
1374                                load_tree(e);
1375                        if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1376                                for (n = 0; n < e->tree->entry_count; n++) {
1377                                        if (e->tree->entries[n]->versions[1].mode) {
1378                                                hashclr(root->versions[1].sha1);
1379                                                return 1;
1380                                        }
1381                                }
1382                                backup_leaf = NULL;
1383                                goto del_entry;
1384                        }
1385                        return 0;
1386                }
1387        }
1388        return 0;
1389
1390del_entry:
1391        if (backup_leaf)
1392                memcpy(backup_leaf, e, sizeof(*backup_leaf));
1393        else if (e->tree)
1394                release_tree_content_recursive(e->tree);
1395        e->tree = NULL;
1396        e->versions[1].mode = 0;
1397        hashclr(e->versions[1].sha1);
1398        hashclr(root->versions[1].sha1);
1399        return 1;
1400}
1401
1402static int tree_content_get(
1403        struct tree_entry *root,
1404        const char *p,
1405        struct tree_entry *leaf)
1406{
1407        struct tree_content *t = root->tree;
1408        const char *slash1;
1409        unsigned int i, n;
1410        struct tree_entry *e;
1411
1412        slash1 = strchr(p, '/');
1413        if (slash1)
1414                n = slash1 - p;
1415        else
1416                n = strlen(p);
1417
1418        for (i = 0; i < t->entry_count; i++) {
1419                e = t->entries[i];
1420                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1421                        if (!slash1) {
1422                                memcpy(leaf, e, sizeof(*leaf));
1423                                if (e->tree && is_null_sha1(e->versions[1].sha1))
1424                                        leaf->tree = dup_tree_content(e->tree);
1425                                else
1426                                        leaf->tree = NULL;
1427                                return 1;
1428                        }
1429                        if (!S_ISDIR(e->versions[1].mode))
1430                                return 0;
1431                        if (!e->tree)
1432                                load_tree(e);
1433                        return tree_content_get(e, slash1 + 1, leaf);
1434                }
1435        }
1436        return 0;
1437}
1438
1439static int update_branch(struct branch *b)
1440{
1441        static const char *msg = "fast-import";
1442        struct ref_lock *lock;
1443        unsigned char old_sha1[20];
1444
1445        if (read_ref(b->name, old_sha1))
1446                hashclr(old_sha1);
1447        lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1448        if (!lock)
1449                return error("Unable to lock %s", b->name);
1450        if (!force_update && !is_null_sha1(old_sha1)) {
1451                struct commit *old_cmit, *new_cmit;
1452
1453                old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1454                new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1455                if (!old_cmit || !new_cmit) {
1456                        unlock_ref(lock);
1457                        return error("Branch %s is missing commits.", b->name);
1458                }
1459
1460                if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1461                        unlock_ref(lock);
1462                        warning("Not updating %s"
1463                                " (new tip %s does not contain %s)",
1464                                b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1465                        return -1;
1466                }
1467        }
1468        if (write_ref_sha1(lock, b->sha1, msg) < 0)
1469                return error("Unable to update %s", b->name);
1470        return 0;
1471}
1472
1473static void dump_branches(void)
1474{
1475        unsigned int i;
1476        struct branch *b;
1477
1478        for (i = 0; i < branch_table_sz; i++) {
1479                for (b = branch_table[i]; b; b = b->table_next_branch)
1480                        failure |= update_branch(b);
1481        }
1482}
1483
1484static void dump_tags(void)
1485{
1486        static const char *msg = "fast-import";
1487        struct tag *t;
1488        struct ref_lock *lock;
1489        char ref_name[PATH_MAX];
1490
1491        for (t = first_tag; t; t = t->next_tag) {
1492                sprintf(ref_name, "tags/%s", t->name);
1493                lock = lock_ref_sha1(ref_name, NULL);
1494                if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1495                        failure |= error("Unable to update %s", ref_name);
1496        }
1497}
1498
1499static void dump_marks_helper(FILE *f,
1500        uintmax_t base,
1501        struct mark_set *m)
1502{
1503        uintmax_t k;
1504        if (m->shift) {
1505                for (k = 0; k < 1024; k++) {
1506                        if (m->data.sets[k])
1507                                dump_marks_helper(f, (base + k) << m->shift,
1508                                        m->data.sets[k]);
1509                }
1510        } else {
1511                for (k = 0; k < 1024; k++) {
1512                        if (m->data.marked[k])
1513                                fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1514                                        sha1_to_hex(m->data.marked[k]->sha1));
1515                }
1516        }
1517}
1518
1519static void dump_marks(void)
1520{
1521        static struct lock_file mark_lock;
1522        int mark_fd;
1523        FILE *f;
1524
1525        if (!mark_file)
1526                return;
1527
1528        mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
1529        if (mark_fd < 0) {
1530                failure |= error("Unable to write marks file %s: %s",
1531                        mark_file, strerror(errno));
1532                return;
1533        }
1534
1535        f = fdopen(mark_fd, "w");
1536        if (!f) {
1537                rollback_lock_file(&mark_lock);
1538                failure |= error("Unable to write marks file %s: %s",
1539                        mark_file, strerror(errno));
1540                return;
1541        }
1542
1543        dump_marks_helper(f, 0, marks);
1544        fclose(f);
1545        if (commit_lock_file(&mark_lock))
1546                failure |= error("Unable to write marks file %s: %s",
1547                        mark_file, strerror(errno));
1548}
1549
1550static int read_next_command(void)
1551{
1552        static int stdin_eof = 0;
1553
1554        if (stdin_eof) {
1555                unread_command_buf = 0;
1556                return EOF;
1557        }
1558
1559        do {
1560                if (unread_command_buf) {
1561                        unread_command_buf = 0;
1562                } else {
1563                        struct recent_command *rc;
1564
1565                        strbuf_detach(&command_buf, NULL);
1566                        stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1567                        if (stdin_eof)
1568                                return EOF;
1569
1570                        rc = rc_free;
1571                        if (rc)
1572                                rc_free = rc->next;
1573                        else {
1574                                rc = cmd_hist.next;
1575                                cmd_hist.next = rc->next;
1576                                cmd_hist.next->prev = &cmd_hist;
1577                                free(rc->buf);
1578                        }
1579
1580                        rc->buf = command_buf.buf;
1581                        rc->prev = cmd_tail;
1582                        rc->next = cmd_hist.prev;
1583                        rc->prev->next = rc;
1584                        cmd_tail = rc;
1585                }
1586        } while (command_buf.buf[0] == '#');
1587
1588        return 0;
1589}
1590
1591static void skip_optional_lf(void)
1592{
1593        int term_char = fgetc(stdin);
1594        if (term_char != '\n' && term_char != EOF)
1595                ungetc(term_char, stdin);
1596}
1597
1598static void cmd_mark(void)
1599{
1600        if (!prefixcmp(command_buf.buf, "mark :")) {
1601                next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1602                read_next_command();
1603        }
1604        else
1605                next_mark = 0;
1606}
1607
1608static void cmd_data(struct strbuf *sb)
1609{
1610        strbuf_reset(sb);
1611
1612        if (prefixcmp(command_buf.buf, "data "))
1613                die("Expected 'data n' command, found: %s", command_buf.buf);
1614
1615        if (!prefixcmp(command_buf.buf + 5, "<<")) {
1616                char *term = xstrdup(command_buf.buf + 5 + 2);
1617                size_t term_len = command_buf.len - 5 - 2;
1618
1619                strbuf_detach(&command_buf, NULL);
1620                for (;;) {
1621                        if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1622                                die("EOF in data (terminator '%s' not found)", term);
1623                        if (term_len == command_buf.len
1624                                && !strcmp(term, command_buf.buf))
1625                                break;
1626                        strbuf_addbuf(sb, &command_buf);
1627                        strbuf_addch(sb, '\n');
1628                }
1629                free(term);
1630        }
1631        else {
1632                size_t n = 0, length;
1633
1634                length = strtoul(command_buf.buf + 5, NULL, 10);
1635
1636                while (n < length) {
1637                        size_t s = strbuf_fread(sb, length - n, stdin);
1638                        if (!s && feof(stdin))
1639                                die("EOF in data (%lu bytes remaining)",
1640                                        (unsigned long)(length - n));
1641                        n += s;
1642                }
1643        }
1644
1645        skip_optional_lf();
1646}
1647
1648static int validate_raw_date(const char *src, char *result, int maxlen)
1649{
1650        const char *orig_src = src;
1651        char *endp, sign;
1652
1653        strtoul(src, &endp, 10);
1654        if (endp == src || *endp != ' ')
1655                return -1;
1656
1657        src = endp + 1;
1658        if (*src != '-' && *src != '+')
1659                return -1;
1660        sign = *src;
1661
1662        strtoul(src + 1, &endp, 10);
1663        if (endp == src || *endp || (endp - orig_src) >= maxlen)
1664                return -1;
1665
1666        strcpy(result, orig_src);
1667        return 0;
1668}
1669
1670static char *parse_ident(const char *buf)
1671{
1672        const char *gt;
1673        size_t name_len;
1674        char *ident;
1675
1676        gt = strrchr(buf, '>');
1677        if (!gt)
1678                die("Missing > in ident string: %s", buf);
1679        gt++;
1680        if (*gt != ' ')
1681                die("Missing space after > in ident string: %s", buf);
1682        gt++;
1683        name_len = gt - buf;
1684        ident = xmalloc(name_len + 24);
1685        strncpy(ident, buf, name_len);
1686
1687        switch (whenspec) {
1688        case WHENSPEC_RAW:
1689                if (validate_raw_date(gt, ident + name_len, 24) < 0)
1690                        die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1691                break;
1692        case WHENSPEC_RFC2822:
1693                if (parse_date(gt, ident + name_len, 24) < 0)
1694                        die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1695                break;
1696        case WHENSPEC_NOW:
1697                if (strcmp("now", gt))
1698                        die("Date in ident must be 'now': %s", buf);
1699                datestamp(ident + name_len, 24);
1700                break;
1701        }
1702
1703        return ident;
1704}
1705
1706static void cmd_new_blob(void)
1707{
1708        static struct strbuf buf = STRBUF_INIT;
1709
1710        read_next_command();
1711        cmd_mark();
1712        cmd_data(&buf);
1713        store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1714}
1715
1716static void unload_one_branch(void)
1717{
1718        while (cur_active_branches
1719                && cur_active_branches >= max_active_branches) {
1720                uintmax_t min_commit = ULONG_MAX;
1721                struct branch *e, *l = NULL, *p = NULL;
1722
1723                for (e = active_branches; e; e = e->active_next_branch) {
1724                        if (e->last_commit < min_commit) {
1725                                p = l;
1726                                min_commit = e->last_commit;
1727                        }
1728                        l = e;
1729                }
1730
1731                if (p) {
1732                        e = p->active_next_branch;
1733                        p->active_next_branch = e->active_next_branch;
1734                } else {
1735                        e = active_branches;
1736                        active_branches = e->active_next_branch;
1737                }
1738                e->active = 0;
1739                e->active_next_branch = NULL;
1740                if (e->branch_tree.tree) {
1741                        release_tree_content_recursive(e->branch_tree.tree);
1742                        e->branch_tree.tree = NULL;
1743                }
1744                cur_active_branches--;
1745        }
1746}
1747
1748static void load_branch(struct branch *b)
1749{
1750        load_tree(&b->branch_tree);
1751        if (!b->active) {
1752                b->active = 1;
1753                b->active_next_branch = active_branches;
1754                active_branches = b;
1755                cur_active_branches++;
1756                branch_load_count++;
1757        }
1758}
1759
1760static void file_change_m(struct branch *b)
1761{
1762        const char *p = command_buf.buf + 2;
1763        static struct strbuf uq = STRBUF_INIT;
1764        const char *endp;
1765        struct object_entry *oe = oe;
1766        unsigned char sha1[20];
1767        uint16_t mode, inline_data = 0;
1768
1769        p = get_mode(p, &mode);
1770        if (!p)
1771                die("Corrupt mode: %s", command_buf.buf);
1772        switch (mode) {
1773        case S_IFREG | 0644:
1774        case S_IFREG | 0755:
1775        case S_IFLNK:
1776        case 0644:
1777        case 0755:
1778                /* ok */
1779                break;
1780        default:
1781                die("Corrupt mode: %s", command_buf.buf);
1782        }
1783
1784        if (*p == ':') {
1785                char *x;
1786                oe = find_mark(strtoumax(p + 1, &x, 10));
1787                hashcpy(sha1, oe->sha1);
1788                p = x;
1789        } else if (!prefixcmp(p, "inline")) {
1790                inline_data = 1;
1791                p += 6;
1792        } else {
1793                if (get_sha1_hex(p, sha1))
1794                        die("Invalid SHA1: %s", command_buf.buf);
1795                oe = find_object(sha1);
1796                p += 40;
1797        }
1798        if (*p++ != ' ')
1799                die("Missing space after SHA1: %s", command_buf.buf);
1800
1801        strbuf_reset(&uq);
1802        if (!unquote_c_style(&uq, p, &endp)) {
1803                if (*endp)
1804                        die("Garbage after path in: %s", command_buf.buf);
1805                p = uq.buf;
1806        }
1807
1808        if (inline_data) {
1809                static struct strbuf buf = STRBUF_INIT;
1810
1811                if (p != uq.buf) {
1812                        strbuf_addstr(&uq, p);
1813                        p = uq.buf;
1814                }
1815                read_next_command();
1816                cmd_data(&buf);
1817                store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1818        } else if (oe) {
1819                if (oe->type != OBJ_BLOB)
1820                        die("Not a blob (actually a %s): %s",
1821                                typename(oe->type), command_buf.buf);
1822        } else {
1823                enum object_type type = sha1_object_info(sha1, NULL);
1824                if (type < 0)
1825                        die("Blob not found: %s", command_buf.buf);
1826                if (type != OBJ_BLOB)
1827                        die("Not a blob (actually a %s): %s",
1828                            typename(type), command_buf.buf);
1829        }
1830
1831        tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1832}
1833
1834static void file_change_d(struct branch *b)
1835{
1836        const char *p = command_buf.buf + 2;
1837        static struct strbuf uq = STRBUF_INIT;
1838        const char *endp;
1839
1840        strbuf_reset(&uq);
1841        if (!unquote_c_style(&uq, p, &endp)) {
1842                if (*endp)
1843                        die("Garbage after path in: %s", command_buf.buf);
1844                p = uq.buf;
1845        }
1846        tree_content_remove(&b->branch_tree, p, NULL);
1847}
1848
1849static void file_change_cr(struct branch *b, int rename)
1850{
1851        const char *s, *d;
1852        static struct strbuf s_uq = STRBUF_INIT;
1853        static struct strbuf d_uq = STRBUF_INIT;
1854        const char *endp;
1855        struct tree_entry leaf;
1856
1857        s = command_buf.buf + 2;
1858        strbuf_reset(&s_uq);
1859        if (!unquote_c_style(&s_uq, s, &endp)) {
1860                if (*endp != ' ')
1861                        die("Missing space after source: %s", command_buf.buf);
1862        } else {
1863                endp = strchr(s, ' ');
1864                if (!endp)
1865                        die("Missing space after source: %s", command_buf.buf);
1866                strbuf_add(&s_uq, s, endp - s);
1867        }
1868        s = s_uq.buf;
1869
1870        endp++;
1871        if (!*endp)
1872                die("Missing dest: %s", command_buf.buf);
1873
1874        d = endp;
1875        strbuf_reset(&d_uq);
1876        if (!unquote_c_style(&d_uq, d, &endp)) {
1877                if (*endp)
1878                        die("Garbage after dest in: %s", command_buf.buf);
1879                d = d_uq.buf;
1880        }
1881
1882        memset(&leaf, 0, sizeof(leaf));
1883        if (rename)
1884                tree_content_remove(&b->branch_tree, s, &leaf);
1885        else
1886                tree_content_get(&b->branch_tree, s, &leaf);
1887        if (!leaf.versions[1].mode)
1888                die("Path %s not in branch", s);
1889        tree_content_set(&b->branch_tree, d,
1890                leaf.versions[1].sha1,
1891                leaf.versions[1].mode,
1892                leaf.tree);
1893}
1894
1895static void file_change_deleteall(struct branch *b)
1896{
1897        release_tree_content_recursive(b->branch_tree.tree);
1898        hashclr(b->branch_tree.versions[0].sha1);
1899        hashclr(b->branch_tree.versions[1].sha1);
1900        load_tree(&b->branch_tree);
1901}
1902
1903static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
1904{
1905        if (!buf || size < 46)
1906                die("Not a valid commit: %s", sha1_to_hex(b->sha1));
1907        if (memcmp("tree ", buf, 5)
1908                || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
1909                die("The commit %s is corrupt", sha1_to_hex(b->sha1));
1910        hashcpy(b->branch_tree.versions[0].sha1,
1911                b->branch_tree.versions[1].sha1);
1912}
1913
1914static void cmd_from_existing(struct branch *b)
1915{
1916        if (is_null_sha1(b->sha1)) {
1917                hashclr(b->branch_tree.versions[0].sha1);
1918                hashclr(b->branch_tree.versions[1].sha1);
1919        } else {
1920                unsigned long size;
1921                char *buf;
1922
1923                buf = read_object_with_reference(b->sha1,
1924                        commit_type, &size, b->sha1);
1925                cmd_from_commit(b, buf, size);
1926                free(buf);
1927        }
1928}
1929
1930static int cmd_from(struct branch *b)
1931{
1932        const char *from;
1933        struct branch *s;
1934
1935        if (prefixcmp(command_buf.buf, "from "))
1936                return 0;
1937
1938        if (b->branch_tree.tree) {
1939                release_tree_content_recursive(b->branch_tree.tree);
1940                b->branch_tree.tree = NULL;
1941        }
1942
1943        from = strchr(command_buf.buf, ' ') + 1;
1944        s = lookup_branch(from);
1945        if (b == s)
1946                die("Can't create a branch from itself: %s", b->name);
1947        else if (s) {
1948                unsigned char *t = s->branch_tree.versions[1].sha1;
1949                hashcpy(b->sha1, s->sha1);
1950                hashcpy(b->branch_tree.versions[0].sha1, t);
1951                hashcpy(b->branch_tree.versions[1].sha1, t);
1952        } else if (*from == ':') {
1953                uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1954                struct object_entry *oe = find_mark(idnum);
1955                if (oe->type != OBJ_COMMIT)
1956                        die("Mark :%" PRIuMAX " not a commit", idnum);
1957                hashcpy(b->sha1, oe->sha1);
1958                if (oe->pack_id != MAX_PACK_ID) {
1959                        unsigned long size;
1960                        char *buf = gfi_unpack_entry(oe, &size);
1961                        cmd_from_commit(b, buf, size);
1962                        free(buf);
1963                } else
1964                        cmd_from_existing(b);
1965        } else if (!get_sha1(from, b->sha1))
1966                cmd_from_existing(b);
1967        else
1968                die("Invalid ref name or SHA1 expression: %s", from);
1969
1970        read_next_command();
1971        return 1;
1972}
1973
1974static struct hash_list *cmd_merge(unsigned int *count)
1975{
1976        struct hash_list *list = NULL, *n, *e = e;
1977        const char *from;
1978        struct branch *s;
1979
1980        *count = 0;
1981        while (!prefixcmp(command_buf.buf, "merge ")) {
1982                from = strchr(command_buf.buf, ' ') + 1;
1983                n = xmalloc(sizeof(*n));
1984                s = lookup_branch(from);
1985                if (s)
1986                        hashcpy(n->sha1, s->sha1);
1987                else if (*from == ':') {
1988                        uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1989                        struct object_entry *oe = find_mark(idnum);
1990                        if (oe->type != OBJ_COMMIT)
1991                                die("Mark :%" PRIuMAX " not a commit", idnum);
1992                        hashcpy(n->sha1, oe->sha1);
1993                } else if (!get_sha1(from, n->sha1)) {
1994                        unsigned long size;
1995                        char *buf = read_object_with_reference(n->sha1,
1996                                commit_type, &size, n->sha1);
1997                        if (!buf || size < 46)
1998                                die("Not a valid commit: %s", from);
1999                        free(buf);
2000                } else
2001                        die("Invalid ref name or SHA1 expression: %s", from);
2002
2003                n->next = NULL;
2004                if (list)
2005                        e->next = n;
2006                else
2007                        list = n;
2008                e = n;
2009                (*count)++;
2010                read_next_command();
2011        }
2012        return list;
2013}
2014
2015static void cmd_new_commit(void)
2016{
2017        static struct strbuf msg = STRBUF_INIT;
2018        struct branch *b;
2019        char *sp;
2020        char *author = NULL;
2021        char *committer = NULL;
2022        struct hash_list *merge_list = NULL;
2023        unsigned int merge_count;
2024
2025        /* Obtain the branch name from the rest of our command */
2026        sp = strchr(command_buf.buf, ' ') + 1;
2027        b = lookup_branch(sp);
2028        if (!b)
2029                b = new_branch(sp);
2030
2031        read_next_command();
2032        cmd_mark();
2033        if (!prefixcmp(command_buf.buf, "author ")) {
2034                author = parse_ident(command_buf.buf + 7);
2035                read_next_command();
2036        }
2037        if (!prefixcmp(command_buf.buf, "committer ")) {
2038                committer = parse_ident(command_buf.buf + 10);
2039                read_next_command();
2040        }
2041        if (!committer)
2042                die("Expected committer but didn't get one");
2043        cmd_data(&msg);
2044        read_next_command();
2045        cmd_from(b);
2046        merge_list = cmd_merge(&merge_count);
2047
2048        /* ensure the branch is active/loaded */
2049        if (!b->branch_tree.tree || !max_active_branches) {
2050                unload_one_branch();
2051                load_branch(b);
2052        }
2053
2054        /* file_change* */
2055        while (command_buf.len > 0) {
2056                if (!prefixcmp(command_buf.buf, "M "))
2057                        file_change_m(b);
2058                else if (!prefixcmp(command_buf.buf, "D "))
2059                        file_change_d(b);
2060                else if (!prefixcmp(command_buf.buf, "R "))
2061                        file_change_cr(b, 1);
2062                else if (!prefixcmp(command_buf.buf, "C "))
2063                        file_change_cr(b, 0);
2064                else if (!strcmp("deleteall", command_buf.buf))
2065                        file_change_deleteall(b);
2066                else {
2067                        unread_command_buf = 1;
2068                        break;
2069                }
2070                if (read_next_command() == EOF)
2071                        break;
2072        }
2073
2074        /* build the tree and the commit */
2075        store_tree(&b->branch_tree);
2076        hashcpy(b->branch_tree.versions[0].sha1,
2077                b->branch_tree.versions[1].sha1);
2078
2079        strbuf_reset(&new_data);
2080        strbuf_addf(&new_data, "tree %s\n",
2081                sha1_to_hex(b->branch_tree.versions[1].sha1));
2082        if (!is_null_sha1(b->sha1))
2083                strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2084        while (merge_list) {
2085                struct hash_list *next = merge_list->next;
2086                strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2087                free(merge_list);
2088                merge_list = next;
2089        }
2090        strbuf_addf(&new_data,
2091                "author %s\n"
2092                "committer %s\n"
2093                "\n",
2094                author ? author : committer, committer);
2095        strbuf_addbuf(&new_data, &msg);
2096        free(author);
2097        free(committer);
2098
2099        if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2100                b->pack_id = pack_id;
2101        b->last_commit = object_count_by_type[OBJ_COMMIT];
2102}
2103
2104static void cmd_new_tag(void)
2105{
2106        static struct strbuf msg = STRBUF_INIT;
2107        char *sp;
2108        const char *from;
2109        char *tagger;
2110        struct branch *s;
2111        struct tag *t;
2112        uintmax_t from_mark = 0;
2113        unsigned char sha1[20];
2114
2115        /* Obtain the new tag name from the rest of our command */
2116        sp = strchr(command_buf.buf, ' ') + 1;
2117        t = pool_alloc(sizeof(struct tag));
2118        t->next_tag = NULL;
2119        t->name = pool_strdup(sp);
2120        if (last_tag)
2121                last_tag->next_tag = t;
2122        else
2123                first_tag = t;
2124        last_tag = t;
2125        read_next_command();
2126
2127        /* from ... */
2128        if (prefixcmp(command_buf.buf, "from "))
2129                die("Expected from command, got %s", command_buf.buf);
2130        from = strchr(command_buf.buf, ' ') + 1;
2131        s = lookup_branch(from);
2132        if (s) {
2133                hashcpy(sha1, s->sha1);
2134        } else if (*from == ':') {
2135                struct object_entry *oe;
2136                from_mark = strtoumax(from + 1, NULL, 10);
2137                oe = find_mark(from_mark);
2138                if (oe->type != OBJ_COMMIT)
2139                        die("Mark :%" PRIuMAX " not a commit", from_mark);
2140                hashcpy(sha1, oe->sha1);
2141        } else if (!get_sha1(from, sha1)) {
2142                unsigned long size;
2143                char *buf;
2144
2145                buf = read_object_with_reference(sha1,
2146                        commit_type, &size, sha1);
2147                if (!buf || size < 46)
2148                        die("Not a valid commit: %s", from);
2149                free(buf);
2150        } else
2151                die("Invalid ref name or SHA1 expression: %s", from);
2152        read_next_command();
2153
2154        /* tagger ... */
2155        if (prefixcmp(command_buf.buf, "tagger "))
2156                die("Expected tagger command, got %s", command_buf.buf);
2157        tagger = parse_ident(command_buf.buf + 7);
2158
2159        /* tag payload/message */
2160        read_next_command();
2161        cmd_data(&msg);
2162
2163        /* build the tag object */
2164        strbuf_reset(&new_data);
2165        strbuf_addf(&new_data,
2166                "object %s\n"
2167                "type %s\n"
2168                "tag %s\n"
2169                "tagger %s\n"
2170                "\n",
2171                sha1_to_hex(sha1), commit_type, t->name, tagger);
2172        strbuf_addbuf(&new_data, &msg);
2173        free(tagger);
2174
2175        if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2176                t->pack_id = MAX_PACK_ID;
2177        else
2178                t->pack_id = pack_id;
2179}
2180
2181static void cmd_reset_branch(void)
2182{
2183        struct branch *b;
2184        char *sp;
2185
2186        /* Obtain the branch name from the rest of our command */
2187        sp = strchr(command_buf.buf, ' ') + 1;
2188        b = lookup_branch(sp);
2189        if (b) {
2190                hashclr(b->sha1);
2191                hashclr(b->branch_tree.versions[0].sha1);
2192                hashclr(b->branch_tree.versions[1].sha1);
2193                if (b->branch_tree.tree) {
2194                        release_tree_content_recursive(b->branch_tree.tree);
2195                        b->branch_tree.tree = NULL;
2196                }
2197        }
2198        else
2199                b = new_branch(sp);
2200        read_next_command();
2201        if (!cmd_from(b) && command_buf.len > 0)
2202                unread_command_buf = 1;
2203}
2204
2205static void cmd_checkpoint(void)
2206{
2207        if (object_count) {
2208                cycle_packfile();
2209                dump_branches();
2210                dump_tags();
2211                dump_marks();
2212        }
2213        skip_optional_lf();
2214}
2215
2216static void cmd_progress(void)
2217{
2218        fwrite(command_buf.buf, 1, command_buf.len, stdout);
2219        fputc('\n', stdout);
2220        fflush(stdout);
2221        skip_optional_lf();
2222}
2223
2224static void import_marks(const char *input_file)
2225{
2226        char line[512];
2227        FILE *f = fopen(input_file, "r");
2228        if (!f)
2229                die("cannot read %s: %s", input_file, strerror(errno));
2230        while (fgets(line, sizeof(line), f)) {
2231                uintmax_t mark;
2232                char *end;
2233                unsigned char sha1[20];
2234                struct object_entry *e;
2235
2236                end = strchr(line, '\n');
2237                if (line[0] != ':' || !end)
2238                        die("corrupt mark line: %s", line);
2239                *end = 0;
2240                mark = strtoumax(line + 1, &end, 10);
2241                if (!mark || end == line + 1
2242                        || *end != ' ' || get_sha1(end + 1, sha1))
2243                        die("corrupt mark line: %s", line);
2244                e = find_object(sha1);
2245                if (!e) {
2246                        enum object_type type = sha1_object_info(sha1, NULL);
2247                        if (type < 0)
2248                                die("object not found: %s", sha1_to_hex(sha1));
2249                        e = insert_object(sha1);
2250                        e->type = type;
2251                        e->pack_id = MAX_PACK_ID;
2252                        e->offset = 1; /* just not zero! */
2253                }
2254                insert_mark(mark, e);
2255        }
2256        fclose(f);
2257}
2258
2259static const char fast_import_usage[] =
2260"git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2261
2262int main(int argc, const char **argv)
2263{
2264        unsigned int i, show_stats = 1;
2265
2266        git_config(git_default_config);
2267        alloc_objects(object_entry_alloc);
2268        strbuf_init(&command_buf, 0);
2269        atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2270        branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2271        avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2272        marks = pool_calloc(1, sizeof(struct mark_set));
2273
2274        for (i = 1; i < argc; i++) {
2275                const char *a = argv[i];
2276
2277                if (*a != '-' || !strcmp(a, "--"))
2278                        break;
2279                else if (!prefixcmp(a, "--date-format=")) {
2280                        const char *fmt = a + 14;
2281                        if (!strcmp(fmt, "raw"))
2282                                whenspec = WHENSPEC_RAW;
2283                        else if (!strcmp(fmt, "rfc2822"))
2284                                whenspec = WHENSPEC_RFC2822;
2285                        else if (!strcmp(fmt, "now"))
2286                                whenspec = WHENSPEC_NOW;
2287                        else
2288                                die("unknown --date-format argument %s", fmt);
2289                }
2290                else if (!prefixcmp(a, "--max-pack-size="))
2291                        max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2292                else if (!prefixcmp(a, "--depth="))
2293                        max_depth = strtoul(a + 8, NULL, 0);
2294                else if (!prefixcmp(a, "--active-branches="))
2295                        max_active_branches = strtoul(a + 18, NULL, 0);
2296                else if (!prefixcmp(a, "--import-marks="))
2297                        import_marks(a + 15);
2298                else if (!prefixcmp(a, "--export-marks="))
2299                        mark_file = a + 15;
2300                else if (!prefixcmp(a, "--export-pack-edges=")) {
2301                        if (pack_edges)
2302                                fclose(pack_edges);
2303                        pack_edges = fopen(a + 20, "a");
2304                        if (!pack_edges)
2305                                die("Cannot open %s: %s", a + 20, strerror(errno));
2306                } else if (!strcmp(a, "--force"))
2307                        force_update = 1;
2308                else if (!strcmp(a, "--quiet"))
2309                        show_stats = 0;
2310                else if (!strcmp(a, "--stats"))
2311                        show_stats = 1;
2312                else
2313                        die("unknown option %s", a);
2314        }
2315        if (i != argc)
2316                usage(fast_import_usage);
2317
2318        rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2319        for (i = 0; i < (cmd_save - 1); i++)
2320                rc_free[i].next = &rc_free[i + 1];
2321        rc_free[cmd_save - 1].next = NULL;
2322
2323        prepare_packed_git();
2324        start_packfile();
2325        set_die_routine(die_nicely);
2326        while (read_next_command() != EOF) {
2327                if (!strcmp("blob", command_buf.buf))
2328                        cmd_new_blob();
2329                else if (!prefixcmp(command_buf.buf, "commit "))
2330                        cmd_new_commit();
2331                else if (!prefixcmp(command_buf.buf, "tag "))
2332                        cmd_new_tag();
2333                else if (!prefixcmp(command_buf.buf, "reset "))
2334                        cmd_reset_branch();
2335                else if (!strcmp("checkpoint", command_buf.buf))
2336                        cmd_checkpoint();
2337                else if (!prefixcmp(command_buf.buf, "progress "))
2338                        cmd_progress();
2339                else
2340                        die("Unsupported command: %s", command_buf.buf);
2341        }
2342        end_packfile();
2343
2344        dump_branches();
2345        dump_tags();
2346        unkeep_all_packs();
2347        dump_marks();
2348
2349        if (pack_edges)
2350                fclose(pack_edges);
2351
2352        if (show_stats) {
2353                uintmax_t total_count = 0, duplicate_count = 0;
2354                for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2355                        total_count += object_count_by_type[i];
2356                for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2357                        duplicate_count += duplicate_count_by_type[i];
2358
2359                fprintf(stderr, "%s statistics:\n", argv[0]);
2360                fprintf(stderr, "---------------------------------------------------------------------\n");
2361                fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2362                fprintf(stderr, "Total objects:   %10" PRIuMAX " (%10" PRIuMAX " duplicates                  )\n", total_count, duplicate_count);
2363                fprintf(stderr, "      blobs  :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB]);
2364                fprintf(stderr, "      trees  :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE]);
2365                fprintf(stderr, "      commits:   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT]);
2366                fprintf(stderr, "      tags   :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG]);
2367                fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
2368                fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2369                fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
2370                fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2371                fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
2372                fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2373                fprintf(stderr, "---------------------------------------------------------------------\n");
2374                pack_report();
2375                fprintf(stderr, "---------------------------------------------------------------------\n");
2376                fprintf(stderr, "\n");
2377        }
2378
2379        return failure ? 1 : 0;
2380}