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