Use atomic updates to the fast-import mark file
[git/git.git] / fast-import.c
CommitLineData
463acbe1
SP
1/*
2Format of STDIN stream:
3
4 stream ::= cmd*;
5
6 cmd ::= new_blob
c44cdc7e 7 | new_commit
463acbe1 8 | new_tag
5fced8dc 9 | reset_branch
8c1f22da 10 | checkpoint
463acbe1
SP
11 ;
12
c44cdc7e
SP
13 new_blob ::= 'blob' lf
14 mark?
15 file_content;
16 file_content ::= data;
463acbe1 17
c44cdc7e 18 new_commit ::= 'commit' sp ref_str lf
00e2b884 19 mark?
63e0c8b3
SP
20 ('author' sp name '<' email '>' when lf)?
21 'committer' sp name '<' email '>' when lf
00e2b884 22 commit_msg
02f3389d 23 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
62b6f483 24 ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
c44cdc7e
SP
25 file_change*
26 lf;
27 commit_msg ::= data;
463acbe1 28
825769a8
SP
29 file_change ::= file_clr | file_del | file_obm | file_inm;
30 file_clr ::= 'deleteall' lf;
b715cfbb
SP
31 file_del ::= 'D' sp path_str lf;
32 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
33 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
34 data;
c44cdc7e
SP
35
36 new_tag ::= 'tag' sp tag_str lf
37 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
63e0c8b3 38 'tagger' sp name '<' email '>' when lf
c44cdc7e
SP
39 tag_msg;
40 tag_msg ::= data;
41
9938ffc5
SP
42 reset_branch ::= 'reset' sp ref_str lf
43 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
44 lf;
5fced8dc 45
7bfe6e26
SP
46 checkpoint ::= 'checkpoint' lf
47 lf;
48
c44cdc7e
SP
49 # note: the first idnum in a stream should be 1 and subsequent
50 # idnums should not have gaps between values as this will cause
51 # the stream parser to reserve space for the gapped values. An
52 # idnum can be updated in the future to a new object by issuing
53 # a new mark directive with the old idnum.
54 #
55 mark ::= 'mark' sp idnum lf;
3b4dce02
SP
56 data ::= (delimited_data | exact_data)
57 lf;
58
59 # note: delim may be any string but must not contain lf.
60 # data_line may contain any data but must not be exactly
61 # delim.
62 delimited_data ::= 'data' sp '<<' delim lf
63 (data_line lf)*
64 delim lf;
c44cdc7e
SP
65
66 # note: declen indicates the length of binary_data in bytes.
3b4dce02 67 # declen does not include the lf preceeding the binary data.
c44cdc7e 68 #
3b4dce02
SP
69 exact_data ::= 'data' sp declen lf
70 binary_data;
c44cdc7e
SP
71
72 # note: quoted strings are C-style quoting supporting \c for
73 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
74 # is the signed byte value in octal. Note that the only
75 # characters which must actually be escaped to protect the
76 # stream formatting is: \, " and LF. Otherwise these values
77 # are UTF8.
78 #
6c3aac1c
SP
79 ref_str ::= ref;
80 sha1exp_str ::= sha1exp;
81 tag_str ::= tag;
c44cdc7e 82 path_str ::= path | '"' quoted(path) '"' ;
b715cfbb
SP
83 mode ::= '100644' | '644'
84 | '100755' | '755'
9981b6d9 85 | '120000'
b715cfbb 86 ;
c44cdc7e
SP
87
88 declen ::= # unsigned 32 bit value, ascii base10 notation;
2104838b 89 bigint ::= # unsigned integer value, ascii base10 notation;
463acbe1 90 binary_data ::= # file content, not interpreted;
c44cdc7e 91
63e0c8b3
SP
92 when ::= raw_when | rfc2822_when;
93 raw_when ::= ts sp tz;
94 rfc2822_when ::= # Valid RFC 2822 date and time;
95
463acbe1
SP
96 sp ::= # ASCII space character;
97 lf ::= # ASCII newline (LF) character;
c44cdc7e
SP
98
99 # note: a colon (':') must precede the numerical value assigned to
100 # an idnum. This is to distinguish it from a ref or tag name as
101 # GIT does not permit ':' in ref or tag strings.
102 #
2104838b 103 idnum ::= ':' bigint;
c44cdc7e
SP
104 path ::= # GIT style file path, e.g. "a/b/c";
105 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
106 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
463acbe1
SP
107 sha1exp ::= # Any valid GIT SHA1 expression;
108 hexsha1 ::= # SHA1 in hexadecimal format;
c44cdc7e
SP
109
110 # note: name and email are UTF8 strings, however name must not
111 # contain '<' or lf and email must not contain any of the
112 # following: '<', '>', lf.
113 #
114 name ::= # valid GIT author/committer name;
463acbe1 115 email ::= # valid GIT author/committer email;
c44cdc7e
SP
116 ts ::= # time since the epoch in seconds, ascii base10 notation;
117 tz ::= # GIT style timezone;
463acbe1
SP
118*/
119
db5e523f
SP
120#include "builtin.h"
121#include "cache.h"
122#include "object.h"
123#include "blob.h"
463acbe1 124#include "tree.h"
7073e69e 125#include "commit.h"
db5e523f
SP
126#include "delta.h"
127#include "pack.h"
463acbe1 128#include "refs.h"
db5e523f 129#include "csum-file.h"
c44cdc7e
SP
130#include "strbuf.h"
131#include "quote.h"
db5e523f 132
69e74e74
SP
133#define PACK_ID_BITS 16
134#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
135
3efb1f34
JR
136#ifndef PRIuMAX
137#define PRIuMAX "llu"
e326bce6
JR
138#endif
139
27d6d290
SP
140struct object_entry
141{
142 struct object_entry *next;
10831c55 143 uint32_t offset;
03842d8e 144 unsigned type : TYPE_BITS;
69e74e74 145 unsigned pack_id : PACK_ID_BITS;
27d6d290
SP
146 unsigned char sha1[20];
147};
148
463acbe1 149struct object_entry_pool
27d6d290 150{
463acbe1 151 struct object_entry_pool *next_pool;
27d6d290
SP
152 struct object_entry *next_free;
153 struct object_entry *end;
ac47a738 154 struct object_entry entries[FLEX_ARRAY]; /* more */
27d6d290
SP
155};
156
d8397168
SP
157struct mark_set
158{
d8397168
SP
159 union {
160 struct object_entry *marked[1024];
161 struct mark_set *sets[1024];
162 } data;
6f64f6d9 163 unsigned int shift;
d8397168
SP
164};
165
ac47a738
SP
166struct last_object
167{
168 void *data;
4cabf858 169 unsigned long len;
10831c55 170 uint32_t offset;
6bb5b329 171 unsigned int depth;
d489bc14 172 unsigned no_free:1;
ac47a738
SP
173};
174
463acbe1
SP
175struct mem_pool
176{
177 struct mem_pool *next_pool;
178 char *next_free;
179 char *end;
180 char space[FLEX_ARRAY]; /* more */
181};
182
183struct atom_str
184{
185 struct atom_str *next_atom;
10831c55 186 unsigned short str_len;
463acbe1
SP
187 char str_dat[FLEX_ARRAY]; /* more */
188};
189
190struct tree_content;
6bb5b329
SP
191struct tree_entry
192{
463acbe1
SP
193 struct tree_content *tree;
194 struct atom_str* name;
4cabf858
SP
195 struct tree_entry_ms
196 {
10831c55 197 uint16_t mode;
4cabf858
SP
198 unsigned char sha1[20];
199 } versions[2];
6bb5b329
SP
200};
201
463acbe1 202struct tree_content
6bb5b329 203{
463acbe1
SP
204 unsigned int entry_capacity; /* must match avail_tree_content */
205 unsigned int entry_count;
4cabf858 206 unsigned int delta_depth;
463acbe1
SP
207 struct tree_entry *entries[FLEX_ARRAY]; /* more */
208};
209
210struct avail_tree_content
211{
212 unsigned int entry_capacity; /* must match tree_content */
213 struct avail_tree_content *next_avail;
6bb5b329
SP
214};
215
216struct branch
217{
463acbe1
SP
218 struct branch *table_next_branch;
219 struct branch *active_next_branch;
6bb5b329 220 const char *name;
463acbe1 221 struct tree_entry branch_tree;
69e74e74 222 uintmax_t last_commit;
734c91f9
SP
223 unsigned active : 1;
224 unsigned pack_id : PACK_ID_BITS;
463acbe1 225 unsigned char sha1[20];
6bb5b329
SP
226};
227
72303d44
SP
228struct tag
229{
230 struct tag *next_tag;
231 const char *name;
2369ed79 232 unsigned int pack_id;
72303d44
SP
233 unsigned char sha1[20];
234};
235
e2eb469d
SP
236struct dbuf
237{
238 void *buffer;
239 size_t capacity;
240};
241
62b6f483
SP
242struct hash_list
243{
244 struct hash_list *next;
245 unsigned char sha1[20];
246};
463acbe1 247
63e0c8b3
SP
248typedef enum {
249 WHENSPEC_RAW = 1,
250 WHENSPEC_RFC2822,
251 WHENSPEC_NOW,
252} whenspec_type;
253
0ea9f045 254/* Configured limits on output */
d5c57b28 255static unsigned long max_depth = 10;
eec11c24 256static unsigned long max_packsize = (1LL << 32) - 1;
7073e69e 257static int force_update;
0ea9f045
SP
258
259/* Stats and misc. counters */
260static uintmax_t alloc_count;
0ea9f045
SP
261static uintmax_t marks_set_count;
262static uintmax_t object_count_by_type[1 << TYPE_BITS];
263static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
264static uintmax_t delta_count_by_type[1 << TYPE_BITS];
a7ddc487 265static unsigned long object_count;
6bb5b329 266static unsigned long branch_count;
d6c7eb2c 267static unsigned long branch_load_count;
7073e69e 268static int failure;
bdf1c06d 269static FILE *pack_edges;
ac47a738 270
463acbe1
SP
271/* Memory pools */
272static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
273static size_t total_allocd;
274static struct mem_pool *mem_pool;
275
c44cdc7e 276/* Atom management */
463acbe1
SP
277static unsigned int atom_table_sz = 4451;
278static unsigned int atom_cnt;
279static struct atom_str **atom_table;
280
281/* The .pack file being generated */
7bfe6e26 282static unsigned int pack_id;
d489bc14 283static struct packed_git *pack_data;
7bfe6e26 284static struct packed_git **all_packs;
41e5257f 285static unsigned long pack_size;
ac47a738
SP
286
287/* Table of objects we've written. */
4cabf858 288static unsigned int object_entry_alloc = 5000;
463acbe1
SP
289static struct object_entry_pool *blocks;
290static struct object_entry *object_table[1 << 16];
d8397168 291static struct mark_set *marks;
a6a1a831 292static const char* mark_file;
ac47a738
SP
293
294/* Our last blob */
463acbe1
SP
295static struct last_object last_blob;
296
297/* Tree management */
298static unsigned int tree_entry_alloc = 1000;
299static void *avail_tree_entry;
300static unsigned int avail_tree_table_sz = 100;
301static struct avail_tree_content **avail_tree_table;
e2eb469d
SP
302static struct dbuf old_tree;
303static struct dbuf new_tree;
8bcce301 304
6bb5b329 305/* Branch data */
d5c57b28
SP
306static unsigned long max_active_branches = 5;
307static unsigned long cur_active_branches;
308static unsigned long branch_table_sz = 1039;
463acbe1
SP
309static struct branch **branch_table;
310static struct branch *active_branches;
311
72303d44
SP
312/* Tag data */
313static struct tag *first_tag;
314static struct tag *last_tag;
315
c44cdc7e 316/* Input stream parsing */
63e0c8b3 317static whenspec_type whenspec = WHENSPEC_RAW;
c44cdc7e 318static struct strbuf command_buf;
0ea9f045 319static uintmax_t next_mark;
243f801d 320static struct dbuf new_data;
c44cdc7e 321
6bb5b329 322
03842d8e 323static void alloc_objects(unsigned int cnt)
8bcce301 324{
463acbe1 325 struct object_entry_pool *b;
27d6d290 326
463acbe1 327 b = xmalloc(sizeof(struct object_entry_pool)
27d6d290 328 + cnt * sizeof(struct object_entry));
463acbe1 329 b->next_pool = blocks;
27d6d290
SP
330 b->next_free = b->entries;
331 b->end = b->entries + cnt;
332 blocks = b;
333 alloc_count += cnt;
334}
8bcce301 335
e5b1444b 336static struct object_entry *new_object(unsigned char *sha1)
8bcce301 337{
27d6d290 338 struct object_entry *e;
8bcce301 339
27d6d290 340 if (blocks->next_free == blocks->end)
463acbe1 341 alloc_objects(object_entry_alloc);
8bcce301 342
27d6d290 343 e = blocks->next_free++;
445b8599 344 hashcpy(e->sha1, sha1);
27d6d290 345 return e;
8bcce301
SP
346}
347
e5b1444b 348static struct object_entry *find_object(unsigned char *sha1)
463acbe1
SP
349{
350 unsigned int h = sha1[0] << 8 | sha1[1];
351 struct object_entry *e;
352 for (e = object_table[h]; e; e = e->next)
445b8599 353 if (!hashcmp(sha1, e->sha1))
463acbe1
SP
354 return e;
355 return NULL;
356}
357
e5b1444b 358static struct object_entry *insert_object(unsigned char *sha1)
8bcce301
SP
359{
360 unsigned int h = sha1[0] << 8 | sha1[1];
27d6d290 361 struct object_entry *e = object_table[h];
463acbe1 362 struct object_entry *p = NULL;
8bcce301
SP
363
364 while (e) {
445b8599 365 if (!hashcmp(sha1, e->sha1))
8bcce301
SP
366 return e;
367 p = e;
368 e = e->next;
369 }
370
371 e = new_object(sha1);
463acbe1 372 e->next = NULL;
8bcce301
SP
373 e->offset = 0;
374 if (p)
375 p->next = e;
376 else
27d6d290 377 object_table[h] = e;
8bcce301
SP
378 return e;
379}
db5e523f 380
463acbe1
SP
381static unsigned int hc_str(const char *s, size_t len)
382{
383 unsigned int r = 0;
384 while (len-- > 0)
385 r = r * 31 + *s++;
386 return r;
387}
388
e5b1444b 389static void *pool_alloc(size_t len)
463acbe1
SP
390{
391 struct mem_pool *p;
392 void *r;
393
394 for (p = mem_pool; p; p = p->next_pool)
395 if ((p->end - p->next_free >= len))
396 break;
397
398 if (!p) {
399 if (len >= (mem_pool_alloc/2)) {
400 total_allocd += len;
401 return xmalloc(len);
402 }
403 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
404 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
405 p->next_pool = mem_pool;
406 p->next_free = p->space;
407 p->end = p->next_free + mem_pool_alloc;
408 mem_pool = p;
409 }
410
411 r = p->next_free;
8d8928b0
SP
412 /* round out to a pointer alignment */
413 if (len & (sizeof(void*) - 1))
414 len += sizeof(void*) - (len & (sizeof(void*) - 1));
463acbe1
SP
415 p->next_free += len;
416 return r;
417}
418
e5b1444b 419static void *pool_calloc(size_t count, size_t size)
463acbe1
SP
420{
421 size_t len = count * size;
422 void *r = pool_alloc(len);
423 memset(r, 0, len);
424 return r;
425}
426
e5b1444b 427static char *pool_strdup(const char *s)
463acbe1
SP
428{
429 char *r = pool_alloc(strlen(s) + 1);
430 strcpy(r, s);
431 return r;
432}
433
243f801d
SP
434static void size_dbuf(struct dbuf *b, size_t maxlen)
435{
436 if (b->buffer) {
437 if (b->capacity >= maxlen)
438 return;
439 free(b->buffer);
440 }
441 b->capacity = ((maxlen / 1024) + 1) * 1024;
442 b->buffer = xmalloc(b->capacity);
443}
444
0ea9f045 445static void insert_mark(uintmax_t idnum, struct object_entry *oe)
d8397168
SP
446{
447 struct mark_set *s = marks;
448 while ((idnum >> s->shift) >= 1024) {
449 s = pool_calloc(1, sizeof(struct mark_set));
450 s->shift = marks->shift + 10;
451 s->data.sets[0] = marks;
452 marks = s;
453 }
454 while (s->shift) {
0ea9f045 455 uintmax_t i = idnum >> s->shift;
d8397168
SP
456 idnum -= i << s->shift;
457 if (!s->data.sets[i]) {
458 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
459 s->data.sets[i]->shift = s->shift - 10;
460 }
461 s = s->data.sets[i];
462 }
463 if (!s->data.marked[idnum])
464 marks_set_count++;
465 s->data.marked[idnum] = oe;
466}
467
e5b1444b 468static struct object_entry *find_mark(uintmax_t idnum)
d8397168 469{
0ea9f045 470 uintmax_t orig_idnum = idnum;
d8397168
SP
471 struct mark_set *s = marks;
472 struct object_entry *oe = NULL;
473 if ((idnum >> s->shift) < 1024) {
474 while (s && s->shift) {
0ea9f045 475 uintmax_t i = idnum >> s->shift;
d8397168
SP
476 idnum -= i << s->shift;
477 s = s->data.sets[i];
478 }
479 if (s)
480 oe = s->data.marked[idnum];
481 }
482 if (!oe)
3efb1f34 483 die("mark :%" PRIuMAX " not declared", orig_idnum);
d8397168
SP
484 return oe;
485}
486
e5b1444b 487static struct atom_str *to_atom(const char *s, unsigned short len)
463acbe1
SP
488{
489 unsigned int hc = hc_str(s, len) % atom_table_sz;
490 struct atom_str *c;
491
492 for (c = atom_table[hc]; c; c = c->next_atom)
493 if (c->str_len == len && !strncmp(s, c->str_dat, len))
494 return c;
495
496 c = pool_alloc(sizeof(struct atom_str) + len + 1);
497 c->str_len = len;
498 strncpy(c->str_dat, s, len);
499 c->str_dat[len] = 0;
500 c->next_atom = atom_table[hc];
501 atom_table[hc] = c;
502 atom_cnt++;
503 return c;
504}
505
e5b1444b 506static struct branch *lookup_branch(const char *name)
463acbe1
SP
507{
508 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
509 struct branch *b;
510
511 for (b = branch_table[hc]; b; b = b->table_next_branch)
512 if (!strcmp(name, b->name))
513 return b;
514 return NULL;
515}
516
e5b1444b 517static struct branch *new_branch(const char *name)
463acbe1
SP
518{
519 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
520 struct branch* b = lookup_branch(name);
521
522 if (b)
523 die("Invalid attempt to create duplicate branch: %s", name);
c44cdc7e
SP
524 if (check_ref_format(name))
525 die("Branch name doesn't conform to GIT standards: %s", name);
463acbe1
SP
526
527 b = pool_calloc(1, sizeof(struct branch));
528 b->name = pool_strdup(name);
529 b->table_next_branch = branch_table[hc];
8a8c55ea
SP
530 b->branch_tree.versions[0].mode = S_IFDIR;
531 b->branch_tree.versions[1].mode = S_IFDIR;
734c91f9 532 b->active = 0;
69e74e74 533 b->pack_id = MAX_PACK_ID;
463acbe1
SP
534 branch_table[hc] = b;
535 branch_count++;
536 return b;
537}
538
539static unsigned int hc_entries(unsigned int cnt)
540{
541 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
542 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
543}
544
e5b1444b 545static struct tree_content *new_tree_content(unsigned int cnt)
463acbe1
SP
546{
547 struct avail_tree_content *f, *l = NULL;
548 struct tree_content *t;
549 unsigned int hc = hc_entries(cnt);
550
551 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
552 if (f->entry_capacity >= cnt)
553 break;
554
555 if (f) {
556 if (l)
557 l->next_avail = f->next_avail;
558 else
559 avail_tree_table[hc] = f->next_avail;
560 } else {
561 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
562 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
563 f->entry_capacity = cnt;
564 }
565
566 t = (struct tree_content*)f;
567 t->entry_count = 0;
4cabf858 568 t->delta_depth = 0;
463acbe1
SP
569 return t;
570}
571
572static void release_tree_entry(struct tree_entry *e);
573static void release_tree_content(struct tree_content *t)
574{
575 struct avail_tree_content *f = (struct avail_tree_content*)t;
576 unsigned int hc = hc_entries(f->entry_capacity);
afde8dd9
SP
577 f->next_avail = avail_tree_table[hc];
578 avail_tree_table[hc] = f;
579}
580
581static void release_tree_content_recursive(struct tree_content *t)
582{
463acbe1
SP
583 unsigned int i;
584 for (i = 0; i < t->entry_count; i++)
585 release_tree_entry(t->entries[i]);
afde8dd9 586 release_tree_content(t);
463acbe1
SP
587}
588
e5b1444b 589static struct tree_content *grow_tree_content(
463acbe1
SP
590 struct tree_content *t,
591 int amt)
592{
593 struct tree_content *r = new_tree_content(t->entry_count + amt);
594 r->entry_count = t->entry_count;
4cabf858 595 r->delta_depth = t->delta_depth;
463acbe1
SP
596 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
597 release_tree_content(t);
598 return r;
599}
600
e5b1444b 601static struct tree_entry *new_tree_entry(void)
463acbe1
SP
602{
603 struct tree_entry *e;
604
605 if (!avail_tree_entry) {
606 unsigned int n = tree_entry_alloc;
8435a9cb 607 total_allocd += n * sizeof(struct tree_entry);
463acbe1 608 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
2eb26d84 609 while (n-- > 1) {
463acbe1
SP
610 *((void**)e) = e + 1;
611 e++;
612 }
35ef237c 613 *((void**)e) = NULL;
463acbe1
SP
614 }
615
616 e = avail_tree_entry;
617 avail_tree_entry = *((void**)e);
618 return e;
619}
620
621static void release_tree_entry(struct tree_entry *e)
622{
623 if (e->tree)
afde8dd9 624 release_tree_content_recursive(e->tree);
463acbe1
SP
625 *((void**)e) = avail_tree_entry;
626 avail_tree_entry = e;
627}
628
fd99224e 629static void start_packfile(void)
f70b6534 630{
8455e484 631 static char tmpfile[PATH_MAX];
7bfe6e26 632 struct packed_git *p;
f70b6534 633 struct pack_header hdr;
0fcbcae7 634 int pack_fd;
f70b6534 635
8455e484
SP
636 snprintf(tmpfile, sizeof(tmpfile),
637 "%s/pack_XXXXXX", get_object_directory());
638 pack_fd = mkstemp(tmpfile);
f70b6534 639 if (pack_fd < 0)
8455e484
SP
640 die("Can't create %s: %s", tmpfile, strerror(errno));
641 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
642 strcpy(p->pack_name, tmpfile);
7bfe6e26 643 p->pack_fd = pack_fd;
f70b6534
SP
644
645 hdr.hdr_signature = htonl(PACK_SIGNATURE);
646 hdr.hdr_version = htonl(2);
647 hdr.hdr_entries = 0;
0fcbcae7 648 write_or_die(p->pack_fd, &hdr, sizeof(hdr));
7bfe6e26
SP
649
650 pack_data = p;
f70b6534
SP
651 pack_size = sizeof(hdr);
652 object_count = 0;
7bfe6e26
SP
653
654 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
655 all_packs[pack_id] = p;
f70b6534
SP
656}
657
fd99224e 658static void fixup_header_footer(void)
f70b6534 659{
566f4425 660 static const int buf_sz = 128 * 1024;
0fcbcae7 661 int pack_fd = pack_data->pack_fd;
f70b6534 662 SHA_CTX c;
566f4425 663 struct pack_header hdr;
f70b6534
SP
664 char *buf;
665
666 if (lseek(pack_fd, 0, SEEK_SET) != 0)
667 die("Failed seeking to start: %s", strerror(errno));
566f4425 668 if (read_in_full(pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
6cf09261 669 die("Unable to reread header of %s", pack_data->pack_name);
566f4425
SP
670 if (lseek(pack_fd, 0, SEEK_SET) != 0)
671 die("Failed seeking to start: %s", strerror(errno));
672 hdr.hdr_entries = htonl(object_count);
673 write_or_die(pack_fd, &hdr, sizeof(hdr));
f70b6534 674
566f4425
SP
675 SHA1_Init(&c);
676 SHA1_Update(&c, &hdr, sizeof(hdr));
f70b6534 677
566f4425 678 buf = xmalloc(buf_sz);
f70b6534 679 for (;;) {
566f4425
SP
680 size_t n = xread(pack_fd, buf, buf_sz);
681 if (!n)
f70b6534 682 break;
566f4425
SP
683 if (n < 0)
684 die("Failed to checksum %s", pack_data->pack_name);
f70b6534
SP
685 SHA1_Update(&c, buf, n);
686 }
687 free(buf);
688
09543c96
SP
689 SHA1_Final(pack_data->sha1, &c);
690 write_or_die(pack_fd, pack_data->sha1, sizeof(pack_data->sha1));
12801587 691 close(pack_fd);
f70b6534
SP
692}
693
694static int oecmp (const void *a_, const void *b_)
695{
696 struct object_entry *a = *((struct object_entry**)a_);
697 struct object_entry *b = *((struct object_entry**)b_);
698 return hashcmp(a->sha1, b->sha1);
699}
700
e5b1444b 701static char *create_index(void)
f70b6534 702{
8455e484
SP
703 static char tmpfile[PATH_MAX];
704 SHA_CTX ctx;
f70b6534
SP
705 struct sha1file *f;
706 struct object_entry **idx, **c, **last, *e;
707 struct object_entry_pool *o;
ebea9dd4 708 uint32_t array[256];
8455e484 709 int i, idx_fd;
f70b6534
SP
710
711 /* Build the sorted table of object IDs. */
712 idx = xmalloc(object_count * sizeof(struct object_entry*));
713 c = idx;
714 for (o = blocks; o; o = o->next_pool)
d9ee53ce
SP
715 for (e = o->next_free; e-- != o->entries;)
716 if (pack_id == e->pack_id)
717 *c++ = e;
f70b6534 718 last = idx + object_count;
2fce1f3c
SP
719 if (c != last)
720 die("internal consistency error creating the index");
f70b6534
SP
721 qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
722
723 /* Generate the fan-out array. */
724 c = idx;
725 for (i = 0; i < 256; i++) {
726 struct object_entry **next = c;;
727 while (next < last) {
728 if ((*next)->sha1[0] != i)
729 break;
730 next++;
731 }
732 array[i] = htonl(next - idx);
733 c = next;
734 }
735
8455e484
SP
736 snprintf(tmpfile, sizeof(tmpfile),
737 "%s/index_XXXXXX", get_object_directory());
738 idx_fd = mkstemp(tmpfile);
739 if (idx_fd < 0)
740 die("Can't create %s: %s", tmpfile, strerror(errno));
741 f = sha1fd(idx_fd, tmpfile);
f70b6534 742 sha1write(f, array, 256 * sizeof(int));
8455e484 743 SHA1_Init(&ctx);
f70b6534 744 for (c = idx; c != last; c++) {
ebea9dd4 745 uint32_t offset = htonl((*c)->offset);
f70b6534
SP
746 sha1write(f, &offset, 4);
747 sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
8455e484 748 SHA1_Update(&ctx, (*c)->sha1, 20);
f70b6534 749 }
09543c96 750 sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
8455e484 751 sha1close(f, NULL, 1);
f70b6534 752 free(idx);
8455e484
SP
753 SHA1_Final(pack_data->sha1, &ctx);
754 return tmpfile;
755}
756
e5b1444b 757static char *keep_pack(char *curr_index_name)
8455e484
SP
758{
759 static char name[PATH_MAX];
760 static char *keep_msg = "fast-import";
761 int keep_fd;
762
763 chmod(pack_data->pack_name, 0444);
764 chmod(curr_index_name, 0444);
765
766 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
767 get_object_directory(), sha1_to_hex(pack_data->sha1));
768 keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
769 if (keep_fd < 0)
770 die("cannot create keep file");
771 write(keep_fd, keep_msg, strlen(keep_msg));
772 close(keep_fd);
773
774 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
775 get_object_directory(), sha1_to_hex(pack_data->sha1));
776 if (move_temp_to_file(pack_data->pack_name, name))
777 die("cannot store pack file");
8455e484
SP
778
779 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
780 get_object_directory(), sha1_to_hex(pack_data->sha1));
781 if (move_temp_to_file(curr_index_name, name))
782 die("cannot store index file");
783 return name;
784}
785
fd99224e 786static void unkeep_all_packs(void)
8455e484
SP
787{
788 static char name[PATH_MAX];
789 int k;
790
791 for (k = 0; k < pack_id; k++) {
792 struct packed_git *p = all_packs[k];
793 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
794 get_object_directory(), sha1_to_hex(p->sha1));
795 unlink(name);
796 }
f70b6534
SP
797}
798
fd99224e 799static void end_packfile(void)
f70b6534 800{
7bfe6e26
SP
801 struct packed_git *old_p = pack_data, *new_p;
802
3e005baf 803 if (object_count) {
8455e484 804 char *idx_name;
2369ed79
SP
805 int i;
806 struct branch *b;
807 struct tag *t;
8455e484 808
3e005baf 809 fixup_header_footer();
8455e484 810 idx_name = keep_pack(create_index());
3e005baf
SP
811
812 /* Register the packfile with core git's machinary. */
813 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
814 if (!new_p)
815 die("core git rejected index %s", idx_name);
816 new_p->windows = old_p->windows;
2369ed79 817 all_packs[pack_id] = new_p;
3e005baf 818 install_packed_git(new_p);
2369ed79
SP
819
820 /* Print the boundary */
bdf1c06d
SP
821 if (pack_edges) {
822 fprintf(pack_edges, "%s:", new_p->pack_name);
823 for (i = 0; i < branch_table_sz; i++) {
824 for (b = branch_table[i]; b; b = b->table_next_branch) {
825 if (b->pack_id == pack_id)
826 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
827 }
2369ed79 828 }
bdf1c06d
SP
829 for (t = first_tag; t; t = t->next_tag) {
830 if (t->pack_id == pack_id)
831 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
832 }
833 fputc('\n', pack_edges);
834 fflush(pack_edges);
2369ed79 835 }
2369ed79
SP
836
837 pack_id++;
3e005baf 838 }
12801587 839 else
3e005baf 840 unlink(old_p->pack_name);
7bfe6e26 841 free(old_p);
7bfe6e26
SP
842
843 /* We can't carry a delta across packfiles. */
844 free(last_blob.data);
845 last_blob.data = NULL;
846 last_blob.len = 0;
847 last_blob.offset = 0;
848 last_blob.depth = 0;
f70b6534
SP
849}
850
820b9310 851static void cycle_packfile(void)
d9ee53ce
SP
852{
853 end_packfile();
854 start_packfile();
855}
856
c44cdc7e 857static size_t encode_header(
ac47a738 858 enum object_type type,
c44cdc7e 859 size_t size,
ac47a738 860 unsigned char *hdr)
db5e523f
SP
861{
862 int n = 1;
863 unsigned char c;
864
1fcdd62a 865 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
db5e523f
SP
866 die("bad type %d", type);
867
868 c = (type << 4) | (size & 15);
869 size >>= 4;
870 while (size) {
871 *hdr++ = c | 0x80;
872 c = size & 0x7f;
873 size >>= 7;
874 n++;
875 }
876 *hdr = c;
877 return n;
878}
879
ac47a738
SP
880static int store_object(
881 enum object_type type,
882 void *dat,
c44cdc7e 883 size_t datlen,
6bb5b329 884 struct last_object *last,
d8397168 885 unsigned char *sha1out,
0ea9f045 886 uintmax_t mark)
db5e523f 887{
db5e523f 888 void *out, *delta;
ac47a738
SP
889 struct object_entry *e;
890 unsigned char hdr[96];
891 unsigned char sha1[20];
db5e523f 892 unsigned long hdrlen, deltalen;
ac47a738
SP
893 SHA_CTX c;
894 z_stream s;
895
df843662 896 hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
40db58b8 897 (unsigned long)datlen) + 1;
ac47a738
SP
898 SHA1_Init(&c);
899 SHA1_Update(&c, hdr, hdrlen);
900 SHA1_Update(&c, dat, datlen);
901 SHA1_Final(sha1, &c);
6bb5b329 902 if (sha1out)
445b8599 903 hashcpy(sha1out, sha1);
ac47a738
SP
904
905 e = insert_object(sha1);
d8397168
SP
906 if (mark)
907 insert_mark(mark, e);
ac47a738 908 if (e->offset) {
6143f064 909 duplicate_count_by_type[type]++;
463acbe1 910 return 1;
ac47a738 911 }
db5e523f 912
d9ee53ce 913 if (last && last->data && last->depth < max_depth) {
ac47a738 914 delta = diff_delta(last->data, last->len,
db5e523f
SP
915 dat, datlen,
916 &deltalen, 0);
d9ee53ce
SP
917 if (delta && deltalen >= datlen) {
918 free(delta);
919 delta = NULL;
920 }
921 } else
922 delta = NULL;
db5e523f
SP
923
924 memset(&s, 0, sizeof(s));
925 deflateInit(&s, zlib_compression_level);
d9ee53ce
SP
926 if (delta) {
927 s.next_in = delta;
928 s.avail_in = deltalen;
929 } else {
930 s.next_in = dat;
931 s.avail_in = datlen;
932 }
933 s.avail_out = deflateBound(&s, s.avail_in);
934 s.next_out = out = xmalloc(s.avail_out);
935 while (deflate(&s, Z_FINISH) == Z_OK)
936 /* nothing */;
937 deflateEnd(&s);
938
939 /* Determine if we should auto-checkpoint. */
e5808826 940 if ((pack_size + 60 + s.total_out) > max_packsize
d9ee53ce
SP
941 || (pack_size + 60 + s.total_out) < pack_size) {
942
943 /* This new object needs to *not* have the current pack_id. */
944 e->pack_id = pack_id + 1;
820b9310 945 cycle_packfile();
d9ee53ce
SP
946
947 /* We cannot carry a delta into the new pack. */
948 if (delta) {
949 free(delta);
950 delta = NULL;
5d6f3ef6
SP
951
952 memset(&s, 0, sizeof(s));
953 deflateInit(&s, zlib_compression_level);
954 s.next_in = dat;
955 s.avail_in = datlen;
956 s.avail_out = deflateBound(&s, s.avail_in);
957 s.next_out = out = xrealloc(out, s.avail_out);
958 while (deflate(&s, Z_FINISH) == Z_OK)
959 /* nothing */;
960 deflateEnd(&s);
d9ee53ce 961 }
d9ee53ce
SP
962 }
963
964 e->type = type;
965 e->pack_id = pack_id;
966 e->offset = pack_size;
967 object_count++;
968 object_count_by_type[type]++;
db5e523f
SP
969
970 if (delta) {
d489bc14
SP
971 unsigned long ofs = e->offset - last->offset;
972 unsigned pos = sizeof(hdr) - 1;
973
4cabf858 974 delta_count_by_type[type]++;
ac47a738 975 last->depth++;
d489bc14
SP
976
977 hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
0fcbcae7 978 write_or_die(pack_data->pack_fd, hdr, hdrlen);
d489bc14
SP
979 pack_size += hdrlen;
980
981 hdr[pos] = ofs & 127;
982 while (ofs >>= 7)
983 hdr[--pos] = 128 | (--ofs & 127);
0fcbcae7 984 write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
d489bc14 985 pack_size += sizeof(hdr) - pos;
db5e523f 986 } else {
463acbe1
SP
987 if (last)
988 last->depth = 0;
ac47a738 989 hdrlen = encode_header(type, datlen, hdr);
0fcbcae7 990 write_or_die(pack_data->pack_fd, hdr, hdrlen);
41e5257f 991 pack_size += hdrlen;
db5e523f
SP
992 }
993
0fcbcae7 994 write_or_die(pack_data->pack_fd, out, s.total_out);
41e5257f 995 pack_size += s.total_out;
db5e523f
SP
996
997 free(out);
e7d06a4b 998 free(delta);
463acbe1 999 if (last) {
e7d06a4b 1000 if (!last->no_free)
463acbe1
SP
1001 free(last->data);
1002 last->data = dat;
d489bc14 1003 last->offset = e->offset;
463acbe1 1004 last->len = datlen;
463acbe1
SP
1005 }
1006 return 0;
1007}
1008
7bfe6e26
SP
1009static void *gfi_unpack_entry(
1010 struct object_entry *oe,
1011 unsigned long *sizep)
41e5257f 1012{
21666f1a 1013 enum object_type type;
7bfe6e26
SP
1014 struct packed_git *p = all_packs[oe->pack_id];
1015 if (p == pack_data)
1016 p->pack_size = pack_size + 20;
21666f1a 1017 return unpack_entry(p, oe->offset, &type, sizep);
41e5257f
SP
1018}
1019
10831c55 1020static const char *get_mode(const char *str, uint16_t *modep)
463acbe1
SP
1021{
1022 unsigned char c;
10831c55 1023 uint16_t mode = 0;
463acbe1
SP
1024
1025 while ((c = *str++) != ' ') {
1026 if (c < '0' || c > '7')
1027 return NULL;
1028 mode = (mode << 3) + (c - '0');
1029 }
1030 *modep = mode;
1031 return str;
1032}
1033
1034static void load_tree(struct tree_entry *root)
1035{
4cabf858 1036 unsigned char* sha1 = root->versions[1].sha1;
463acbe1
SP
1037 struct object_entry *myoe;
1038 struct tree_content *t;
1039 unsigned long size;
1040 char *buf;
1041 const char *c;
463acbe1
SP
1042
1043 root->tree = t = new_tree_content(8);
4cabf858 1044 if (is_null_sha1(sha1))
463acbe1
SP
1045 return;
1046
4cabf858 1047 myoe = find_object(sha1);
463acbe1 1048 if (myoe) {
41e5257f 1049 if (myoe->type != OBJ_TREE)
4cabf858 1050 die("Not a tree: %s", sha1_to_hex(sha1));
d489bc14 1051 t->delta_depth = 0;
7bfe6e26 1052 buf = gfi_unpack_entry(myoe, &size);
463acbe1 1053 } else {
21666f1a
NP
1054 enum object_type type;
1055 buf = read_sha1_file(sha1, &type, &size);
1056 if (!buf || type != OBJ_TREE)
4cabf858 1057 die("Can't load tree %s", sha1_to_hex(sha1));
463acbe1
SP
1058 }
1059
1060 c = buf;
1061 while (c != (buf + size)) {
1062 struct tree_entry *e = new_tree_entry();
1063
1064 if (t->entry_count == t->entry_capacity)
1065 root->tree = t = grow_tree_content(t, 8);
1066 t->entries[t->entry_count++] = e;
1067
1068 e->tree = NULL;
4cabf858 1069 c = get_mode(c, &e->versions[1].mode);
463acbe1 1070 if (!c)
4cabf858
SP
1071 die("Corrupt mode in %s", sha1_to_hex(sha1));
1072 e->versions[0].mode = e->versions[1].mode;
10831c55 1073 e->name = to_atom(c, (unsigned short)strlen(c));
463acbe1 1074 c += e->name->str_len + 1;
4cabf858
SP
1075 hashcpy(e->versions[0].sha1, (unsigned char*)c);
1076 hashcpy(e->versions[1].sha1, (unsigned char*)c);
463acbe1
SP
1077 c += 20;
1078 }
1079 free(buf);
1080}
1081
4cabf858 1082static int tecmp0 (const void *_a, const void *_b)
463acbe1
SP
1083{
1084 struct tree_entry *a = *((struct tree_entry**)_a);
1085 struct tree_entry *b = *((struct tree_entry**)_b);
1086 return base_name_compare(
4cabf858
SP
1087 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1088 b->name->str_dat, b->name->str_len, b->versions[0].mode);
463acbe1
SP
1089}
1090
4cabf858 1091static int tecmp1 (const void *_a, const void *_b)
463acbe1 1092{
4cabf858
SP
1093 struct tree_entry *a = *((struct tree_entry**)_a);
1094 struct tree_entry *b = *((struct tree_entry**)_b);
1095 return base_name_compare(
1096 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1097 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1098}
1099
e2eb469d
SP
1100static void mktree(struct tree_content *t,
1101 int v,
1102 unsigned long *szp,
1103 struct dbuf *b)
4cabf858
SP
1104{
1105 size_t maxlen = 0;
463acbe1 1106 unsigned int i;
e2eb469d 1107 char *c;
463acbe1 1108
4cabf858
SP
1109 if (!v)
1110 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1111 else
1112 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
463acbe1 1113
463acbe1 1114 for (i = 0; i < t->entry_count; i++) {
4cabf858
SP
1115 if (t->entries[i]->versions[v].mode)
1116 maxlen += t->entries[i]->name->str_len + 34;
463acbe1
SP
1117 }
1118
243f801d 1119 size_dbuf(b, maxlen);
e2eb469d 1120 c = b->buffer;
463acbe1
SP
1121 for (i = 0; i < t->entry_count; i++) {
1122 struct tree_entry *e = t->entries[i];
4cabf858
SP
1123 if (!e->versions[v].mode)
1124 continue;
10831c55 1125 c += sprintf(c, "%o", (unsigned int)e->versions[v].mode);
463acbe1
SP
1126 *c++ = ' ';
1127 strcpy(c, e->name->str_dat);
1128 c += e->name->str_len + 1;
4cabf858 1129 hashcpy((unsigned char*)c, e->versions[v].sha1);
463acbe1
SP
1130 c += 20;
1131 }
e2eb469d 1132 *szp = c - (char*)b->buffer;
4cabf858
SP
1133}
1134
1135static void store_tree(struct tree_entry *root)
1136{
1137 struct tree_content *t = root->tree;
1138 unsigned int i, j, del;
e2eb469d 1139 unsigned long new_len;
4cabf858 1140 struct last_object lo;
d489bc14 1141 struct object_entry *le;
4cabf858
SP
1142
1143 if (!is_null_sha1(root->versions[1].sha1))
1144 return;
1145
1146 for (i = 0; i < t->entry_count; i++) {
1147 if (t->entries[i]->tree)
1148 store_tree(t->entries[i]);
1149 }
1150
d489bc14 1151 le = find_object(root->versions[0].sha1);
7bfe6e26
SP
1152 if (!S_ISDIR(root->versions[0].mode)
1153 || !le
1154 || le->pack_id != pack_id) {
4cabf858
SP
1155 lo.data = NULL;
1156 lo.depth = 0;
1157 } else {
e2eb469d
SP
1158 mktree(t, 0, &lo.len, &old_tree);
1159 lo.data = old_tree.buffer;
d489bc14 1160 lo.offset = le->offset;
4cabf858 1161 lo.depth = t->delta_depth;
e2eb469d 1162 lo.no_free = 1;
4cabf858 1163 }
4cabf858 1164
8a8c55ea 1165 mktree(t, 1, &new_len, &new_tree);
e2eb469d 1166 store_object(OBJ_TREE, new_tree.buffer, new_len,
4cabf858 1167 &lo, root->versions[1].sha1, 0);
4cabf858
SP
1168
1169 t->delta_depth = lo.depth;
4cabf858
SP
1170 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1171 struct tree_entry *e = t->entries[i];
1172 if (e->versions[1].mode) {
1173 e->versions[0].mode = e->versions[1].mode;
1174 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1175 t->entries[j++] = e;
1176 } else {
1177 release_tree_entry(e);
1178 del++;
1179 }
1180 }
1181 t->entry_count -= del;
463acbe1
SP
1182}
1183
1184static int tree_content_set(
1185 struct tree_entry *root,
1186 const char *p,
1187 const unsigned char *sha1,
10831c55 1188 const uint16_t mode)
463acbe1
SP
1189{
1190 struct tree_content *t = root->tree;
1191 const char *slash1;
1192 unsigned int i, n;
1193 struct tree_entry *e;
1194
1195 slash1 = strchr(p, '/');
1196 if (slash1)
1197 n = slash1 - p;
1198 else
1199 n = strlen(p);
1200
1201 for (i = 0; i < t->entry_count; i++) {
1202 e = t->entries[i];
1203 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1204 if (!slash1) {
4cabf858
SP
1205 if (e->versions[1].mode == mode
1206 && !hashcmp(e->versions[1].sha1, sha1))
463acbe1 1207 return 0;
4cabf858
SP
1208 e->versions[1].mode = mode;
1209 hashcpy(e->versions[1].sha1, sha1);
463acbe1 1210 if (e->tree) {
afde8dd9 1211 release_tree_content_recursive(e->tree);
463acbe1
SP
1212 e->tree = NULL;
1213 }
4cabf858 1214 hashclr(root->versions[1].sha1);
463acbe1
SP
1215 return 1;
1216 }
4cabf858 1217 if (!S_ISDIR(e->versions[1].mode)) {
463acbe1 1218 e->tree = new_tree_content(8);
4cabf858 1219 e->versions[1].mode = S_IFDIR;
463acbe1
SP
1220 }
1221 if (!e->tree)
1222 load_tree(e);
1223 if (tree_content_set(e, slash1 + 1, sha1, mode)) {
4cabf858 1224 hashclr(root->versions[1].sha1);
463acbe1
SP
1225 return 1;
1226 }
1227 return 0;
1228 }
1229 }
1230
1231 if (t->entry_count == t->entry_capacity)
1232 root->tree = t = grow_tree_content(t, 8);
1233 e = new_tree_entry();
10831c55 1234 e->name = to_atom(p, (unsigned short)n);
4cabf858
SP
1235 e->versions[0].mode = 0;
1236 hashclr(e->versions[0].sha1);
463acbe1
SP
1237 t->entries[t->entry_count++] = e;
1238 if (slash1) {
1239 e->tree = new_tree_content(8);
4cabf858 1240 e->versions[1].mode = S_IFDIR;
463acbe1
SP
1241 tree_content_set(e, slash1 + 1, sha1, mode);
1242 } else {
1243 e->tree = NULL;
4cabf858
SP
1244 e->versions[1].mode = mode;
1245 hashcpy(e->versions[1].sha1, sha1);
463acbe1 1246 }
4cabf858 1247 hashclr(root->versions[1].sha1);
463acbe1
SP
1248 return 1;
1249}
1250
1251static int tree_content_remove(struct tree_entry *root, const char *p)
1252{
1253 struct tree_content *t = root->tree;
1254 const char *slash1;
1255 unsigned int i, n;
1256 struct tree_entry *e;
1257
1258 slash1 = strchr(p, '/');
1259 if (slash1)
1260 n = slash1 - p;
1261 else
1262 n = strlen(p);
1263
1264 for (i = 0; i < t->entry_count; i++) {
1265 e = t->entries[i];
1266 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
4cabf858 1267 if (!slash1 || !S_ISDIR(e->versions[1].mode))
463acbe1
SP
1268 goto del_entry;
1269 if (!e->tree)
1270 load_tree(e);
1271 if (tree_content_remove(e, slash1 + 1)) {
b54d6422
SP
1272 for (n = 0; n < e->tree->entry_count; n++) {
1273 if (e->tree->entries[n]->versions[1].mode) {
1274 hashclr(root->versions[1].sha1);
1275 return 1;
1276 }
1277 }
1278 goto del_entry;
463acbe1
SP
1279 }
1280 return 0;
1281 }
1282 }
1283 return 0;
1284
1285del_entry:
4cabf858
SP
1286 if (e->tree) {
1287 release_tree_content_recursive(e->tree);
1288 e->tree = NULL;
1289 }
1290 e->versions[1].mode = 0;
1291 hashclr(e->versions[1].sha1);
1292 hashclr(root->versions[1].sha1);
ac47a738 1293 return 1;
db5e523f
SP
1294}
1295
7073e69e 1296static int update_branch(struct branch *b)
463acbe1
SP
1297{
1298 static const char *msg = "fast-import";
7073e69e
SP
1299 struct ref_lock *lock;
1300 unsigned char old_sha1[20];
1301
1302 if (read_ref(b->name, old_sha1))
1303 hashclr(old_sha1);
1304 lock = lock_any_ref_for_update(b->name, old_sha1);
1305 if (!lock)
1306 return error("Unable to lock %s", b->name);
1307 if (!force_update && !is_null_sha1(old_sha1)) {
1308 struct commit *old_cmit, *new_cmit;
1309
1310 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1311 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1312 if (!old_cmit || !new_cmit) {
1313 unlock_ref(lock);
1314 return error("Branch %s is missing commits.", b->name);
1315 }
1316
4a164d48 1317 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
7073e69e
SP
1318 unlock_ref(lock);
1319 warn("Not updating %s"
1320 " (new tip %s does not contain %s)",
1321 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1322 return -1;
1323 }
1324 }
1325 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1326 return error("Unable to update %s", b->name);
1327 return 0;
1328}
1329
1330static void dump_branches(void)
1331{
463acbe1
SP
1332 unsigned int i;
1333 struct branch *b;
463acbe1
SP
1334
1335 for (i = 0; i < branch_table_sz; i++) {
7073e69e
SP
1336 for (b = branch_table[i]; b; b = b->table_next_branch)
1337 failure |= update_branch(b);
463acbe1
SP
1338 }
1339}
1340
fd99224e 1341static void dump_tags(void)
72303d44
SP
1342{
1343 static const char *msg = "fast-import";
1344 struct tag *t;
1345 struct ref_lock *lock;
7073e69e 1346 char ref_name[PATH_MAX];
72303d44
SP
1347
1348 for (t = first_tag; t; t = t->next_tag) {
7073e69e
SP
1349 sprintf(ref_name, "tags/%s", t->name);
1350 lock = lock_ref_sha1(ref_name, NULL);
72303d44 1351 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
7073e69e 1352 failure |= error("Unable to update %s", ref_name);
72303d44
SP
1353 }
1354}
1355
a6a1a831 1356static void dump_marks_helper(FILE *f,
0ea9f045 1357 uintmax_t base,
a6a1a831
SP
1358 struct mark_set *m)
1359{
0ea9f045 1360 uintmax_t k;
a6a1a831
SP
1361 if (m->shift) {
1362 for (k = 0; k < 1024; k++) {
1363 if (m->data.sets[k])
1364 dump_marks_helper(f, (base + k) << m->shift,
1365 m->data.sets[k]);
1366 }
1367 } else {
1368 for (k = 0; k < 1024; k++) {
1369 if (m->data.marked[k])
3efb1f34 1370 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
a6a1a831
SP
1371 sha1_to_hex(m->data.marked[k]->sha1));
1372 }
1373 }
1374}
1375
fd99224e 1376static void dump_marks(void)
a6a1a831 1377{
60b9004c
SP
1378 static struct lock_file mark_lock;
1379 int mark_fd;
1380 FILE *f;
1381
1382 if (!mark_file)
1383 return;
1384
1385 mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
1386 if (mark_fd < 0) {
1387 failure |= error("Unable to write marks file %s: %s",
1388 mark_file, strerror(errno));
1389 return;
a6a1a831 1390 }
60b9004c
SP
1391
1392 f = fdopen(mark_fd, "w");
1393 if (!f) {
1394 rollback_lock_file(&mark_lock);
1395 failure |= error("Unable to write marks file %s: %s",
1396 mark_file, strerror(errno));
1397 return;
1398 }
1399
1400 dump_marks_helper(f, 0, marks);
1401 fclose(f);
1402 if (commit_lock_file(&mark_lock))
1403 failure |= error("Unable to write marks file %s: %s",
1404 mark_file, strerror(errno));
a6a1a831
SP
1405}
1406
fd99224e 1407static void read_next_command(void)
c44cdc7e
SP
1408{
1409 read_line(&command_buf, stdin, '\n');
1410}
1411
fd99224e 1412static void cmd_mark(void)
c44cdc7e 1413{
599065a3 1414 if (!prefixcmp(command_buf.buf, "mark :")) {
0ea9f045 1415 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
c44cdc7e
SP
1416 read_next_command();
1417 }
1418 else
d8397168 1419 next_mark = 0;
c44cdc7e
SP
1420}
1421
e5b1444b 1422static void *cmd_data (size_t *size)
c44cdc7e 1423{
c44cdc7e 1424 size_t length;
3b4dce02 1425 char *buffer;
c44cdc7e 1426
599065a3 1427 if (prefixcmp(command_buf.buf, "data "))
c44cdc7e
SP
1428 die("Expected 'data n' command, found: %s", command_buf.buf);
1429
599065a3 1430 if (!prefixcmp(command_buf.buf + 5, "<<")) {
3b4dce02
SP
1431 char *term = xstrdup(command_buf.buf + 5 + 2);
1432 size_t sz = 8192, term_len = command_buf.len - 5 - 2;
1433 length = 0;
1434 buffer = xmalloc(sz);
1435 for (;;) {
1436 read_next_command();
1437 if (command_buf.eof)
1438 die("EOF in data (terminator '%s' not found)", term);
1439 if (term_len == command_buf.len
1440 && !strcmp(term, command_buf.buf))
1441 break;
1442 if (sz < (length + command_buf.len)) {
1443 sz = sz * 3 / 2 + 16;
1444 if (sz < (length + command_buf.len))
1445 sz = length + command_buf.len;
1446 buffer = xrealloc(buffer, sz);
1447 }
1448 memcpy(buffer + length,
1449 command_buf.buf,
1450 command_buf.len - 1);
1451 length += command_buf.len - 1;
1452 buffer[length++] = '\n';
1453 }
1454 free(term);
1455 }
1456 else {
1457 size_t n = 0;
1458 length = strtoul(command_buf.buf + 5, NULL, 10);
1459 buffer = xmalloc(length);
1460 while (n < length) {
1461 size_t s = fread(buffer + n, 1, length - n, stdin);
1462 if (!s && feof(stdin))
40db58b8
JS
1463 die("EOF in data (%lu bytes remaining)",
1464 (unsigned long)(length - n));
3b4dce02
SP
1465 n += s;
1466 }
c44cdc7e
SP
1467 }
1468
1469 if (fgetc(stdin) != '\n')
1470 die("An lf did not trail the binary data as expected.");
1471
1472 *size = length;
1473 return buffer;
1474}
1475
63e0c8b3
SP
1476static int validate_raw_date(const char *src, char *result, int maxlen)
1477{
1478 const char *orig_src = src;
1479 char *endp, sign;
1480
1481 strtoul(src, &endp, 10);
1482 if (endp == src || *endp != ' ')
1483 return -1;
1484
1485 src = endp + 1;
1486 if (*src != '-' && *src != '+')
1487 return -1;
1488 sign = *src;
1489
1490 strtoul(src + 1, &endp, 10);
1491 if (endp == src || *endp || (endp - orig_src) >= maxlen)
1492 return -1;
1493
1494 strcpy(result, orig_src);
1495 return 0;
1496}
1497
1498static char *parse_ident(const char *buf)
1499{
1500 const char *gt;
1501 size_t name_len;
1502 char *ident;
1503
1504 gt = strrchr(buf, '>');
1505 if (!gt)
1506 die("Missing > in ident string: %s", buf);
1507 gt++;
1508 if (*gt != ' ')
1509 die("Missing space after > in ident string: %s", buf);
1510 gt++;
1511 name_len = gt - buf;
1512 ident = xmalloc(name_len + 24);
1513 strncpy(ident, buf, name_len);
1514
1515 switch (whenspec) {
1516 case WHENSPEC_RAW:
1517 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1518 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1519 break;
1520 case WHENSPEC_RFC2822:
1521 if (parse_date(gt, ident + name_len, 24) < 0)
1522 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1523 break;
1524 case WHENSPEC_NOW:
1525 if (strcmp("now", gt))
1526 die("Date in ident must be 'now': %s", buf);
1527 datestamp(ident + name_len, 24);
1528 break;
1529 }
1530
1531 return ident;
1532}
1533
fd99224e 1534static void cmd_new_blob(void)
6143f064 1535{
d8397168
SP
1536 size_t l;
1537 void *d;
c44cdc7e
SP
1538
1539 read_next_command();
1540 cmd_mark();
d8397168 1541 d = cmd_data(&l);
6143f064 1542
d8397168
SP
1543 if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
1544 free(d);
6143f064
SP
1545}
1546
fd99224e 1547static void unload_one_branch(void)
6bb5b329 1548{
41e5257f
SP
1549 while (cur_active_branches
1550 && cur_active_branches >= max_active_branches) {
463acbe1
SP
1551 unsigned long min_commit = ULONG_MAX;
1552 struct branch *e, *l = NULL, *p = NULL;
1553
1554 for (e = active_branches; e; e = e->active_next_branch) {
1555 if (e->last_commit < min_commit) {
1556 p = l;
1557 min_commit = e->last_commit;
1558 }
1559 l = e;
1560 }
1561
1562 if (p) {
1563 e = p->active_next_branch;
1564 p->active_next_branch = e->active_next_branch;
1565 } else {
1566 e = active_branches;
1567 active_branches = e->active_next_branch;
1568 }
734c91f9 1569 e->active = 0;
463acbe1
SP
1570 e->active_next_branch = NULL;
1571 if (e->branch_tree.tree) {
afde8dd9 1572 release_tree_content_recursive(e->branch_tree.tree);
463acbe1
SP
1573 e->branch_tree.tree = NULL;
1574 }
1575 cur_active_branches--;
6bb5b329 1576 }
6bb5b329
SP
1577}
1578
463acbe1 1579static void load_branch(struct branch *b)
6bb5b329 1580{
463acbe1 1581 load_tree(&b->branch_tree);
734c91f9
SP
1582 if (!b->active) {
1583 b->active = 1;
1584 b->active_next_branch = active_branches;
1585 active_branches = b;
1586 cur_active_branches++;
1587 branch_load_count++;
1588 }
6bb5b329
SP
1589}
1590
463acbe1 1591static void file_change_m(struct branch *b)
6bb5b329 1592{
c44cdc7e
SP
1593 const char *p = command_buf.buf + 2;
1594 char *p_uq;
1595 const char *endp;
10e8d688 1596 struct object_entry *oe = oe;
463acbe1 1597 unsigned char sha1[20];
10831c55 1598 uint16_t mode, inline_data = 0;
6bb5b329 1599
c44cdc7e
SP
1600 p = get_mode(p, &mode);
1601 if (!p)
1602 die("Corrupt mode: %s", command_buf.buf);
1603 switch (mode) {
1604 case S_IFREG | 0644:
1605 case S_IFREG | 0755:
ace4a9d1 1606 case S_IFLNK:
c44cdc7e
SP
1607 case 0644:
1608 case 0755:
1609 /* ok */
1610 break;
1611 default:
1612 die("Corrupt mode: %s", command_buf.buf);
1613 }
1614
d8397168
SP
1615 if (*p == ':') {
1616 char *x;
0ea9f045 1617 oe = find_mark(strtoumax(p + 1, &x, 10));
cacbdd0a 1618 hashcpy(sha1, oe->sha1);
d8397168 1619 p = x;
599065a3 1620 } else if (!prefixcmp(p, "inline")) {
b715cfbb
SP
1621 inline_data = 1;
1622 p += 6;
d8397168
SP
1623 } else {
1624 if (get_sha1_hex(p, sha1))
1625 die("Invalid SHA1: %s", command_buf.buf);
1626 oe = find_object(sha1);
1627 p += 40;
1628 }
c44cdc7e
SP
1629 if (*p++ != ' ')
1630 die("Missing space after SHA1: %s", command_buf.buf);
1631
1632 p_uq = unquote_c_style(p, &endp);
1633 if (p_uq) {
1634 if (*endp)
1635 die("Garbage after path in: %s", command_buf.buf);
1636 p = p_uq;
1637 }
6bb5b329 1638
b715cfbb
SP
1639 if (inline_data) {
1640 size_t l;
1641 void *d;
1642 if (!p_uq)
1643 p = p_uq = xstrdup(p);
1644 read_next_command();
1645 d = cmd_data(&l);
1646 if (store_object(OBJ_BLOB, d, l, &last_blob, sha1, 0))
1647 free(d);
1648 } else if (oe) {
7111feed 1649 if (oe->type != OBJ_BLOB)
c44cdc7e 1650 die("Not a blob (actually a %s): %s",
df843662 1651 command_buf.buf, typename(oe->type));
7111feed 1652 } else {
21666f1a
NP
1653 enum object_type type = sha1_object_info(sha1, NULL);
1654 if (type < 0)
c44cdc7e 1655 die("Blob not found: %s", command_buf.buf);
21666f1a 1656 if (type != OBJ_BLOB)
c44cdc7e 1657 die("Not a blob (actually a %s): %s",
21666f1a 1658 typename(type), command_buf.buf);
7111feed 1659 }
6bb5b329 1660
c44cdc7e 1661 tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);
e7d06a4b 1662 free(p_uq);
463acbe1 1663}
6bb5b329 1664
463acbe1
SP
1665static void file_change_d(struct branch *b)
1666{
c44cdc7e
SP
1667 const char *p = command_buf.buf + 2;
1668 char *p_uq;
1669 const char *endp;
1670
1671 p_uq = unquote_c_style(p, &endp);
1672 if (p_uq) {
1673 if (*endp)
1674 die("Garbage after path in: %s", command_buf.buf);
1675 p = p_uq;
1676 }
1677 tree_content_remove(&b->branch_tree, p);
e7d06a4b 1678 free(p_uq);
6bb5b329
SP
1679}
1680
825769a8
SP
1681static void file_change_deleteall(struct branch *b)
1682{
1683 release_tree_content_recursive(b->branch_tree.tree);
1684 hashclr(b->branch_tree.versions[0].sha1);
1685 hashclr(b->branch_tree.versions[1].sha1);
1686 load_tree(&b->branch_tree);
1687}
1688
00e2b884
SP
1689static void cmd_from(struct branch *b)
1690{
6c3aac1c 1691 const char *from;
00e2b884
SP
1692 struct branch *s;
1693
599065a3 1694 if (prefixcmp(command_buf.buf, "from "))
00e2b884
SP
1695 return;
1696
ea5e370a
SP
1697 if (b->branch_tree.tree) {
1698 release_tree_content_recursive(b->branch_tree.tree);
1699 b->branch_tree.tree = NULL;
1700 }
00e2b884
SP
1701
1702 from = strchr(command_buf.buf, ' ') + 1;
00e2b884
SP
1703 s = lookup_branch(from);
1704 if (b == s)
1705 die("Can't create a branch from itself: %s", b->name);
1706 else if (s) {
4cabf858 1707 unsigned char *t = s->branch_tree.versions[1].sha1;
445b8599 1708 hashcpy(b->sha1, s->sha1);
4cabf858
SP
1709 hashcpy(b->branch_tree.versions[0].sha1, t);
1710 hashcpy(b->branch_tree.versions[1].sha1, t);
00e2b884 1711 } else if (*from == ':') {
0ea9f045 1712 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
00e2b884
SP
1713 struct object_entry *oe = find_mark(idnum);
1714 unsigned long size;
1715 char *buf;
1716 if (oe->type != OBJ_COMMIT)
3efb1f34 1717 die("Mark :%" PRIuMAX " not a commit", idnum);
445b8599 1718 hashcpy(b->sha1, oe->sha1);
7bfe6e26 1719 buf = gfi_unpack_entry(oe, &size);
00e2b884
SP
1720 if (!buf || size < 46)
1721 die("Not a valid commit: %s", from);
1722 if (memcmp("tree ", buf, 5)
4cabf858 1723 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
00e2b884
SP
1724 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
1725 free(buf);
4cabf858
SP
1726 hashcpy(b->branch_tree.versions[0].sha1,
1727 b->branch_tree.versions[1].sha1);
00e2b884 1728 } else if (!get_sha1(from, b->sha1)) {
4cabf858
SP
1729 if (is_null_sha1(b->sha1)) {
1730 hashclr(b->branch_tree.versions[0].sha1);
1731 hashclr(b->branch_tree.versions[1].sha1);
1732 } else {
00e2b884
SP
1733 unsigned long size;
1734 char *buf;
1735
1736 buf = read_object_with_reference(b->sha1,
df843662 1737 commit_type, &size, b->sha1);
00e2b884
SP
1738 if (!buf || size < 46)
1739 die("Not a valid commit: %s", from);
1740 if (memcmp("tree ", buf, 5)
4cabf858 1741 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
00e2b884
SP
1742 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
1743 free(buf);
4cabf858
SP
1744 hashcpy(b->branch_tree.versions[0].sha1,
1745 b->branch_tree.versions[1].sha1);
00e2b884
SP
1746 }
1747 } else
1748 die("Invalid ref name or SHA1 expression: %s", from);
1749
1750 read_next_command();
1751}
1752
e5b1444b 1753static struct hash_list *cmd_merge(unsigned int *count)
62b6f483 1754{
10e8d688 1755 struct hash_list *list = NULL, *n, *e = e;
6c3aac1c 1756 const char *from;
62b6f483
SP
1757 struct branch *s;
1758
1759 *count = 0;
599065a3 1760 while (!prefixcmp(command_buf.buf, "merge ")) {
62b6f483 1761 from = strchr(command_buf.buf, ' ') + 1;
62b6f483
SP
1762 n = xmalloc(sizeof(*n));
1763 s = lookup_branch(from);
1764 if (s)
1765 hashcpy(n->sha1, s->sha1);
1766 else if (*from == ':') {
0ea9f045 1767 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
62b6f483
SP
1768 struct object_entry *oe = find_mark(idnum);
1769 if (oe->type != OBJ_COMMIT)
3efb1f34 1770 die("Mark :%" PRIuMAX " not a commit", idnum);
62b6f483 1771 hashcpy(n->sha1, oe->sha1);
2f6dc35d
SP
1772 } else if (!get_sha1(from, n->sha1)) {
1773 unsigned long size;
1774 char *buf = read_object_with_reference(n->sha1,
6b4318e6 1775 commit_type, &size, n->sha1);
2f6dc35d
SP
1776 if (!buf || size < 46)
1777 die("Not a valid commit: %s", from);
1778 free(buf);
1779 } else
62b6f483
SP
1780 die("Invalid ref name or SHA1 expression: %s", from);
1781
1782 n->next = NULL;
1783 if (list)
1784 e->next = n;
1785 else
1786 list = n;
1787 e = n;
10e8d688 1788 (*count)++;
62b6f483
SP
1789 read_next_command();
1790 }
1791 return list;
1792}
1793
fd99224e 1794static void cmd_new_commit(void)
6bb5b329 1795{
c44cdc7e
SP
1796 struct branch *b;
1797 void *msg;
1798 size_t msglen;
c44cdc7e
SP
1799 char *sp;
1800 char *author = NULL;
1801 char *committer = NULL;
62b6f483
SP
1802 struct hash_list *merge_list = NULL;
1803 unsigned int merge_count;
c44cdc7e
SP
1804
1805 /* Obtain the branch name from the rest of our command */
1806 sp = strchr(command_buf.buf, ' ') + 1;
c44cdc7e 1807 b = lookup_branch(sp);
463acbe1 1808 if (!b)
00e2b884 1809 b = new_branch(sp);
c44cdc7e
SP
1810
1811 read_next_command();
1812 cmd_mark();
599065a3 1813 if (!prefixcmp(command_buf.buf, "author ")) {
63e0c8b3 1814 author = parse_ident(command_buf.buf + 7);
c44cdc7e
SP
1815 read_next_command();
1816 }
599065a3 1817 if (!prefixcmp(command_buf.buf, "committer ")) {
63e0c8b3 1818 committer = parse_ident(command_buf.buf + 10);
c44cdc7e
SP
1819 read_next_command();
1820 }
1821 if (!committer)
1822 die("Expected committer but didn't get one");
1823 msg = cmd_data(&msglen);
02f3389d
SP
1824 read_next_command();
1825 cmd_from(b);
62b6f483 1826 merge_list = cmd_merge(&merge_count);
c44cdc7e
SP
1827
1828 /* ensure the branch is active/loaded */
41e5257f 1829 if (!b->branch_tree.tree || !max_active_branches) {
463acbe1
SP
1830 unload_one_branch();
1831 load_branch(b);
1832 }
6bb5b329 1833
463acbe1
SP
1834 /* file_change* */
1835 for (;;) {
c44cdc7e 1836 if (1 == command_buf.len)
463acbe1 1837 break;
599065a3 1838 else if (!prefixcmp(command_buf.buf, "M "))
463acbe1 1839 file_change_m(b);
599065a3 1840 else if (!prefixcmp(command_buf.buf, "D "))
463acbe1 1841 file_change_d(b);
825769a8
SP
1842 else if (!strcmp("deleteall", command_buf.buf))
1843 file_change_deleteall(b);
463acbe1 1844 else
c44cdc7e 1845 die("Unsupported file_change: %s", command_buf.buf);
02f3389d 1846 read_next_command();
6bb5b329 1847 }
6bb5b329 1848
c44cdc7e 1849 /* build the tree and the commit */
463acbe1 1850 store_tree(&b->branch_tree);
8a8c55ea
SP
1851 hashcpy(b->branch_tree.versions[0].sha1,
1852 b->branch_tree.versions[1].sha1);
63e0c8b3 1853 size_dbuf(&new_data, 114 + msglen
62b6f483 1854 + merge_count * 49
c44cdc7e
SP
1855 + (author
1856 ? strlen(author) + strlen(committer)
1857 : 2 * strlen(committer)));
243f801d 1858 sp = new_data.buffer;
4cabf858
SP
1859 sp += sprintf(sp, "tree %s\n",
1860 sha1_to_hex(b->branch_tree.versions[1].sha1));
445b8599 1861 if (!is_null_sha1(b->sha1))
c44cdc7e 1862 sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
62b6f483
SP
1863 while (merge_list) {
1864 struct hash_list *next = merge_list->next;
1865 sp += sprintf(sp, "parent %s\n", sha1_to_hex(merge_list->sha1));
1866 free(merge_list);
1867 merge_list = next;
1868 }
63e0c8b3
SP
1869 sp += sprintf(sp, "author %s\n", author ? author : committer);
1870 sp += sprintf(sp, "committer %s\n", committer);
1871 *sp++ = '\n';
c44cdc7e
SP
1872 memcpy(sp, msg, msglen);
1873 sp += msglen;
e7d06a4b 1874 free(author);
c44cdc7e
SP
1875 free(committer);
1876 free(msg);
1877
69e74e74 1878 if (!store_object(OBJ_COMMIT,
243f801d 1879 new_data.buffer, sp - (char*)new_data.buffer,
69e74e74
SP
1880 NULL, b->sha1, next_mark))
1881 b->pack_id = pack_id;
463acbe1 1882 b->last_commit = object_count_by_type[OBJ_COMMIT];
6bb5b329
SP
1883}
1884
fd99224e 1885static void cmd_new_tag(void)
72303d44 1886{
72303d44
SP
1887 char *sp;
1888 const char *from;
1889 char *tagger;
1890 struct branch *s;
1891 void *msg;
1892 size_t msglen;
72303d44 1893 struct tag *t;
0ea9f045 1894 uintmax_t from_mark = 0;
72303d44
SP
1895 unsigned char sha1[20];
1896
1897 /* Obtain the new tag name from the rest of our command */
1898 sp = strchr(command_buf.buf, ' ') + 1;
72303d44
SP
1899 t = pool_alloc(sizeof(struct tag));
1900 t->next_tag = NULL;
1901 t->name = pool_strdup(sp);
1902 if (last_tag)
1903 last_tag->next_tag = t;
1904 else
1905 first_tag = t;
1906 last_tag = t;
72303d44
SP
1907 read_next_command();
1908
1909 /* from ... */
599065a3 1910 if (prefixcmp(command_buf.buf, "from "))
72303d44 1911 die("Expected from command, got %s", command_buf.buf);
72303d44 1912 from = strchr(command_buf.buf, ' ') + 1;
72303d44
SP
1913 s = lookup_branch(from);
1914 if (s) {
445b8599 1915 hashcpy(sha1, s->sha1);
72303d44 1916 } else if (*from == ':') {
10e8d688 1917 struct object_entry *oe;
0ea9f045 1918 from_mark = strtoumax(from + 1, NULL, 10);
10e8d688 1919 oe = find_mark(from_mark);
72303d44 1920 if (oe->type != OBJ_COMMIT)
3efb1f34 1921 die("Mark :%" PRIuMAX " not a commit", from_mark);
445b8599 1922 hashcpy(sha1, oe->sha1);
72303d44
SP
1923 } else if (!get_sha1(from, sha1)) {
1924 unsigned long size;
1925 char *buf;
1926
1927 buf = read_object_with_reference(sha1,
df843662 1928 commit_type, &size, sha1);
72303d44
SP
1929 if (!buf || size < 46)
1930 die("Not a valid commit: %s", from);
1931 free(buf);
1932 } else
1933 die("Invalid ref name or SHA1 expression: %s", from);
72303d44
SP
1934 read_next_command();
1935
1936 /* tagger ... */
599065a3 1937 if (prefixcmp(command_buf.buf, "tagger "))
72303d44 1938 die("Expected tagger command, got %s", command_buf.buf);
63e0c8b3 1939 tagger = parse_ident(command_buf.buf + 7);
72303d44
SP
1940
1941 /* tag payload/message */
1942 read_next_command();
1943 msg = cmd_data(&msglen);
1944
1945 /* build the tag object */
243f801d
SP
1946 size_dbuf(&new_data, 67+strlen(t->name)+strlen(tagger)+msglen);
1947 sp = new_data.buffer;
72303d44 1948 sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
df843662 1949 sp += sprintf(sp, "type %s\n", commit_type);
72303d44 1950 sp += sprintf(sp, "tag %s\n", t->name);
63e0c8b3
SP
1951 sp += sprintf(sp, "tagger %s\n", tagger);
1952 *sp++ = '\n';
72303d44
SP
1953 memcpy(sp, msg, msglen);
1954 sp += msglen;
1955 free(tagger);
1956 free(msg);
1957
69e74e74
SP
1958 if (store_object(OBJ_TAG, new_data.buffer,
1959 sp - (char*)new_data.buffer,
1960 NULL, t->sha1, 0))
1961 t->pack_id = MAX_PACK_ID;
1962 else
1963 t->pack_id = pack_id;
72303d44
SP
1964}
1965
fd99224e 1966static void cmd_reset_branch(void)
5fced8dc
SP
1967{
1968 struct branch *b;
5fced8dc
SP
1969 char *sp;
1970
1971 /* Obtain the branch name from the rest of our command */
1972 sp = strchr(command_buf.buf, ' ') + 1;
5fced8dc
SP
1973 b = lookup_branch(sp);
1974 if (b) {
ea5e370a
SP
1975 hashclr(b->sha1);
1976 hashclr(b->branch_tree.versions[0].sha1);
1977 hashclr(b->branch_tree.versions[1].sha1);
5fced8dc
SP
1978 if (b->branch_tree.tree) {
1979 release_tree_content_recursive(b->branch_tree.tree);
1980 b->branch_tree.tree = NULL;
1981 }
1982 }
9938ffc5
SP
1983 else
1984 b = new_branch(sp);
9938ffc5
SP
1985 read_next_command();
1986 cmd_from(b);
5fced8dc
SP
1987}
1988
fd99224e 1989static void cmd_checkpoint(void)
7bfe6e26 1990{
820b9310
SP
1991 if (object_count) {
1992 cycle_packfile();
1993 dump_branches();
1994 dump_tags();
1995 dump_marks();
1996 }
7bfe6e26
SP
1997 read_next_command();
1998}
1999
d5c57b28 2000static const char fast_import_usage[] =
63e0c8b3 2001"git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
d5c57b28 2002
8bcce301
SP
2003int main(int argc, const char **argv)
2004{
c499d768 2005 int i, show_stats = 1;
8bcce301 2006
463acbe1 2007 git_config(git_default_config);
93e72d8d
SP
2008 alloc_objects(object_entry_alloc);
2009 strbuf_init(&command_buf);
2010 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2011 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2012 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2013 marks = pool_calloc(1, sizeof(struct mark_set));
463acbe1 2014
d5c57b28
SP
2015 for (i = 1; i < argc; i++) {
2016 const char *a = argv[i];
2017
2018 if (*a != '-' || !strcmp(a, "--"))
2019 break;
cc44c765 2020 else if (!prefixcmp(a, "--date-format=")) {
63e0c8b3
SP
2021 const char *fmt = a + 14;
2022 if (!strcmp(fmt, "raw"))
2023 whenspec = WHENSPEC_RAW;
2024 else if (!strcmp(fmt, "rfc2822"))
2025 whenspec = WHENSPEC_RFC2822;
2026 else if (!strcmp(fmt, "now"))
2027 whenspec = WHENSPEC_NOW;
2028 else
2029 die("unknown --date-format argument %s", fmt);
2030 }
cc44c765 2031 else if (!prefixcmp(a, "--max-pack-size="))
0ea9f045 2032 max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
cc44c765 2033 else if (!prefixcmp(a, "--depth="))
d5c57b28 2034 max_depth = strtoul(a + 8, NULL, 0);
cc44c765 2035 else if (!prefixcmp(a, "--active-branches="))
d5c57b28 2036 max_active_branches = strtoul(a + 18, NULL, 0);
cc44c765 2037 else if (!prefixcmp(a, "--export-marks="))
a6a1a831 2038 mark_file = a + 15;
cc44c765 2039 else if (!prefixcmp(a, "--export-pack-edges=")) {
bdf1c06d
SP
2040 if (pack_edges)
2041 fclose(pack_edges);
2042 pack_edges = fopen(a + 20, "a");
2043 if (!pack_edges)
2044 die("Cannot open %s: %s", a + 20, strerror(errno));
2045 } else if (!strcmp(a, "--force"))
7073e69e 2046 force_update = 1;
c499d768
SP
2047 else if (!strcmp(a, "--quiet"))
2048 show_stats = 0;
2049 else if (!strcmp(a, "--stats"))
2050 show_stats = 1;
d5c57b28
SP
2051 else
2052 die("unknown option %s", a);
2053 }
8455e484 2054 if (i != argc)
d5c57b28 2055 usage(fast_import_usage);
d5c57b28 2056
f70b6534 2057 start_packfile();
db5e523f 2058 for (;;) {
c44cdc7e
SP
2059 read_next_command();
2060 if (command_buf.eof)
db5e523f 2061 break;
c44cdc7e
SP
2062 else if (!strcmp("blob", command_buf.buf))
2063 cmd_new_blob();
599065a3 2064 else if (!prefixcmp(command_buf.buf, "commit "))
c44cdc7e 2065 cmd_new_commit();
599065a3 2066 else if (!prefixcmp(command_buf.buf, "tag "))
72303d44 2067 cmd_new_tag();
599065a3 2068 else if (!prefixcmp(command_buf.buf, "reset "))
5fced8dc 2069 cmd_reset_branch();
7bfe6e26
SP
2070 else if (!strcmp("checkpoint", command_buf.buf))
2071 cmd_checkpoint();
c44cdc7e
SP
2072 else
2073 die("Unsupported command: %s", command_buf.buf);
db5e523f 2074 }
f70b6534 2075 end_packfile();
c44cdc7e 2076
463acbe1 2077 dump_branches();
72303d44 2078 dump_tags();
8455e484 2079 unkeep_all_packs();
a6a1a831 2080 dump_marks();
8bcce301 2081
bdf1c06d
SP
2082 if (pack_edges)
2083 fclose(pack_edges);
2084
c499d768
SP
2085 if (show_stats) {
2086 uintmax_t total_count = 0, duplicate_count = 0;
2087 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2088 total_count += object_count_by_type[i];
2089 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2090 duplicate_count += duplicate_count_by_type[i];
2091
2092 fprintf(stderr, "%s statistics:\n", argv[0]);
2093 fprintf(stderr, "---------------------------------------------------------------------\n");
3efb1f34
JR
2094 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2095 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
2096 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]);
2097 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]);
2098 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]);
2099 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]);
c499d768 2100 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
3efb1f34 2101 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
c499d768 2102 fprintf(stderr, " atoms: %10u\n", atom_cnt);
3efb1f34 2103 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
40db58b8 2104 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
3efb1f34 2105 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
c499d768
SP
2106 fprintf(stderr, "---------------------------------------------------------------------\n");
2107 pack_report();
2108 fprintf(stderr, "---------------------------------------------------------------------\n");
2109 fprintf(stderr, "\n");
2110 }
db5e523f 2111
7073e69e 2112 return failure ? 1 : 0;
db5e523f 2113}