Merge branch 'cn/maint-rev-list-doc'
[git] / fast-import.c
1 /*
2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
4
5   stream ::= cmd*;
6
7   cmd ::= new_blob
8         | new_commit
9         | new_tag
10         | reset_branch
11         | checkpoint
12         | progress
13         ;
14
15   new_blob ::= 'blob' lf
16     mark?
17     file_content;
18   file_content ::= data;
19
20   new_commit ::= 'commit' sp ref_str lf
21     mark?
22     ('author' (sp name)? sp '<' email '>' sp when lf)?
23     'committer' (sp name)? sp '<' email '>' sp when lf
24     commit_msg
25     ('from' sp committish lf)?
26     ('merge' sp committish lf)*
27     (file_change | 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 committish lf;
47   note_inm ::= 'N' sp 'inline' sp committish lf
48     data;
49
50   new_tag ::= 'tag' sp tag_str lf
51     'from' sp committish 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 committish 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   committish  ::= (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
178 struct 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
186 struct 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
193 struct mark_set {
194         union {
195                 struct object_entry *marked[1024];
196                 struct mark_set *sets[1024];
197         } data;
198         unsigned int shift;
199 };
200
201 struct last_object {
202         struct strbuf data;
203         off_t offset;
204         unsigned int depth;
205         unsigned no_swap : 1;
206 };
207
208 struct mem_pool {
209         struct mem_pool *next_pool;
210         char *next_free;
211         char *end;
212         uintmax_t space[FLEX_ARRAY]; /* more */
213 };
214
215 struct atom_str {
216         struct atom_str *next_atom;
217         unsigned short str_len;
218         char str_dat[FLEX_ARRAY]; /* more */
219 };
220
221 struct tree_content;
222 struct 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
231 struct 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
238 struct avail_tree_content {
239         unsigned int entry_capacity; /* must match tree_content */
240         struct avail_tree_content *next_avail;
241 };
242
243 struct 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
255 struct tag {
256         struct tag *next_tag;
257         const char *name;
258         unsigned int pack_id;
259         unsigned char sha1[20];
260 };
261
262 struct hash_list {
263         struct hash_list *next;
264         unsigned char sha1[20];
265 };
266
267 typedef enum {
268         WHENSPEC_RAW = 1,
269         WHENSPEC_RFC2822,
270         WHENSPEC_NOW
271 } whenspec_type;
272
273 struct recent_command {
274         struct recent_command *prev;
275         struct recent_command *next;
276         char *buf;
277 };
278
279 /* Configured limits on output */
280 static unsigned long max_depth = 10;
281 static off_t max_packsize;
282 static int force_update;
283 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
284 static int pack_compression_seen;
285
286 /* Stats and misc. counters */
287 static uintmax_t alloc_count;
288 static uintmax_t marks_set_count;
289 static uintmax_t object_count_by_type[1 << TYPE_BITS];
290 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
291 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
292 static uintmax_t delta_count_attempts_by_type[1 << TYPE_BITS];
293 static unsigned long object_count;
294 static unsigned long branch_count;
295 static unsigned long branch_load_count;
296 static int failure;
297 static FILE *pack_edges;
298 static unsigned int show_stats = 1;
299 static int global_argc;
300 static const char **global_argv;
301
302 /* Memory pools */
303 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
304 static size_t total_allocd;
305 static struct mem_pool *mem_pool;
306
307 /* Atom management */
308 static unsigned int atom_table_sz = 4451;
309 static unsigned int atom_cnt;
310 static struct atom_str **atom_table;
311
312 /* The .pack file being generated */
313 static struct pack_idx_option pack_idx_opts;
314 static unsigned int pack_id;
315 static struct sha1file *pack_file;
316 static struct packed_git *pack_data;
317 static struct packed_git **all_packs;
318 static off_t pack_size;
319
320 /* Table of objects we've written. */
321 static unsigned int object_entry_alloc = 5000;
322 static struct object_entry_pool *blocks;
323 static struct object_entry *object_table[1 << 16];
324 static struct mark_set *marks;
325 static const char *export_marks_file;
326 static const char *import_marks_file;
327 static int import_marks_file_from_stream;
328 static int import_marks_file_ignore_missing;
329 static int relative_marks_paths;
330
331 /* Our last blob */
332 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
333
334 /* Tree management */
335 static unsigned int tree_entry_alloc = 1000;
336 static void *avail_tree_entry;
337 static unsigned int avail_tree_table_sz = 100;
338 static struct avail_tree_content **avail_tree_table;
339 static struct strbuf old_tree = STRBUF_INIT;
340 static struct strbuf new_tree = STRBUF_INIT;
341
342 /* Branch data */
343 static unsigned long max_active_branches = 5;
344 static unsigned long cur_active_branches;
345 static unsigned long branch_table_sz = 1039;
346 static struct branch **branch_table;
347 static struct branch *active_branches;
348
349 /* Tag data */
350 static struct tag *first_tag;
351 static struct tag *last_tag;
352
353 /* Input stream parsing */
354 static whenspec_type whenspec = WHENSPEC_RAW;
355 static struct strbuf command_buf = STRBUF_INIT;
356 static int unread_command_buf;
357 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
358 static struct recent_command *cmd_tail = &cmd_hist;
359 static struct recent_command *rc_free;
360 static unsigned int cmd_save = 100;
361 static uintmax_t next_mark;
362 static struct strbuf new_data = STRBUF_INIT;
363 static int seen_data_command;
364 static int require_explicit_termination;
365
366 /* Signal handling */
367 static volatile sig_atomic_t checkpoint_requested;
368
369 /* Where to write output of cat-blob commands */
370 static int cat_blob_fd = STDOUT_FILENO;
371
372 static void parse_argv(void);
373 static void parse_cat_blob(void);
374 static void parse_ls(struct branch *b);
375
376 static 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
402 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
403
404 static 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
489 static void end_packfile(void);
490 static void unkeep_all_packs(void);
491 static void dump_marks(void);
492
493 static 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
515 static void set_checkpoint_signal(void)
516 {
517 }
518
519 #else
520
521 static void checkpoint_signal(int signo)
522 {
523         checkpoint_requested = 1;
524 }
525
526 static 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
539 static 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
552 static 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
564 static 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
574 static 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
592 static 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
600 static 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
631 static 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
639 static char *pool_strdup(const char *s)
640 {
641         char *r = pool_alloc(strlen(s) + 1);
642         strcpy(r, s);
643         return r;
644 }
645
646 static 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
669 static 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
688 static 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
707 static 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
718 static 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
741 static 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
747 static 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
774 static void release_tree_entry(struct tree_entry *e);
775 static 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
783 static 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
791 static 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
803 static 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
823 static 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
831 static 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
856 static 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
884 static 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
907 static 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
933 static 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
946 static void end_packfile(void)
947 {
948         struct packed_git *old_p = pack_data, *new_p;
949
950         clear_delta_base_cache();
951         if (object_count) {
952                 unsigned char cur_pack_sha1[20];
953                 char *idx_name;
954                 int i;
955                 struct branch *b;
956                 struct tag *t;
957
958                 close_pack_windows(pack_data);
959                 sha1close(pack_file, cur_pack_sha1, 0);
960                 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
961                                     pack_data->pack_name, object_count,
962                                     cur_pack_sha1, pack_size);
963                 close(pack_data->pack_fd);
964                 idx_name = keep_pack(create_index());
965
966                 /* Register the packfile with core git's machinery. */
967                 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
968                 if (!new_p)
969                         die("core git rejected index %s", idx_name);
970                 all_packs[pack_id] = new_p;
971                 install_packed_git(new_p);
972
973                 /* Print the boundary */
974                 if (pack_edges) {
975                         fprintf(pack_edges, "%s:", new_p->pack_name);
976                         for (i = 0; i < branch_table_sz; i++) {
977                                 for (b = branch_table[i]; b; b = b->table_next_branch) {
978                                         if (b->pack_id == pack_id)
979                                                 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
980                                 }
981                         }
982                         for (t = first_tag; t; t = t->next_tag) {
983                                 if (t->pack_id == pack_id)
984                                         fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
985                         }
986                         fputc('\n', pack_edges);
987                         fflush(pack_edges);
988                 }
989
990                 pack_id++;
991         }
992         else {
993                 close(old_p->pack_fd);
994                 unlink_or_warn(old_p->pack_name);
995         }
996         free(old_p);
997
998         /* We can't carry a delta across packfiles. */
999         strbuf_release(&last_blob.data);
1000         last_blob.offset = 0;
1001         last_blob.depth = 0;
1002 }
1003
1004 static void cycle_packfile(void)
1005 {
1006         end_packfile();
1007         start_packfile();
1008 }
1009
1010 static int store_object(
1011         enum object_type type,
1012         struct strbuf *dat,
1013         struct last_object *last,
1014         unsigned char *sha1out,
1015         uintmax_t mark)
1016 {
1017         void *out, *delta;
1018         struct object_entry *e;
1019         unsigned char hdr[96];
1020         unsigned char sha1[20];
1021         unsigned long hdrlen, deltalen;
1022         git_SHA_CTX c;
1023         git_zstream s;
1024
1025         hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
1026                 (unsigned long)dat->len) + 1;
1027         git_SHA1_Init(&c);
1028         git_SHA1_Update(&c, hdr, hdrlen);
1029         git_SHA1_Update(&c, dat->buf, dat->len);
1030         git_SHA1_Final(sha1, &c);
1031         if (sha1out)
1032                 hashcpy(sha1out, sha1);
1033
1034         e = insert_object(sha1);
1035         if (mark)
1036                 insert_mark(mark, e);
1037         if (e->idx.offset) {
1038                 duplicate_count_by_type[type]++;
1039                 return 1;
1040         } else if (find_sha1_pack(sha1, packed_git)) {
1041                 e->type = type;
1042                 e->pack_id = MAX_PACK_ID;
1043                 e->idx.offset = 1; /* just not zero! */
1044                 duplicate_count_by_type[type]++;
1045                 return 1;
1046         }
1047
1048         if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
1049                 delta_count_attempts_by_type[type]++;
1050                 delta = diff_delta(last->data.buf, last->data.len,
1051                         dat->buf, dat->len,
1052                         &deltalen, dat->len - 20);
1053         } else
1054                 delta = NULL;
1055
1056         memset(&s, 0, sizeof(s));
1057         git_deflate_init(&s, pack_compression_level);
1058         if (delta) {
1059                 s.next_in = delta;
1060                 s.avail_in = deltalen;
1061         } else {
1062                 s.next_in = (void *)dat->buf;
1063                 s.avail_in = dat->len;
1064         }
1065         s.avail_out = git_deflate_bound(&s, s.avail_in);
1066         s.next_out = out = xmalloc(s.avail_out);
1067         while (git_deflate(&s, Z_FINISH) == Z_OK)
1068                 ; /* nothing */
1069         git_deflate_end(&s);
1070
1071         /* Determine if we should auto-checkpoint. */
1072         if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
1073                 || (pack_size + 60 + s.total_out) < pack_size) {
1074
1075                 /* This new object needs to *not* have the current pack_id. */
1076                 e->pack_id = pack_id + 1;
1077                 cycle_packfile();
1078
1079                 /* We cannot carry a delta into the new pack. */
1080                 if (delta) {
1081                         free(delta);
1082                         delta = NULL;
1083
1084                         memset(&s, 0, sizeof(s));
1085                         git_deflate_init(&s, pack_compression_level);
1086                         s.next_in = (void *)dat->buf;
1087                         s.avail_in = dat->len;
1088                         s.avail_out = git_deflate_bound(&s, s.avail_in);
1089                         s.next_out = out = xrealloc(out, s.avail_out);
1090                         while (git_deflate(&s, Z_FINISH) == Z_OK)
1091                                 ; /* nothing */
1092                         git_deflate_end(&s);
1093                 }
1094         }
1095
1096         e->type = type;
1097         e->pack_id = pack_id;
1098         e->idx.offset = pack_size;
1099         object_count++;
1100         object_count_by_type[type]++;
1101
1102         crc32_begin(pack_file);
1103
1104         if (delta) {
1105                 off_t ofs = e->idx.offset - last->offset;
1106                 unsigned pos = sizeof(hdr) - 1;
1107
1108                 delta_count_by_type[type]++;
1109                 e->depth = last->depth + 1;
1110
1111                 hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
1112                 sha1write(pack_file, hdr, hdrlen);
1113                 pack_size += hdrlen;
1114
1115                 hdr[pos] = ofs & 127;
1116                 while (ofs >>= 7)
1117                         hdr[--pos] = 128 | (--ofs & 127);
1118                 sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
1119                 pack_size += sizeof(hdr) - pos;
1120         } else {
1121                 e->depth = 0;
1122                 hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
1123                 sha1write(pack_file, hdr, hdrlen);
1124                 pack_size += hdrlen;
1125         }
1126
1127         sha1write(pack_file, out, s.total_out);
1128         pack_size += s.total_out;
1129
1130         e->idx.crc32 = crc32_end(pack_file);
1131
1132         free(out);
1133         free(delta);
1134         if (last) {
1135                 if (last->no_swap) {
1136                         last->data = *dat;
1137                 } else {
1138                         strbuf_swap(&last->data, dat);
1139                 }
1140                 last->offset = e->idx.offset;
1141                 last->depth = e->depth;
1142         }
1143         return 0;
1144 }
1145
1146 static void truncate_pack(struct sha1file_checkpoint *checkpoint)
1147 {
1148         if (sha1file_truncate(pack_file, checkpoint))
1149                 die_errno("cannot truncate pack to skip duplicate");
1150         pack_size = checkpoint->offset;
1151 }
1152
1153 static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1154 {
1155         size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1156         unsigned char *in_buf = xmalloc(in_sz);
1157         unsigned char *out_buf = xmalloc(out_sz);
1158         struct object_entry *e;
1159         unsigned char sha1[20];
1160         unsigned long hdrlen;
1161         off_t offset;
1162         git_SHA_CTX c;
1163         git_zstream s;
1164         struct sha1file_checkpoint checkpoint;
1165         int status = Z_OK;
1166
1167         /* Determine if we should auto-checkpoint. */
1168         if ((max_packsize && (pack_size + 60 + len) > max_packsize)
1169                 || (pack_size + 60 + len) < pack_size)
1170                 cycle_packfile();
1171
1172         sha1file_checkpoint(pack_file, &checkpoint);
1173         offset = checkpoint.offset;
1174
1175         hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1176         if (out_sz <= hdrlen)
1177                 die("impossibly large object header");
1178
1179         git_SHA1_Init(&c);
1180         git_SHA1_Update(&c, out_buf, hdrlen);
1181
1182         crc32_begin(pack_file);
1183
1184         memset(&s, 0, sizeof(s));
1185         git_deflate_init(&s, pack_compression_level);
1186
1187         hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
1188         if (out_sz <= hdrlen)
1189                 die("impossibly large object header");
1190
1191         s.next_out = out_buf + hdrlen;
1192         s.avail_out = out_sz - hdrlen;
1193
1194         while (status != Z_STREAM_END) {
1195                 if (0 < len && !s.avail_in) {
1196                         size_t cnt = in_sz < len ? in_sz : (size_t)len;
1197                         size_t n = fread(in_buf, 1, cnt, stdin);
1198                         if (!n && feof(stdin))
1199                                 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1200
1201                         git_SHA1_Update(&c, in_buf, n);
1202                         s.next_in = in_buf;
1203                         s.avail_in = n;
1204                         len -= n;
1205                 }
1206
1207                 status = git_deflate(&s, len ? 0 : Z_FINISH);
1208
1209                 if (!s.avail_out || status == Z_STREAM_END) {
1210                         size_t n = s.next_out - out_buf;
1211                         sha1write(pack_file, out_buf, n);
1212                         pack_size += n;
1213                         s.next_out = out_buf;
1214                         s.avail_out = out_sz;
1215                 }
1216
1217                 switch (status) {
1218                 case Z_OK:
1219                 case Z_BUF_ERROR:
1220                 case Z_STREAM_END:
1221                         continue;
1222                 default:
1223                         die("unexpected deflate failure: %d", status);
1224                 }
1225         }
1226         git_deflate_end(&s);
1227         git_SHA1_Final(sha1, &c);
1228
1229         if (sha1out)
1230                 hashcpy(sha1out, sha1);
1231
1232         e = insert_object(sha1);
1233
1234         if (mark)
1235                 insert_mark(mark, e);
1236
1237         if (e->idx.offset) {
1238                 duplicate_count_by_type[OBJ_BLOB]++;
1239                 truncate_pack(&checkpoint);
1240
1241         } else if (find_sha1_pack(sha1, packed_git)) {
1242                 e->type = OBJ_BLOB;
1243                 e->pack_id = MAX_PACK_ID;
1244                 e->idx.offset = 1; /* just not zero! */
1245                 duplicate_count_by_type[OBJ_BLOB]++;
1246                 truncate_pack(&checkpoint);
1247
1248         } else {
1249                 e->depth = 0;
1250                 e->type = OBJ_BLOB;
1251                 e->pack_id = pack_id;
1252                 e->idx.offset = offset;
1253                 e->idx.crc32 = crc32_end(pack_file);
1254                 object_count++;
1255                 object_count_by_type[OBJ_BLOB]++;
1256         }
1257
1258         free(in_buf);
1259         free(out_buf);
1260 }
1261
1262 /* All calls must be guarded by find_object() or find_mark() to
1263  * ensure the 'struct object_entry' passed was written by this
1264  * process instance.  We unpack the entry by the offset, avoiding
1265  * the need for the corresponding .idx file.  This unpacking rule
1266  * works because we only use OBJ_REF_DELTA within the packfiles
1267  * created by fast-import.
1268  *
1269  * oe must not be NULL.  Such an oe usually comes from giving
1270  * an unknown SHA-1 to find_object() or an undefined mark to
1271  * find_mark().  Callers must test for this condition and use
1272  * the standard read_sha1_file() when it happens.
1273  *
1274  * oe->pack_id must not be MAX_PACK_ID.  Such an oe is usually from
1275  * find_mark(), where the mark was reloaded from an existing marks
1276  * file and is referencing an object that this fast-import process
1277  * instance did not write out to a packfile.  Callers must test for
1278  * this condition and use read_sha1_file() instead.
1279  */
1280 static void *gfi_unpack_entry(
1281         struct object_entry *oe,
1282         unsigned long *sizep)
1283 {
1284         enum object_type type;
1285         struct packed_git *p = all_packs[oe->pack_id];
1286         if (p == pack_data && p->pack_size < (pack_size + 20)) {
1287                 /* The object is stored in the packfile we are writing to
1288                  * and we have modified it since the last time we scanned
1289                  * back to read a previously written object.  If an old
1290                  * window covered [p->pack_size, p->pack_size + 20) its
1291                  * data is stale and is not valid.  Closing all windows
1292                  * and updating the packfile length ensures we can read
1293                  * the newly written data.
1294                  */
1295                 close_pack_windows(p);
1296                 sha1flush(pack_file);
1297
1298                 /* We have to offer 20 bytes additional on the end of
1299                  * the packfile as the core unpacker code assumes the
1300                  * footer is present at the file end and must promise
1301                  * at least 20 bytes within any window it maps.  But
1302                  * we don't actually create the footer here.
1303                  */
1304                 p->pack_size = pack_size + 20;
1305         }
1306         return unpack_entry(p, oe->idx.offset, &type, sizep);
1307 }
1308
1309 static const char *get_mode(const char *str, uint16_t *modep)
1310 {
1311         unsigned char c;
1312         uint16_t mode = 0;
1313
1314         while ((c = *str++) != ' ') {
1315                 if (c < '0' || c > '7')
1316                         return NULL;
1317                 mode = (mode << 3) + (c - '0');
1318         }
1319         *modep = mode;
1320         return str;
1321 }
1322
1323 static void load_tree(struct tree_entry *root)
1324 {
1325         unsigned char *sha1 = root->versions[1].sha1;
1326         struct object_entry *myoe;
1327         struct tree_content *t;
1328         unsigned long size;
1329         char *buf;
1330         const char *c;
1331
1332         root->tree = t = new_tree_content(8);
1333         if (is_null_sha1(sha1))
1334                 return;
1335
1336         myoe = find_object(sha1);
1337         if (myoe && myoe->pack_id != MAX_PACK_ID) {
1338                 if (myoe->type != OBJ_TREE)
1339                         die("Not a tree: %s", sha1_to_hex(sha1));
1340                 t->delta_depth = myoe->depth;
1341                 buf = gfi_unpack_entry(myoe, &size);
1342                 if (!buf)
1343                         die("Can't load tree %s", sha1_to_hex(sha1));
1344         } else {
1345                 enum object_type type;
1346                 buf = read_sha1_file(sha1, &type, &size);
1347                 if (!buf || type != OBJ_TREE)
1348                         die("Can't load tree %s", sha1_to_hex(sha1));
1349         }
1350
1351         c = buf;
1352         while (c != (buf + size)) {
1353                 struct tree_entry *e = new_tree_entry();
1354
1355                 if (t->entry_count == t->entry_capacity)
1356                         root->tree = t = grow_tree_content(t, t->entry_count);
1357                 t->entries[t->entry_count++] = e;
1358
1359                 e->tree = NULL;
1360                 c = get_mode(c, &e->versions[1].mode);
1361                 if (!c)
1362                         die("Corrupt mode in %s", sha1_to_hex(sha1));
1363                 e->versions[0].mode = e->versions[1].mode;
1364                 e->name = to_atom(c, strlen(c));
1365                 c += e->name->str_len + 1;
1366                 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1367                 hashcpy(e->versions[1].sha1, (unsigned char *)c);
1368                 c += 20;
1369         }
1370         free(buf);
1371 }
1372
1373 static int tecmp0 (const void *_a, const void *_b)
1374 {
1375         struct tree_entry *a = *((struct tree_entry**)_a);
1376         struct tree_entry *b = *((struct tree_entry**)_b);
1377         return base_name_compare(
1378                 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1379                 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1380 }
1381
1382 static int tecmp1 (const void *_a, const void *_b)
1383 {
1384         struct tree_entry *a = *((struct tree_entry**)_a);
1385         struct tree_entry *b = *((struct tree_entry**)_b);
1386         return base_name_compare(
1387                 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1388                 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1389 }
1390
1391 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1392 {
1393         size_t maxlen = 0;
1394         unsigned int i;
1395
1396         if (!v)
1397                 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1398         else
1399                 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1400
1401         for (i = 0; i < t->entry_count; i++) {
1402                 if (t->entries[i]->versions[v].mode)
1403                         maxlen += t->entries[i]->name->str_len + 34;
1404         }
1405
1406         strbuf_reset(b);
1407         strbuf_grow(b, maxlen);
1408         for (i = 0; i < t->entry_count; i++) {
1409                 struct tree_entry *e = t->entries[i];
1410                 if (!e->versions[v].mode)
1411                         continue;
1412                 strbuf_addf(b, "%o %s%c",
1413                         (unsigned int)(e->versions[v].mode & ~NO_DELTA),
1414                         e->name->str_dat, '\0');
1415                 strbuf_add(b, e->versions[v].sha1, 20);
1416         }
1417 }
1418
1419 static void store_tree(struct tree_entry *root)
1420 {
1421         struct tree_content *t = root->tree;
1422         unsigned int i, j, del;
1423         struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1424         struct object_entry *le = NULL;
1425
1426         if (!is_null_sha1(root->versions[1].sha1))
1427                 return;
1428
1429         for (i = 0; i < t->entry_count; i++) {
1430                 if (t->entries[i]->tree)
1431                         store_tree(t->entries[i]);
1432         }
1433
1434         if (!(root->versions[0].mode & NO_DELTA))
1435                 le = find_object(root->versions[0].sha1);
1436         if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1437                 mktree(t, 0, &old_tree);
1438                 lo.data = old_tree;
1439                 lo.offset = le->idx.offset;
1440                 lo.depth = t->delta_depth;
1441         }
1442
1443         mktree(t, 1, &new_tree);
1444         store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1445
1446         t->delta_depth = lo.depth;
1447         for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1448                 struct tree_entry *e = t->entries[i];
1449                 if (e->versions[1].mode) {
1450                         e->versions[0].mode = e->versions[1].mode;
1451                         hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1452                         t->entries[j++] = e;
1453                 } else {
1454                         release_tree_entry(e);
1455                         del++;
1456                 }
1457         }
1458         t->entry_count -= del;
1459 }
1460
1461 static void tree_content_replace(
1462         struct tree_entry *root,
1463         const unsigned char *sha1,
1464         const uint16_t mode,
1465         struct tree_content *newtree)
1466 {
1467         if (!S_ISDIR(mode))
1468                 die("Root cannot be a non-directory");
1469         hashclr(root->versions[0].sha1);
1470         hashcpy(root->versions[1].sha1, sha1);
1471         if (root->tree)
1472                 release_tree_content_recursive(root->tree);
1473         root->tree = newtree;
1474 }
1475
1476 static int tree_content_set(
1477         struct tree_entry *root,
1478         const char *p,
1479         const unsigned char *sha1,
1480         const uint16_t mode,
1481         struct tree_content *subtree)
1482 {
1483         struct tree_content *t;
1484         const char *slash1;
1485         unsigned int i, n;
1486         struct tree_entry *e;
1487
1488         slash1 = strchr(p, '/');
1489         if (slash1)
1490                 n = slash1 - p;
1491         else
1492                 n = strlen(p);
1493         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
1568 static int tree_content_remove(
1569         struct tree_entry *root,
1570         const char *p,
1571         struct tree_entry *backup_leaf)
1572 {
1573         struct tree_content *t;
1574         const char *slash1;
1575         unsigned int i, n;
1576         struct tree_entry *e;
1577
1578         slash1 = strchr(p, '/');
1579         if (slash1)
1580                 n = slash1 - p;
1581         else
1582                 n = strlen(p);
1583
1584         if (!root->tree)
1585                 load_tree(root);
1586         t = root->tree;
1587         for (i = 0; i < t->entry_count; i++) {
1588                 e = t->entries[i];
1589                 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1590                         if (slash1 && !S_ISDIR(e->versions[1].mode))
1591                                 /*
1592                                  * If p names a file in some subdirectory, and a
1593                                  * file or symlink matching the name of the
1594                                  * parent directory of p exists, then p cannot
1595                                  * exist and need not be deleted.
1596                                  */
1597                                 return 1;
1598                         if (!slash1 || !S_ISDIR(e->versions[1].mode))
1599                                 goto del_entry;
1600                         if (!e->tree)
1601                                 load_tree(e);
1602                         if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1603                                 for (n = 0; n < e->tree->entry_count; n++) {
1604                                         if (e->tree->entries[n]->versions[1].mode) {
1605                                                 hashclr(root->versions[1].sha1);
1606                                                 return 1;
1607                                         }
1608                                 }
1609                                 backup_leaf = NULL;
1610                                 goto del_entry;
1611                         }
1612                         return 0;
1613                 }
1614         }
1615         return 0;
1616
1617 del_entry:
1618         if (backup_leaf)
1619                 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1620         else if (e->tree)
1621                 release_tree_content_recursive(e->tree);
1622         e->tree = NULL;
1623         e->versions[1].mode = 0;
1624         hashclr(e->versions[1].sha1);
1625         hashclr(root->versions[1].sha1);
1626         return 1;
1627 }
1628
1629 static int tree_content_get(
1630         struct tree_entry *root,
1631         const char *p,
1632         struct tree_entry *leaf)
1633 {
1634         struct tree_content *t;
1635         const char *slash1;
1636         unsigned int i, n;
1637         struct tree_entry *e;
1638
1639         slash1 = strchr(p, '/');
1640         if (slash1)
1641                 n = slash1 - p;
1642         else
1643                 n = strlen(p);
1644
1645         if (!root->tree)
1646                 load_tree(root);
1647         t = root->tree;
1648         for (i = 0; i < t->entry_count; i++) {
1649                 e = t->entries[i];
1650                 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1651                         if (!slash1) {
1652                                 memcpy(leaf, e, sizeof(*leaf));
1653                                 if (e->tree && is_null_sha1(e->versions[1].sha1))
1654                                         leaf->tree = dup_tree_content(e->tree);
1655                                 else
1656                                         leaf->tree = NULL;
1657                                 return 1;
1658                         }
1659                         if (!S_ISDIR(e->versions[1].mode))
1660                                 return 0;
1661                         if (!e->tree)
1662                                 load_tree(e);
1663                         return tree_content_get(e, slash1 + 1, leaf);
1664                 }
1665         }
1666         return 0;
1667 }
1668
1669 static int update_branch(struct branch *b)
1670 {
1671         static const char *msg = "fast-import";
1672         struct ref_lock *lock;
1673         unsigned char old_sha1[20];
1674
1675         if (is_null_sha1(b->sha1))
1676                 return 0;
1677         if (read_ref(b->name, old_sha1))
1678                 hashclr(old_sha1);
1679         lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1680         if (!lock)
1681                 return error("Unable to lock %s", b->name);
1682         if (!force_update && !is_null_sha1(old_sha1)) {
1683                 struct commit *old_cmit, *new_cmit;
1684
1685                 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1686                 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1687                 if (!old_cmit || !new_cmit) {
1688                         unlock_ref(lock);
1689                         return error("Branch %s is missing commits.", b->name);
1690                 }
1691
1692                 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1693                         unlock_ref(lock);
1694                         warning("Not updating %s"
1695                                 " (new tip %s does not contain %s)",
1696                                 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1697                         return -1;
1698                 }
1699         }
1700         if (write_ref_sha1(lock, b->sha1, msg) < 0)
1701                 return error("Unable to update %s", b->name);
1702         return 0;
1703 }
1704
1705 static void dump_branches(void)
1706 {
1707         unsigned int i;
1708         struct branch *b;
1709
1710         for (i = 0; i < branch_table_sz; i++) {
1711                 for (b = branch_table[i]; b; b = b->table_next_branch)
1712                         failure |= update_branch(b);
1713         }
1714 }
1715
1716 static void dump_tags(void)
1717 {
1718         static const char *msg = "fast-import";
1719         struct tag *t;
1720         struct ref_lock *lock;
1721         char ref_name[PATH_MAX];
1722
1723         for (t = first_tag; t; t = t->next_tag) {
1724                 sprintf(ref_name, "tags/%s", t->name);
1725                 lock = lock_ref_sha1(ref_name, NULL);
1726                 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1727                         failure |= error("Unable to update %s", ref_name);
1728         }
1729 }
1730
1731 static void dump_marks_helper(FILE *f,
1732         uintmax_t base,
1733         struct mark_set *m)
1734 {
1735         uintmax_t k;
1736         if (m->shift) {
1737                 for (k = 0; k < 1024; k++) {
1738                         if (m->data.sets[k])
1739                                 dump_marks_helper(f, base + (k << m->shift),
1740                                         m->data.sets[k]);
1741                 }
1742         } else {
1743                 for (k = 0; k < 1024; k++) {
1744                         if (m->data.marked[k])
1745                                 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1746                                         sha1_to_hex(m->data.marked[k]->idx.sha1));
1747                 }
1748         }
1749 }
1750
1751 static void dump_marks(void)
1752 {
1753         static struct lock_file mark_lock;
1754         int mark_fd;
1755         FILE *f;
1756
1757         if (!export_marks_file)
1758                 return;
1759
1760         mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
1761         if (mark_fd < 0) {
1762                 failure |= error("Unable to write marks file %s: %s",
1763                         export_marks_file, strerror(errno));
1764                 return;
1765         }
1766
1767         f = fdopen(mark_fd, "w");
1768         if (!f) {
1769                 int saved_errno = errno;
1770                 rollback_lock_file(&mark_lock);
1771                 failure |= error("Unable to write marks file %s: %s",
1772                         export_marks_file, strerror(saved_errno));
1773                 return;
1774         }
1775
1776         /*
1777          * Since the lock file was fdopen()'ed, it should not be close()'ed.
1778          * Assign -1 to the lock file descriptor so that commit_lock_file()
1779          * won't try to close() it.
1780          */
1781         mark_lock.fd = -1;
1782
1783         dump_marks_helper(f, 0, marks);
1784         if (ferror(f) || fclose(f)) {
1785                 int saved_errno = errno;
1786                 rollback_lock_file(&mark_lock);
1787                 failure |= error("Unable to write marks file %s: %s",
1788                         export_marks_file, strerror(saved_errno));
1789                 return;
1790         }
1791
1792         if (commit_lock_file(&mark_lock)) {
1793                 int saved_errno = errno;
1794                 rollback_lock_file(&mark_lock);
1795                 failure |= error("Unable to commit marks file %s: %s",
1796                         export_marks_file, strerror(saved_errno));
1797                 return;
1798         }
1799 }
1800
1801 static void read_marks(void)
1802 {
1803         char line[512];
1804         FILE *f = fopen(import_marks_file, "r");
1805         if (f)
1806                 ;
1807         else if (import_marks_file_ignore_missing && errno == ENOENT)
1808                 return; /* Marks file does not exist */
1809         else
1810                 die_errno("cannot read '%s'", import_marks_file);
1811         while (fgets(line, sizeof(line), f)) {
1812                 uintmax_t mark;
1813                 char *end;
1814                 unsigned char sha1[20];
1815                 struct object_entry *e;
1816
1817                 end = strchr(line, '\n');
1818                 if (line[0] != ':' || !end)
1819                         die("corrupt mark line: %s", line);
1820                 *end = 0;
1821                 mark = strtoumax(line + 1, &end, 10);
1822                 if (!mark || end == line + 1
1823                         || *end != ' ' || get_sha1(end + 1, sha1))
1824                         die("corrupt mark line: %s", line);
1825                 e = find_object(sha1);
1826                 if (!e) {
1827                         enum object_type type = sha1_object_info(sha1, NULL);
1828                         if (type < 0)
1829                                 die("object not found: %s", sha1_to_hex(sha1));
1830                         e = insert_object(sha1);
1831                         e->type = type;
1832                         e->pack_id = MAX_PACK_ID;
1833                         e->idx.offset = 1; /* just not zero! */
1834                 }
1835                 insert_mark(mark, e);
1836         }
1837         fclose(f);
1838 }
1839
1840
1841 static int read_next_command(void)
1842 {
1843         static int stdin_eof = 0;
1844
1845         if (stdin_eof) {
1846                 unread_command_buf = 0;
1847                 return EOF;
1848         }
1849
1850         for (;;) {
1851                 if (unread_command_buf) {
1852                         unread_command_buf = 0;
1853                 } else {
1854                         struct recent_command *rc;
1855
1856                         strbuf_detach(&command_buf, NULL);
1857                         stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1858                         if (stdin_eof)
1859                                 return EOF;
1860
1861                         if (!seen_data_command
1862                                 && prefixcmp(command_buf.buf, "feature ")
1863                                 && prefixcmp(command_buf.buf, "option ")) {
1864                                 parse_argv();
1865                         }
1866
1867                         rc = rc_free;
1868                         if (rc)
1869                                 rc_free = rc->next;
1870                         else {
1871                                 rc = cmd_hist.next;
1872                                 cmd_hist.next = rc->next;
1873                                 cmd_hist.next->prev = &cmd_hist;
1874                                 free(rc->buf);
1875                         }
1876
1877                         rc->buf = command_buf.buf;
1878                         rc->prev = cmd_tail;
1879                         rc->next = cmd_hist.prev;
1880                         rc->prev->next = rc;
1881                         cmd_tail = rc;
1882                 }
1883                 if (!prefixcmp(command_buf.buf, "cat-blob ")) {
1884                         parse_cat_blob();
1885                         continue;
1886                 }
1887                 if (command_buf.buf[0] == '#')
1888                         continue;
1889                 return 0;
1890         }
1891 }
1892
1893 static void skip_optional_lf(void)
1894 {
1895         int term_char = fgetc(stdin);
1896         if (term_char != '\n' && term_char != EOF)
1897                 ungetc(term_char, stdin);
1898 }
1899
1900 static void parse_mark(void)
1901 {
1902         if (!prefixcmp(command_buf.buf, "mark :")) {
1903                 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1904                 read_next_command();
1905         }
1906         else
1907                 next_mark = 0;
1908 }
1909
1910 static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
1911 {
1912         strbuf_reset(sb);
1913
1914         if (prefixcmp(command_buf.buf, "data "))
1915                 die("Expected 'data n' command, found: %s", command_buf.buf);
1916
1917         if (!prefixcmp(command_buf.buf + 5, "<<")) {
1918                 char *term = xstrdup(command_buf.buf + 5 + 2);
1919                 size_t term_len = command_buf.len - 5 - 2;
1920
1921                 strbuf_detach(&command_buf, NULL);
1922                 for (;;) {
1923                         if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1924                                 die("EOF in data (terminator '%s' not found)", term);
1925                         if (term_len == command_buf.len
1926                                 && !strcmp(term, command_buf.buf))
1927                                 break;
1928                         strbuf_addbuf(sb, &command_buf);
1929                         strbuf_addch(sb, '\n');
1930                 }
1931                 free(term);
1932         }
1933         else {
1934                 uintmax_t len = strtoumax(command_buf.buf + 5, NULL, 10);
1935                 size_t n = 0, length = (size_t)len;
1936
1937                 if (limit && limit < len) {
1938                         *len_res = len;
1939                         return 0;
1940                 }
1941                 if (length < len)
1942                         die("data is too large to use in this context");
1943
1944                 while (n < length) {
1945                         size_t s = strbuf_fread(sb, length - n, stdin);
1946                         if (!s && feof(stdin))
1947                                 die("EOF in data (%lu bytes remaining)",
1948                                         (unsigned long)(length - n));
1949                         n += s;
1950                 }
1951         }
1952
1953         skip_optional_lf();
1954         return 1;
1955 }
1956
1957 static int validate_raw_date(const char *src, char *result, int maxlen)
1958 {
1959         const char *orig_src = src;
1960         char *endp;
1961         unsigned long num;
1962
1963         errno = 0;
1964
1965         num = strtoul(src, &endp, 10);
1966         /* NEEDSWORK: perhaps check for reasonable values? */
1967         if (errno || endp == src || *endp != ' ')
1968                 return -1;
1969
1970         src = endp + 1;
1971         if (*src != '-' && *src != '+')
1972                 return -1;
1973
1974         num = strtoul(src + 1, &endp, 10);
1975         if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
1976             1400 < num)
1977                 return -1;
1978
1979         strcpy(result, orig_src);
1980         return 0;
1981 }
1982
1983 static char *parse_ident(const char *buf)
1984 {
1985         const char *ltgt;
1986         size_t name_len;
1987         char *ident;
1988
1989         /* ensure there is a space delimiter even if there is no name */
1990         if (*buf == '<')
1991                 --buf;
1992
1993         ltgt = buf + strcspn(buf, "<>");
1994         if (*ltgt != '<')
1995                 die("Missing < in ident string: %s", buf);
1996         if (ltgt != buf && ltgt[-1] != ' ')
1997                 die("Missing space before < in ident string: %s", buf);
1998         ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>");
1999         if (*ltgt != '>')
2000                 die("Missing > in ident string: %s", buf);
2001         ltgt++;
2002         if (*ltgt != ' ')
2003                 die("Missing space after > in ident string: %s", buf);
2004         ltgt++;
2005         name_len = ltgt - buf;
2006         ident = xmalloc(name_len + 24);
2007         strncpy(ident, buf, name_len);
2008
2009         switch (whenspec) {
2010         case WHENSPEC_RAW:
2011                 if (validate_raw_date(ltgt, ident + name_len, 24) < 0)
2012                         die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
2013                 break;
2014         case WHENSPEC_RFC2822:
2015                 if (parse_date(ltgt, ident + name_len, 24) < 0)
2016                         die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf);
2017                 break;
2018         case WHENSPEC_NOW:
2019                 if (strcmp("now", ltgt))
2020                         die("Date in ident must be 'now': %s", buf);
2021                 datestamp(ident + name_len, 24);
2022                 break;
2023         }
2024
2025         return ident;
2026 }
2027
2028 static void parse_and_store_blob(
2029         struct last_object *last,
2030         unsigned char *sha1out,
2031         uintmax_t mark)
2032 {
2033         static struct strbuf buf = STRBUF_INIT;
2034         uintmax_t len;
2035
2036         if (parse_data(&buf, big_file_threshold, &len))
2037                 store_object(OBJ_BLOB, &buf, last, sha1out, mark);
2038         else {
2039                 if (last) {
2040                         strbuf_release(&last->data);
2041                         last->offset = 0;
2042                         last->depth = 0;
2043                 }
2044                 stream_blob(len, sha1out, mark);
2045                 skip_optional_lf();
2046         }
2047 }
2048
2049 static void parse_new_blob(void)
2050 {
2051         read_next_command();
2052         parse_mark();
2053         parse_and_store_blob(&last_blob, NULL, next_mark);
2054 }
2055
2056 static void unload_one_branch(void)
2057 {
2058         while (cur_active_branches
2059                 && cur_active_branches >= max_active_branches) {
2060                 uintmax_t min_commit = ULONG_MAX;
2061                 struct branch *e, *l = NULL, *p = NULL;
2062
2063                 for (e = active_branches; e; e = e->active_next_branch) {
2064                         if (e->last_commit < min_commit) {
2065                                 p = l;
2066                                 min_commit = e->last_commit;
2067                         }
2068                         l = e;
2069                 }
2070
2071                 if (p) {
2072                         e = p->active_next_branch;
2073                         p->active_next_branch = e->active_next_branch;
2074                 } else {
2075                         e = active_branches;
2076                         active_branches = e->active_next_branch;
2077                 }
2078                 e->active = 0;
2079                 e->active_next_branch = NULL;
2080                 if (e->branch_tree.tree) {
2081                         release_tree_content_recursive(e->branch_tree.tree);
2082                         e->branch_tree.tree = NULL;
2083                 }
2084                 cur_active_branches--;
2085         }
2086 }
2087
2088 static void load_branch(struct branch *b)
2089 {
2090         load_tree(&b->branch_tree);
2091         if (!b->active) {
2092                 b->active = 1;
2093                 b->active_next_branch = active_branches;
2094                 active_branches = b;
2095                 cur_active_branches++;
2096                 branch_load_count++;
2097         }
2098 }
2099
2100 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2101 {
2102         unsigned char fanout = 0;
2103         while ((num_notes >>= 8))
2104                 fanout++;
2105         return fanout;
2106 }
2107
2108 static void construct_path_with_fanout(const char *hex_sha1,
2109                 unsigned char fanout, char *path)
2110 {
2111         unsigned int i = 0, j = 0;
2112         if (fanout >= 20)
2113                 die("Too large fanout (%u)", fanout);
2114         while (fanout) {
2115                 path[i++] = hex_sha1[j++];
2116                 path[i++] = hex_sha1[j++];
2117                 path[i++] = '/';
2118                 fanout--;
2119         }
2120         memcpy(path + i, hex_sha1 + j, 40 - j);
2121         path[i + 40 - j] = '\0';
2122 }
2123
2124 static uintmax_t do_change_note_fanout(
2125                 struct tree_entry *orig_root, struct tree_entry *root,
2126                 char *hex_sha1, unsigned int hex_sha1_len,
2127                 char *fullpath, unsigned int fullpath_len,
2128                 unsigned char fanout)
2129 {
2130         struct tree_content *t = root->tree;
2131         struct tree_entry *e, leaf;
2132         unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2133         uintmax_t num_notes = 0;
2134         unsigned char sha1[20];
2135         char realpath[60];
2136
2137         for (i = 0; t && i < t->entry_count; i++) {
2138                 e = t->entries[i];
2139                 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2140                 tmp_fullpath_len = fullpath_len;
2141
2142                 /*
2143                  * We're interested in EITHER existing note entries (entries
2144                  * with exactly 40 hex chars in path, not including directory
2145                  * separators), OR directory entries that may contain note
2146                  * entries (with < 40 hex chars in path).
2147                  * Also, each path component in a note entry must be a multiple
2148                  * of 2 chars.
2149                  */
2150                 if (!e->versions[1].mode ||
2151                     tmp_hex_sha1_len > 40 ||
2152                     e->name->str_len % 2)
2153                         continue;
2154
2155                 /* This _may_ be a note entry, or a subdir containing notes */
2156                 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2157                        e->name->str_len);
2158                 if (tmp_fullpath_len)
2159                         fullpath[tmp_fullpath_len++] = '/';
2160                 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2161                        e->name->str_len);
2162                 tmp_fullpath_len += e->name->str_len;
2163                 fullpath[tmp_fullpath_len] = '\0';
2164
2165                 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2166                         /* This is a note entry */
2167                         if (fanout == 0xff) {
2168                                 /* Counting mode, no rename */
2169                                 num_notes++;
2170                                 continue;
2171                         }
2172                         construct_path_with_fanout(hex_sha1, fanout, realpath);
2173                         if (!strcmp(fullpath, realpath)) {
2174                                 /* Note entry is in correct location */
2175                                 num_notes++;
2176                                 continue;
2177                         }
2178
2179                         /* Rename fullpath to realpath */
2180                         if (!tree_content_remove(orig_root, fullpath, &leaf))
2181                                 die("Failed to remove path %s", fullpath);
2182                         tree_content_set(orig_root, realpath,
2183                                 leaf.versions[1].sha1,
2184                                 leaf.versions[1].mode,
2185                                 leaf.tree);
2186                 } else if (S_ISDIR(e->versions[1].mode)) {
2187                         /* This is a subdir that may contain note entries */
2188                         if (!e->tree)
2189                                 load_tree(e);
2190                         num_notes += do_change_note_fanout(orig_root, e,
2191                                 hex_sha1, tmp_hex_sha1_len,
2192                                 fullpath, tmp_fullpath_len, fanout);
2193                 }
2194
2195                 /* The above may have reallocated the current tree_content */
2196                 t = root->tree;
2197         }
2198         return num_notes;
2199 }
2200
2201 static uintmax_t change_note_fanout(struct tree_entry *root,
2202                 unsigned char fanout)
2203 {
2204         char hex_sha1[40], path[60];
2205         return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2206 }
2207
2208 static void file_change_m(struct branch *b)
2209 {
2210         const char *p = command_buf.buf + 2;
2211         static struct strbuf uq = STRBUF_INIT;
2212         const char *endp;
2213         struct object_entry *oe = oe;
2214         unsigned char sha1[20];
2215         uint16_t mode, inline_data = 0;
2216
2217         p = get_mode(p, &mode);
2218         if (!p)
2219                 die("Corrupt mode: %s", command_buf.buf);
2220         switch (mode) {
2221         case 0644:
2222         case 0755:
2223                 mode |= S_IFREG;
2224         case S_IFREG | 0644:
2225         case S_IFREG | 0755:
2226         case S_IFLNK:
2227         case S_IFDIR:
2228         case S_IFGITLINK:
2229                 /* ok */
2230                 break;
2231         default:
2232                 die("Corrupt mode: %s", command_buf.buf);
2233         }
2234
2235         if (*p == ':') {
2236                 char *x;
2237                 oe = find_mark(strtoumax(p + 1, &x, 10));
2238                 hashcpy(sha1, oe->idx.sha1);
2239                 p = x;
2240         } else if (!prefixcmp(p, "inline")) {
2241                 inline_data = 1;
2242                 p += 6;
2243         } else {
2244                 if (get_sha1_hex(p, sha1))
2245                         die("Invalid SHA1: %s", command_buf.buf);
2246                 oe = find_object(sha1);
2247                 p += 40;
2248         }
2249         if (*p++ != ' ')
2250                 die("Missing space after SHA1: %s", command_buf.buf);
2251
2252         strbuf_reset(&uq);
2253         if (!unquote_c_style(&uq, p, &endp)) {
2254                 if (*endp)
2255                         die("Garbage after path in: %s", command_buf.buf);
2256                 p = uq.buf;
2257         }
2258
2259         /* Git does not track empty, non-toplevel directories. */
2260         if (S_ISDIR(mode) && !memcmp(sha1, EMPTY_TREE_SHA1_BIN, 20) && *p) {
2261                 tree_content_remove(&b->branch_tree, p, NULL);
2262                 return;
2263         }
2264
2265         if (S_ISGITLINK(mode)) {
2266                 if (inline_data)
2267                         die("Git links cannot be specified 'inline': %s",
2268                                 command_buf.buf);
2269                 else if (oe) {
2270                         if (oe->type != OBJ_COMMIT)
2271                                 die("Not a commit (actually a %s): %s",
2272                                         typename(oe->type), command_buf.buf);
2273                 }
2274                 /*
2275                  * Accept the sha1 without checking; it expected to be in
2276                  * another repository.
2277                  */
2278         } else if (inline_data) {
2279                 if (S_ISDIR(mode))
2280                         die("Directories cannot be specified 'inline': %s",
2281                                 command_buf.buf);
2282                 if (p != uq.buf) {
2283                         strbuf_addstr(&uq, p);
2284                         p = uq.buf;
2285                 }
2286                 read_next_command();
2287                 parse_and_store_blob(&last_blob, sha1, 0);
2288         } else {
2289                 enum object_type expected = S_ISDIR(mode) ?
2290                                                 OBJ_TREE: OBJ_BLOB;
2291                 enum object_type type = oe ? oe->type :
2292                                         sha1_object_info(sha1, NULL);
2293                 if (type < 0)
2294                         die("%s not found: %s",
2295                                         S_ISDIR(mode) ?  "Tree" : "Blob",
2296                                         command_buf.buf);
2297                 if (type != expected)
2298                         die("Not a %s (actually a %s): %s",
2299                                 typename(expected), typename(type),
2300                                 command_buf.buf);
2301         }
2302
2303         if (!*p) {
2304                 tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2305                 return;
2306         }
2307         tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
2308 }
2309
2310 static void file_change_d(struct branch *b)
2311 {
2312         const char *p = command_buf.buf + 2;
2313         static struct strbuf uq = STRBUF_INIT;
2314         const char *endp;
2315
2316         strbuf_reset(&uq);
2317         if (!unquote_c_style(&uq, p, &endp)) {
2318                 if (*endp)
2319                         die("Garbage after path in: %s", command_buf.buf);
2320                 p = uq.buf;
2321         }
2322         tree_content_remove(&b->branch_tree, p, NULL);
2323 }
2324
2325 static void file_change_cr(struct branch *b, int rename)
2326 {
2327         const char *s, *d;
2328         static struct strbuf s_uq = STRBUF_INIT;
2329         static struct strbuf d_uq = STRBUF_INIT;
2330         const char *endp;
2331         struct tree_entry leaf;
2332
2333         s = command_buf.buf + 2;
2334         strbuf_reset(&s_uq);
2335         if (!unquote_c_style(&s_uq, s, &endp)) {
2336                 if (*endp != ' ')
2337                         die("Missing space after source: %s", command_buf.buf);
2338         } else {
2339                 endp = strchr(s, ' ');
2340                 if (!endp)
2341                         die("Missing space after source: %s", command_buf.buf);
2342                 strbuf_add(&s_uq, s, endp - s);
2343         }
2344         s = s_uq.buf;
2345
2346         endp++;
2347         if (!*endp)
2348                 die("Missing dest: %s", command_buf.buf);
2349
2350         d = endp;
2351         strbuf_reset(&d_uq);
2352         if (!unquote_c_style(&d_uq, d, &endp)) {
2353                 if (*endp)
2354                         die("Garbage after dest in: %s", command_buf.buf);
2355                 d = d_uq.buf;
2356         }
2357
2358         memset(&leaf, 0, sizeof(leaf));
2359         if (rename)
2360                 tree_content_remove(&b->branch_tree, s, &leaf);
2361         else
2362                 tree_content_get(&b->branch_tree, s, &leaf);
2363         if (!leaf.versions[1].mode)
2364                 die("Path %s not in branch", s);
2365         if (!*d) {      /* C "path/to/subdir" "" */
2366                 tree_content_replace(&b->branch_tree,
2367                         leaf.versions[1].sha1,
2368                         leaf.versions[1].mode,
2369                         leaf.tree);
2370                 return;
2371         }
2372         tree_content_set(&b->branch_tree, d,
2373                 leaf.versions[1].sha1,
2374                 leaf.versions[1].mode,
2375                 leaf.tree);
2376 }
2377
2378 static void note_change_n(struct branch *b, unsigned char *old_fanout)
2379 {
2380         const char *p = command_buf.buf + 2;
2381         static struct strbuf uq = STRBUF_INIT;
2382         struct object_entry *oe = oe;
2383         struct branch *s;
2384         unsigned char sha1[20], commit_sha1[20];
2385         char path[60];
2386         uint16_t inline_data = 0;
2387         unsigned char new_fanout;
2388
2389         /*
2390          * When loading a branch, we don't traverse its tree to count the real
2391          * number of notes (too expensive to do this for all non-note refs).
2392          * This means that recently loaded notes refs might incorrectly have
2393          * b->num_notes == 0, and consequently, old_fanout might be wrong.
2394          *
2395          * Fix this by traversing the tree and counting the number of notes
2396          * when b->num_notes == 0. If the notes tree is truly empty, the
2397          * calculation should not take long.
2398          */
2399         if (b->num_notes == 0 && *old_fanout == 0) {
2400                 /* Invoke change_note_fanout() in "counting mode". */
2401                 b->num_notes = change_note_fanout(&b->branch_tree, 0xff);
2402                 *old_fanout = convert_num_notes_to_fanout(b->num_notes);
2403         }
2404
2405         /* Now parse the notemodify command. */
2406         /* <dataref> or 'inline' */
2407         if (*p == ':') {
2408                 char *x;
2409                 oe = find_mark(strtoumax(p + 1, &x, 10));
2410                 hashcpy(sha1, oe->idx.sha1);
2411                 p = x;
2412         } else if (!prefixcmp(p, "inline")) {
2413                 inline_data = 1;
2414                 p += 6;
2415         } else {
2416                 if (get_sha1_hex(p, sha1))
2417                         die("Invalid SHA1: %s", command_buf.buf);
2418                 oe = find_object(sha1);
2419                 p += 40;
2420         }
2421         if (*p++ != ' ')
2422                 die("Missing space after SHA1: %s", command_buf.buf);
2423
2424         /* <committish> */
2425         s = lookup_branch(p);
2426         if (s) {
2427                 if (is_null_sha1(s->sha1))
2428                         die("Can't add a note on empty branch.");
2429                 hashcpy(commit_sha1, s->sha1);
2430         } else if (*p == ':') {
2431                 uintmax_t commit_mark = strtoumax(p + 1, NULL, 10);
2432                 struct object_entry *commit_oe = find_mark(commit_mark);
2433                 if (commit_oe->type != OBJ_COMMIT)
2434                         die("Mark :%" PRIuMAX " not a commit", commit_mark);
2435                 hashcpy(commit_sha1, commit_oe->idx.sha1);
2436         } else if (!get_sha1(p, commit_sha1)) {
2437                 unsigned long size;
2438                 char *buf = read_object_with_reference(commit_sha1,
2439                         commit_type, &size, commit_sha1);
2440                 if (!buf || size < 46)
2441                         die("Not a valid commit: %s", p);
2442                 free(buf);
2443         } else
2444                 die("Invalid ref name or SHA1 expression: %s", p);
2445
2446         if (inline_data) {
2447                 if (p != uq.buf) {
2448                         strbuf_addstr(&uq, p);
2449                         p = uq.buf;
2450                 }
2451                 read_next_command();
2452                 parse_and_store_blob(&last_blob, sha1, 0);
2453         } else if (oe) {
2454                 if (oe->type != OBJ_BLOB)
2455                         die("Not a blob (actually a %s): %s",
2456                                 typename(oe->type), command_buf.buf);
2457         } else if (!is_null_sha1(sha1)) {
2458                 enum object_type type = sha1_object_info(sha1, NULL);
2459                 if (type < 0)
2460                         die("Blob not found: %s", command_buf.buf);
2461                 if (type != OBJ_BLOB)
2462                         die("Not a blob (actually a %s): %s",
2463                             typename(type), command_buf.buf);
2464         }
2465
2466         construct_path_with_fanout(sha1_to_hex(commit_sha1), *old_fanout, path);
2467         if (tree_content_remove(&b->branch_tree, path, NULL))
2468                 b->num_notes--;
2469
2470         if (is_null_sha1(sha1))
2471                 return; /* nothing to insert */
2472
2473         b->num_notes++;
2474         new_fanout = convert_num_notes_to_fanout(b->num_notes);
2475         construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2476         tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
2477 }
2478
2479 static void file_change_deleteall(struct branch *b)
2480 {
2481         release_tree_content_recursive(b->branch_tree.tree);
2482         hashclr(b->branch_tree.versions[0].sha1);
2483         hashclr(b->branch_tree.versions[1].sha1);
2484         load_tree(&b->branch_tree);
2485         b->num_notes = 0;
2486 }
2487
2488 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2489 {
2490         if (!buf || size < 46)
2491                 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2492         if (memcmp("tree ", buf, 5)
2493                 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2494                 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2495         hashcpy(b->branch_tree.versions[0].sha1,
2496                 b->branch_tree.versions[1].sha1);
2497 }
2498
2499 static void parse_from_existing(struct branch *b)
2500 {
2501         if (is_null_sha1(b->sha1)) {
2502                 hashclr(b->branch_tree.versions[0].sha1);
2503                 hashclr(b->branch_tree.versions[1].sha1);
2504         } else {
2505                 unsigned long size;
2506                 char *buf;
2507
2508                 buf = read_object_with_reference(b->sha1,
2509                         commit_type, &size, b->sha1);
2510                 parse_from_commit(b, buf, size);
2511                 free(buf);
2512         }
2513 }
2514
2515 static int parse_from(struct branch *b)
2516 {
2517         const char *from;
2518         struct branch *s;
2519
2520         if (prefixcmp(command_buf.buf, "from "))
2521                 return 0;
2522
2523         if (b->branch_tree.tree) {
2524                 release_tree_content_recursive(b->branch_tree.tree);
2525                 b->branch_tree.tree = NULL;
2526         }
2527
2528         from = strchr(command_buf.buf, ' ') + 1;
2529         s = lookup_branch(from);
2530         if (b == s)
2531                 die("Can't create a branch from itself: %s", b->name);
2532         else if (s) {
2533                 unsigned char *t = s->branch_tree.versions[1].sha1;
2534                 hashcpy(b->sha1, s->sha1);
2535                 hashcpy(b->branch_tree.versions[0].sha1, t);
2536                 hashcpy(b->branch_tree.versions[1].sha1, t);
2537         } else if (*from == ':') {
2538                 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2539                 struct object_entry *oe = find_mark(idnum);
2540                 if (oe->type != OBJ_COMMIT)
2541                         die("Mark :%" PRIuMAX " not a commit", idnum);
2542                 hashcpy(b->sha1, oe->idx.sha1);
2543                 if (oe->pack_id != MAX_PACK_ID) {
2544                         unsigned long size;
2545                         char *buf = gfi_unpack_entry(oe, &size);
2546                         parse_from_commit(b, buf, size);
2547                         free(buf);
2548                 } else
2549                         parse_from_existing(b);
2550         } else if (!get_sha1(from, b->sha1))
2551                 parse_from_existing(b);
2552         else
2553                 die("Invalid ref name or SHA1 expression: %s", from);
2554
2555         read_next_command();
2556         return 1;
2557 }
2558
2559 static struct hash_list *parse_merge(unsigned int *count)
2560 {
2561         struct hash_list *list = NULL, *n, *e = e;
2562         const char *from;
2563         struct branch *s;
2564
2565         *count = 0;
2566         while (!prefixcmp(command_buf.buf, "merge ")) {
2567                 from = strchr(command_buf.buf, ' ') + 1;
2568                 n = xmalloc(sizeof(*n));
2569                 s = lookup_branch(from);
2570                 if (s)
2571                         hashcpy(n->sha1, s->sha1);
2572                 else if (*from == ':') {
2573                         uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2574                         struct object_entry *oe = find_mark(idnum);
2575                         if (oe->type != OBJ_COMMIT)
2576                                 die("Mark :%" PRIuMAX " not a commit", idnum);
2577                         hashcpy(n->sha1, oe->idx.sha1);
2578                 } else if (!get_sha1(from, n->sha1)) {
2579                         unsigned long size;
2580                         char *buf = read_object_with_reference(n->sha1,
2581                                 commit_type, &size, n->sha1);
2582                         if (!buf || size < 46)
2583                                 die("Not a valid commit: %s", from);
2584                         free(buf);
2585                 } else
2586                         die("Invalid ref name or SHA1 expression: %s", from);
2587
2588                 n->next = NULL;
2589                 if (list)
2590                         e->next = n;
2591                 else
2592                         list = n;
2593                 e = n;
2594                 (*count)++;
2595                 read_next_command();
2596         }
2597         return list;
2598 }
2599
2600 static void parse_new_commit(void)
2601 {
2602         static struct strbuf msg = STRBUF_INIT;
2603         struct branch *b;
2604         char *sp;
2605         char *author = NULL;
2606         char *committer = NULL;
2607         struct hash_list *merge_list = NULL;
2608         unsigned int merge_count;
2609         unsigned char prev_fanout, new_fanout;
2610
2611         /* Obtain the branch name from the rest of our command */
2612         sp = strchr(command_buf.buf, ' ') + 1;
2613         b = lookup_branch(sp);
2614         if (!b)
2615                 b = new_branch(sp);
2616
2617         read_next_command();
2618         parse_mark();
2619         if (!prefixcmp(command_buf.buf, "author ")) {
2620                 author = parse_ident(command_buf.buf + 7);
2621                 read_next_command();
2622         }
2623         if (!prefixcmp(command_buf.buf, "committer ")) {
2624                 committer = parse_ident(command_buf.buf + 10);
2625                 read_next_command();
2626         }
2627         if (!committer)
2628                 die("Expected committer but didn't get one");
2629         parse_data(&msg, 0, NULL);
2630         read_next_command();
2631         parse_from(b);
2632         merge_list = parse_merge(&merge_count);
2633
2634         /* ensure the branch is active/loaded */
2635         if (!b->branch_tree.tree || !max_active_branches) {
2636                 unload_one_branch();
2637                 load_branch(b);
2638         }
2639
2640         prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2641
2642         /* file_change* */
2643         while (command_buf.len > 0) {
2644                 if (!prefixcmp(command_buf.buf, "M "))
2645                         file_change_m(b);
2646                 else if (!prefixcmp(command_buf.buf, "D "))
2647                         file_change_d(b);
2648                 else if (!prefixcmp(command_buf.buf, "R "))
2649                         file_change_cr(b, 1);
2650                 else if (!prefixcmp(command_buf.buf, "C "))
2651                         file_change_cr(b, 0);
2652                 else if (!prefixcmp(command_buf.buf, "N "))
2653                         note_change_n(b, &prev_fanout);
2654                 else if (!strcmp("deleteall", command_buf.buf))
2655                         file_change_deleteall(b);
2656                 else if (!prefixcmp(command_buf.buf, "ls "))
2657                         parse_ls(b);
2658                 else {
2659                         unread_command_buf = 1;
2660                         break;
2661                 }
2662                 if (read_next_command() == EOF)
2663                         break;
2664         }
2665
2666         new_fanout = convert_num_notes_to_fanout(b->num_notes);
2667         if (new_fanout != prev_fanout)
2668                 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2669
2670         /* build the tree and the commit */
2671         store_tree(&b->branch_tree);
2672         hashcpy(b->branch_tree.versions[0].sha1,
2673                 b->branch_tree.versions[1].sha1);
2674
2675         strbuf_reset(&new_data);
2676         strbuf_addf(&new_data, "tree %s\n",
2677                 sha1_to_hex(b->branch_tree.versions[1].sha1));
2678         if (!is_null_sha1(b->sha1))
2679                 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2680         while (merge_list) {
2681                 struct hash_list *next = merge_list->next;
2682                 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2683                 free(merge_list);
2684                 merge_list = next;
2685         }
2686         strbuf_addf(&new_data,
2687                 "author %s\n"
2688                 "committer %s\n"
2689                 "\n",
2690                 author ? author : committer, committer);
2691         strbuf_addbuf(&new_data, &msg);
2692         free(author);
2693         free(committer);
2694
2695         if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2696                 b->pack_id = pack_id;
2697         b->last_commit = object_count_by_type[OBJ_COMMIT];
2698 }
2699
2700 static void parse_new_tag(void)
2701 {
2702         static struct strbuf msg = STRBUF_INIT;
2703         char *sp;
2704         const char *from;
2705         char *tagger;
2706         struct branch *s;
2707         struct tag *t;
2708         uintmax_t from_mark = 0;
2709         unsigned char sha1[20];
2710         enum object_type type;
2711
2712         /* Obtain the new tag name from the rest of our command */
2713         sp = strchr(command_buf.buf, ' ') + 1;
2714         t = pool_alloc(sizeof(struct tag));
2715         t->next_tag = NULL;
2716         t->name = pool_strdup(sp);
2717         if (last_tag)
2718                 last_tag->next_tag = t;
2719         else
2720                 first_tag = t;
2721         last_tag = t;
2722         read_next_command();
2723
2724         /* from ... */
2725         if (prefixcmp(command_buf.buf, "from "))
2726                 die("Expected from command, got %s", command_buf.buf);
2727         from = strchr(command_buf.buf, ' ') + 1;
2728         s = lookup_branch(from);
2729         if (s) {
2730                 if (is_null_sha1(s->sha1))
2731                         die("Can't tag an empty branch.");
2732                 hashcpy(sha1, s->sha1);
2733                 type = OBJ_COMMIT;
2734         } else if (*from == ':') {
2735                 struct object_entry *oe;
2736                 from_mark = strtoumax(from + 1, NULL, 10);
2737                 oe = find_mark(from_mark);
2738                 type = oe->type;
2739                 hashcpy(sha1, oe->idx.sha1);
2740         } else if (!get_sha1(from, sha1)) {
2741                 struct object_entry *oe = find_object(sha1);
2742                 if (!oe) {
2743                         type = sha1_object_info(sha1, NULL);
2744                         if (type < 0)
2745                                 die("Not a valid object: %s", from);
2746                 } else
2747                         type = oe->type;
2748         } else
2749                 die("Invalid ref name or SHA1 expression: %s", from);
2750         read_next_command();
2751
2752         /* tagger ... */
2753         if (!prefixcmp(command_buf.buf, "tagger ")) {
2754                 tagger = parse_ident(command_buf.buf + 7);
2755                 read_next_command();
2756         } else
2757                 tagger = NULL;
2758
2759         /* tag payload/message */
2760         parse_data(&msg, 0, NULL);
2761
2762         /* build the tag object */
2763         strbuf_reset(&new_data);
2764
2765         strbuf_addf(&new_data,
2766                     "object %s\n"
2767                     "type %s\n"
2768                     "tag %s\n",
2769                     sha1_to_hex(sha1), typename(type), t->name);
2770         if (tagger)
2771                 strbuf_addf(&new_data,
2772                             "tagger %s\n", tagger);
2773         strbuf_addch(&new_data, '\n');
2774         strbuf_addbuf(&new_data, &msg);
2775         free(tagger);
2776
2777         if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2778                 t->pack_id = MAX_PACK_ID;
2779         else
2780                 t->pack_id = pack_id;
2781 }
2782
2783 static void parse_reset_branch(void)
2784 {
2785         struct branch *b;
2786         char *sp;
2787
2788         /* Obtain the branch name from the rest of our command */
2789         sp = strchr(command_buf.buf, ' ') + 1;
2790         b = lookup_branch(sp);
2791         if (b) {
2792                 hashclr(b->sha1);
2793                 hashclr(b->branch_tree.versions[0].sha1);
2794                 hashclr(b->branch_tree.versions[1].sha1);
2795                 if (b->branch_tree.tree) {
2796                         release_tree_content_recursive(b->branch_tree.tree);
2797                         b->branch_tree.tree = NULL;
2798                 }
2799         }
2800         else
2801                 b = new_branch(sp);
2802         read_next_command();
2803         parse_from(b);
2804         if (command_buf.len > 0)
2805                 unread_command_buf = 1;
2806 }
2807
2808 static void cat_blob_write(const char *buf, unsigned long size)
2809 {
2810         if (write_in_full(cat_blob_fd, buf, size) != size)
2811                 die_errno("Write to frontend failed");
2812 }
2813
2814 static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
2815 {
2816         struct strbuf line = STRBUF_INIT;
2817         unsigned long size;
2818         enum object_type type = 0;
2819         char *buf;
2820
2821         if (!oe || oe->pack_id == MAX_PACK_ID) {
2822                 buf = read_sha1_file(sha1, &type, &size);
2823         } else {
2824                 type = oe->type;
2825                 buf = gfi_unpack_entry(oe, &size);
2826         }
2827
2828         /*
2829          * Output based on batch_one_object() from cat-file.c.
2830          */
2831         if (type <= 0) {
2832                 strbuf_reset(&line);
2833                 strbuf_addf(&line, "%s missing\n", sha1_to_hex(sha1));
2834                 cat_blob_write(line.buf, line.len);
2835                 strbuf_release(&line);
2836                 free(buf);
2837                 return;
2838         }
2839         if (!buf)
2840                 die("Can't read object %s", sha1_to_hex(sha1));
2841         if (type != OBJ_BLOB)
2842                 die("Object %s is a %s but a blob was expected.",
2843                     sha1_to_hex(sha1), typename(type));
2844         strbuf_reset(&line);
2845         strbuf_addf(&line, "%s %s %lu\n", sha1_to_hex(sha1),
2846                                                 typename(type), size);
2847         cat_blob_write(line.buf, line.len);
2848         strbuf_release(&line);
2849         cat_blob_write(buf, size);
2850         cat_blob_write("\n", 1);
2851         if (oe && oe->pack_id == pack_id) {
2852                 last_blob.offset = oe->idx.offset;
2853                 strbuf_attach(&last_blob.data, buf, size, size);
2854                 last_blob.depth = oe->depth;
2855         } else
2856                 free(buf);
2857 }
2858
2859 static void parse_cat_blob(void)
2860 {
2861         const char *p;
2862         struct object_entry *oe = oe;
2863         unsigned char sha1[20];
2864
2865         /* cat-blob SP <object> LF */
2866         p = command_buf.buf + strlen("cat-blob ");
2867         if (*p == ':') {
2868                 char *x;
2869                 oe = find_mark(strtoumax(p + 1, &x, 10));
2870                 if (x == p + 1)
2871                         die("Invalid mark: %s", command_buf.buf);
2872                 if (!oe)
2873                         die("Unknown mark: %s", command_buf.buf);
2874                 if (*x)
2875                         die("Garbage after mark: %s", command_buf.buf);
2876                 hashcpy(sha1, oe->idx.sha1);
2877         } else {
2878                 if (get_sha1_hex(p, sha1))
2879                         die("Invalid SHA1: %s", command_buf.buf);
2880                 if (p[40])
2881                         die("Garbage after SHA1: %s", command_buf.buf);
2882                 oe = find_object(sha1);
2883         }
2884
2885         cat_blob(oe, sha1);
2886 }
2887
2888 static struct object_entry *dereference(struct object_entry *oe,
2889                                         unsigned char sha1[20])
2890 {
2891         unsigned long size;
2892         char *buf = NULL;
2893         if (!oe) {
2894                 enum object_type type = sha1_object_info(sha1, NULL);
2895                 if (type < 0)
2896                         die("object not found: %s", sha1_to_hex(sha1));
2897                 /* cache it! */
2898                 oe = insert_object(sha1);
2899                 oe->type = type;
2900                 oe->pack_id = MAX_PACK_ID;
2901                 oe->idx.offset = 1;
2902         }
2903         switch (oe->type) {
2904         case OBJ_TREE:  /* easy case. */
2905                 return oe;
2906         case OBJ_COMMIT:
2907         case OBJ_TAG:
2908                 break;
2909         default:
2910                 die("Not a treeish: %s", command_buf.buf);
2911         }
2912
2913         if (oe->pack_id != MAX_PACK_ID) {       /* in a pack being written */
2914                 buf = gfi_unpack_entry(oe, &size);
2915         } else {
2916                 enum object_type unused;
2917                 buf = read_sha1_file(sha1, &unused, &size);
2918         }
2919         if (!buf)
2920                 die("Can't load object %s", sha1_to_hex(sha1));
2921
2922         /* Peel one layer. */
2923         switch (oe->type) {
2924         case OBJ_TAG:
2925                 if (size < 40 + strlen("object ") ||
2926                     get_sha1_hex(buf + strlen("object "), sha1))
2927                         die("Invalid SHA1 in tag: %s", command_buf.buf);
2928                 break;
2929         case OBJ_COMMIT:
2930                 if (size < 40 + strlen("tree ") ||
2931                     get_sha1_hex(buf + strlen("tree "), sha1))
2932                         die("Invalid SHA1 in commit: %s", command_buf.buf);
2933         }
2934
2935         free(buf);
2936         return find_object(sha1);
2937 }
2938
2939 static struct object_entry *parse_treeish_dataref(const char **p)
2940 {
2941         unsigned char sha1[20];
2942         struct object_entry *e;
2943
2944         if (**p == ':') {       /* <mark> */
2945                 char *endptr;
2946                 e = find_mark(strtoumax(*p + 1, &endptr, 10));
2947                 if (endptr == *p + 1)
2948                         die("Invalid mark: %s", command_buf.buf);
2949                 if (!e)
2950                         die("Unknown mark: %s", command_buf.buf);
2951                 *p = endptr;
2952                 hashcpy(sha1, e->idx.sha1);
2953         } else {        /* <sha1> */
2954                 if (get_sha1_hex(*p, sha1))
2955                         die("Invalid SHA1: %s", command_buf.buf);
2956                 e = find_object(sha1);
2957                 *p += 40;
2958         }
2959
2960         while (!e || e->type != OBJ_TREE)
2961                 e = dereference(e, sha1);
2962         return e;
2963 }
2964
2965 static void print_ls(int mode, const unsigned char *sha1, const char *path)
2966 {
2967         static struct strbuf line = STRBUF_INIT;
2968
2969         /* See show_tree(). */
2970         const char *type =
2971                 S_ISGITLINK(mode) ? commit_type :
2972                 S_ISDIR(mode) ? tree_type :
2973                 blob_type;
2974
2975         if (!mode) {
2976                 /* missing SP path LF */
2977                 strbuf_reset(&line);
2978                 strbuf_addstr(&line, "missing ");
2979                 quote_c_style(path, &line, NULL, 0);
2980                 strbuf_addch(&line, '\n');
2981         } else {
2982                 /* mode SP type SP object_name TAB path LF */
2983                 strbuf_reset(&line);
2984                 strbuf_addf(&line, "%06o %s %s\t",
2985                                 mode & ~NO_DELTA, type, sha1_to_hex(sha1));
2986                 quote_c_style(path, &line, NULL, 0);
2987                 strbuf_addch(&line, '\n');
2988         }
2989         cat_blob_write(line.buf, line.len);
2990 }
2991
2992 static void parse_ls(struct branch *b)
2993 {
2994         const char *p;
2995         struct tree_entry *root = NULL;
2996         struct tree_entry leaf = {NULL};
2997
2998         /* ls SP (<treeish> SP)? <path> */
2999         p = command_buf.buf + strlen("ls ");
3000         if (*p == '"') {
3001                 if (!b)
3002                         die("Not in a commit: %s", command_buf.buf);
3003                 root = &b->branch_tree;
3004         } else {
3005                 struct object_entry *e = parse_treeish_dataref(&p);
3006                 root = new_tree_entry();
3007                 hashcpy(root->versions[1].sha1, e->idx.sha1);
3008                 load_tree(root);
3009                 if (*p++ != ' ')
3010                         die("Missing space after tree-ish: %s", command_buf.buf);
3011         }
3012         if (*p == '"') {
3013                 static struct strbuf uq = STRBUF_INIT;
3014                 const char *endp;
3015                 strbuf_reset(&uq);
3016                 if (unquote_c_style(&uq, p, &endp))
3017                         die("Invalid path: %s", command_buf.buf);
3018                 if (*endp)
3019                         die("Garbage after path in: %s", command_buf.buf);
3020                 p = uq.buf;
3021         }
3022         tree_content_get(root, p, &leaf);
3023         /*
3024          * A directory in preparation would have a sha1 of zero
3025          * until it is saved.  Save, for simplicity.
3026          */
3027         if (S_ISDIR(leaf.versions[1].mode))
3028                 store_tree(&leaf);
3029
3030         print_ls(leaf.versions[1].mode, leaf.versions[1].sha1, p);
3031         if (!b || root != &b->branch_tree)
3032                 release_tree_entry(root);
3033 }
3034
3035 static void checkpoint(void)
3036 {
3037         checkpoint_requested = 0;
3038         if (object_count) {
3039                 cycle_packfile();
3040                 dump_branches();
3041                 dump_tags();
3042                 dump_marks();
3043         }
3044 }
3045
3046 static void parse_checkpoint(void)
3047 {
3048         checkpoint_requested = 1;
3049         skip_optional_lf();
3050 }
3051
3052 static void parse_progress(void)
3053 {
3054         fwrite(command_buf.buf, 1, command_buf.len, stdout);
3055         fputc('\n', stdout);
3056         fflush(stdout);
3057         skip_optional_lf();
3058 }
3059
3060 static char* make_fast_import_path(const char *path)
3061 {
3062         struct strbuf abs_path = STRBUF_INIT;
3063
3064         if (!relative_marks_paths || is_absolute_path(path))
3065                 return xstrdup(path);
3066         strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
3067         return strbuf_detach(&abs_path, NULL);
3068 }
3069
3070 static void option_import_marks(const char *marks,
3071                                         int from_stream, int ignore_missing)
3072 {
3073         if (import_marks_file) {
3074                 if (from_stream)
3075                         die("Only one import-marks command allowed per stream");
3076
3077                 /* read previous mark file */
3078                 if(!import_marks_file_from_stream)
3079                         read_marks();
3080         }
3081
3082         import_marks_file = make_fast_import_path(marks);
3083         safe_create_leading_directories_const(import_marks_file);
3084         import_marks_file_from_stream = from_stream;
3085         import_marks_file_ignore_missing = ignore_missing;
3086 }
3087
3088 static void option_date_format(const char *fmt)
3089 {
3090         if (!strcmp(fmt, "raw"))
3091                 whenspec = WHENSPEC_RAW;
3092         else if (!strcmp(fmt, "rfc2822"))
3093                 whenspec = WHENSPEC_RFC2822;
3094         else if (!strcmp(fmt, "now"))
3095                 whenspec = WHENSPEC_NOW;
3096         else
3097                 die("unknown --date-format argument %s", fmt);
3098 }
3099
3100 static unsigned long ulong_arg(const char *option, const char *arg)
3101 {
3102         char *endptr;
3103         unsigned long rv = strtoul(arg, &endptr, 0);
3104         if (strchr(arg, '-') || endptr == arg || *endptr)
3105                 die("%s: argument must be a non-negative integer", option);
3106         return rv;
3107 }
3108
3109 static void option_depth(const char *depth)
3110 {
3111         max_depth = ulong_arg("--depth", depth);
3112         if (max_depth > MAX_DEPTH)
3113                 die("--depth cannot exceed %u", MAX_DEPTH);
3114 }
3115
3116 static void option_active_branches(const char *branches)
3117 {
3118         max_active_branches = ulong_arg("--active-branches", branches);
3119 }
3120
3121 static void option_export_marks(const char *marks)
3122 {
3123         export_marks_file = make_fast_import_path(marks);
3124         safe_create_leading_directories_const(export_marks_file);
3125 }
3126
3127 static void option_cat_blob_fd(const char *fd)
3128 {
3129         unsigned long n = ulong_arg("--cat-blob-fd", fd);
3130         if (n > (unsigned long) INT_MAX)
3131                 die("--cat-blob-fd cannot exceed %d", INT_MAX);
3132         cat_blob_fd = (int) n;
3133 }
3134
3135 static void option_export_pack_edges(const char *edges)
3136 {
3137         if (pack_edges)
3138                 fclose(pack_edges);
3139         pack_edges = fopen(edges, "a");
3140         if (!pack_edges)
3141                 die_errno("Cannot open '%s'", edges);
3142 }
3143
3144 static int parse_one_option(const char *option)
3145 {
3146         if (!prefixcmp(option, "max-pack-size=")) {
3147                 unsigned long v;
3148                 if (!git_parse_ulong(option + 14, &v))
3149                         return 0;
3150                 if (v < 8192) {
3151                         warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
3152                         v *= 1024 * 1024;
3153                 } else if (v < 1024 * 1024) {
3154                         warning("minimum max-pack-size is 1 MiB");
3155                         v = 1024 * 1024;
3156                 }
3157                 max_packsize = v;
3158         } else if (!prefixcmp(option, "big-file-threshold=")) {
3159                 unsigned long v;
3160                 if (!git_parse_ulong(option + 19, &v))
3161                         return 0;
3162                 big_file_threshold = v;
3163         } else if (!prefixcmp(option, "depth=")) {
3164                 option_depth(option + 6);
3165         } else if (!prefixcmp(option, "active-branches=")) {
3166                 option_active_branches(option + 16);
3167         } else if (!prefixcmp(option, "export-pack-edges=")) {
3168                 option_export_pack_edges(option + 18);
3169         } else if (!prefixcmp(option, "quiet")) {
3170                 show_stats = 0;
3171         } else if (!prefixcmp(option, "stats")) {
3172                 show_stats = 1;
3173         } else {
3174                 return 0;
3175         }
3176
3177         return 1;
3178 }
3179
3180 static int parse_one_feature(const char *feature, int from_stream)
3181 {
3182         if (!prefixcmp(feature, "date-format=")) {
3183                 option_date_format(feature + 12);
3184         } else if (!prefixcmp(feature, "import-marks=")) {
3185                 option_import_marks(feature + 13, from_stream, 0);
3186         } else if (!prefixcmp(feature, "import-marks-if-exists=")) {
3187                 option_import_marks(feature + strlen("import-marks-if-exists="),
3188                                         from_stream, 1);
3189         } else if (!prefixcmp(feature, "export-marks=")) {
3190                 option_export_marks(feature + 13);
3191         } else if (!strcmp(feature, "cat-blob")) {
3192                 ; /* Don't die - this feature is supported */
3193         } else if (!strcmp(feature, "relative-marks")) {
3194                 relative_marks_paths = 1;
3195         } else if (!strcmp(feature, "no-relative-marks")) {
3196                 relative_marks_paths = 0;
3197         } else if (!strcmp(feature, "done")) {
3198                 require_explicit_termination = 1;
3199         } else if (!strcmp(feature, "force")) {
3200                 force_update = 1;
3201         } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
3202                 ; /* do nothing; we have the feature */
3203         } else {
3204                 return 0;
3205         }
3206
3207         return 1;
3208 }
3209
3210 static void parse_feature(void)
3211 {
3212         char *feature = command_buf.buf + 8;
3213
3214         if (seen_data_command)
3215                 die("Got feature command '%s' after data command", feature);
3216
3217         if (parse_one_feature(feature, 1))
3218                 return;
3219
3220         die("This version of fast-import does not support feature %s.", feature);
3221 }
3222
3223 static void parse_option(void)
3224 {
3225         char *option = command_buf.buf + 11;
3226
3227         if (seen_data_command)
3228                 die("Got option command '%s' after data command", option);
3229
3230         if (parse_one_option(option))
3231                 return;
3232
3233         die("This version of fast-import does not support option: %s", option);
3234 }
3235
3236 static int git_pack_config(const char *k, const char *v, void *cb)
3237 {
3238         if (!strcmp(k, "pack.depth")) {
3239                 max_depth = git_config_int(k, v);
3240                 if (max_depth > MAX_DEPTH)
3241                         max_depth = MAX_DEPTH;
3242                 return 0;
3243         }
3244         if (!strcmp(k, "pack.compression")) {
3245                 int level = git_config_int(k, v);
3246                 if (level == -1)
3247                         level = Z_DEFAULT_COMPRESSION;
3248                 else if (level < 0 || level > Z_BEST_COMPRESSION)
3249                         die("bad pack compression level %d", level);
3250                 pack_compression_level = level;
3251                 pack_compression_seen = 1;
3252                 return 0;
3253         }
3254         if (!strcmp(k, "pack.indexversion")) {
3255                 pack_idx_opts.version = git_config_int(k, v);
3256                 if (pack_idx_opts.version > 2)
3257                         die("bad pack.indexversion=%"PRIu32,
3258                             pack_idx_opts.version);
3259                 return 0;
3260         }
3261         if (!strcmp(k, "pack.packsizelimit")) {
3262                 max_packsize = git_config_ulong(k, v);
3263                 return 0;
3264         }
3265         return git_default_config(k, v, cb);
3266 }
3267
3268 static const char fast_import_usage[] =
3269 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3270
3271 static void parse_argv(void)
3272 {
3273         unsigned int i;
3274
3275         for (i = 1; i < global_argc; i++) {
3276                 const char *a = global_argv[i];
3277
3278                 if (*a != '-' || !strcmp(a, "--"))
3279                         break;
3280
3281                 if (parse_one_option(a + 2))
3282                         continue;
3283
3284                 if (parse_one_feature(a + 2, 0))
3285                         continue;
3286
3287                 if (!prefixcmp(a + 2, "cat-blob-fd=")) {
3288                         option_cat_blob_fd(a + 2 + strlen("cat-blob-fd="));
3289                         continue;
3290                 }
3291
3292                 die("unknown option %s", a);
3293         }
3294         if (i != global_argc)
3295                 usage(fast_import_usage);
3296
3297         seen_data_command = 1;
3298         if (import_marks_file)
3299                 read_marks();
3300 }
3301
3302 int main(int argc, const char **argv)
3303 {
3304         unsigned int i;
3305
3306         git_extract_argv0_path(argv[0]);
3307
3308         git_setup_gettext();
3309
3310         if (argc == 2 && !strcmp(argv[1], "-h"))
3311                 usage(fast_import_usage);
3312
3313         setup_git_directory();
3314         reset_pack_idx_option(&pack_idx_opts);
3315         git_config(git_pack_config, NULL);
3316         if (!pack_compression_seen && core_compression_seen)
3317                 pack_compression_level = core_compression_level;
3318
3319         alloc_objects(object_entry_alloc);
3320         strbuf_init(&command_buf, 0);
3321         atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
3322         branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
3323         avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
3324         marks = pool_calloc(1, sizeof(struct mark_set));
3325
3326         global_argc = argc;
3327         global_argv = argv;
3328
3329         rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
3330         for (i = 0; i < (cmd_save - 1); i++)
3331                 rc_free[i].next = &rc_free[i + 1];
3332         rc_free[cmd_save - 1].next = NULL;
3333
3334         prepare_packed_git();
3335         start_packfile();
3336         set_die_routine(die_nicely);
3337         set_checkpoint_signal();
3338         while (read_next_command() != EOF) {
3339                 if (!strcmp("blob", command_buf.buf))
3340                         parse_new_blob();
3341                 else if (!prefixcmp(command_buf.buf, "ls "))
3342                         parse_ls(NULL);
3343                 else if (!prefixcmp(command_buf.buf, "commit "))
3344                         parse_new_commit();
3345                 else if (!prefixcmp(command_buf.buf, "tag "))
3346                         parse_new_tag();
3347                 else if (!prefixcmp(command_buf.buf, "reset "))
3348                         parse_reset_branch();
3349                 else if (!strcmp("checkpoint", command_buf.buf))
3350                         parse_checkpoint();
3351                 else if (!strcmp("done", command_buf.buf))
3352                         break;
3353                 else if (!prefixcmp(command_buf.buf, "progress "))
3354                         parse_progress();
3355                 else if (!prefixcmp(command_buf.buf, "feature "))
3356                         parse_feature();
3357                 else if (!prefixcmp(command_buf.buf, "option git "))
3358                         parse_option();
3359                 else if (!prefixcmp(command_buf.buf, "option "))
3360                         /* ignore non-git options*/;
3361                 else
3362                         die("Unsupported command: %s", command_buf.buf);
3363
3364                 if (checkpoint_requested)
3365                         checkpoint();
3366         }
3367
3368         /* argv hasn't been parsed yet, do so */
3369         if (!seen_data_command)
3370                 parse_argv();
3371
3372         if (require_explicit_termination && feof(stdin))
3373                 die("stream ends early");
3374
3375         end_packfile();
3376
3377         dump_branches();
3378         dump_tags();
3379         unkeep_all_packs();
3380         dump_marks();
3381
3382         if (pack_edges)
3383                 fclose(pack_edges);
3384
3385         if (show_stats) {
3386                 uintmax_t total_count = 0, duplicate_count = 0;
3387                 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3388                         total_count += object_count_by_type[i];
3389                 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3390                         duplicate_count += duplicate_count_by_type[i];
3391
3392                 fprintf(stderr, "%s statistics:\n", argv[0]);
3393                 fprintf(stderr, "---------------------------------------------------------------------\n");
3394                 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3395                 fprintf(stderr, "Total objects:   %10" PRIuMAX " (%10" PRIuMAX " duplicates                  )\n", total_count, duplicate_count);
3396                 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]);
3397                 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]);
3398                 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]);
3399                 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]);
3400                 fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
3401                 fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
3402                 fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
3403                 fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
3404                 fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
3405                 fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
3406                 fprintf(stderr, "---------------------------------------------------------------------\n");
3407                 pack_report();
3408                 fprintf(stderr, "---------------------------------------------------------------------\n");
3409                 fprintf(stderr, "\n");
3410         }
3411
3412         return failure ? 1 : 0;
3413 }