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