fast-import.c

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