fast-import.con commit t9300 (fast-import): another test for the "replace root" feature (971728c)
   1/*
   2(See Documentation/git-fast-import.txt for maintained documentation.)
   3Format of STDIN stream:
   4
   5  stream ::= cmd*;
   6
   7  cmd ::= new_blob
   8        | new_commit
   9        | new_tag
  10        | reset_branch
  11        | checkpoint
  12        | progress
  13        ;
  14
  15  new_blob ::= 'blob' lf
  16    mark?
  17    file_content;
  18  file_content ::= data;
  19
  20  new_commit ::= 'commit' sp ref_str lf
  21    mark?
  22    ('author' (sp name)? sp '<' email '>' sp when lf)?
  23    'committer' (sp name)? sp '<' email '>' sp when lf
  24    commit_msg
  25    ('from' sp committish lf)?
  26    ('merge' sp committish lf)*
  27    file_change*
  28    lf?;
  29  commit_msg ::= data;
  30
  31  file_change ::= file_clr
  32    | file_del
  33    | file_rnm
  34    | file_cpy
  35    | file_obm
  36    | file_inm;
  37  file_clr ::= 'deleteall' lf;
  38  file_del ::= 'D' sp path_str lf;
  39  file_rnm ::= 'R' sp path_str sp path_str lf;
  40  file_cpy ::= 'C' sp path_str sp path_str lf;
  41  file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
  42  file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
  43    data;
  44  note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
  45  note_inm ::= 'N' sp 'inline' sp committish lf
  46    data;
  47
  48  new_tag ::= 'tag' sp tag_str lf
  49    'from' sp committish lf
  50    ('tagger' (sp name)? sp '<' email '>' sp when lf)?
  51    tag_msg;
  52  tag_msg ::= data;
  53
  54  reset_branch ::= 'reset' sp ref_str lf
  55    ('from' sp committish lf)?
  56    lf?;
  57
  58  checkpoint ::= 'checkpoint' lf
  59    lf?;
  60
  61  progress ::= 'progress' sp not_lf* lf
  62    lf?;
  63
  64     # note: the first idnum in a stream should be 1 and subsequent
  65     # idnums should not have gaps between values as this will cause
  66     # the stream parser to reserve space for the gapped values.  An
  67     # idnum can be updated in the future to a new object by issuing
  68     # a new mark directive with the old idnum.
  69     #
  70  mark ::= 'mark' sp idnum lf;
  71  data ::= (delimited_data | exact_data)
  72    lf?;
  73
  74    # note: delim may be any string but must not contain lf.
  75    # data_line may contain any data but must not be exactly
  76    # delim.
  77  delimited_data ::= 'data' sp '<<' delim lf
  78    (data_line lf)*
  79    delim lf;
  80
  81     # note: declen indicates the length of binary_data in bytes.
  82     # declen does not include the lf preceding the binary data.
  83     #
  84  exact_data ::= 'data' sp declen lf
  85    binary_data;
  86
  87     # note: quoted strings are C-style quoting supporting \c for
  88     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
  89     # is the signed byte value in octal.  Note that the only
  90     # characters which must actually be escaped to protect the
  91     # stream formatting is: \, " and LF.  Otherwise these values
  92     # are UTF8.
  93     #
  94  committish  ::= (ref_str | hexsha1 | sha1exp_str | idnum);
  95  ref_str     ::= ref;
  96  sha1exp_str ::= sha1exp;
  97  tag_str     ::= tag;
  98  path_str    ::= path    | '"' quoted(path)    '"' ;
  99  mode        ::= '100644' | '644'
 100                | '100755' | '755'
 101                | '120000'
 102                ;
 103
 104  declen ::= # unsigned 32 bit value, ascii base10 notation;
 105  bigint ::= # unsigned integer value, ascii base10 notation;
 106  binary_data ::= # file content, not interpreted;
 107
 108  when         ::= raw_when | rfc2822_when;
 109  raw_when     ::= ts sp tz;
 110  rfc2822_when ::= # Valid RFC 2822 date and time;
 111
 112  sp ::= # ASCII space character;
 113  lf ::= # ASCII newline (LF) character;
 114
 115     # note: a colon (':') must precede the numerical value assigned to
 116     # an idnum.  This is to distinguish it from a ref or tag name as
 117     # GIT does not permit ':' in ref or tag strings.
 118     #
 119  idnum   ::= ':' bigint;
 120  path    ::= # GIT style file path, e.g. "a/b/c";
 121  ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
 122  tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
 123  sha1exp ::= # Any valid GIT SHA1 expression;
 124  hexsha1 ::= # SHA1 in hexadecimal format;
 125
 126     # note: name and email are UTF8 strings, however name must not
 127     # contain '<' or lf and email must not contain any of the
 128     # following: '<', '>', lf.
 129     #
 130  name  ::= # valid GIT author/committer name;
 131  email ::= # valid GIT author/committer email;
 132  ts    ::= # time since the epoch in seconds, ascii base10 notation;
 133  tz    ::= # GIT style timezone;
 134
 135     # note: comments may appear anywhere in the input, except
 136     # within a data command.  Any form of the data command
 137     # always escapes the related input from comment processing.
 138     #
 139     # In case it is not clear, the '#' that starts the comment
 140     # must be the first character on that line (an lf
 141     # preceded it).
 142     #
 143  comment ::= '#' not_lf* lf;
 144  not_lf  ::= # Any byte that is not ASCII newline (LF);
 145*/
 146
 147#include "builtin.h"
 148#include "cache.h"
 149#include "object.h"
 150#include "blob.h"
 151#include "tree.h"
 152#include "commit.h"
 153#include "delta.h"
 154#include "pack.h"
 155#include "refs.h"
 156#include "csum-file.h"
 157#include "quote.h"
 158#include "exec_cmd.h"
 159
 160#define PACK_ID_BITS 16
 161#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
 162#define DEPTH_BITS 13
 163#define MAX_DEPTH ((1<<DEPTH_BITS)-1)
 164
 165struct object_entry
 166{
 167        struct pack_idx_entry idx;
 168        struct object_entry *next;
 169        uint32_t type : TYPE_BITS,
 170                pack_id : PACK_ID_BITS,
 171                depth : DEPTH_BITS;
 172};
 173
 174struct object_entry_pool
 175{
 176        struct object_entry_pool *next_pool;
 177        struct object_entry *next_free;
 178        struct object_entry *end;
 179        struct object_entry entries[FLEX_ARRAY]; /* more */
 180};
 181
 182struct mark_set
 183{
 184        union {
 185                struct object_entry *marked[1024];
 186                struct mark_set *sets[1024];
 187        } data;
 188        unsigned int shift;
 189};
 190
 191struct last_object
 192{
 193        struct strbuf data;
 194        off_t offset;
 195        unsigned int depth;
 196        unsigned no_swap : 1;
 197};
 198
 199struct mem_pool
 200{
 201        struct mem_pool *next_pool;
 202        char *next_free;
 203        char *end;
 204        uintmax_t space[FLEX_ARRAY]; /* more */
 205};
 206
 207struct atom_str
 208{
 209        struct atom_str *next_atom;
 210        unsigned short str_len;
 211        char str_dat[FLEX_ARRAY]; /* more */
 212};
 213
 214struct tree_content;
 215struct tree_entry
 216{
 217        struct tree_content *tree;
 218        struct atom_str *name;
 219        struct tree_entry_ms
 220        {
 221                uint16_t mode;
 222                unsigned char sha1[20];
 223        } versions[2];
 224};
 225
 226struct tree_content
 227{
 228        unsigned int entry_capacity; /* must match avail_tree_content */
 229        unsigned int entry_count;
 230        unsigned int delta_depth;
 231        struct tree_entry *entries[FLEX_ARRAY]; /* more */
 232};
 233
 234struct avail_tree_content
 235{
 236        unsigned int entry_capacity; /* must match tree_content */
 237        struct avail_tree_content *next_avail;
 238};
 239
 240struct branch
 241{
 242        struct branch *table_next_branch;
 243        struct branch *active_next_branch;
 244        const char *name;
 245        struct tree_entry branch_tree;
 246        uintmax_t last_commit;
 247        uintmax_t num_notes;
 248        unsigned active : 1;
 249        unsigned pack_id : PACK_ID_BITS;
 250        unsigned char sha1[20];
 251};
 252
 253struct tag
 254{
 255        struct tag *next_tag;
 256        const char *name;
 257        unsigned int pack_id;
 258        unsigned char sha1[20];
 259};
 260
 261struct hash_list
 262{
 263        struct hash_list *next;
 264        unsigned char sha1[20];
 265};
 266
 267typedef enum {
 268        WHENSPEC_RAW = 1,
 269        WHENSPEC_RFC2822,
 270        WHENSPEC_NOW
 271} whenspec_type;
 272
 273struct recent_command
 274{
 275        struct recent_command *prev;
 276        struct recent_command *next;
 277        char *buf;
 278};
 279
 280/* Configured limits on output */
 281static unsigned long max_depth = 10;
 282static off_t max_packsize;
 283static uintmax_t big_file_threshold = 512 * 1024 * 1024;
 284static int force_update;
 285static int pack_compression_level = Z_DEFAULT_COMPRESSION;
 286static int pack_compression_seen;
 287
 288/* Stats and misc. counters */
 289static uintmax_t alloc_count;
 290static uintmax_t marks_set_count;
 291static uintmax_t object_count_by_type[1 << TYPE_BITS];
 292static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
 293static uintmax_t delta_count_by_type[1 << TYPE_BITS];
 294static unsigned long object_count;
 295static unsigned long branch_count;
 296static unsigned long branch_load_count;
 297static int failure;
 298static FILE *pack_edges;
 299static unsigned int show_stats = 1;
 300static int global_argc;
 301static const char **global_argv;
 302
 303/* Memory pools */
 304static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
 305static size_t total_allocd;
 306static struct mem_pool *mem_pool;
 307
 308/* Atom management */
 309static unsigned int atom_table_sz = 4451;
 310static unsigned int atom_cnt;
 311static struct atom_str **atom_table;
 312
 313/* The .pack file being generated */
 314static unsigned int pack_id;
 315static struct sha1file *pack_file;
 316static struct packed_git *pack_data;
 317static struct packed_git **all_packs;
 318static off_t pack_size;
 319
 320/* Table of objects we've written. */
 321static unsigned int object_entry_alloc = 5000;
 322static struct object_entry_pool *blocks;
 323static struct object_entry *object_table[1 << 16];
 324static struct mark_set *marks;
 325static const char *export_marks_file;
 326static const char *import_marks_file;
 327static int import_marks_file_from_stream;
 328static int relative_marks_paths;
 329
 330/* Our last blob */
 331static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
 332
 333/* Tree management */
 334static unsigned int tree_entry_alloc = 1000;
 335static void *avail_tree_entry;
 336static unsigned int avail_tree_table_sz = 100;
 337static struct avail_tree_content **avail_tree_table;
 338static struct strbuf old_tree = STRBUF_INIT;
 339static struct strbuf new_tree = STRBUF_INIT;
 340
 341/* Branch data */
 342static unsigned long max_active_branches = 5;
 343static unsigned long cur_active_branches;
 344static unsigned long branch_table_sz = 1039;
 345static struct branch **branch_table;
 346static struct branch *active_branches;
 347
 348/* Tag data */
 349static struct tag *first_tag;
 350static struct tag *last_tag;
 351
 352/* Input stream parsing */
 353static whenspec_type whenspec = WHENSPEC_RAW;
 354static struct strbuf command_buf = STRBUF_INIT;
 355static int unread_command_buf;
 356static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
 357static struct recent_command *cmd_tail = &cmd_hist;
 358static struct recent_command *rc_free;
 359static unsigned int cmd_save = 100;
 360static uintmax_t next_mark;
 361static struct strbuf new_data = STRBUF_INIT;
 362static int seen_data_command;
 363
 364static void parse_argv(void);
 365
 366static void write_branch_report(FILE *rpt, struct branch *b)
 367{
 368        fprintf(rpt, "%s:\n", b->name);
 369
 370        fprintf(rpt, "  status      :");
 371        if (b->active)
 372                fputs(" active", rpt);
 373        if (b->branch_tree.tree)
 374                fputs(" loaded", rpt);
 375        if (is_null_sha1(b->branch_tree.versions[1].sha1))
 376                fputs(" dirty", rpt);
 377        fputc('\n', rpt);
 378
 379        fprintf(rpt, "  tip commit  : %s\n", sha1_to_hex(b->sha1));
 380        fprintf(rpt, "  old tree    : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
 381        fprintf(rpt, "  cur tree    : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
 382        fprintf(rpt, "  commit clock: %" PRIuMAX "\n", b->last_commit);
 383
 384        fputs("  last pack   : ", rpt);
 385        if (b->pack_id < MAX_PACK_ID)
 386                fprintf(rpt, "%u", b->pack_id);
 387        fputc('\n', rpt);
 388
 389        fputc('\n', rpt);
 390}
 391
 392static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
 393
 394static void write_crash_report(const char *err)
 395{
 396        char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
 397        FILE *rpt = fopen(loc, "w");
 398        struct branch *b;
 399        unsigned long lu;
 400        struct recent_command *rc;
 401
 402        if (!rpt) {
 403                error("can't write crash report %s: %s", loc, strerror(errno));
 404                return;
 405        }
 406
 407        fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
 408
 409        fprintf(rpt, "fast-import crash report:\n");
 410        fprintf(rpt, "    fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
 411        fprintf(rpt, "    parent process     : %"PRIuMAX"\n", (uintmax_t) getppid());
 412        fprintf(rpt, "    at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
 413        fputc('\n', rpt);
 414
 415        fputs("fatal: ", rpt);
 416        fputs(err, rpt);
 417        fputc('\n', rpt);
 418
 419        fputc('\n', rpt);
 420        fputs("Most Recent Commands Before Crash\n", rpt);
 421        fputs("---------------------------------\n", rpt);
 422        for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
 423                if (rc->next == &cmd_hist)
 424                        fputs("* ", rpt);
 425                else
 426                        fputs("  ", rpt);
 427                fputs(rc->buf, rpt);
 428                fputc('\n', rpt);
 429        }
 430
 431        fputc('\n', rpt);
 432        fputs("Active Branch LRU\n", rpt);
 433        fputs("-----------------\n", rpt);
 434        fprintf(rpt, "    active_branches = %lu cur, %lu max\n",
 435                cur_active_branches,
 436                max_active_branches);
 437        fputc('\n', rpt);
 438        fputs("  pos  clock name\n", rpt);
 439        fputs("  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
 440        for (b = active_branches, lu = 0; b; b = b->active_next_branch)
 441                fprintf(rpt, "  %2lu) %6" PRIuMAX" %s\n",
 442                        ++lu, b->last_commit, b->name);
 443
 444        fputc('\n', rpt);
 445        fputs("Inactive Branches\n", rpt);
 446        fputs("-----------------\n", rpt);
 447        for (lu = 0; lu < branch_table_sz; lu++) {
 448                for (b = branch_table[lu]; b; b = b->table_next_branch)
 449                        write_branch_report(rpt, b);
 450        }
 451
 452        if (first_tag) {
 453                struct tag *tg;
 454                fputc('\n', rpt);
 455                fputs("Annotated Tags\n", rpt);
 456                fputs("--------------\n", rpt);
 457                for (tg = first_tag; tg; tg = tg->next_tag) {
 458                        fputs(sha1_to_hex(tg->sha1), rpt);
 459                        fputc(' ', rpt);
 460                        fputs(tg->name, rpt);
 461                        fputc('\n', rpt);
 462                }
 463        }
 464
 465        fputc('\n', rpt);
 466        fputs("Marks\n", rpt);
 467        fputs("-----\n", rpt);
 468        if (export_marks_file)
 469                fprintf(rpt, "  exported to %s\n", export_marks_file);
 470        else
 471                dump_marks_helper(rpt, 0, marks);
 472
 473        fputc('\n', rpt);
 474        fputs("-------------------\n", rpt);
 475        fputs("END OF CRASH REPORT\n", rpt);
 476        fclose(rpt);
 477}
 478
 479static void end_packfile(void);
 480static void unkeep_all_packs(void);
 481static void dump_marks(void);
 482
 483static NORETURN void die_nicely(const char *err, va_list params)
 484{
 485        static int zombie;
 486        char message[2 * PATH_MAX];
 487
 488        vsnprintf(message, sizeof(message), err, params);
 489        fputs("fatal: ", stderr);
 490        fputs(message, stderr);
 491        fputc('\n', stderr);
 492
 493        if (!zombie) {
 494                zombie = 1;
 495                write_crash_report(message);
 496                end_packfile();
 497                unkeep_all_packs();
 498                dump_marks();
 499        }
 500        exit(128);
 501}
 502
 503static void alloc_objects(unsigned int cnt)
 504{
 505        struct object_entry_pool *b;
 506
 507        b = xmalloc(sizeof(struct object_entry_pool)
 508                + cnt * sizeof(struct object_entry));
 509        b->next_pool = blocks;
 510        b->next_free = b->entries;
 511        b->end = b->entries + cnt;
 512        blocks = b;
 513        alloc_count += cnt;
 514}
 515
 516static struct object_entry *new_object(unsigned char *sha1)
 517{
 518        struct object_entry *e;
 519
 520        if (blocks->next_free == blocks->end)
 521                alloc_objects(object_entry_alloc);
 522
 523        e = blocks->next_free++;
 524        hashcpy(e->idx.sha1, sha1);
 525        return e;
 526}
 527
 528static struct object_entry *find_object(unsigned char *sha1)
 529{
 530        unsigned int h = sha1[0] << 8 | sha1[1];
 531        struct object_entry *e;
 532        for (e = object_table[h]; e; e = e->next)
 533                if (!hashcmp(sha1, e->idx.sha1))
 534                        return e;
 535        return NULL;
 536}
 537
 538static struct object_entry *insert_object(unsigned char *sha1)
 539{
 540        unsigned int h = sha1[0] << 8 | sha1[1];
 541        struct object_entry *e = object_table[h];
 542        struct object_entry *p = NULL;
 543
 544        while (e) {
 545                if (!hashcmp(sha1, e->idx.sha1))
 546                        return e;
 547                p = e;
 548                e = e->next;
 549        }
 550
 551        e = new_object(sha1);
 552        e->next = NULL;
 553        e->idx.offset = 0;
 554        if (p)
 555                p->next = e;
 556        else
 557                object_table[h] = e;
 558        return e;
 559}
 560
 561static unsigned int hc_str(const char *s, size_t len)
 562{
 563        unsigned int r = 0;
 564        while (len-- > 0)
 565                r = r * 31 + *s++;
 566        return r;
 567}
 568
 569static void *pool_alloc(size_t len)
 570{
 571        struct mem_pool *p;
 572        void *r;
 573
 574        /* round up to a 'uintmax_t' alignment */
 575        if (len & (sizeof(uintmax_t) - 1))
 576                len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
 577
 578        for (p = mem_pool; p; p = p->next_pool)
 579                if ((p->end - p->next_free >= len))
 580                        break;
 581
 582        if (!p) {
 583                if (len >= (mem_pool_alloc/2)) {
 584                        total_allocd += len;
 585                        return xmalloc(len);
 586                }
 587                total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
 588                p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
 589                p->next_pool = mem_pool;
 590                p->next_free = (char *) p->space;
 591                p->end = p->next_free + mem_pool_alloc;
 592                mem_pool = p;
 593        }
 594
 595        r = p->next_free;
 596        p->next_free += len;
 597        return r;
 598}
 599
 600static void *pool_calloc(size_t count, size_t size)
 601{
 602        size_t len = count * size;
 603        void *r = pool_alloc(len);
 604        memset(r, 0, len);
 605        return r;
 606}
 607
 608static char *pool_strdup(const char *s)
 609{
 610        char *r = pool_alloc(strlen(s) + 1);
 611        strcpy(r, s);
 612        return r;
 613}
 614
 615static void insert_mark(uintmax_t idnum, struct object_entry *oe)
 616{
 617        struct mark_set *s = marks;
 618        while ((idnum >> s->shift) >= 1024) {
 619                s = pool_calloc(1, sizeof(struct mark_set));
 620                s->shift = marks->shift + 10;
 621                s->data.sets[0] = marks;
 622                marks = s;
 623        }
 624        while (s->shift) {
 625                uintmax_t i = idnum >> s->shift;
 626                idnum -= i << s->shift;
 627                if (!s->data.sets[i]) {
 628                        s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
 629                        s->data.sets[i]->shift = s->shift - 10;
 630                }
 631                s = s->data.sets[i];
 632        }
 633        if (!s->data.marked[idnum])
 634                marks_set_count++;
 635        s->data.marked[idnum] = oe;
 636}
 637
 638static struct object_entry *find_mark(uintmax_t idnum)
 639{
 640        uintmax_t orig_idnum = idnum;
 641        struct mark_set *s = marks;
 642        struct object_entry *oe = NULL;
 643        if ((idnum >> s->shift) < 1024) {
 644                while (s && s->shift) {
 645                        uintmax_t i = idnum >> s->shift;
 646                        idnum -= i << s->shift;
 647                        s = s->data.sets[i];
 648                }
 649                if (s)
 650                        oe = s->data.marked[idnum];
 651        }
 652        if (!oe)
 653                die("mark :%" PRIuMAX " not declared", orig_idnum);
 654        return oe;
 655}
 656
 657static struct atom_str *to_atom(const char *s, unsigned short len)
 658{
 659        unsigned int hc = hc_str(s, len) % atom_table_sz;
 660        struct atom_str *c;
 661
 662        for (c = atom_table[hc]; c; c = c->next_atom)
 663                if (c->str_len == len && !strncmp(s, c->str_dat, len))
 664                        return c;
 665
 666        c = pool_alloc(sizeof(struct atom_str) + len + 1);
 667        c->str_len = len;
 668        strncpy(c->str_dat, s, len);
 669        c->str_dat[len] = 0;
 670        c->next_atom = atom_table[hc];
 671        atom_table[hc] = c;
 672        atom_cnt++;
 673        return c;
 674}
 675
 676static struct branch *lookup_branch(const char *name)
 677{
 678        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 679        struct branch *b;
 680
 681        for (b = branch_table[hc]; b; b = b->table_next_branch)
 682                if (!strcmp(name, b->name))
 683                        return b;
 684        return NULL;
 685}
 686
 687static struct branch *new_branch(const char *name)
 688{
 689        unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
 690        struct branch *b = lookup_branch(name);
 691
 692        if (b)
 693                die("Invalid attempt to create duplicate branch: %s", name);
 694        switch (check_ref_format(name)) {
 695        case 0: break; /* its valid */
 696        case CHECK_REF_FORMAT_ONELEVEL:
 697                break; /* valid, but too few '/', allow anyway */
 698        default:
 699                die("Branch name doesn't conform to GIT standards: %s", name);
 700        }
 701
 702        b = pool_calloc(1, sizeof(struct branch));
 703        b->name = pool_strdup(name);
 704        b->table_next_branch = branch_table[hc];
 705        b->branch_tree.versions[0].mode = S_IFDIR;
 706        b->branch_tree.versions[1].mode = S_IFDIR;
 707        b->num_notes = 0;
 708        b->active = 0;
 709        b->pack_id = MAX_PACK_ID;
 710        branch_table[hc] = b;
 711        branch_count++;
 712        return b;
 713}
 714
 715static unsigned int hc_entries(unsigned int cnt)
 716{
 717        cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
 718        return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
 719}
 720
 721static struct tree_content *new_tree_content(unsigned int cnt)
 722{
 723        struct avail_tree_content *f, *l = NULL;
 724        struct tree_content *t;
 725        unsigned int hc = hc_entries(cnt);
 726
 727        for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
 728                if (f->entry_capacity >= cnt)
 729                        break;
 730
 731        if (f) {
 732                if (l)
 733                        l->next_avail = f->next_avail;
 734                else
 735                        avail_tree_table[hc] = f->next_avail;
 736        } else {
 737                cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
 738                f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
 739                f->entry_capacity = cnt;
 740        }
 741
 742        t = (struct tree_content*)f;
 743        t->entry_count = 0;
 744        t->delta_depth = 0;
 745        return t;
 746}
 747
 748static void release_tree_entry(struct tree_entry *e);
 749static void release_tree_content(struct tree_content *t)
 750{
 751        struct avail_tree_content *f = (struct avail_tree_content*)t;
 752        unsigned int hc = hc_entries(f->entry_capacity);
 753        f->next_avail = avail_tree_table[hc];
 754        avail_tree_table[hc] = f;
 755}
 756
 757static void release_tree_content_recursive(struct tree_content *t)
 758{
 759        unsigned int i;
 760        for (i = 0; i < t->entry_count; i++)
 761                release_tree_entry(t->entries[i]);
 762        release_tree_content(t);
 763}
 764
 765static struct tree_content *grow_tree_content(
 766        struct tree_content *t,
 767        int amt)
 768{
 769        struct tree_content *r = new_tree_content(t->entry_count + amt);
 770        r->entry_count = t->entry_count;
 771        r->delta_depth = t->delta_depth;
 772        memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
 773        release_tree_content(t);
 774        return r;
 775}
 776
 777static struct tree_entry *new_tree_entry(void)
 778{
 779        struct tree_entry *e;
 780
 781        if (!avail_tree_entry) {
 782                unsigned int n = tree_entry_alloc;
 783                total_allocd += n * sizeof(struct tree_entry);
 784                avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
 785                while (n-- > 1) {
 786                        *((void**)e) = e + 1;
 787                        e++;
 788                }
 789                *((void**)e) = NULL;
 790        }
 791
 792        e = avail_tree_entry;
 793        avail_tree_entry = *((void**)e);
 794        return e;
 795}
 796
 797static void release_tree_entry(struct tree_entry *e)
 798{
 799        if (e->tree)
 800                release_tree_content_recursive(e->tree);
 801        *((void**)e) = avail_tree_entry;
 802        avail_tree_entry = e;
 803}
 804
 805static struct tree_content *dup_tree_content(struct tree_content *s)
 806{
 807        struct tree_content *d;
 808        struct tree_entry *a, *b;
 809        unsigned int i;
 810
 811        if (!s)
 812                return NULL;
 813        d = new_tree_content(s->entry_count);
 814        for (i = 0; i < s->entry_count; i++) {
 815                a = s->entries[i];
 816                b = new_tree_entry();
 817                memcpy(b, a, sizeof(*a));
 818                if (a->tree && is_null_sha1(b->versions[1].sha1))
 819                        b->tree = dup_tree_content(a->tree);
 820                else
 821                        b->tree = NULL;
 822                d->entries[i] = b;
 823        }
 824        d->entry_count = s->entry_count;
 825        d->delta_depth = s->delta_depth;
 826
 827        return d;
 828}
 829
 830static void start_packfile(void)
 831{
 832        static char tmpfile[PATH_MAX];
 833        struct packed_git *p;
 834        struct pack_header hdr;
 835        int pack_fd;
 836
 837        pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
 838                              "pack/tmp_pack_XXXXXX");
 839        p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
 840        strcpy(p->pack_name, tmpfile);
 841        p->pack_fd = pack_fd;
 842        pack_file = sha1fd(pack_fd, p->pack_name);
 843
 844        hdr.hdr_signature = htonl(PACK_SIGNATURE);
 845        hdr.hdr_version = htonl(2);
 846        hdr.hdr_entries = 0;
 847        sha1write(pack_file, &hdr, sizeof(hdr));
 848
 849        pack_data = p;
 850        pack_size = sizeof(hdr);
 851        object_count = 0;
 852
 853        all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
 854        all_packs[pack_id] = p;
 855}
 856
 857static const char *create_index(void)
 858{
 859        const char *tmpfile;
 860        struct pack_idx_entry **idx, **c, **last;
 861        struct object_entry *e;
 862        struct object_entry_pool *o;
 863
 864        /* Build the table of object IDs. */
 865        idx = xmalloc(object_count * sizeof(*idx));
 866        c = idx;
 867        for (o = blocks; o; o = o->next_pool)
 868                for (e = o->next_free; e-- != o->entries;)
 869                        if (pack_id == e->pack_id)
 870                                *c++ = &e->idx;
 871        last = idx + object_count;
 872        if (c != last)
 873                die("internal consistency error creating the index");
 874
 875        tmpfile = write_idx_file(NULL, idx, object_count, pack_data->sha1);
 876        free(idx);
 877        return tmpfile;
 878}
 879
 880static char *keep_pack(const char *curr_index_name)
 881{
 882        static char name[PATH_MAX];
 883        static const char *keep_msg = "fast-import";
 884        int keep_fd;
 885
 886        keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
 887        if (keep_fd < 0)
 888                die_errno("cannot create keep file");
 889        write_or_die(keep_fd, keep_msg, strlen(keep_msg));
 890        if (close(keep_fd))
 891                die_errno("failed to write keep file");
 892
 893        snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
 894                 get_object_directory(), sha1_to_hex(pack_data->sha1));
 895        if (move_temp_to_file(pack_data->pack_name, name))
 896                die("cannot store pack file");
 897
 898        snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
 899                 get_object_directory(), sha1_to_hex(pack_data->sha1));
 900        if (move_temp_to_file(curr_index_name, name))
 901                die("cannot store index file");
 902        free((void *)curr_index_name);
 903        return name;
 904}
 905
 906static void unkeep_all_packs(void)
 907{
 908        static char name[PATH_MAX];
 909        int k;
 910
 911        for (k = 0; k < pack_id; k++) {
 912                struct packed_git *p = all_packs[k];
 913                snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
 914                         get_object_directory(), sha1_to_hex(p->sha1));
 915                unlink_or_warn(name);
 916        }
 917}
 918
 919static void end_packfile(void)
 920{
 921        struct packed_git *old_p = pack_data, *new_p;
 922
 923        clear_delta_base_cache();
 924        if (object_count) {
 925                unsigned char cur_pack_sha1[20];
 926                char *idx_name;
 927                int i;
 928                struct branch *b;
 929                struct tag *t;
 930
 931                close_pack_windows(pack_data);
 932                sha1close(pack_file, cur_pack_sha1, 0);
 933                fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
 934                                    pack_data->pack_name, object_count,
 935                                    cur_pack_sha1, pack_size);
 936                close(pack_data->pack_fd);
 937                idx_name = keep_pack(create_index());
 938
 939                /* Register the packfile with core git's machinery. */
 940                new_p = add_packed_git(idx_name, strlen(idx_name), 1);
 941                if (!new_p)
 942                        die("core git rejected index %s", idx_name);
 943                all_packs[pack_id] = new_p;
 944                install_packed_git(new_p);
 945
 946                /* Print the boundary */
 947                if (pack_edges) {
 948                        fprintf(pack_edges, "%s:", new_p->pack_name);
 949                        for (i = 0; i < branch_table_sz; i++) {
 950                                for (b = branch_table[i]; b; b = b->table_next_branch) {
 951                                        if (b->pack_id == pack_id)
 952                                                fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
 953                                }
 954                        }
 955                        for (t = first_tag; t; t = t->next_tag) {
 956                                if (t->pack_id == pack_id)
 957                                        fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
 958                        }
 959                        fputc('\n', pack_edges);
 960                        fflush(pack_edges);
 961                }
 962
 963                pack_id++;
 964        }
 965        else {
 966                close(old_p->pack_fd);
 967                unlink_or_warn(old_p->pack_name);
 968        }
 969        free(old_p);
 970
 971        /* We can't carry a delta across packfiles. */
 972        strbuf_release(&last_blob.data);
 973        last_blob.offset = 0;
 974        last_blob.depth = 0;
 975}
 976
 977static void cycle_packfile(void)
 978{
 979        end_packfile();
 980        start_packfile();
 981}
 982
 983static int store_object(
 984        enum object_type type,
 985        struct strbuf *dat,
 986        struct last_object *last,
 987        unsigned char *sha1out,
 988        uintmax_t mark)
 989{
 990        void *out, *delta;
 991        struct object_entry *e;
 992        unsigned char hdr[96];
 993        unsigned char sha1[20];
 994        unsigned long hdrlen, deltalen;
 995        git_SHA_CTX c;
 996        z_stream s;
 997
 998        hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
 999                (unsigned long)dat->len) + 1;
1000        git_SHA1_Init(&c);
1001        git_SHA1_Update(&c, hdr, hdrlen);
1002        git_SHA1_Update(&c, dat->buf, dat->len);
1003        git_SHA1_Final(sha1, &c);
1004        if (sha1out)
1005                hashcpy(sha1out, sha1);
1006
1007        e = insert_object(sha1);
1008        if (mark)
1009                insert_mark(mark, e);
1010        if (e->idx.offset) {
1011                duplicate_count_by_type[type]++;
1012                return 1;
1013        } else if (find_sha1_pack(sha1, packed_git)) {
1014                e->type = type;
1015                e->pack_id = MAX_PACK_ID;
1016                e->idx.offset = 1; /* just not zero! */
1017                duplicate_count_by_type[type]++;
1018                return 1;
1019        }
1020
1021        if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
1022                delta = diff_delta(last->data.buf, last->data.len,
1023                        dat->buf, dat->len,
1024                        &deltalen, dat->len - 20);
1025        } else
1026                delta = NULL;
1027
1028        memset(&s, 0, sizeof(s));
1029        deflateInit(&s, pack_compression_level);
1030        if (delta) {
1031                s.next_in = delta;
1032                s.avail_in = deltalen;
1033        } else {
1034                s.next_in = (void *)dat->buf;
1035                s.avail_in = dat->len;
1036        }
1037        s.avail_out = deflateBound(&s, s.avail_in);
1038        s.next_out = out = xmalloc(s.avail_out);
1039        while (deflate(&s, Z_FINISH) == Z_OK)
1040                /* nothing */;
1041        deflateEnd(&s);
1042
1043        /* Determine if we should auto-checkpoint. */
1044        if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
1045                || (pack_size + 60 + s.total_out) < pack_size) {
1046
1047                /* This new object needs to *not* have the current pack_id. */
1048                e->pack_id = pack_id + 1;
1049                cycle_packfile();
1050
1051                /* We cannot carry a delta into the new pack. */
1052                if (delta) {
1053                        free(delta);
1054                        delta = NULL;
1055
1056                        memset(&s, 0, sizeof(s));
1057                        deflateInit(&s, pack_compression_level);
1058                        s.next_in = (void *)dat->buf;
1059                        s.avail_in = dat->len;
1060                        s.avail_out = deflateBound(&s, s.avail_in);
1061                        s.next_out = out = xrealloc(out, s.avail_out);
1062                        while (deflate(&s, Z_FINISH) == Z_OK)
1063                                /* nothing */;
1064                        deflateEnd(&s);
1065                }
1066        }
1067
1068        e->type = type;
1069        e->pack_id = pack_id;
1070        e->idx.offset = pack_size;
1071        object_count++;
1072        object_count_by_type[type]++;
1073
1074        crc32_begin(pack_file);
1075
1076        if (delta) {
1077                off_t ofs = e->idx.offset - last->offset;
1078                unsigned pos = sizeof(hdr) - 1;
1079
1080                delta_count_by_type[type]++;
1081                e->depth = last->depth + 1;
1082
1083                hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
1084                sha1write(pack_file, hdr, hdrlen);
1085                pack_size += hdrlen;
1086
1087                hdr[pos] = ofs & 127;
1088                while (ofs >>= 7)
1089                        hdr[--pos] = 128 | (--ofs & 127);
1090                sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
1091                pack_size += sizeof(hdr) - pos;
1092        } else {
1093                e->depth = 0;
1094                hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
1095                sha1write(pack_file, hdr, hdrlen);
1096                pack_size += hdrlen;
1097        }
1098
1099        sha1write(pack_file, out, s.total_out);
1100        pack_size += s.total_out;
1101
1102        e->idx.crc32 = crc32_end(pack_file);
1103
1104        free(out);
1105        free(delta);
1106        if (last) {
1107                if (last->no_swap) {
1108                        last->data = *dat;
1109                } else {
1110                        strbuf_swap(&last->data, dat);
1111                }
1112                last->offset = e->idx.offset;
1113                last->depth = e->depth;
1114        }
1115        return 0;
1116}
1117
1118static void truncate_pack(off_t to, git_SHA_CTX *ctx)
1119{
1120        if (ftruncate(pack_data->pack_fd, to)
1121         || lseek(pack_data->pack_fd, to, SEEK_SET) != to)
1122                die_errno("cannot truncate pack to skip duplicate");
1123        pack_size = to;
1124
1125        /* yes this is a layering violation */
1126        pack_file->total = to;
1127        pack_file->offset = 0;
1128        pack_file->ctx = *ctx;
1129}
1130
1131static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1132{
1133        size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1134        unsigned char *in_buf = xmalloc(in_sz);
1135        unsigned char *out_buf = xmalloc(out_sz);
1136        struct object_entry *e;
1137        unsigned char sha1[20];
1138        unsigned long hdrlen;
1139        off_t offset;
1140        git_SHA_CTX c;
1141        git_SHA_CTX pack_file_ctx;
1142        z_stream s;
1143        int status = Z_OK;
1144
1145        /* Determine if we should auto-checkpoint. */
1146        if ((max_packsize && (pack_size + 60 + len) > max_packsize)
1147                || (pack_size + 60 + len) < pack_size)
1148                cycle_packfile();
1149
1150        offset = pack_size;
1151
1152        /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1153        sha1flush(pack_file);
1154        pack_file_ctx = pack_file->ctx;
1155
1156        hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1157        if (out_sz <= hdrlen)
1158                die("impossibly large object header");
1159
1160        git_SHA1_Init(&c);
1161        git_SHA1_Update(&c, out_buf, hdrlen);
1162
1163        crc32_begin(pack_file);
1164
1165        memset(&s, 0, sizeof(s));
1166        deflateInit(&s, pack_compression_level);
1167
1168        hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
1169        if (out_sz <= hdrlen)
1170                die("impossibly large object header");
1171
1172        s.next_out = out_buf + hdrlen;
1173        s.avail_out = out_sz - hdrlen;
1174
1175        while (status != Z_STREAM_END) {
1176                if (0 < len && !s.avail_in) {
1177                        size_t cnt = in_sz < len ? in_sz : (size_t)len;
1178                        size_t n = fread(in_buf, 1, cnt, stdin);
1179                        if (!n && feof(stdin))
1180                                die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1181
1182                        git_SHA1_Update(&c, in_buf, n);
1183                        s.next_in = in_buf;
1184                        s.avail_in = n;
1185                        len -= n;
1186                }
1187
1188                status = deflate(&s, len ? 0 : Z_FINISH);
1189
1190                if (!s.avail_out || status == Z_STREAM_END) {
1191                        size_t n = s.next_out - out_buf;
1192                        sha1write(pack_file, out_buf, n);
1193                        pack_size += n;
1194                        s.next_out = out_buf;
1195                        s.avail_out = out_sz;
1196                }
1197
1198                switch (status) {
1199                case Z_OK:
1200                case Z_BUF_ERROR:
1201                case Z_STREAM_END:
1202                        continue;
1203                default:
1204                        die("unexpected deflate failure: %d", status);
1205                }
1206        }
1207        deflateEnd(&s);
1208        git_SHA1_Final(sha1, &c);
1209
1210        if (sha1out)
1211                hashcpy(sha1out, sha1);
1212
1213        e = insert_object(sha1);
1214
1215        if (mark)
1216                insert_mark(mark, e);
1217
1218        if (e->idx.offset) {
1219                duplicate_count_by_type[OBJ_BLOB]++;
1220                truncate_pack(offset, &pack_file_ctx);
1221
1222        } else if (find_sha1_pack(sha1, packed_git)) {
1223                e->type = OBJ_BLOB;
1224                e->pack_id = MAX_PACK_ID;
1225                e->idx.offset = 1; /* just not zero! */
1226                duplicate_count_by_type[OBJ_BLOB]++;
1227                truncate_pack(offset, &pack_file_ctx);
1228
1229        } else {
1230                e->depth = 0;
1231                e->type = OBJ_BLOB;
1232                e->pack_id = pack_id;
1233                e->idx.offset = offset;
1234                e->idx.crc32 = crc32_end(pack_file);
1235                object_count++;
1236                object_count_by_type[OBJ_BLOB]++;
1237        }
1238
1239        free(in_buf);
1240        free(out_buf);
1241}
1242
1243/* All calls must be guarded by find_object() or find_mark() to
1244 * ensure the 'struct object_entry' passed was written by this
1245 * process instance.  We unpack the entry by the offset, avoiding
1246 * the need for the corresponding .idx file.  This unpacking rule
1247 * works because we only use OBJ_REF_DELTA within the packfiles
1248 * created by fast-import.
1249 *
1250 * oe must not be NULL.  Such an oe usually comes from giving
1251 * an unknown SHA-1 to find_object() or an undefined mark to
1252 * find_mark().  Callers must test for this condition and use
1253 * the standard read_sha1_file() when it happens.
1254 *
1255 * oe->pack_id must not be MAX_PACK_ID.  Such an oe is usually from
1256 * find_mark(), where the mark was reloaded from an existing marks
1257 * file and is referencing an object that this fast-import process
1258 * instance did not write out to a packfile.  Callers must test for
1259 * this condition and use read_sha1_file() instead.
1260 */
1261static void *gfi_unpack_entry(
1262        struct object_entry *oe,
1263        unsigned long *sizep)
1264{
1265        enum object_type type;
1266        struct packed_git *p = all_packs[oe->pack_id];
1267        if (p == pack_data && p->pack_size < (pack_size + 20)) {
1268                /* The object is stored in the packfile we are writing to
1269                 * and we have modified it since the last time we scanned
1270                 * back to read a previously written object.  If an old
1271                 * window covered [p->pack_size, p->pack_size + 20) its
1272                 * data is stale and is not valid.  Closing all windows
1273                 * and updating the packfile length ensures we can read
1274                 * the newly written data.
1275                 */
1276                close_pack_windows(p);
1277                sha1flush(pack_file);
1278
1279                /* We have to offer 20 bytes additional on the end of
1280                 * the packfile as the core unpacker code assumes the
1281                 * footer is present at the file end and must promise
1282                 * at least 20 bytes within any window it maps.  But
1283                 * we don't actually create the footer here.
1284                 */
1285                p->pack_size = pack_size + 20;
1286        }
1287        return unpack_entry(p, oe->idx.offset, &type, sizep);
1288}
1289
1290static const char *get_mode(const char *str, uint16_t *modep)
1291{
1292        unsigned char c;
1293        uint16_t mode = 0;
1294
1295        while ((c = *str++) != ' ') {
1296                if (c < '0' || c > '7')
1297                        return NULL;
1298                mode = (mode << 3) + (c - '0');
1299        }
1300        *modep = mode;
1301        return str;
1302}
1303
1304static void load_tree(struct tree_entry *root)
1305{
1306        unsigned char *sha1 = root->versions[1].sha1;
1307        struct object_entry *myoe;
1308        struct tree_content *t;
1309        unsigned long size;
1310        char *buf;
1311        const char *c;
1312
1313        root->tree = t = new_tree_content(8);
1314        if (is_null_sha1(sha1))
1315                return;
1316
1317        myoe = find_object(sha1);
1318        if (myoe && myoe->pack_id != MAX_PACK_ID) {
1319                if (myoe->type != OBJ_TREE)
1320                        die("Not a tree: %s", sha1_to_hex(sha1));
1321                t->delta_depth = myoe->depth;
1322                buf = gfi_unpack_entry(myoe, &size);
1323                if (!buf)
1324                        die("Can't load tree %s", sha1_to_hex(sha1));
1325        } else {
1326                enum object_type type;
1327                buf = read_sha1_file(sha1, &type, &size);
1328                if (!buf || type != OBJ_TREE)
1329                        die("Can't load tree %s", sha1_to_hex(sha1));
1330        }
1331
1332        c = buf;
1333        while (c != (buf + size)) {
1334                struct tree_entry *e = new_tree_entry();
1335
1336                if (t->entry_count == t->entry_capacity)
1337                        root->tree = t = grow_tree_content(t, t->entry_count);
1338                t->entries[t->entry_count++] = e;
1339
1340                e->tree = NULL;
1341                c = get_mode(c, &e->versions[1].mode);
1342                if (!c)
1343                        die("Corrupt mode in %s", sha1_to_hex(sha1));
1344                e->versions[0].mode = e->versions[1].mode;
1345                e->name = to_atom(c, strlen(c));
1346                c += e->name->str_len + 1;
1347                hashcpy(e->versions[0].sha1, (unsigned char *)c);
1348                hashcpy(e->versions[1].sha1, (unsigned char *)c);
1349                c += 20;
1350        }
1351        free(buf);
1352}
1353
1354static int tecmp0 (const void *_a, const void *_b)
1355{
1356        struct tree_entry *a = *((struct tree_entry**)_a);
1357        struct tree_entry *b = *((struct tree_entry**)_b);
1358        return base_name_compare(
1359                a->name->str_dat, a->name->str_len, a->versions[0].mode,
1360                b->name->str_dat, b->name->str_len, b->versions[0].mode);
1361}
1362
1363static int tecmp1 (const void *_a, const void *_b)
1364{
1365        struct tree_entry *a = *((struct tree_entry**)_a);
1366        struct tree_entry *b = *((struct tree_entry**)_b);
1367        return base_name_compare(
1368                a->name->str_dat, a->name->str_len, a->versions[1].mode,
1369                b->name->str_dat, b->name->str_len, b->versions[1].mode);
1370}
1371
1372static void mktree(struct tree_content *t, int v, struct strbuf *b)
1373{
1374        size_t maxlen = 0;
1375        unsigned int i;
1376
1377        if (!v)
1378                qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1379        else
1380                qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1381
1382        for (i = 0; i < t->entry_count; i++) {
1383                if (t->entries[i]->versions[v].mode)
1384                        maxlen += t->entries[i]->name->str_len + 34;
1385        }
1386
1387        strbuf_reset(b);
1388        strbuf_grow(b, maxlen);
1389        for (i = 0; i < t->entry_count; i++) {
1390                struct tree_entry *e = t->entries[i];
1391                if (!e->versions[v].mode)
1392                        continue;
1393                strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1394                                        e->name->str_dat, '\0');
1395                strbuf_add(b, e->versions[v].sha1, 20);
1396        }
1397}
1398
1399static void store_tree(struct tree_entry *root)
1400{
1401        struct tree_content *t = root->tree;
1402        unsigned int i, j, del;
1403        struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1404        struct object_entry *le;
1405
1406        if (!is_null_sha1(root->versions[1].sha1))
1407                return;
1408
1409        for (i = 0; i < t->entry_count; i++) {
1410                if (t->entries[i]->tree)
1411                        store_tree(t->entries[i]);
1412        }
1413
1414        le = find_object(root->versions[0].sha1);
1415        if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1416                mktree(t, 0, &old_tree);
1417                lo.data = old_tree;
1418                lo.offset = le->idx.offset;
1419                lo.depth = t->delta_depth;
1420        }
1421
1422        mktree(t, 1, &new_tree);
1423        store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1424
1425        t->delta_depth = lo.depth;
1426        for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1427                struct tree_entry *e = t->entries[i];
1428                if (e->versions[1].mode) {
1429                        e->versions[0].mode = e->versions[1].mode;
1430                        hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1431                        t->entries[j++] = e;
1432                } else {
1433                        release_tree_entry(e);
1434                        del++;
1435                }
1436        }
1437        t->entry_count -= del;
1438}
1439
1440static void tree_content_replace(
1441        struct tree_entry *root,
1442        const unsigned char *sha1,
1443        const uint16_t mode,
1444        struct tree_content *newtree)
1445{
1446        if (!S_ISDIR(mode))
1447                die("Root cannot be a non-directory");
1448        hashcpy(root->versions[1].sha1, sha1);
1449        if (root->tree)
1450                release_tree_content_recursive(root->tree);
1451        root->tree = newtree;
1452}
1453
1454static int tree_content_set(
1455        struct tree_entry *root,
1456        const char *p,
1457        const unsigned char *sha1,
1458        const uint16_t mode,
1459        struct tree_content *subtree)
1460{
1461        struct tree_content *t;
1462        const char *slash1;
1463        unsigned int i, n;
1464        struct tree_entry *e;
1465
1466        slash1 = strchr(p, '/');
1467        if (slash1)
1468                n = slash1 - p;
1469        else
1470                n = strlen(p);
1471        if (!n)
1472                die("Empty path component found in input");
1473        if (!slash1 && !S_ISDIR(mode) && subtree)
1474                die("Non-directories cannot have subtrees");
1475
1476        if (!root->tree)
1477                load_tree(root);
1478        t = root->tree;
1479        for (i = 0; i < t->entry_count; i++) {
1480                e = t->entries[i];
1481                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1482                        if (!slash1) {
1483                                if (!S_ISDIR(mode)
1484                                                && e->versions[1].mode == mode
1485                                                && !hashcmp(e->versions[1].sha1, sha1))
1486                                        return 0;
1487                                e->versions[1].mode = mode;
1488                                hashcpy(e->versions[1].sha1, sha1);
1489                                if (e->tree)
1490                                        release_tree_content_recursive(e->tree);
1491                                e->tree = subtree;
1492                                hashclr(root->versions[1].sha1);
1493                                return 1;
1494                        }
1495                        if (!S_ISDIR(e->versions[1].mode)) {
1496                                e->tree = new_tree_content(8);
1497                                e->versions[1].mode = S_IFDIR;
1498                        }
1499                        if (!e->tree)
1500                                load_tree(e);
1501                        if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1502                                hashclr(root->versions[1].sha1);
1503                                return 1;
1504                        }
1505                        return 0;
1506                }
1507        }
1508
1509        if (t->entry_count == t->entry_capacity)
1510                root->tree = t = grow_tree_content(t, t->entry_count);
1511        e = new_tree_entry();
1512        e->name = to_atom(p, n);
1513        e->versions[0].mode = 0;
1514        hashclr(e->versions[0].sha1);
1515        t->entries[t->entry_count++] = e;
1516        if (slash1) {
1517                e->tree = new_tree_content(8);
1518                e->versions[1].mode = S_IFDIR;
1519                tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1520        } else {
1521                e->tree = subtree;
1522                e->versions[1].mode = mode;
1523                hashcpy(e->versions[1].sha1, sha1);
1524        }
1525        hashclr(root->versions[1].sha1);
1526        return 1;
1527}
1528
1529static int tree_content_remove(
1530        struct tree_entry *root,
1531        const char *p,
1532        struct tree_entry *backup_leaf)
1533{
1534        struct tree_content *t;
1535        const char *slash1;
1536        unsigned int i, n;
1537        struct tree_entry *e;
1538
1539        slash1 = strchr(p, '/');
1540        if (slash1)
1541                n = slash1 - p;
1542        else
1543                n = strlen(p);
1544
1545        if (!root->tree)
1546                load_tree(root);
1547        t = root->tree;
1548        for (i = 0; i < t->entry_count; i++) {
1549                e = t->entries[i];
1550                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1551                        if (slash1 && !S_ISDIR(e->versions[1].mode))
1552                                /*
1553                                 * If p names a file in some subdirectory, and a
1554                                 * file or symlink matching the name of the
1555                                 * parent directory of p exists, then p cannot
1556                                 * exist and need not be deleted.
1557                                 */
1558                                return 1;
1559                        if (!slash1 || !S_ISDIR(e->versions[1].mode))
1560                                goto del_entry;
1561                        if (!e->tree)
1562                                load_tree(e);
1563                        if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1564                                for (n = 0; n < e->tree->entry_count; n++) {
1565                                        if (e->tree->entries[n]->versions[1].mode) {
1566                                                hashclr(root->versions[1].sha1);
1567                                                return 1;
1568                                        }
1569                                }
1570                                backup_leaf = NULL;
1571                                goto del_entry;
1572                        }
1573                        return 0;
1574                }
1575        }
1576        return 0;
1577
1578del_entry:
1579        if (backup_leaf)
1580                memcpy(backup_leaf, e, sizeof(*backup_leaf));
1581        else if (e->tree)
1582                release_tree_content_recursive(e->tree);
1583        e->tree = NULL;
1584        e->versions[1].mode = 0;
1585        hashclr(e->versions[1].sha1);
1586        hashclr(root->versions[1].sha1);
1587        return 1;
1588}
1589
1590static int tree_content_get(
1591        struct tree_entry *root,
1592        const char *p,
1593        struct tree_entry *leaf)
1594{
1595        struct tree_content *t;
1596        const char *slash1;
1597        unsigned int i, n;
1598        struct tree_entry *e;
1599
1600        slash1 = strchr(p, '/');
1601        if (slash1)
1602                n = slash1 - p;
1603        else
1604                n = strlen(p);
1605
1606        if (!root->tree)
1607                load_tree(root);
1608        t = root->tree;
1609        for (i = 0; i < t->entry_count; i++) {
1610                e = t->entries[i];
1611                if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1612                        if (!slash1) {
1613                                memcpy(leaf, e, sizeof(*leaf));
1614                                if (e->tree && is_null_sha1(e->versions[1].sha1))
1615                                        leaf->tree = dup_tree_content(e->tree);
1616                                else
1617                                        leaf->tree = NULL;
1618                                return 1;
1619                        }
1620                        if (!S_ISDIR(e->versions[1].mode))
1621                                return 0;
1622                        if (!e->tree)
1623                                load_tree(e);
1624                        return tree_content_get(e, slash1 + 1, leaf);
1625                }
1626        }
1627        return 0;
1628}
1629
1630static int update_branch(struct branch *b)
1631{
1632        static const char *msg = "fast-import";
1633        struct ref_lock *lock;
1634        unsigned char old_sha1[20];
1635
1636        if (is_null_sha1(b->sha1))
1637                return 0;
1638        if (read_ref(b->name, old_sha1))
1639                hashclr(old_sha1);
1640        lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1641        if (!lock)
1642                return error("Unable to lock %s", b->name);
1643        if (!force_update && !is_null_sha1(old_sha1)) {
1644                struct commit *old_cmit, *new_cmit;
1645
1646                old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1647                new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1648                if (!old_cmit || !new_cmit) {
1649                        unlock_ref(lock);
1650                        return error("Branch %s is missing commits.", b->name);
1651                }
1652
1653                if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1654                        unlock_ref(lock);
1655                        warning("Not updating %s"
1656                                " (new tip %s does not contain %s)",
1657                                b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1658                        return -1;
1659                }
1660        }
1661        if (write_ref_sha1(lock, b->sha1, msg) < 0)
1662                return error("Unable to update %s", b->name);
1663        return 0;
1664}
1665
1666static void dump_branches(void)
1667{
1668        unsigned int i;
1669        struct branch *b;
1670
1671        for (i = 0; i < branch_table_sz; i++) {
1672                for (b = branch_table[i]; b; b = b->table_next_branch)
1673                        failure |= update_branch(b);
1674        }
1675}
1676
1677static void dump_tags(void)
1678{
1679        static const char *msg = "fast-import";
1680        struct tag *t;
1681        struct ref_lock *lock;
1682        char ref_name[PATH_MAX];
1683
1684        for (t = first_tag; t; t = t->next_tag) {
1685                sprintf(ref_name, "tags/%s", t->name);
1686                lock = lock_ref_sha1(ref_name, NULL);
1687                if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1688                        failure |= error("Unable to update %s", ref_name);
1689        }
1690}
1691
1692static void dump_marks_helper(FILE *f,
1693        uintmax_t base,
1694        struct mark_set *m)
1695{
1696        uintmax_t k;
1697        if (m->shift) {
1698                for (k = 0; k < 1024; k++) {
1699                        if (m->data.sets[k])
1700                                dump_marks_helper(f, base + (k << m->shift),
1701                                        m->data.sets[k]);
1702                }
1703        } else {
1704                for (k = 0; k < 1024; k++) {
1705                        if (m->data.marked[k])
1706                                fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1707                                        sha1_to_hex(m->data.marked[k]->idx.sha1));
1708                }
1709        }
1710}
1711
1712static void dump_marks(void)
1713{
1714        static struct lock_file mark_lock;
1715        int mark_fd;
1716        FILE *f;
1717
1718        if (!export_marks_file)
1719                return;
1720
1721        mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
1722        if (mark_fd < 0) {
1723                failure |= error("Unable to write marks file %s: %s",
1724                        export_marks_file, strerror(errno));
1725                return;
1726        }
1727
1728        f = fdopen(mark_fd, "w");
1729        if (!f) {
1730                int saved_errno = errno;
1731                rollback_lock_file(&mark_lock);
1732                failure |= error("Unable to write marks file %s: %s",
1733                        export_marks_file, strerror(saved_errno));
1734                return;
1735        }
1736
1737        /*
1738         * Since the lock file was fdopen()'ed, it should not be close()'ed.
1739         * Assign -1 to the lock file descriptor so that commit_lock_file()
1740         * won't try to close() it.
1741         */
1742        mark_lock.fd = -1;
1743
1744        dump_marks_helper(f, 0, marks);
1745        if (ferror(f) || fclose(f)) {
1746                int saved_errno = errno;
1747                rollback_lock_file(&mark_lock);
1748                failure |= error("Unable to write marks file %s: %s",
1749                        export_marks_file, strerror(saved_errno));
1750                return;
1751        }
1752
1753        if (commit_lock_file(&mark_lock)) {
1754                int saved_errno = errno;
1755                rollback_lock_file(&mark_lock);
1756                failure |= error("Unable to commit marks file %s: %s",
1757                        export_marks_file, strerror(saved_errno));
1758                return;
1759        }
1760}
1761
1762static void read_marks(void)
1763{
1764        char line[512];
1765        FILE *f = fopen(import_marks_file, "r");
1766        if (!f)
1767                die_errno("cannot read '%s'", import_marks_file);
1768        while (fgets(line, sizeof(line), f)) {
1769                uintmax_t mark;
1770                char *end;
1771                unsigned char sha1[20];
1772                struct object_entry *e;
1773
1774                end = strchr(line, '\n');
1775                if (line[0] != ':' || !end)
1776                        die("corrupt mark line: %s", line);
1777                *end = 0;
1778                mark = strtoumax(line + 1, &end, 10);
1779                if (!mark || end == line + 1
1780                        || *end != ' ' || get_sha1(end + 1, sha1))
1781                        die("corrupt mark line: %s", line);
1782                e = find_object(sha1);
1783                if (!e) {
1784                        enum object_type type = sha1_object_info(sha1, NULL);
1785                        if (type < 0)
1786                                die("object not found: %s", sha1_to_hex(sha1));
1787                        e = insert_object(sha1);
1788                        e->type = type;
1789                        e->pack_id = MAX_PACK_ID;
1790                        e->idx.offset = 1; /* just not zero! */
1791                }
1792                insert_mark(mark, e);
1793        }
1794        fclose(f);
1795}
1796
1797
1798static int read_next_command(void)
1799{
1800        static int stdin_eof = 0;
1801
1802        if (stdin_eof) {
1803                unread_command_buf = 0;
1804                return EOF;
1805        }
1806
1807        do {
1808                if (unread_command_buf) {
1809                        unread_command_buf = 0;
1810                } else {
1811                        struct recent_command *rc;
1812
1813                        strbuf_detach(&command_buf, NULL);
1814                        stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1815                        if (stdin_eof)
1816                                return EOF;
1817
1818                        if (!seen_data_command
1819                                && prefixcmp(command_buf.buf, "feature ")
1820                                && prefixcmp(command_buf.buf, "option ")) {
1821                                parse_argv();
1822                        }
1823
1824                        rc = rc_free;
1825                        if (rc)
1826                                rc_free = rc->next;
1827                        else {
1828                                rc = cmd_hist.next;
1829                                cmd_hist.next = rc->next;
1830                                cmd_hist.next->prev = &cmd_hist;
1831                                free(rc->buf);
1832                        }
1833
1834                        rc->buf = command_buf.buf;
1835                        rc->prev = cmd_tail;
1836                        rc->next = cmd_hist.prev;
1837                        rc->prev->next = rc;
1838                        cmd_tail = rc;
1839                }
1840        } while (command_buf.buf[0] == '#');
1841
1842        return 0;
1843}
1844
1845static void skip_optional_lf(void)
1846{
1847        int term_char = fgetc(stdin);
1848        if (term_char != '\n' && term_char != EOF)
1849                ungetc(term_char, stdin);
1850}
1851
1852static void parse_mark(void)
1853{
1854        if (!prefixcmp(command_buf.buf, "mark :")) {
1855                next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1856                read_next_command();
1857        }
1858        else
1859                next_mark = 0;
1860}
1861
1862static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
1863{
1864        strbuf_reset(sb);
1865
1866        if (prefixcmp(command_buf.buf, "data "))
1867                die("Expected 'data n' command, found: %s", command_buf.buf);
1868
1869        if (!prefixcmp(command_buf.buf + 5, "<<")) {
1870                char *term = xstrdup(command_buf.buf + 5 + 2);
1871                size_t term_len = command_buf.len - 5 - 2;
1872
1873                strbuf_detach(&command_buf, NULL);
1874                for (;;) {
1875                        if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1876                                die("EOF in data (terminator '%s' not found)", term);
1877                        if (term_len == command_buf.len
1878                                && !strcmp(term, command_buf.buf))
1879                                break;
1880                        strbuf_addbuf(sb, &command_buf);
1881                        strbuf_addch(sb, '\n');
1882                }
1883                free(term);
1884        }
1885        else {
1886                uintmax_t len = strtoumax(command_buf.buf + 5, NULL, 10);
1887                size_t n = 0, length = (size_t)len;
1888
1889                if (limit && limit < len) {
1890                        *len_res = len;
1891                        return 0;
1892                }
1893                if (length < len)
1894                        die("data is too large to use in this context");
1895
1896                while (n < length) {
1897                        size_t s = strbuf_fread(sb, length - n, stdin);
1898                        if (!s && feof(stdin))
1899                                die("EOF in data (%lu bytes remaining)",
1900                                        (unsigned long)(length - n));
1901                        n += s;
1902                }
1903        }
1904
1905        skip_optional_lf();
1906        return 1;
1907}
1908
1909static int validate_raw_date(const char *src, char *result, int maxlen)
1910{
1911        const char *orig_src = src;
1912        char *endp;
1913        unsigned long num;
1914
1915        errno = 0;
1916
1917        num = strtoul(src, &endp, 10);
1918        /* NEEDSWORK: perhaps check for reasonable values? */
1919        if (errno || endp == src || *endp != ' ')
1920                return -1;
1921
1922        src = endp + 1;
1923        if (*src != '-' && *src != '+')
1924                return -1;
1925
1926        num = strtoul(src + 1, &endp, 10);
1927        if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
1928            1400 < num)
1929                return -1;
1930
1931        strcpy(result, orig_src);
1932        return 0;
1933}
1934
1935static char *parse_ident(const char *buf)
1936{
1937        const char *gt;
1938        size_t name_len;
1939        char *ident;
1940
1941        gt = strrchr(buf, '>');
1942        if (!gt)
1943                die("Missing > in ident string: %s", buf);
1944        gt++;
1945        if (*gt != ' ')
1946                die("Missing space after > in ident string: %s", buf);
1947        gt++;
1948        name_len = gt - buf;
1949        ident = xmalloc(name_len + 24);
1950        strncpy(ident, buf, name_len);
1951
1952        switch (whenspec) {
1953        case WHENSPEC_RAW:
1954                if (validate_raw_date(gt, ident + name_len, 24) < 0)
1955                        die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1956                break;
1957        case WHENSPEC_RFC2822:
1958                if (parse_date(gt, ident + name_len, 24) < 0)
1959                        die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1960                break;
1961        case WHENSPEC_NOW:
1962                if (strcmp("now", gt))
1963                        die("Date in ident must be 'now': %s", buf);
1964                datestamp(ident + name_len, 24);
1965                break;
1966        }
1967
1968        return ident;
1969}
1970
1971static void parse_and_store_blob(
1972        struct last_object *last,
1973        unsigned char *sha1out,
1974        uintmax_t mark)
1975{
1976        static struct strbuf buf = STRBUF_INIT;
1977        uintmax_t len;
1978
1979        if (parse_data(&buf, big_file_threshold, &len))
1980                store_object(OBJ_BLOB, &buf, last, sha1out, mark);
1981        else {
1982                if (last) {
1983                        strbuf_release(&last->data);
1984                        last->offset = 0;
1985                        last->depth = 0;
1986                }
1987                stream_blob(len, sha1out, mark);
1988                skip_optional_lf();
1989        }
1990}
1991
1992static void parse_new_blob(void)
1993{
1994        read_next_command();
1995        parse_mark();
1996        parse_and_store_blob(&last_blob, NULL, next_mark);
1997}
1998
1999static void unload_one_branch(void)
2000{
2001        while (cur_active_branches
2002                && cur_active_branches >= max_active_branches) {
2003                uintmax_t min_commit = ULONG_MAX;
2004                struct branch *e, *l = NULL, *p = NULL;
2005
2006                for (e = active_branches; e; e = e->active_next_branch) {
2007                        if (e->last_commit < min_commit) {
2008                                p = l;
2009                                min_commit = e->last_commit;
2010                        }
2011                        l = e;
2012                }
2013
2014                if (p) {
2015                        e = p->active_next_branch;
2016                        p->active_next_branch = e->active_next_branch;
2017                } else {
2018                        e = active_branches;
2019                        active_branches = e->active_next_branch;
2020                }
2021                e->active = 0;
2022                e->active_next_branch = NULL;
2023                if (e->branch_tree.tree) {
2024                        release_tree_content_recursive(e->branch_tree.tree);
2025                        e->branch_tree.tree = NULL;
2026                }
2027                cur_active_branches--;
2028        }
2029}
2030
2031static void load_branch(struct branch *b)
2032{
2033        load_tree(&b->branch_tree);
2034        if (!b->active) {
2035                b->active = 1;
2036                b->active_next_branch = active_branches;
2037                active_branches = b;
2038                cur_active_branches++;
2039                branch_load_count++;
2040        }
2041}
2042
2043static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2044{
2045        unsigned char fanout = 0;
2046        while ((num_notes >>= 8))
2047                fanout++;
2048        return fanout;
2049}
2050
2051static void construct_path_with_fanout(const char *hex_sha1,
2052                unsigned char fanout, char *path)
2053{
2054        unsigned int i = 0, j = 0;
2055        if (fanout >= 20)
2056                die("Too large fanout (%u)", fanout);
2057        while (fanout) {
2058                path[i++] = hex_sha1[j++];
2059                path[i++] = hex_sha1[j++];
2060                path[i++] = '/';
2061                fanout--;
2062        }
2063        memcpy(path + i, hex_sha1 + j, 40 - j);
2064        path[i + 40 - j] = '\0';
2065}
2066
2067static uintmax_t do_change_note_fanout(
2068                struct tree_entry *orig_root, struct tree_entry *root,
2069                char *hex_sha1, unsigned int hex_sha1_len,
2070                char *fullpath, unsigned int fullpath_len,
2071                unsigned char fanout)
2072{
2073        struct tree_content *t;
2074        struct tree_entry *e, leaf;
2075        unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2076        uintmax_t num_notes = 0;
2077        unsigned char sha1[20];
2078        char realpath[60];
2079
2080        if (!root->tree);
2081                load_tree(root);
2082        t = root->tree;
2083        for (i = 0; t && i < t->entry_count; i++) {
2084                e = t->entries[i];
2085                tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2086                tmp_fullpath_len = fullpath_len;
2087
2088                /*
2089                 * We're interested in EITHER existing note entries (entries
2090                 * with exactly 40 hex chars in path, not including directory
2091                 * separators), OR directory entries that may contain note
2092                 * entries (with < 40 hex chars in path).
2093                 * Also, each path component in a note entry must be a multiple
2094                 * of 2 chars.
2095                 */
2096                if (!e->versions[1].mode ||
2097                    tmp_hex_sha1_len > 40 ||
2098                    e->name->str_len % 2)
2099                        continue;
2100
2101                /* This _may_ be a note entry, or a subdir containing notes */
2102                memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2103                       e->name->str_len);
2104                if (tmp_fullpath_len)
2105                        fullpath[tmp_fullpath_len++] = '/';
2106                memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2107                       e->name->str_len);
2108                tmp_fullpath_len += e->name->str_len;
2109                fullpath[tmp_fullpath_len] = '\0';
2110
2111                if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2112                        /* This is a note entry */
2113                        construct_path_with_fanout(hex_sha1, fanout, realpath);
2114                        if (!strcmp(fullpath, realpath)) {
2115                                /* Note entry is in correct location */
2116                                num_notes++;
2117                                continue;
2118                        }
2119
2120                        /* Rename fullpath to realpath */
2121                        if (!tree_content_remove(orig_root, fullpath, &leaf))
2122                                die("Failed to remove path %s", fullpath);
2123                        tree_content_set(orig_root, realpath,
2124                                leaf.versions[1].sha1,
2125                                leaf.versions[1].mode,
2126                                leaf.tree);
2127                } else if (S_ISDIR(e->versions[1].mode)) {
2128                        /* This is a subdir that may contain note entries */
2129                        if (!e->tree)
2130                                load_tree(e);
2131                        num_notes += do_change_note_fanout(orig_root, e,
2132                                hex_sha1, tmp_hex_sha1_len,
2133                                fullpath, tmp_fullpath_len, fanout);
2134                }
2135
2136                /* The above may have reallocated the current tree_content */
2137                t = root->tree;
2138        }
2139        return num_notes;
2140}
2141
2142static uintmax_t change_note_fanout(struct tree_entry *root,
2143                unsigned char fanout)
2144{
2145        char hex_sha1[40], path[60];
2146        return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2147}
2148
2149static void file_change_m(struct branch *b)
2150{
2151        const char *p = command_buf.buf + 2;
2152        static struct strbuf uq = STRBUF_INIT;
2153        const char *endp;
2154        struct object_entry *oe = oe;
2155        unsigned char sha1[20];
2156        uint16_t mode, inline_data = 0;
2157
2158        p = get_mode(p, &mode);
2159        if (!p)
2160                die("Corrupt mode: %s", command_buf.buf);
2161        switch (mode) {
2162        case 0644:
2163        case 0755:
2164                mode |= S_IFREG;
2165        case S_IFREG | 0644:
2166        case S_IFREG | 0755:
2167        case S_IFLNK:
2168        case S_IFDIR:
2169        case S_IFGITLINK:
2170                /* ok */
2171                break;
2172        default:
2173                die("Corrupt mode: %s", command_buf.buf);
2174        }
2175
2176        if (*p == ':') {
2177                char *x;
2178                oe = find_mark(strtoumax(p + 1, &x, 10));
2179                hashcpy(sha1, oe->idx.sha1);
2180                p = x;
2181        } else if (!prefixcmp(p, "inline")) {
2182                inline_data = 1;
2183                p += 6;
2184        } else {
2185                if (get_sha1_hex(p, sha1))
2186                        die("Invalid SHA1: %s", command_buf.buf);
2187                oe = find_object(sha1);
2188                p += 40;
2189        }
2190        if (*p++ != ' ')
2191                die("Missing space after SHA1: %s", command_buf.buf);
2192
2193        strbuf_reset(&uq);
2194        if (!unquote_c_style(&uq, p, &endp)) {
2195                if (*endp)
2196                        die("Garbage after path in: %s", command_buf.buf);
2197                p = uq.buf;
2198        }
2199
2200        if (S_ISGITLINK(mode)) {
2201                if (inline_data)
2202                        die("Git links cannot be specified 'inline': %s",
2203                                command_buf.buf);
2204                else if (oe) {
2205                        if (oe->type != OBJ_COMMIT)
2206                                die("Not a commit (actually a %s): %s",
2207                                        typename(oe->type), command_buf.buf);
2208                }
2209                /*
2210                 * Accept the sha1 without checking; it expected to be in
2211                 * another repository.
2212                 */
2213        } else if (inline_data) {
2214                if (S_ISDIR(mode))
2215                        die("Directories cannot be specified 'inline': %s",
2216                                command_buf.buf);
2217                if (p != uq.buf) {
2218                        strbuf_addstr(&uq, p);
2219                        p = uq.buf;
2220                }
2221                read_next_command();
2222                parse_and_store_blob(&last_blob, sha1, 0);
2223        } else {
2224                enum object_type expected = S_ISDIR(mode) ?
2225                                                OBJ_TREE: OBJ_BLOB;
2226                enum object_type type = oe ? oe->type :
2227                                        sha1_object_info(sha1, NULL);
2228                if (type < 0)
2229                        die("%s not found: %s",
2230                                        S_ISDIR(mode) ?  "Tree" : "Blob",
2231                                        command_buf.buf);
2232                if (type != expected)
2233                        die("Not a %s (actually a %s): %s",
2234                                typename(expected), typename(type),
2235                                command_buf.buf);
2236        }
2237
2238        if (!*p) {
2239                tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2240                return;
2241        }
2242        tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
2243}
2244
2245static void file_change_d(struct branch *b)
2246{
2247        const char *p = command_buf.buf + 2;
2248        static struct strbuf uq = STRBUF_INIT;
2249        const char *endp;
2250
2251        strbuf_reset(&uq);
2252        if (!unquote_c_style(&uq, p, &endp)) {
2253                if (*endp)
2254                        die("Garbage after path in: %s", command_buf.buf);
2255                p = uq.buf;
2256        }
2257        tree_content_remove(&b->branch_tree, p, NULL);
2258}
2259
2260static void file_change_cr(struct branch *b, int rename)
2261{
2262        const char *s, *d;
2263        static struct strbuf s_uq = STRBUF_INIT;
2264        static struct strbuf d_uq = STRBUF_INIT;
2265        const char *endp;
2266        struct tree_entry leaf;
2267
2268        s = command_buf.buf + 2;
2269        strbuf_reset(&s_uq);
2270        if (!unquote_c_style(&s_uq, s, &endp)) {
2271                if (*endp != ' ')
2272                        die("Missing space after source: %s", command_buf.buf);
2273        } else {
2274                endp = strchr(s, ' ');
2275                if (!endp)
2276                        die("Missing space after source: %s", command_buf.buf);
2277                strbuf_add(&s_uq, s, endp - s);
2278        }
2279        s = s_uq.buf;
2280
2281        endp++;
2282        if (!*endp)
2283                die("Missing dest: %s", command_buf.buf);
2284
2285        d = endp;
2286        strbuf_reset(&d_uq);
2287        if (!unquote_c_style(&d_uq, d, &endp)) {
2288                if (*endp)
2289                        die("Garbage after dest in: %s", command_buf.buf);
2290                d = d_uq.buf;
2291        }
2292
2293        memset(&leaf, 0, sizeof(leaf));
2294        if (rename)
2295                tree_content_remove(&b->branch_tree, s, &leaf);
2296        else
2297                tree_content_get(&b->branch_tree, s, &leaf);
2298        if (!leaf.versions[1].mode)
2299                die("Path %s not in branch", s);
2300        if (!*d) {      /* C "path/to/subdir" "" */
2301                tree_content_replace(&b->branch_tree,
2302                        leaf.versions[1].sha1,
2303                        leaf.versions[1].mode,
2304                        leaf.tree);
2305                return;
2306        }
2307        tree_content_set(&b->branch_tree, d,
2308                leaf.versions[1].sha1,
2309                leaf.versions[1].mode,
2310                leaf.tree);
2311}
2312
2313static void note_change_n(struct branch *b, unsigned char old_fanout)
2314{
2315        const char *p = command_buf.buf + 2;
2316        static struct strbuf uq = STRBUF_INIT;
2317        struct object_entry *oe = oe;
2318        struct branch *s;
2319        unsigned char sha1[20], commit_sha1[20];
2320        char path[60];
2321        uint16_t inline_data = 0;
2322        unsigned char new_fanout;
2323
2324        /* <dataref> or 'inline' */
2325        if (*p == ':') {
2326                char *x;
2327                oe = find_mark(strtoumax(p + 1, &x, 10));
2328                hashcpy(sha1, oe->idx.sha1);
2329                p = x;
2330        } else if (!prefixcmp(p, "inline")) {
2331                inline_data = 1;
2332                p += 6;
2333        } else {
2334                if (get_sha1_hex(p, sha1))
2335                        die("Invalid SHA1: %s", command_buf.buf);
2336                oe = find_object(sha1);
2337                p += 40;
2338        }
2339        if (*p++ != ' ')
2340                die("Missing space after SHA1: %s", command_buf.buf);
2341
2342        /* <committish> */
2343        s = lookup_branch(p);
2344        if (s) {
2345                hashcpy(commit_sha1, s->sha1);
2346        } else if (*p == ':') {
2347                uintmax_t commit_mark = strtoumax(p + 1, NULL, 10);
2348                struct object_entry *commit_oe = find_mark(commit_mark);
2349                if (commit_oe->type != OBJ_COMMIT)
2350                        die("Mark :%" PRIuMAX " not a commit", commit_mark);
2351                hashcpy(commit_sha1, commit_oe->idx.sha1);
2352        } else if (!get_sha1(p, commit_sha1)) {
2353                unsigned long size;
2354                char *buf = read_object_with_reference(commit_sha1,
2355                        commit_type, &size, commit_sha1);
2356                if (!buf || size < 46)
2357                        die("Not a valid commit: %s", p);
2358                free(buf);
2359        } else
2360                die("Invalid ref name or SHA1 expression: %s", p);
2361
2362        if (inline_data) {
2363                if (p != uq.buf) {
2364                        strbuf_addstr(&uq, p);
2365                        p = uq.buf;
2366                }
2367                read_next_command();
2368                parse_and_store_blob(&last_blob, sha1, 0);
2369        } else if (oe) {
2370                if (oe->type != OBJ_BLOB)
2371                        die("Not a blob (actually a %s): %s",
2372                                typename(oe->type), command_buf.buf);
2373        } else if (!is_null_sha1(sha1)) {
2374                enum object_type type = sha1_object_info(sha1, NULL);
2375                if (type < 0)
2376                        die("Blob not found: %s", command_buf.buf);
2377                if (type != OBJ_BLOB)
2378                        die("Not a blob (actually a %s): %s",
2379                            typename(type), command_buf.buf);
2380        }
2381
2382        construct_path_with_fanout(sha1_to_hex(commit_sha1), old_fanout, path);
2383        if (tree_content_remove(&b->branch_tree, path, NULL))
2384                b->num_notes--;
2385
2386        if (is_null_sha1(sha1))
2387                return; /* nothing to insert */
2388
2389        b->num_notes++;
2390        new_fanout = convert_num_notes_to_fanout(b->num_notes);
2391        construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2392        tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
2393}
2394
2395static void file_change_deleteall(struct branch *b)
2396{
2397        release_tree_content_recursive(b->branch_tree.tree);
2398        hashclr(b->branch_tree.versions[0].sha1);
2399        hashclr(b->branch_tree.versions[1].sha1);
2400        load_tree(&b->branch_tree);
2401        b->num_notes = 0;
2402}
2403
2404static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2405{
2406        if (!buf || size < 46)
2407                die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2408        if (memcmp("tree ", buf, 5)
2409                || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2410                die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2411        hashcpy(b->branch_tree.versions[0].sha1,
2412                b->branch_tree.versions[1].sha1);
2413}
2414
2415static void parse_from_existing(struct branch *b)
2416{
2417        if (is_null_sha1(b->sha1)) {
2418                hashclr(b->branch_tree.versions[0].sha1);
2419                hashclr(b->branch_tree.versions[1].sha1);
2420        } else {
2421                unsigned long size;
2422                char *buf;
2423
2424                buf = read_object_with_reference(b->sha1,
2425                        commit_type, &size, b->sha1);
2426                parse_from_commit(b, buf, size);
2427                free(buf);
2428        }
2429}
2430
2431static int parse_from(struct branch *b)
2432{
2433        const char *from;
2434        struct branch *s;
2435
2436        if (prefixcmp(command_buf.buf, "from "))
2437                return 0;
2438
2439        if (b->branch_tree.tree) {
2440                release_tree_content_recursive(b->branch_tree.tree);
2441                b->branch_tree.tree = NULL;
2442        }
2443
2444        from = strchr(command_buf.buf, ' ') + 1;
2445        s = lookup_branch(from);
2446        if (b == s)
2447                die("Can't create a branch from itself: %s", b->name);
2448        else if (s) {
2449                unsigned char *t = s->branch_tree.versions[1].sha1;
2450                hashcpy(b->sha1, s->sha1);
2451                hashcpy(b->branch_tree.versions[0].sha1, t);
2452                hashcpy(b->branch_tree.versions[1].sha1, t);
2453        } else if (*from == ':') {
2454                uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2455                struct object_entry *oe = find_mark(idnum);
2456                if (oe->type != OBJ_COMMIT)
2457                        die("Mark :%" PRIuMAX " not a commit", idnum);
2458                hashcpy(b->sha1, oe->idx.sha1);
2459                if (oe->pack_id != MAX_PACK_ID) {
2460                        unsigned long size;
2461                        char *buf = gfi_unpack_entry(oe, &size);
2462                        parse_from_commit(b, buf, size);
2463                        free(buf);
2464                } else
2465                        parse_from_existing(b);
2466        } else if (!get_sha1(from, b->sha1))
2467                parse_from_existing(b);
2468        else
2469                die("Invalid ref name or SHA1 expression: %s", from);
2470
2471        read_next_command();
2472        return 1;
2473}
2474
2475static struct hash_list *parse_merge(unsigned int *count)
2476{
2477        struct hash_list *list = NULL, *n, *e = e;
2478        const char *from;
2479        struct branch *s;
2480
2481        *count = 0;
2482        while (!prefixcmp(command_buf.buf, "merge ")) {
2483                from = strchr(command_buf.buf, ' ') + 1;
2484                n = xmalloc(sizeof(*n));
2485                s = lookup_branch(from);
2486                if (s)
2487                        hashcpy(n->sha1, s->sha1);
2488                else if (*from == ':') {
2489                        uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2490                        struct object_entry *oe = find_mark(idnum);
2491                        if (oe->type != OBJ_COMMIT)
2492                                die("Mark :%" PRIuMAX " not a commit", idnum);
2493                        hashcpy(n->sha1, oe->idx.sha1);
2494                } else if (!get_sha1(from, n->sha1)) {
2495                        unsigned long size;
2496                        char *buf = read_object_with_reference(n->sha1,
2497                                commit_type, &size, n->sha1);
2498                        if (!buf || size < 46)
2499                                die("Not a valid commit: %s", from);
2500                        free(buf);
2501                } else
2502                        die("Invalid ref name or SHA1 expression: %s", from);
2503
2504                n->next = NULL;
2505                if (list)
2506                        e->next = n;
2507                else
2508                        list = n;
2509                e = n;
2510                (*count)++;
2511                read_next_command();
2512        }
2513        return list;
2514}
2515
2516static void parse_new_commit(void)
2517{
2518        static struct strbuf msg = STRBUF_INIT;
2519        struct branch *b;
2520        char *sp;
2521        char *author = NULL;
2522        char *committer = NULL;
2523        struct hash_list *merge_list = NULL;
2524        unsigned int merge_count;
2525        unsigned char prev_fanout, new_fanout;
2526
2527        /* Obtain the branch name from the rest of our command */
2528        sp = strchr(command_buf.buf, ' ') + 1;
2529        b = lookup_branch(sp);
2530        if (!b)
2531                b = new_branch(sp);
2532
2533        read_next_command();
2534        parse_mark();
2535        if (!prefixcmp(command_buf.buf, "author ")) {
2536                author = parse_ident(command_buf.buf + 7);
2537                read_next_command();
2538        }
2539        if (!prefixcmp(command_buf.buf, "committer ")) {
2540                committer = parse_ident(command_buf.buf + 10);
2541                read_next_command();
2542        }
2543        if (!committer)
2544                die("Expected committer but didn't get one");
2545        parse_data(&msg, 0, NULL);
2546        read_next_command();
2547        parse_from(b);
2548        merge_list = parse_merge(&merge_count);
2549
2550        /* ensure the branch is active/loaded */
2551        if (!b->branch_tree.tree || !max_active_branches) {
2552                unload_one_branch();
2553                load_branch(b);
2554        }
2555
2556        prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2557
2558        /* file_change* */
2559        while (command_buf.len > 0) {
2560                if (!prefixcmp(command_buf.buf, "M "))
2561                        file_change_m(b);
2562                else if (!prefixcmp(command_buf.buf, "D "))
2563                        file_change_d(b);
2564                else if (!prefixcmp(command_buf.buf, "R "))
2565                        file_change_cr(b, 1);
2566                else if (!prefixcmp(command_buf.buf, "C "))
2567                        file_change_cr(b, 0);
2568                else if (!prefixcmp(command_buf.buf, "N "))
2569                        note_change_n(b, prev_fanout);
2570                else if (!strcmp("deleteall", command_buf.buf))
2571                        file_change_deleteall(b);
2572                else {
2573                        unread_command_buf = 1;
2574                        break;
2575                }
2576                if (read_next_command() == EOF)
2577                        break;
2578        }
2579
2580        new_fanout = convert_num_notes_to_fanout(b->num_notes);
2581        if (new_fanout != prev_fanout)
2582                b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2583
2584        /* build the tree and the commit */
2585        store_tree(&b->branch_tree);
2586        hashcpy(b->branch_tree.versions[0].sha1,
2587                b->branch_tree.versions[1].sha1);
2588
2589        strbuf_reset(&new_data);
2590        strbuf_addf(&new_data, "tree %s\n",
2591                sha1_to_hex(b->branch_tree.versions[1].sha1));
2592        if (!is_null_sha1(b->sha1))
2593                strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2594        while (merge_list) {
2595                struct hash_list *next = merge_list->next;
2596                strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2597                free(merge_list);
2598                merge_list = next;
2599        }
2600        strbuf_addf(&new_data,
2601                "author %s\n"
2602                "committer %s\n"
2603                "\n",
2604                author ? author : committer, committer);
2605        strbuf_addbuf(&new_data, &msg);
2606        free(author);
2607        free(committer);
2608
2609        if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2610                b->pack_id = pack_id;
2611        b->last_commit = object_count_by_type[OBJ_COMMIT];
2612}
2613
2614static void parse_new_tag(void)
2615{
2616        static struct strbuf msg = STRBUF_INIT;
2617        char *sp;
2618        const char *from;
2619        char *tagger;
2620        struct branch *s;
2621        struct tag *t;
2622        uintmax_t from_mark = 0;
2623        unsigned char sha1[20];
2624        enum object_type type;
2625
2626        /* Obtain the new tag name from the rest of our command */
2627        sp = strchr(command_buf.buf, ' ') + 1;
2628        t = pool_alloc(sizeof(struct tag));
2629        t->next_tag = NULL;
2630        t->name = pool_strdup(sp);
2631        if (last_tag)
2632                last_tag->next_tag = t;
2633        else
2634                first_tag = t;
2635        last_tag = t;
2636        read_next_command();
2637
2638        /* from ... */
2639        if (prefixcmp(command_buf.buf, "from "))
2640                die("Expected from command, got %s", command_buf.buf);
2641        from = strchr(command_buf.buf, ' ') + 1;
2642        s = lookup_branch(from);
2643        if (s) {
2644                hashcpy(sha1, s->sha1);
2645                type = OBJ_COMMIT;
2646        } else if (*from == ':') {
2647                struct object_entry *oe;
2648                from_mark = strtoumax(from + 1, NULL, 10);
2649                oe = find_mark(from_mark);
2650                type = oe->type;
2651                hashcpy(sha1, oe->idx.sha1);
2652        } else if (!get_sha1(from, sha1)) {
2653                unsigned long size;
2654                char *buf;
2655
2656                buf = read_sha1_file(sha1, &type, &size);
2657                if (!buf || size < 46)
2658                        die("Not a valid commit: %s", from);
2659                free(buf);
2660        } else
2661                die("Invalid ref name or SHA1 expression: %s", from);
2662        read_next_command();
2663
2664        /* tagger ... */
2665        if (!prefixcmp(command_buf.buf, "tagger ")) {
2666                tagger = parse_ident(command_buf.buf + 7);
2667                read_next_command();
2668        } else
2669                tagger = NULL;
2670
2671        /* tag payload/message */
2672        parse_data(&msg, 0, NULL);
2673
2674        /* build the tag object */
2675        strbuf_reset(&new_data);
2676
2677        strbuf_addf(&new_data,
2678                    "object %s\n"
2679                    "type %s\n"
2680                    "tag %s\n",
2681                    sha1_to_hex(sha1), typename(type), t->name);
2682        if (tagger)
2683                strbuf_addf(&new_data,
2684                            "tagger %s\n", tagger);
2685        strbuf_addch(&new_data, '\n');
2686        strbuf_addbuf(&new_data, &msg);
2687        free(tagger);
2688
2689        if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2690                t->pack_id = MAX_PACK_ID;
2691        else
2692                t->pack_id = pack_id;
2693}
2694
2695static void parse_reset_branch(void)
2696{
2697        struct branch *b;
2698        char *sp;
2699
2700        /* Obtain the branch name from the rest of our command */
2701        sp = strchr(command_buf.buf, ' ') + 1;
2702        b = lookup_branch(sp);
2703        if (b) {
2704                hashclr(b->sha1);
2705                hashclr(b->branch_tree.versions[0].sha1);
2706                hashclr(b->branch_tree.versions[1].sha1);
2707                if (b->branch_tree.tree) {
2708                        release_tree_content_recursive(b->branch_tree.tree);
2709                        b->branch_tree.tree = NULL;
2710                }
2711        }
2712        else
2713                b = new_branch(sp);
2714        read_next_command();
2715        parse_from(b);
2716        if (command_buf.len > 0)
2717                unread_command_buf = 1;
2718}
2719
2720static void parse_checkpoint(void)
2721{
2722        if (object_count) {
2723                cycle_packfile();
2724                dump_branches();
2725                dump_tags();
2726                dump_marks();
2727        }
2728        skip_optional_lf();
2729}
2730
2731static void parse_progress(void)
2732{
2733        fwrite(command_buf.buf, 1, command_buf.len, stdout);
2734        fputc('\n', stdout);
2735        fflush(stdout);
2736        skip_optional_lf();
2737}
2738
2739static char* make_fast_import_path(const char *path)
2740{
2741        struct strbuf abs_path = STRBUF_INIT;
2742
2743        if (!relative_marks_paths || is_absolute_path(path))
2744                return xstrdup(path);
2745        strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
2746        return strbuf_detach(&abs_path, NULL);
2747}
2748
2749static void option_import_marks(const char *marks, int from_stream)
2750{
2751        if (import_marks_file) {
2752                if (from_stream)
2753                        die("Only one import-marks command allowed per stream");
2754
2755                /* read previous mark file */
2756                if(!import_marks_file_from_stream)
2757                        read_marks();
2758        }
2759
2760        import_marks_file = make_fast_import_path(marks);
2761        safe_create_leading_directories_const(import_marks_file);
2762        import_marks_file_from_stream = from_stream;
2763}
2764
2765static void option_date_format(const char *fmt)
2766{
2767        if (!strcmp(fmt, "raw"))
2768                whenspec = WHENSPEC_RAW;
2769        else if (!strcmp(fmt, "rfc2822"))
2770                whenspec = WHENSPEC_RFC2822;
2771        else if (!strcmp(fmt, "now"))
2772                whenspec = WHENSPEC_NOW;
2773        else
2774                die("unknown --date-format argument %s", fmt);
2775}
2776
2777static void option_depth(const char *depth)
2778{
2779        max_depth = strtoul(depth, NULL, 0);
2780        if (max_depth > MAX_DEPTH)
2781                die("--depth cannot exceed %u", MAX_DEPTH);
2782}
2783
2784static void option_active_branches(const char *branches)
2785{
2786        max_active_branches = strtoul(branches, NULL, 0);
2787}
2788
2789static void option_export_marks(const char *marks)
2790{
2791        export_marks_file = make_fast_import_path(marks);
2792        safe_create_leading_directories_const(export_marks_file);
2793}
2794
2795static void option_export_pack_edges(const char *edges)
2796{
2797        if (pack_edges)
2798                fclose(pack_edges);
2799        pack_edges = fopen(edges, "a");
2800        if (!pack_edges)
2801                die_errno("Cannot open '%s'", edges);
2802}
2803
2804static int parse_one_option(const char *option)
2805{
2806        if (!prefixcmp(option, "max-pack-size=")) {
2807                unsigned long v;
2808                if (!git_parse_ulong(option + 14, &v))
2809                        return 0;
2810                if (v < 8192) {
2811                        warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
2812                        v *= 1024 * 1024;
2813                } else if (v < 1024 * 1024) {
2814                        warning("minimum max-pack-size is 1 MiB");
2815                        v = 1024 * 1024;
2816                }
2817                max_packsize = v;
2818        } else if (!prefixcmp(option, "big-file-threshold=")) {
2819                unsigned long v;
2820                if (!git_parse_ulong(option + 19, &v))
2821                        return 0;
2822                big_file_threshold = v;
2823        } else if (!prefixcmp(option, "depth=")) {
2824                option_depth(option + 6);
2825        } else if (!prefixcmp(option, "active-branches=")) {
2826                option_active_branches(option + 16);
2827        } else if (!prefixcmp(option, "export-pack-edges=")) {
2828                option_export_pack_edges(option + 18);
2829        } else if (!prefixcmp(option, "quiet")) {
2830                show_stats = 0;
2831        } else if (!prefixcmp(option, "stats")) {
2832                show_stats = 1;
2833        } else {
2834                return 0;
2835        }
2836
2837        return 1;
2838}
2839
2840static int parse_one_feature(const char *feature, int from_stream)
2841{
2842        if (!prefixcmp(feature, "date-format=")) {
2843                option_date_format(feature + 12);
2844        } else if (!prefixcmp(feature, "import-marks=")) {
2845                option_import_marks(feature + 13, from_stream);
2846        } else if (!prefixcmp(feature, "export-marks=")) {
2847                option_export_marks(feature + 13);
2848        } else if (!prefixcmp(feature, "relative-marks")) {
2849                relative_marks_paths = 1;
2850        } else if (!prefixcmp(feature, "no-relative-marks")) {
2851                relative_marks_paths = 0;
2852        } else if (!prefixcmp(feature, "force")) {
2853                force_update = 1;
2854        } else {
2855                return 0;
2856        }
2857
2858        return 1;
2859}
2860
2861static void parse_feature(void)
2862{
2863        char *feature = command_buf.buf + 8;
2864
2865        if (seen_data_command)
2866                die("Got feature command '%s' after data command", feature);
2867
2868        if (parse_one_feature(feature, 1))
2869                return;
2870
2871        die("This version of fast-import does not support feature %s.", feature);
2872}
2873
2874static void parse_option(void)
2875{
2876        char *option = command_buf.buf + 11;
2877
2878        if (seen_data_command)
2879                die("Got option command '%s' after data command", option);
2880
2881        if (parse_one_option(option))
2882                return;
2883
2884        die("This version of fast-import does not support option: %s", option);
2885}
2886
2887static int git_pack_config(const char *k, const char *v, void *cb)
2888{
2889        if (!strcmp(k, "pack.depth")) {
2890                max_depth = git_config_int(k, v);
2891                if (max_depth > MAX_DEPTH)
2892                        max_depth = MAX_DEPTH;
2893                return 0;
2894        }
2895        if (!strcmp(k, "pack.compression")) {
2896                int level = git_config_int(k, v);
2897                if (level == -1)
2898                        level = Z_DEFAULT_COMPRESSION;
2899                else if (level < 0 || level > Z_BEST_COMPRESSION)
2900                        die("bad pack compression level %d", level);
2901                pack_compression_level = level;
2902                pack_compression_seen = 1;
2903                return 0;
2904        }
2905        if (!strcmp(k, "pack.indexversion")) {
2906                pack_idx_default_version = git_config_int(k, v);
2907                if (pack_idx_default_version > 2)
2908                        die("bad pack.indexversion=%"PRIu32,
2909                            pack_idx_default_version);
2910                return 0;
2911        }
2912        if (!strcmp(k, "pack.packsizelimit")) {
2913                max_packsize = git_config_ulong(k, v);
2914                return 0;
2915        }
2916        if (!strcmp(k, "core.bigfilethreshold")) {
2917                long n = git_config_int(k, v);
2918                big_file_threshold = 0 < n ? n : 0;
2919        }
2920        return git_default_config(k, v, cb);
2921}
2922
2923static const char fast_import_usage[] =
2924"git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2925
2926static void parse_argv(void)
2927{
2928        unsigned int i;
2929
2930        for (i = 1; i < global_argc; i++) {
2931                const char *a = global_argv[i];
2932
2933                if (*a != '-' || !strcmp(a, "--"))
2934                        break;
2935
2936                if (parse_one_option(a + 2))
2937                        continue;
2938
2939                if (parse_one_feature(a + 2, 0))
2940                        continue;
2941
2942                die("unknown option %s", a);
2943        }
2944        if (i != global_argc)
2945                usage(fast_import_usage);
2946
2947        seen_data_command = 1;
2948        if (import_marks_file)
2949                read_marks();
2950}
2951
2952int main(int argc, const char **argv)
2953{
2954        unsigned int i;
2955
2956        git_extract_argv0_path(argv[0]);
2957
2958        if (argc == 2 && !strcmp(argv[1], "-h"))
2959                usage(fast_import_usage);
2960
2961        setup_git_directory();
2962        git_config(git_pack_config, NULL);
2963        if (!pack_compression_seen && core_compression_seen)
2964                pack_compression_level = core_compression_level;
2965
2966        alloc_objects(object_entry_alloc);
2967        strbuf_init(&command_buf, 0);
2968        atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2969        branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2970        avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2971        marks = pool_calloc(1, sizeof(struct mark_set));
2972
2973        global_argc = argc;
2974        global_argv = argv;
2975
2976        rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2977        for (i = 0; i < (cmd_save - 1); i++)
2978                rc_free[i].next = &rc_free[i + 1];
2979        rc_free[cmd_save - 1].next = NULL;
2980
2981        prepare_packed_git();
2982        start_packfile();
2983        set_die_routine(die_nicely);
2984        while (read_next_command() != EOF) {
2985                if (!strcmp("blob", command_buf.buf))
2986                        parse_new_blob();
2987                else if (!prefixcmp(command_buf.buf, "commit "))
2988                        parse_new_commit();
2989                else if (!prefixcmp(command_buf.buf, "tag "))
2990                        parse_new_tag();
2991                else if (!prefixcmp(command_buf.buf, "reset "))
2992                        parse_reset_branch();
2993                else if (!strcmp("checkpoint", command_buf.buf))
2994                        parse_checkpoint();
2995                else if (!prefixcmp(command_buf.buf, "progress "))
2996                        parse_progress();
2997                else if (!prefixcmp(command_buf.buf, "feature "))
2998                        parse_feature();
2999                else if (!prefixcmp(command_buf.buf, "option git "))
3000                        parse_option();
3001                else if (!prefixcmp(command_buf.buf, "option "))
3002                        /* ignore non-git options*/;
3003                else
3004                        die("Unsupported command: %s", command_buf.buf);
3005        }
3006
3007        /* argv hasn't been parsed yet, do so */
3008        if (!seen_data_command)
3009                parse_argv();
3010
3011        end_packfile();
3012
3013        dump_branches();
3014        dump_tags();
3015        unkeep_all_packs();
3016        dump_marks();
3017
3018        if (pack_edges)
3019                fclose(pack_edges);
3020
3021        if (show_stats) {
3022                uintmax_t total_count = 0, duplicate_count = 0;
3023                for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3024                        total_count += object_count_by_type[i];
3025                for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3026                        duplicate_count += duplicate_count_by_type[i];
3027
3028                fprintf(stderr, "%s statistics:\n", argv[0]);
3029                fprintf(stderr, "---------------------------------------------------------------------\n");
3030                fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3031                fprintf(stderr, "Total objects:   %10" PRIuMAX " (%10" PRIuMAX " duplicates                  )\n", total_count, duplicate_count);
3032                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]);
3033                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]);
3034                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]);
3035                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]);
3036                fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
3037                fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
3038                fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
3039                fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
3040                fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
3041                fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
3042                fprintf(stderr, "---------------------------------------------------------------------\n");
3043                pack_report();
3044                fprintf(stderr, "---------------------------------------------------------------------\n");
3045                fprintf(stderr, "\n");
3046        }
3047
3048        return failure ? 1 : 0;
3049}