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