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