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