Code

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