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