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