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