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