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