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