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