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