strbuf: introduce strbuf_getline_{lf,nul}()
[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;
625 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
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);
463acbe1 817 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
2eb26d84 818 while (n-- > 1) {
463acbe1
SP
819 *((void**)e) = e + 1;
820 e++;
821 }
35ef237c 822 *((void**)e) = NULL;
463acbe1
SP
823 }
824
825 e = avail_tree_entry;
826 avail_tree_entry = *((void**)e);
827 return e;
828}
829
830static void release_tree_entry(struct tree_entry *e)
831{
832 if (e->tree)
afde8dd9 833 release_tree_content_recursive(e->tree);
463acbe1
SP
834 *((void**)e) = avail_tree_entry;
835 avail_tree_entry = e;
836}
837
b6f3481b
SP
838static struct tree_content *dup_tree_content(struct tree_content *s)
839{
840 struct tree_content *d;
841 struct tree_entry *a, *b;
842 unsigned int i;
843
844 if (!s)
845 return NULL;
846 d = new_tree_content(s->entry_count);
847 for (i = 0; i < s->entry_count; i++) {
848 a = s->entries[i];
849 b = new_tree_entry();
850 memcpy(b, a, sizeof(*a));
851 if (a->tree && is_null_sha1(b->versions[1].sha1))
852 b->tree = dup_tree_content(a->tree);
853 else
854 b->tree = NULL;
855 d->entries[i] = b;
856 }
857 d->entry_count = s->entry_count;
858 d->delta_depth = s->delta_depth;
859
860 return d;
861}
862
fd99224e 863static void start_packfile(void)
f70b6534 864{
ab1900a3 865 static char tmp_file[PATH_MAX];
7bfe6e26 866 struct packed_git *p;
c7ab0ba3 867 int namelen;
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");
c7ab0ba3
JK
873 namelen = strlen(tmp_file) + 2;
874 p = xcalloc(1, sizeof(*p) + namelen);
875 xsnprintf(p->pack_name, namelen, "%s", tmp_file);
7bfe6e26 876 p->pack_fd = pack_fd;
d131b7af 877 p->do_not_close = 1;
21281816 878 pack_file = sha1fd(pack_fd, p->pack_name);
f70b6534
SP
879
880 hdr.hdr_signature = htonl(PACK_SIGNATURE);
881 hdr.hdr_version = htonl(2);
882 hdr.hdr_entries = 0;
21281816 883 sha1write(pack_file, &hdr, sizeof(hdr));
7bfe6e26
SP
884
885 pack_data = p;
f70b6534
SP
886 pack_size = sizeof(hdr);
887 object_count = 0;
7bfe6e26 888
2756ca43 889 REALLOC_ARRAY(all_packs, pack_id + 1);
7bfe6e26 890 all_packs[pack_id] = p;
f70b6534
SP
891}
892
427cb22c 893static const char *create_index(void)
f70b6534 894{
427cb22c
NP
895 const char *tmpfile;
896 struct pack_idx_entry **idx, **c, **last;
897 struct object_entry *e;
f70b6534 898 struct object_entry_pool *o;
f70b6534 899
427cb22c
NP
900 /* Build the table of object IDs. */
901 idx = xmalloc(object_count * sizeof(*idx));
f70b6534
SP
902 c = idx;
903 for (o = blocks; o; o = o->next_pool)
d9ee53ce
SP
904 for (e = o->next_free; e-- != o->entries;)
905 if (pack_id == e->pack_id)
427cb22c 906 *c++ = &e->idx;
f70b6534 907 last = idx + object_count;
2fce1f3c
SP
908 if (c != last)
909 die("internal consistency error creating the index");
f70b6534 910
ebcfb379 911 tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, pack_data->sha1);
f70b6534 912 free(idx);
8455e484
SP
913 return tmpfile;
914}
915
427cb22c 916static char *keep_pack(const char *curr_index_name)
8455e484
SP
917{
918 static char name[PATH_MAX];
3a55602e 919 static const char *keep_msg = "fast-import";
8455e484
SP
920 int keep_fd;
921
6e180cdc 922 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
8455e484 923 if (keep_fd < 0)
0721c314 924 die_errno("cannot create keep file");
95693d45
JM
925 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
926 if (close(keep_fd))
0721c314 927 die_errno("failed to write keep file");
8455e484
SP
928
929 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
930 get_object_directory(), sha1_to_hex(pack_data->sha1));
cb5add58 931 if (finalize_object_file(pack_data->pack_name, name))
8455e484 932 die("cannot store pack file");
8455e484
SP
933
934 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
935 get_object_directory(), sha1_to_hex(pack_data->sha1));
cb5add58 936 if (finalize_object_file(curr_index_name, name))
8455e484 937 die("cannot store index file");
427cb22c 938 free((void *)curr_index_name);
8455e484
SP
939 return name;
940}
941
fd99224e 942static void unkeep_all_packs(void)
8455e484
SP
943{
944 static char name[PATH_MAX];
945 int k;
946
947 for (k = 0; k < pack_id; k++) {
948 struct packed_git *p = all_packs[k];
949 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
950 get_object_directory(), sha1_to_hex(p->sha1));
691f1a28 951 unlink_or_warn(name);
8455e484 952 }
f70b6534
SP
953}
954
fd99224e 955static void end_packfile(void)
f70b6534 956{
5e915f30
JK
957 static int running;
958
959 if (running || !pack_data)
3c078b9c 960 return;
7bfe6e26 961
5e915f30 962 running = 1;
3d20c636 963 clear_delta_base_cache();
3e005baf 964 if (object_count) {
3c078b9c 965 struct packed_git *new_p;
21281816 966 unsigned char cur_pack_sha1[20];
8455e484 967 char *idx_name;
2369ed79
SP
968 int i;
969 struct branch *b;
970 struct tag *t;
8455e484 971
c9ced051 972 close_pack_windows(pack_data);
21281816 973 sha1close(pack_file, cur_pack_sha1, 0);
8b0eca7c 974 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
abeb40e5 975 pack_data->pack_name, object_count,
21281816 976 cur_pack_sha1, pack_size);
8b0eca7c 977 close(pack_data->pack_fd);
8455e484 978 idx_name = keep_pack(create_index());
3e005baf 979
3ea3c215 980 /* Register the packfile with core git's machinery. */
3e005baf
SP
981 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
982 if (!new_p)
983 die("core git rejected index %s", idx_name);
2369ed79 984 all_packs[pack_id] = new_p;
3e005baf 985 install_packed_git(new_p);
2369ed79
SP
986
987 /* Print the boundary */
bdf1c06d
SP
988 if (pack_edges) {
989 fprintf(pack_edges, "%s:", new_p->pack_name);
990 for (i = 0; i < branch_table_sz; i++) {
991 for (b = branch_table[i]; b; b = b->table_next_branch) {
992 if (b->pack_id == pack_id)
993 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
994 }
2369ed79 995 }
bdf1c06d
SP
996 for (t = first_tag; t; t = t->next_tag) {
997 if (t->pack_id == pack_id)
998 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
999 }
1000 fputc('\n', pack_edges);
1001 fflush(pack_edges);
2369ed79 1002 }
2369ed79
SP
1003
1004 pack_id++;
3e005baf 1005 }
87c8a56e 1006 else {
3c078b9c
JK
1007 close(pack_data->pack_fd);
1008 unlink_or_warn(pack_data->pack_name);
87c8a56e 1009 }
3c078b9c
JK
1010 free(pack_data);
1011 pack_data = NULL;
5e915f30 1012 running = 0;
7bfe6e26
SP
1013
1014 /* We can't carry a delta across packfiles. */
05576569 1015 strbuf_release(&last_blob.data);
7bfe6e26
SP
1016 last_blob.offset = 0;
1017 last_blob.depth = 0;
f70b6534
SP
1018}
1019
820b9310 1020static void cycle_packfile(void)
d9ee53ce
SP
1021{
1022 end_packfile();
1023 start_packfile();
1024}
1025
ac47a738
SP
1026static int store_object(
1027 enum object_type type,
eec813cf 1028 struct strbuf *dat,
6bb5b329 1029 struct last_object *last,
d8397168 1030 unsigned char *sha1out,
0ea9f045 1031 uintmax_t mark)
db5e523f 1032{
db5e523f 1033 void *out, *delta;
ac47a738
SP
1034 struct object_entry *e;
1035 unsigned char hdr[96];
1036 unsigned char sha1[20];
db5e523f 1037 unsigned long hdrlen, deltalen;
9126f009 1038 git_SHA_CTX c;
ef49a7a0 1039 git_zstream s;
ac47a738 1040
ef1286d3
JK
1041 hdrlen = xsnprintf((char *)hdr, sizeof(hdr), "%s %lu",
1042 typename(type), (unsigned long)dat->len) + 1;
9126f009
NP
1043 git_SHA1_Init(&c);
1044 git_SHA1_Update(&c, hdr, hdrlen);
1045 git_SHA1_Update(&c, dat->buf, dat->len);
1046 git_SHA1_Final(sha1, &c);
6bb5b329 1047 if (sha1out)
445b8599 1048 hashcpy(sha1out, sha1);
ac47a738
SP
1049
1050 e = insert_object(sha1);
d8397168
SP
1051 if (mark)
1052 insert_mark(mark, e);
3fc366bd 1053 if (e->idx.offset) {
6143f064 1054 duplicate_count_by_type[type]++;
463acbe1 1055 return 1;
a5c1780a
SP
1056 } else if (find_sha1_pack(sha1, packed_git)) {
1057 e->type = type;
1058 e->pack_id = MAX_PACK_ID;
3fc366bd 1059 e->idx.offset = 1; /* just not zero! */
a5c1780a
SP
1060 duplicate_count_by_type[type]++;
1061 return 1;
ac47a738 1062 }
db5e523f 1063
b500d5e1 1064 if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
94c3b482 1065 delta_count_attempts_by_type[type]++;
05576569 1066 delta = diff_delta(last->data.buf, last->data.len,
eec813cf 1067 dat->buf, dat->len,
b500d5e1 1068 &deltalen, dat->len - 20);
d9ee53ce
SP
1069 } else
1070 delta = NULL;
db5e523f 1071
55bb5c91 1072 git_deflate_init(&s, pack_compression_level);
d9ee53ce
SP
1073 if (delta) {
1074 s.next_in = delta;
1075 s.avail_in = deltalen;
1076 } else {
eec813cf
PH
1077 s.next_in = (void *)dat->buf;
1078 s.avail_in = dat->len;
d9ee53ce 1079 }
225a6f10 1080 s.avail_out = git_deflate_bound(&s, s.avail_in);
d9ee53ce 1081 s.next_out = out = xmalloc(s.avail_out);
55bb5c91
JH
1082 while (git_deflate(&s, Z_FINISH) == Z_OK)
1083 ; /* nothing */
1084 git_deflate_end(&s);
d9ee53ce
SP
1085
1086 /* Determine if we should auto-checkpoint. */
89e0a3a1 1087 if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
d9ee53ce
SP
1088 || (pack_size + 60 + s.total_out) < pack_size) {
1089
1090 /* This new object needs to *not* have the current pack_id. */
1091 e->pack_id = pack_id + 1;
820b9310 1092 cycle_packfile();
d9ee53ce
SP
1093
1094 /* We cannot carry a delta into the new pack. */
1095 if (delta) {
1096 free(delta);
1097 delta = NULL;
5d6f3ef6 1098
55bb5c91 1099 git_deflate_init(&s, pack_compression_level);
eec813cf
PH
1100 s.next_in = (void *)dat->buf;
1101 s.avail_in = dat->len;
225a6f10 1102 s.avail_out = git_deflate_bound(&s, s.avail_in);
5d6f3ef6 1103 s.next_out = out = xrealloc(out, s.avail_out);
55bb5c91
JH
1104 while (git_deflate(&s, Z_FINISH) == Z_OK)
1105 ; /* nothing */
1106 git_deflate_end(&s);
d9ee53ce 1107 }
d9ee53ce
SP
1108 }
1109
1110 e->type = type;
1111 e->pack_id = pack_id;
3fc366bd 1112 e->idx.offset = pack_size;
d9ee53ce
SP
1113 object_count++;
1114 object_count_by_type[type]++;
db5e523f 1115
427cb22c
NP
1116 crc32_begin(pack_file);
1117
db5e523f 1118 if (delta) {
89e0a3a1 1119 off_t ofs = e->idx.offset - last->offset;
d489bc14
SP
1120 unsigned pos = sizeof(hdr) - 1;
1121
4cabf858 1122 delta_count_by_type[type]++;
436e7a74 1123 e->depth = last->depth + 1;
d489bc14 1124
1b22b6c8 1125 hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
21281816 1126 sha1write(pack_file, hdr, hdrlen);
d489bc14
SP
1127 pack_size += hdrlen;
1128
1129 hdr[pos] = ofs & 127;
1130 while (ofs >>= 7)
1131 hdr[--pos] = 128 | (--ofs & 127);
21281816 1132 sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
d489bc14 1133 pack_size += sizeof(hdr) - pos;
db5e523f 1134 } else {
436e7a74 1135 e->depth = 0;
1b22b6c8 1136 hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
21281816 1137 sha1write(pack_file, hdr, hdrlen);
41e5257f 1138 pack_size += hdrlen;
db5e523f
SP
1139 }
1140
21281816 1141 sha1write(pack_file, out, s.total_out);
41e5257f 1142 pack_size += s.total_out;
db5e523f 1143
427cb22c
NP
1144 e->idx.crc32 = crc32_end(pack_file);
1145
db5e523f 1146 free(out);
e7d06a4b 1147 free(delta);
463acbe1 1148 if (last) {
05576569
PH
1149 if (last->no_swap) {
1150 last->data = *dat;
1151 } else {
c76689df 1152 strbuf_swap(&last->data, dat);
05576569 1153 }
3fc366bd 1154 last->offset = e->idx.offset;
436e7a74 1155 last->depth = e->depth;
463acbe1
SP
1156 }
1157 return 0;
1158}
1159
6c526148 1160static void truncate_pack(struct sha1file_checkpoint *checkpoint)
5eef828b 1161{
6c526148 1162 if (sha1file_truncate(pack_file, checkpoint))
5eef828b 1163 die_errno("cannot truncate pack to skip duplicate");
6c526148 1164 pack_size = checkpoint->offset;
5eef828b
SP
1165}
1166
1167static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1168{
1169 size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1170 unsigned char *in_buf = xmalloc(in_sz);
1171 unsigned char *out_buf = xmalloc(out_sz);
1172 struct object_entry *e;
1173 unsigned char sha1[20];
1174 unsigned long hdrlen;
1175 off_t offset;
1176 git_SHA_CTX c;
ef49a7a0 1177 git_zstream s;
6c526148 1178 struct sha1file_checkpoint checkpoint;
5eef828b
SP
1179 int status = Z_OK;
1180
1181 /* Determine if we should auto-checkpoint. */
89e0a3a1 1182 if ((max_packsize && (pack_size + 60 + len) > max_packsize)
5eef828b
SP
1183 || (pack_size + 60 + len) < pack_size)
1184 cycle_packfile();
1185
6c526148
JH
1186 sha1file_checkpoint(pack_file, &checkpoint);
1187 offset = checkpoint.offset;
21281816 1188
5eef828b
SP
1189 hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1190 if (out_sz <= hdrlen)
1191 die("impossibly large object header");
1192
1193 git_SHA1_Init(&c);
1194 git_SHA1_Update(&c, out_buf, hdrlen);
1195
427cb22c
NP
1196 crc32_begin(pack_file);
1197
55bb5c91 1198 git_deflate_init(&s, pack_compression_level);
5eef828b 1199
1b22b6c8 1200 hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
5eef828b
SP
1201 if (out_sz <= hdrlen)
1202 die("impossibly large object header");
1203
1204 s.next_out = out_buf + hdrlen;
1205 s.avail_out = out_sz - hdrlen;
1206
1207 while (status != Z_STREAM_END) {
1208 if (0 < len && !s.avail_in) {
1209 size_t cnt = in_sz < len ? in_sz : (size_t)len;
1210 size_t n = fread(in_buf, 1, cnt, stdin);
1211 if (!n && feof(stdin))
1212 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1213
1214 git_SHA1_Update(&c, in_buf, n);
1215 s.next_in = in_buf;
1216 s.avail_in = n;
1217 len -= n;
1218 }
1219
55bb5c91 1220 status = git_deflate(&s, len ? 0 : Z_FINISH);
5eef828b
SP
1221
1222 if (!s.avail_out || status == Z_STREAM_END) {
1223 size_t n = s.next_out - out_buf;
21281816 1224 sha1write(pack_file, out_buf, n);
5eef828b
SP
1225 pack_size += n;
1226 s.next_out = out_buf;
1227 s.avail_out = out_sz;
1228 }
1229
1230 switch (status) {
1231 case Z_OK:
1232 case Z_BUF_ERROR:
1233 case Z_STREAM_END:
1234 continue;
1235 default:
1236 die("unexpected deflate failure: %d", status);
1237 }
1238 }
55bb5c91 1239 git_deflate_end(&s);
5eef828b
SP
1240 git_SHA1_Final(sha1, &c);
1241
1242 if (sha1out)
1243 hashcpy(sha1out, sha1);
1244
1245 e = insert_object(sha1);
1246
1247 if (mark)
1248 insert_mark(mark, e);
1249
3fc366bd 1250 if (e->idx.offset) {
5eef828b 1251 duplicate_count_by_type[OBJ_BLOB]++;
6c526148 1252 truncate_pack(&checkpoint);
5eef828b
SP
1253
1254 } else if (find_sha1_pack(sha1, packed_git)) {
1255 e->type = OBJ_BLOB;
1256 e->pack_id = MAX_PACK_ID;
3fc366bd 1257 e->idx.offset = 1; /* just not zero! */
5eef828b 1258 duplicate_count_by_type[OBJ_BLOB]++;
6c526148 1259 truncate_pack(&checkpoint);
5eef828b
SP
1260
1261 } else {
1262 e->depth = 0;
1263 e->type = OBJ_BLOB;
1264 e->pack_id = pack_id;
3fc366bd 1265 e->idx.offset = offset;
427cb22c 1266 e->idx.crc32 = crc32_end(pack_file);
5eef828b
SP
1267 object_count++;
1268 object_count_by_type[OBJ_BLOB]++;
1269 }
1270
1271 free(in_buf);
1272 free(out_buf);
1273}
1274
7422bac4
SP
1275/* All calls must be guarded by find_object() or find_mark() to
1276 * ensure the 'struct object_entry' passed was written by this
1277 * process instance. We unpack the entry by the offset, avoiding
1278 * the need for the corresponding .idx file. This unpacking rule
1279 * works because we only use OBJ_REF_DELTA within the packfiles
1280 * created by fast-import.
1281 *
1282 * oe must not be NULL. Such an oe usually comes from giving
1283 * an unknown SHA-1 to find_object() or an undefined mark to
1284 * find_mark(). Callers must test for this condition and use
1285 * the standard read_sha1_file() when it happens.
1286 *
1287 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1288 * find_mark(), where the mark was reloaded from an existing marks
1289 * file and is referencing an object that this fast-import process
1290 * instance did not write out to a packfile. Callers must test for
1291 * this condition and use read_sha1_file() instead.
1292 */
7bfe6e26
SP
1293static void *gfi_unpack_entry(
1294 struct object_entry *oe,
1295 unsigned long *sizep)
41e5257f 1296{
21666f1a 1297 enum object_type type;
7bfe6e26 1298 struct packed_git *p = all_packs[oe->pack_id];
c9ced051 1299 if (p == pack_data && p->pack_size < (pack_size + 20)) {
7422bac4
SP
1300 /* The object is stored in the packfile we are writing to
1301 * and we have modified it since the last time we scanned
1302 * back to read a previously written object. If an old
1303 * window covered [p->pack_size, p->pack_size + 20) its
1304 * data is stale and is not valid. Closing all windows
1305 * and updating the packfile length ensures we can read
1306 * the newly written data.
1307 */
c9ced051 1308 close_pack_windows(p);
21281816 1309 sha1flush(pack_file);
7422bac4
SP
1310
1311 /* We have to offer 20 bytes additional on the end of
1312 * the packfile as the core unpacker code assumes the
1313 * footer is present at the file end and must promise
1314 * at least 20 bytes within any window it maps. But
1315 * we don't actually create the footer here.
1316 */
7bfe6e26 1317 p->pack_size = pack_size + 20;
c9ced051 1318 }
3fc366bd 1319 return unpack_entry(p, oe->idx.offset, &type, sizep);
41e5257f
SP
1320}
1321
10831c55 1322static const char *get_mode(const char *str, uint16_t *modep)
463acbe1
SP
1323{
1324 unsigned char c;
10831c55 1325 uint16_t mode = 0;
463acbe1
SP
1326
1327 while ((c = *str++) != ' ') {
1328 if (c < '0' || c > '7')
1329 return NULL;
1330 mode = (mode << 3) + (c - '0');
1331 }
1332 *modep = mode;
1333 return str;
1334}
1335
1336static void load_tree(struct tree_entry *root)
1337{
4b25d091 1338 unsigned char *sha1 = root->versions[1].sha1;
463acbe1
SP
1339 struct object_entry *myoe;
1340 struct tree_content *t;
1341 unsigned long size;
1342 char *buf;
1343 const char *c;
463acbe1
SP
1344
1345 root->tree = t = new_tree_content(8);
4cabf858 1346 if (is_null_sha1(sha1))
463acbe1
SP
1347 return;
1348
4cabf858 1349 myoe = find_object(sha1);
20f546a8 1350 if (myoe && myoe->pack_id != MAX_PACK_ID) {
41e5257f 1351 if (myoe->type != OBJ_TREE)
4cabf858 1352 die("Not a tree: %s", sha1_to_hex(sha1));
436e7a74 1353 t->delta_depth = myoe->depth;
7bfe6e26 1354 buf = gfi_unpack_entry(myoe, &size);
e8b32e06
SP
1355 if (!buf)
1356 die("Can't load tree %s", sha1_to_hex(sha1));
463acbe1 1357 } else {
21666f1a
NP
1358 enum object_type type;
1359 buf = read_sha1_file(sha1, &type, &size);
1360 if (!buf || type != OBJ_TREE)
4cabf858 1361 die("Can't load tree %s", sha1_to_hex(sha1));
463acbe1
SP
1362 }
1363
1364 c = buf;
1365 while (c != (buf + size)) {
1366 struct tree_entry *e = new_tree_entry();
1367
1368 if (t->entry_count == t->entry_capacity)
f022f85f 1369 root->tree = t = grow_tree_content(t, t->entry_count);
463acbe1
SP
1370 t->entries[t->entry_count++] = e;
1371
1372 e->tree = NULL;
4cabf858 1373 c = get_mode(c, &e->versions[1].mode);
463acbe1 1374 if (!c)
4cabf858
SP
1375 die("Corrupt mode in %s", sha1_to_hex(sha1));
1376 e->versions[0].mode = e->versions[1].mode;
061e35c5 1377 e->name = to_atom(c, strlen(c));
463acbe1 1378 c += e->name->str_len + 1;
4b25d091
FC
1379 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1380 hashcpy(e->versions[1].sha1, (unsigned char *)c);
463acbe1
SP
1381 c += 20;
1382 }
1383 free(buf);
1384}
1385
4cabf858 1386static int tecmp0 (const void *_a, const void *_b)
463acbe1
SP
1387{
1388 struct tree_entry *a = *((struct tree_entry**)_a);
1389 struct tree_entry *b = *((struct tree_entry**)_b);
1390 return base_name_compare(
4cabf858
SP
1391 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1392 b->name->str_dat, b->name->str_len, b->versions[0].mode);
463acbe1
SP
1393}
1394
4cabf858 1395static int tecmp1 (const void *_a, const void *_b)
463acbe1 1396{
4cabf858
SP
1397 struct tree_entry *a = *((struct tree_entry**)_a);
1398 struct tree_entry *b = *((struct tree_entry**)_b);
1399 return base_name_compare(
1400 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1401 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1402}
1403
eec813cf 1404static void mktree(struct tree_content *t, int v, struct strbuf *b)
4cabf858
SP
1405{
1406 size_t maxlen = 0;
463acbe1 1407 unsigned int i;
463acbe1 1408
4cabf858
SP
1409 if (!v)
1410 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1411 else
1412 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
463acbe1 1413
463acbe1 1414 for (i = 0; i < t->entry_count; i++) {
4cabf858
SP
1415 if (t->entries[i]->versions[v].mode)
1416 maxlen += t->entries[i]->name->str_len + 34;
463acbe1
SP
1417 }
1418
eec813cf
PH
1419 strbuf_reset(b);
1420 strbuf_grow(b, maxlen);
463acbe1
SP
1421 for (i = 0; i < t->entry_count; i++) {
1422 struct tree_entry *e = t->entries[i];
4cabf858
SP
1423 if (!e->versions[v].mode)
1424 continue;
8fb3ad76
DI
1425 strbuf_addf(b, "%o %s%c",
1426 (unsigned int)(e->versions[v].mode & ~NO_DELTA),
1427 e->name->str_dat, '\0');
eec813cf 1428 strbuf_add(b, e->versions[v].sha1, 20);
463acbe1 1429 }
4cabf858
SP
1430}
1431
1432static void store_tree(struct tree_entry *root)
1433{
2668d692 1434 struct tree_content *t;
4cabf858 1435 unsigned int i, j, del;
05576569 1436 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
8fb3ad76 1437 struct object_entry *le = NULL;
4cabf858
SP
1438
1439 if (!is_null_sha1(root->versions[1].sha1))
1440 return;
1441
2668d692
MB
1442 if (!root->tree)
1443 load_tree(root);
1444 t = root->tree;
1445
4cabf858
SP
1446 for (i = 0; i < t->entry_count; i++) {
1447 if (t->entries[i]->tree)
1448 store_tree(t->entries[i]);
1449 }
1450
8fb3ad76
DI
1451 if (!(root->versions[0].mode & NO_DELTA))
1452 le = find_object(root->versions[0].sha1);
05576569 1453 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
eec813cf 1454 mktree(t, 0, &old_tree);
05576569 1455 lo.data = old_tree;
3fc366bd 1456 lo.offset = le->idx.offset;
4cabf858 1457 lo.depth = t->delta_depth;
4cabf858 1458 }
4cabf858 1459
eec813cf
PH
1460 mktree(t, 1, &new_tree);
1461 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
4cabf858
SP
1462
1463 t->delta_depth = lo.depth;
4cabf858
SP
1464 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1465 struct tree_entry *e = t->entries[i];
1466 if (e->versions[1].mode) {
1467 e->versions[0].mode = e->versions[1].mode;
1468 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1469 t->entries[j++] = e;
1470 } else {
1471 release_tree_entry(e);
1472 del++;
1473 }
1474 }
1475 t->entry_count -= del;
463acbe1
SP
1476}
1477
34215783
JN
1478static void tree_content_replace(
1479 struct tree_entry *root,
1480 const unsigned char *sha1,
1481 const uint16_t mode,
1482 struct tree_content *newtree)
1483{
1484 if (!S_ISDIR(mode))
1485 die("Root cannot be a non-directory");
8fb3ad76 1486 hashclr(root->versions[0].sha1);
34215783
JN
1487 hashcpy(root->versions[1].sha1, sha1);
1488 if (root->tree)
1489 release_tree_content_recursive(root->tree);
1490 root->tree = newtree;
1491}
1492
463acbe1
SP
1493static int tree_content_set(
1494 struct tree_entry *root,
1495 const char *p,
1496 const unsigned char *sha1,
f39a946a
SP
1497 const uint16_t mode,
1498 struct tree_content *subtree)
463acbe1 1499{
5edde510 1500 struct tree_content *t;
463acbe1
SP
1501 const char *slash1;
1502 unsigned int i, n;
1503 struct tree_entry *e;
1504
2c5495f7
RM
1505 slash1 = strchrnul(p, '/');
1506 n = slash1 - p;
475d1b33
SP
1507 if (!n)
1508 die("Empty path component found in input");
2c5495f7 1509 if (!*slash1 && !S_ISDIR(mode) && subtree)
f39a946a 1510 die("Non-directories cannot have subtrees");
463acbe1 1511
5edde510
JN
1512 if (!root->tree)
1513 load_tree(root);
1514 t = root->tree;
463acbe1
SP
1515 for (i = 0; i < t->entry_count; i++) {
1516 e = t->entries[i];
50906e04 1517 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
2c5495f7 1518 if (!*slash1) {
f39a946a
SP
1519 if (!S_ISDIR(mode)
1520 && e->versions[1].mode == mode
4cabf858 1521 && !hashcmp(e->versions[1].sha1, sha1))
463acbe1 1522 return 0;
4cabf858
SP
1523 e->versions[1].mode = mode;
1524 hashcpy(e->versions[1].sha1, sha1);
f39a946a 1525 if (e->tree)
afde8dd9 1526 release_tree_content_recursive(e->tree);
f39a946a 1527 e->tree = subtree;
8fb3ad76
DI
1528
1529 /*
1530 * We need to leave e->versions[0].sha1 alone
1531 * to avoid modifying the preimage tree used
1532 * when writing out the parent directory.
1533 * But after replacing the subdir with a
1534 * completely different one, it's not a good
1535 * delta base any more, and besides, we've
1536 * thrown away the tree entries needed to
1537 * make a delta against it.
1538 *
1539 * So let's just explicitly disable deltas
1540 * for the subtree.
1541 */
1542 if (S_ISDIR(e->versions[0].mode))
1543 e->versions[0].mode |= NO_DELTA;
1544
4cabf858 1545 hashclr(root->versions[1].sha1);
463acbe1
SP
1546 return 1;
1547 }
4cabf858 1548 if (!S_ISDIR(e->versions[1].mode)) {
463acbe1 1549 e->tree = new_tree_content(8);
4cabf858 1550 e->versions[1].mode = S_IFDIR;
463acbe1
SP
1551 }
1552 if (!e->tree)
1553 load_tree(e);
f39a946a 1554 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
4cabf858 1555 hashclr(root->versions[1].sha1);
463acbe1
SP
1556 return 1;
1557 }
1558 return 0;
1559 }
1560 }
1561
1562 if (t->entry_count == t->entry_capacity)
f022f85f 1563 root->tree = t = grow_tree_content(t, t->entry_count);
463acbe1 1564 e = new_tree_entry();
061e35c5 1565 e->name = to_atom(p, n);
4cabf858
SP
1566 e->versions[0].mode = 0;
1567 hashclr(e->versions[0].sha1);
463acbe1 1568 t->entries[t->entry_count++] = e;
2c5495f7 1569 if (*slash1) {
463acbe1 1570 e->tree = new_tree_content(8);
4cabf858 1571 e->versions[1].mode = S_IFDIR;
f39a946a 1572 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
463acbe1 1573 } else {
f39a946a 1574 e->tree = subtree;
4cabf858
SP
1575 e->versions[1].mode = mode;
1576 hashcpy(e->versions[1].sha1, sha1);
463acbe1 1577 }
4cabf858 1578 hashclr(root->versions[1].sha1);
463acbe1
SP
1579 return 1;
1580}
1581
f39a946a
SP
1582static int tree_content_remove(
1583 struct tree_entry *root,
1584 const char *p,
62bfa11c
JK
1585 struct tree_entry *backup_leaf,
1586 int allow_root)
463acbe1 1587{
5edde510 1588 struct tree_content *t;
463acbe1
SP
1589 const char *slash1;
1590 unsigned int i, n;
1591 struct tree_entry *e;
1592
2c5495f7
RM
1593 slash1 = strchrnul(p, '/');
1594 n = slash1 - p;
463acbe1 1595
5edde510
JN
1596 if (!root->tree)
1597 load_tree(root);
62bfa11c
JK
1598
1599 if (!*p && allow_root) {
1600 e = root;
1601 goto del_entry;
1602 }
1603
5edde510 1604 t = root->tree;
463acbe1
SP
1605 for (i = 0; i < t->entry_count; i++) {
1606 e = t->entries[i];
50906e04 1607 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
2c5495f7 1608 if (*slash1 && !S_ISDIR(e->versions[1].mode))
253fb5f8
EN
1609 /*
1610 * If p names a file in some subdirectory, and a
1611 * file or symlink matching the name of the
1612 * parent directory of p exists, then p cannot
1613 * exist and need not be deleted.
1614 */
1615 return 1;
2c5495f7 1616 if (!*slash1 || !S_ISDIR(e->versions[1].mode))
463acbe1
SP
1617 goto del_entry;
1618 if (!e->tree)
1619 load_tree(e);
62bfa11c 1620 if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) {
b54d6422
SP
1621 for (n = 0; n < e->tree->entry_count; n++) {
1622 if (e->tree->entries[n]->versions[1].mode) {
1623 hashclr(root->versions[1].sha1);
1624 return 1;
1625 }
1626 }
f39a946a 1627 backup_leaf = NULL;
b54d6422 1628 goto del_entry;
463acbe1
SP
1629 }
1630 return 0;
1631 }
1632 }
1633 return 0;
1634
1635del_entry:
f39a946a
SP
1636 if (backup_leaf)
1637 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1638 else if (e->tree)
4cabf858 1639 release_tree_content_recursive(e->tree);
f39a946a 1640 e->tree = NULL;
4cabf858
SP
1641 e->versions[1].mode = 0;
1642 hashclr(e->versions[1].sha1);
1643 hashclr(root->versions[1].sha1);
ac47a738 1644 return 1;
db5e523f
SP
1645}
1646
b6f3481b
SP
1647static int tree_content_get(
1648 struct tree_entry *root,
1649 const char *p,
e0eb6b97
JK
1650 struct tree_entry *leaf,
1651 int allow_root)
b6f3481b 1652{
5edde510 1653 struct tree_content *t;
b6f3481b
SP
1654 const char *slash1;
1655 unsigned int i, n;
1656 struct tree_entry *e;
1657
2c5495f7
RM
1658 slash1 = strchrnul(p, '/');
1659 n = slash1 - p;
e0eb6b97 1660 if (!n && !allow_root)
178e1dea 1661 die("Empty path component found in input");
b6f3481b 1662
5edde510
JN
1663 if (!root->tree)
1664 load_tree(root);
e0eb6b97
JK
1665
1666 if (!n) {
1667 e = root;
1668 goto found_entry;
1669 }
1670
5edde510 1671 t = root->tree;
b6f3481b
SP
1672 for (i = 0; i < t->entry_count; i++) {
1673 e = t->entries[i];
50906e04 1674 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
2c5495f7 1675 if (!*slash1)
e0eb6b97 1676 goto found_entry;
b6f3481b
SP
1677 if (!S_ISDIR(e->versions[1].mode))
1678 return 0;
1679 if (!e->tree)
1680 load_tree(e);
e0eb6b97 1681 return tree_content_get(e, slash1 + 1, leaf, 0);
b6f3481b
SP
1682 }
1683 }
1684 return 0;
e0eb6b97
JK
1685
1686found_entry:
1687 memcpy(leaf, e, sizeof(*leaf));
1688 if (e->tree && is_null_sha1(e->versions[1].sha1))
1689 leaf->tree = dup_tree_content(e->tree);
1690 else
1691 leaf->tree = NULL;
1692 return 1;
b6f3481b
SP
1693}
1694
7073e69e 1695static int update_branch(struct branch *b)
463acbe1
SP
1696{
1697 static const char *msg = "fast-import";
de7e86f5 1698 struct ref_transaction *transaction;
7073e69e 1699 unsigned char old_sha1[20];
de7e86f5 1700 struct strbuf err = STRBUF_INIT;
7073e69e 1701
4ee1b225
FC
1702 if (is_null_sha1(b->sha1)) {
1703 if (b->delete)
a1c9eb91 1704 delete_ref(b->name, NULL, 0);
4ee1b225
FC
1705 return 0;
1706 }
a1c9eb91
MH
1707 if (read_ref(b->name, old_sha1))
1708 hashclr(old_sha1);
7073e69e
SP
1709 if (!force_update && !is_null_sha1(old_sha1)) {
1710 struct commit *old_cmit, *new_cmit;
1711
1712 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1713 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
de7e86f5 1714 if (!old_cmit || !new_cmit)
7073e69e 1715 return error("Branch %s is missing commits.", b->name);
7073e69e 1716
a20efee9 1717 if (!in_merge_bases(old_cmit, new_cmit)) {
46efd2d9 1718 warning("Not updating %s"
7073e69e
SP
1719 " (new tip %s does not contain %s)",
1720 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1721 return -1;
1722 }
1723 }
de7e86f5
RS
1724 transaction = ref_transaction_begin(&err);
1725 if (!transaction ||
1726 ref_transaction_update(transaction, b->name, b->sha1, old_sha1,
1d147bdf 1727 0, msg, &err) ||
db7516ab 1728 ref_transaction_commit(transaction, &err)) {
de7e86f5
RS
1729 ref_transaction_free(transaction);
1730 error("%s", err.buf);
1731 strbuf_release(&err);
1732 return -1;
1733 }
1734 ref_transaction_free(transaction);
1735 strbuf_release(&err);
7073e69e
SP
1736 return 0;
1737}
1738
1739static void dump_branches(void)
1740{
463acbe1
SP
1741 unsigned int i;
1742 struct branch *b;
463acbe1
SP
1743
1744 for (i = 0; i < branch_table_sz; i++) {
7073e69e
SP
1745 for (b = branch_table[i]; b; b = b->table_next_branch)
1746 failure |= update_branch(b);
463acbe1
SP
1747 }
1748}
1749
fd99224e 1750static void dump_tags(void)
72303d44
SP
1751{
1752 static const char *msg = "fast-import";
1753 struct tag *t;
3f09ba75
RS
1754 struct strbuf ref_name = STRBUF_INIT;
1755 struct strbuf err = STRBUF_INIT;
1756 struct ref_transaction *transaction;
72303d44 1757
3f09ba75
RS
1758 transaction = ref_transaction_begin(&err);
1759 if (!transaction) {
1760 failure |= error("%s", err.buf);
1761 goto cleanup;
1762 }
72303d44 1763 for (t = first_tag; t; t = t->next_tag) {
3f09ba75
RS
1764 strbuf_reset(&ref_name);
1765 strbuf_addf(&ref_name, "refs/tags/%s", t->name);
1766
1d147bdf
MH
1767 if (ref_transaction_update(transaction, ref_name.buf,
1768 t->sha1, NULL, 0, msg, &err)) {
3f09ba75
RS
1769 failure |= error("%s", err.buf);
1770 goto cleanup;
1771 }
72303d44 1772 }
db7516ab 1773 if (ref_transaction_commit(transaction, &err))
3f09ba75
RS
1774 failure |= error("%s", err.buf);
1775
1776 cleanup:
1777 ref_transaction_free(transaction);
1778 strbuf_release(&ref_name);
1779 strbuf_release(&err);
72303d44
SP
1780}
1781
a6a1a831 1782static void dump_marks_helper(FILE *f,
0ea9f045 1783 uintmax_t base,
a6a1a831
SP
1784 struct mark_set *m)
1785{
0ea9f045 1786 uintmax_t k;
a6a1a831
SP
1787 if (m->shift) {
1788 for (k = 0; k < 1024; k++) {
1789 if (m->data.sets[k])
7e7db5e4 1790 dump_marks_helper(f, base + (k << m->shift),
a6a1a831
SP
1791 m->data.sets[k]);
1792 }
1793 } else {
1794 for (k = 0; k < 1024; k++) {
1795 if (m->data.marked[k])
3efb1f34 1796 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
3fc366bd 1797 sha1_to_hex(m->data.marked[k]->idx.sha1));
a6a1a831
SP
1798 }
1799 }
1800}
1801
fd99224e 1802static void dump_marks(void)
a6a1a831 1803{
60b9004c 1804 static struct lock_file mark_lock;
60b9004c
SP
1805 FILE *f;
1806
07cd9328 1807 if (!export_marks_file)
60b9004c
SP
1808 return;
1809
f70f0565 1810 if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
60b9004c 1811 failure |= error("Unable to write marks file %s: %s",
07cd9328 1812 export_marks_file, strerror(errno));
60b9004c 1813 return;
a6a1a831 1814 }
60b9004c 1815
f70f0565 1816 f = fdopen_lock_file(&mark_lock, "w");
60b9004c 1817 if (!f) {
5a7b1b57 1818 int saved_errno = errno;
60b9004c
SP
1819 rollback_lock_file(&mark_lock);
1820 failure |= error("Unable to write marks file %s: %s",
07cd9328 1821 export_marks_file, strerror(saved_errno));
60b9004c 1822 return;
a6a1a831 1823 }
60b9004c 1824
fb54abd6 1825 dump_marks_helper(f, 0, marks);
fb54abd6 1826 if (commit_lock_file(&mark_lock)) {
08a3651f 1827 failure |= error("Unable to write file %s: %s",
32c3ec25 1828 export_marks_file, strerror(errno));
fb54abd6
BC
1829 return;
1830 }
a6a1a831
SP
1831}
1832
07cd9328
SR
1833static void read_marks(void)
1834{
1835 char line[512];
1836 FILE *f = fopen(import_marks_file, "r");
dded4f12
RR
1837 if (f)
1838 ;
1839 else if (import_marks_file_ignore_missing && errno == ENOENT)
1840 return; /* Marks file does not exist */
1841 else
07cd9328
SR
1842 die_errno("cannot read '%s'", import_marks_file);
1843 while (fgets(line, sizeof(line), f)) {
1844 uintmax_t mark;
1845 char *end;
1846 unsigned char sha1[20];
1847 struct object_entry *e;
1848
1849 end = strchr(line, '\n');
1850 if (line[0] != ':' || !end)
1851 die("corrupt mark line: %s", line);
1852 *end = 0;
1853 mark = strtoumax(line + 1, &end, 10);
1854 if (!mark || end == line + 1
45c5d4a5 1855 || *end != ' ' || get_sha1_hex(end + 1, sha1))
07cd9328
SR
1856 die("corrupt mark line: %s", line);
1857 e = find_object(sha1);
1858 if (!e) {
1859 enum object_type type = sha1_object_info(sha1, NULL);
1860 if (type < 0)
1861 die("object not found: %s", sha1_to_hex(sha1));
1862 e = insert_object(sha1);
1863 e->type = type;
1864 e->pack_id = MAX_PACK_ID;
3fc366bd 1865 e->idx.offset = 1; /* just not zero! */
07cd9328
SR
1866 }
1867 insert_mark(mark, e);
1868 }
1869 fclose(f);
1870}
1871
1872
e6c019d0 1873static int read_next_command(void)
c44cdc7e 1874{
e6c019d0
PH
1875 static int stdin_eof = 0;
1876
1877 if (stdin_eof) {
1878 unread_command_buf = 0;
1879 return EOF;
1880 }
1881
777f80d7 1882 for (;;) {
97313bef
JK
1883 const char *p;
1884
904b1941 1885 if (unread_command_buf) {
1fdb649c 1886 unread_command_buf = 0;
904b1941
SP
1887 } else {
1888 struct recent_command *rc;
1889
b315c5c0 1890 strbuf_detach(&command_buf, NULL);
8f309aeb 1891 stdin_eof = strbuf_getline_lf(&command_buf, stdin);
e6c019d0
PH
1892 if (stdin_eof)
1893 return EOF;
904b1941 1894
f963bd5d 1895 if (!seen_data_command
59556548
CC
1896 && !starts_with(command_buf.buf, "feature ")
1897 && !starts_with(command_buf.buf, "option ")) {
9c8398f0 1898 parse_argv();
f963bd5d
SR
1899 }
1900
904b1941
SP
1901 rc = rc_free;
1902 if (rc)
1903 rc_free = rc->next;
1904 else {
1905 rc = cmd_hist.next;
1906 cmd_hist.next = rc->next;
1907 cmd_hist.next->prev = &cmd_hist;
1908 free(rc->buf);
1909 }
1910
1911 rc->buf = command_buf.buf;
1912 rc->prev = cmd_tail;
1913 rc->next = cmd_hist.prev;
1914 rc->prev->next = rc;
1915 cmd_tail = rc;
1916 }
28c7b1f7
MH
1917 if (skip_prefix(command_buf.buf, "get-mark ", &p)) {
1918 parse_get_mark(p);
1919 continue;
1920 }
97313bef
JK
1921 if (skip_prefix(command_buf.buf, "cat-blob ", &p)) {
1922 parse_cat_blob(p);
777f80d7
JN
1923 continue;
1924 }
1925 if (command_buf.buf[0] == '#')
1926 continue;
1927 return 0;
1928 }
c44cdc7e
SP
1929}
1930
7e5dcea8 1931static void skip_optional_lf(void)
2c570cde
SP
1932{
1933 int term_char = fgetc(stdin);
1934 if (term_char != '\n' && term_char != EOF)
1935 ungetc(term_char, stdin);
1936}
1937
b3031781 1938static void parse_mark(void)
c44cdc7e 1939{
ae021d87
JK
1940 const char *v;
1941 if (skip_prefix(command_buf.buf, "mark :", &v)) {
1942 next_mark = strtoumax(v, NULL, 10);
c44cdc7e
SP
1943 read_next_command();
1944 }
1945 else
d8397168 1946 next_mark = 0;
c44cdc7e
SP
1947}
1948
5eef828b 1949static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
c44cdc7e 1950{
ae021d87 1951 const char *data;
eec813cf 1952 strbuf_reset(sb);
c44cdc7e 1953
ae021d87 1954 if (!skip_prefix(command_buf.buf, "data ", &data))
c44cdc7e
SP
1955 die("Expected 'data n' command, found: %s", command_buf.buf);
1956
ae021d87
JK
1957 if (skip_prefix(data, "<<", &data)) {
1958 char *term = xstrdup(data);
1959 size_t term_len = command_buf.len - (data - command_buf.buf);
4a241d79 1960
c2e6b6d0 1961 strbuf_detach(&command_buf, NULL);
3b4dce02 1962 for (;;) {
8f309aeb 1963 if (strbuf_getline_lf(&command_buf, stdin) == EOF)
3b4dce02
SP
1964 die("EOF in data (terminator '%s' not found)", term);
1965 if (term_len == command_buf.len
1966 && !strcmp(term, command_buf.buf))
1967 break;
eec813cf
PH
1968 strbuf_addbuf(sb, &command_buf);
1969 strbuf_addch(sb, '\n');
3b4dce02
SP
1970 }
1971 free(term);
1972 }
1973 else {
ae021d87 1974 uintmax_t len = strtoumax(data, NULL, 10);
5eef828b 1975 size_t n = 0, length = (size_t)len;
4a241d79 1976
5eef828b
SP
1977 if (limit && limit < len) {
1978 *len_res = len;
1979 return 0;
1980 }
1981 if (length < len)
1982 die("data is too large to use in this context");
4a241d79 1983
3b4dce02 1984 while (n < length) {
eec813cf 1985 size_t s = strbuf_fread(sb, length - n, stdin);
3b4dce02 1986 if (!s && feof(stdin))
40db58b8
JS
1987 die("EOF in data (%lu bytes remaining)",
1988 (unsigned long)(length - n));
3b4dce02
SP
1989 n += s;
1990 }
c44cdc7e
SP
1991 }
1992
2c570cde 1993 skip_optional_lf();
5eef828b 1994 return 1;
c44cdc7e
SP
1995}
1996
c33ddc2e 1997static int validate_raw_date(const char *src, struct strbuf *result)
63e0c8b3
SP
1998{
1999 const char *orig_src = src;
eb3a9dd3 2000 char *endp;
1cd749cc 2001 unsigned long num;
63e0c8b3 2002
c55fae43
RS
2003 errno = 0;
2004
1cd749cc
JH
2005 num = strtoul(src, &endp, 10);
2006 /* NEEDSWORK: perhaps check for reasonable values? */
c55fae43 2007 if (errno || endp == src || *endp != ' ')
63e0c8b3
SP
2008 return -1;
2009
2010 src = endp + 1;
2011 if (*src != '-' && *src != '+')
2012 return -1;
63e0c8b3 2013
1cd749cc 2014 num = strtoul(src + 1, &endp, 10);
c33ddc2e 2015 if (errno || endp == src + 1 || *endp || 1400 < num)
63e0c8b3
SP
2016 return -1;
2017
c33ddc2e 2018 strbuf_addstr(result, orig_src);
63e0c8b3
SP
2019 return 0;
2020}
2021
2022static char *parse_ident(const char *buf)
2023{
4b4963c0 2024 const char *ltgt;
63e0c8b3 2025 size_t name_len;
c33ddc2e 2026 struct strbuf ident = STRBUF_INIT;
63e0c8b3 2027
17fb0072
DI
2028 /* ensure there is a space delimiter even if there is no name */
2029 if (*buf == '<')
2030 --buf;
2031
4b4963c0
DI
2032 ltgt = buf + strcspn(buf, "<>");
2033 if (*ltgt != '<')
2034 die("Missing < in ident string: %s", buf);
2035 if (ltgt != buf && ltgt[-1] != ' ')
2036 die("Missing space before < in ident string: %s", buf);
2037 ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>");
2038 if (*ltgt != '>')
63e0c8b3 2039 die("Missing > in ident string: %s", buf);
4b4963c0
DI
2040 ltgt++;
2041 if (*ltgt != ' ')
63e0c8b3 2042 die("Missing space after > in ident string: %s", buf);
4b4963c0
DI
2043 ltgt++;
2044 name_len = ltgt - buf;
c33ddc2e 2045 strbuf_add(&ident, buf, name_len);
63e0c8b3
SP
2046
2047 switch (whenspec) {
2048 case WHENSPEC_RAW:
c33ddc2e 2049 if (validate_raw_date(ltgt, &ident) < 0)
4b4963c0 2050 die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
63e0c8b3
SP
2051 break;
2052 case WHENSPEC_RFC2822:
c33ddc2e 2053 if (parse_date(ltgt, &ident) < 0)
4b4963c0 2054 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf);
63e0c8b3
SP
2055 break;
2056 case WHENSPEC_NOW:
4b4963c0 2057 if (strcmp("now", ltgt))
63e0c8b3 2058 die("Date in ident must be 'now': %s", buf);
c33ddc2e 2059 datestamp(&ident);
63e0c8b3
SP
2060 break;
2061 }
2062
c33ddc2e 2063 return strbuf_detach(&ident, NULL);
63e0c8b3
SP
2064}
2065
5eef828b
SP
2066static void parse_and_store_blob(
2067 struct last_object *last,
2068 unsigned char *sha1out,
2069 uintmax_t mark)
6143f064 2070{
05576569 2071 static struct strbuf buf = STRBUF_INIT;
5eef828b 2072 uintmax_t len;
c44cdc7e 2073
5eef828b
SP
2074 if (parse_data(&buf, big_file_threshold, &len))
2075 store_object(OBJ_BLOB, &buf, last, sha1out, mark);
2076 else {
2077 if (last) {
2078 strbuf_release(&last->data);
2079 last->offset = 0;
2080 last->depth = 0;
2081 }
2082 stream_blob(len, sha1out, mark);
2083 skip_optional_lf();
2084 }
2085}
2086
2087static void parse_new_blob(void)
2088{
c44cdc7e 2089 read_next_command();
b3031781 2090 parse_mark();
5eef828b 2091 parse_and_store_blob(&last_blob, NULL, next_mark);
6143f064
SP
2092}
2093
fd99224e 2094static void unload_one_branch(void)
6bb5b329 2095{
41e5257f
SP
2096 while (cur_active_branches
2097 && cur_active_branches >= max_active_branches) {
6777a59f 2098 uintmax_t min_commit = ULONG_MAX;
463acbe1
SP
2099 struct branch *e, *l = NULL, *p = NULL;
2100
2101 for (e = active_branches; e; e = e->active_next_branch) {
2102 if (e->last_commit < min_commit) {
2103 p = l;
2104 min_commit = e->last_commit;
2105 }
2106 l = e;
2107 }
2108
2109 if (p) {
2110 e = p->active_next_branch;
2111 p->active_next_branch = e->active_next_branch;
2112 } else {
2113 e = active_branches;
2114 active_branches = e->active_next_branch;
2115 }
734c91f9 2116 e->active = 0;
463acbe1
SP
2117 e->active_next_branch = NULL;
2118 if (e->branch_tree.tree) {
afde8dd9 2119 release_tree_content_recursive(e->branch_tree.tree);
463acbe1
SP
2120 e->branch_tree.tree = NULL;
2121 }
2122 cur_active_branches--;
6bb5b329 2123 }
6bb5b329
SP
2124}
2125
463acbe1 2126static void load_branch(struct branch *b)
6bb5b329 2127{
463acbe1 2128 load_tree(&b->branch_tree);
734c91f9
SP
2129 if (!b->active) {
2130 b->active = 1;
2131 b->active_next_branch = active_branches;
2132 active_branches = b;
2133 cur_active_branches++;
2134 branch_load_count++;
2135 }
6bb5b329
SP
2136}
2137
2a113aee
JH
2138static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2139{
2140 unsigned char fanout = 0;
2141 while ((num_notes >>= 8))
2142 fanout++;
2143 return fanout;
2144}
2145
2146static void construct_path_with_fanout(const char *hex_sha1,
2147 unsigned char fanout, char *path)
2148{
2149 unsigned int i = 0, j = 0;
2150 if (fanout >= 20)
2151 die("Too large fanout (%u)", fanout);
2152 while (fanout) {
2153 path[i++] = hex_sha1[j++];
2154 path[i++] = hex_sha1[j++];
2155 path[i++] = '/';
2156 fanout--;
2157 }
2158 memcpy(path + i, hex_sha1 + j, 40 - j);
2159 path[i + 40 - j] = '\0';
2160}
2161
2162static uintmax_t do_change_note_fanout(
2163 struct tree_entry *orig_root, struct tree_entry *root,
2164 char *hex_sha1, unsigned int hex_sha1_len,
2165 char *fullpath, unsigned int fullpath_len,
2166 unsigned char fanout)
2167{
2168 struct tree_content *t = root->tree;
2169 struct tree_entry *e, leaf;
2170 unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2171 uintmax_t num_notes = 0;
2172 unsigned char sha1[20];
2173 char realpath[60];
2174
2175 for (i = 0; t && i < t->entry_count; i++) {
2176 e = t->entries[i];
2177 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2178 tmp_fullpath_len = fullpath_len;
2179
2180 /*
2181 * We're interested in EITHER existing note entries (entries
2182 * with exactly 40 hex chars in path, not including directory
2183 * separators), OR directory entries that may contain note
2184 * entries (with < 40 hex chars in path).
2185 * Also, each path component in a note entry must be a multiple
2186 * of 2 chars.
2187 */
2188 if (!e->versions[1].mode ||
2189 tmp_hex_sha1_len > 40 ||
2190 e->name->str_len % 2)
2191 continue;
2192
2193 /* This _may_ be a note entry, or a subdir containing notes */
2194 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2195 e->name->str_len);
2196 if (tmp_fullpath_len)
2197 fullpath[tmp_fullpath_len++] = '/';
2198 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2199 e->name->str_len);
2200 tmp_fullpath_len += e->name->str_len;
2201 fullpath[tmp_fullpath_len] = '\0';
2202
2203 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2204 /* This is a note entry */
18386857
JH
2205 if (fanout == 0xff) {
2206 /* Counting mode, no rename */
2207 num_notes++;
2208 continue;
2209 }
2a113aee
JH
2210 construct_path_with_fanout(hex_sha1, fanout, realpath);
2211 if (!strcmp(fullpath, realpath)) {
2212 /* Note entry is in correct location */
2213 num_notes++;
2214 continue;
2215 }
2216
2217 /* Rename fullpath to realpath */
62bfa11c 2218 if (!tree_content_remove(orig_root, fullpath, &leaf, 0))
2a113aee
JH
2219 die("Failed to remove path %s", fullpath);
2220 tree_content_set(orig_root, realpath,
2221 leaf.versions[1].sha1,
2222 leaf.versions[1].mode,
2223 leaf.tree);
2224 } else if (S_ISDIR(e->versions[1].mode)) {
2225 /* This is a subdir that may contain note entries */
2226 if (!e->tree)
2227 load_tree(e);
2228 num_notes += do_change_note_fanout(orig_root, e,
2229 hex_sha1, tmp_hex_sha1_len,
2230 fullpath, tmp_fullpath_len, fanout);
2231 }
2232
2233 /* The above may have reallocated the current tree_content */
2234 t = root->tree;
2235 }
2236 return num_notes;
2237}
2238
2239static uintmax_t change_note_fanout(struct tree_entry *root,
2240 unsigned char fanout)
2241{
2242 char hex_sha1[40], path[60];
2243 return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2244}
2245
06454cb9
PW
2246/*
2247 * Given a pointer into a string, parse a mark reference:
2248 *
2249 * idnum ::= ':' bigint;
2250 *
2251 * Return the first character after the value in *endptr.
2252 *
2253 * Complain if the following character is not what is expected,
2254 * either a space or end of the string.
2255 */
2256static uintmax_t parse_mark_ref(const char *p, char **endptr)
2257{
2258 uintmax_t mark;
2259
2260 assert(*p == ':');
2261 p++;
2262 mark = strtoumax(p, endptr, 10);
2263 if (*endptr == p)
2264 die("No value after ':' in mark: %s", command_buf.buf);
2265 return mark;
2266}
2267
2268/*
2269 * Parse the mark reference, and complain if this is not the end of
2270 * the string.
2271 */
2272static uintmax_t parse_mark_ref_eol(const char *p)
2273{
2274 char *end;
2275 uintmax_t mark;
2276
2277 mark = parse_mark_ref(p, &end);
2278 if (*end != '\0')
2279 die("Garbage after mark: %s", command_buf.buf);
2280 return mark;
2281}
2282
2283/*
2284 * Parse the mark reference, demanding a trailing space. Return a
2285 * pointer to the space.
2286 */
2287static uintmax_t parse_mark_ref_space(const char **p)
2288{
2289 uintmax_t mark;
2290 char *end;
2291
2292 mark = parse_mark_ref(*p, &end);
e814c39c 2293 if (*end++ != ' ')
06454cb9
PW
2294 die("Missing space after mark: %s", command_buf.buf);
2295 *p = end;
2296 return mark;
2297}
2298
97313bef 2299static void file_change_m(const char *p, struct branch *b)
6bb5b329 2300{
7fb1011e 2301 static struct strbuf uq = STRBUF_INIT;
c44cdc7e 2302 const char *endp;
3aa99df8 2303 struct object_entry *oe;
463acbe1 2304 unsigned char sha1[20];
10831c55 2305 uint16_t mode, inline_data = 0;
6bb5b329 2306
c44cdc7e
SP
2307 p = get_mode(p, &mode);
2308 if (!p)
2309 die("Corrupt mode: %s", command_buf.buf);
2310 switch (mode) {
3d1d81eb
FC
2311 case 0644:
2312 case 0755:
2313 mode |= S_IFREG;
c44cdc7e
SP
2314 case S_IFREG | 0644:
2315 case S_IFREG | 0755:
ace4a9d1 2316 case S_IFLNK:
334fba65 2317 case S_IFDIR:
03db4525 2318 case S_IFGITLINK:
c44cdc7e
SP
2319 /* ok */
2320 break;
2321 default:
2322 die("Corrupt mode: %s", command_buf.buf);
2323 }
2324
d8397168 2325 if (*p == ':') {
06454cb9 2326 oe = find_mark(parse_mark_ref_space(&p));
3fc366bd 2327 hashcpy(sha1, oe->idx.sha1);
e814c39c 2328 } else if (skip_prefix(p, "inline ", &p)) {
b715cfbb 2329 inline_data = 1;
3aa99df8 2330 oe = NULL; /* not used with inline_data, but makes gcc happy */
d8397168
SP
2331 } else {
2332 if (get_sha1_hex(p, sha1))
06454cb9 2333 die("Invalid dataref: %s", command_buf.buf);
d8397168
SP
2334 oe = find_object(sha1);
2335 p += 40;
e814c39c 2336 if (*p++ != ' ')
06454cb9 2337 die("Missing space after SHA1: %s", command_buf.buf);
d8397168 2338 }
c44cdc7e 2339
7fb1011e
PH
2340 strbuf_reset(&uq);
2341 if (!unquote_c_style(&uq, p, &endp)) {
c44cdc7e
SP
2342 if (*endp)
2343 die("Garbage after path in: %s", command_buf.buf);
7fb1011e 2344 p = uq.buf;
c44cdc7e 2345 }
6bb5b329 2346
8fe533f6 2347 /* Git does not track empty, non-toplevel directories. */
14576df0 2348 if (S_ISDIR(mode) && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN) && *p) {
62bfa11c 2349 tree_content_remove(&b->branch_tree, p, NULL, 0);
8fe533f6
JN
2350 return;
2351 }
2352
03db4525
AG
2353 if (S_ISGITLINK(mode)) {
2354 if (inline_data)
2355 die("Git links cannot be specified 'inline': %s",
2356 command_buf.buf);
2357 else if (oe) {
2358 if (oe->type != OBJ_COMMIT)
2359 die("Not a commit (actually a %s): %s",
2360 typename(oe->type), command_buf.buf);
2361 }
2362 /*
2363 * Accept the sha1 without checking; it expected to be in
2364 * another repository.
2365 */
2366 } else if (inline_data) {
334fba65
JN
2367 if (S_ISDIR(mode))
2368 die("Directories cannot be specified 'inline': %s",
2369 command_buf.buf);
7fb1011e
PH
2370 if (p != uq.buf) {
2371 strbuf_addstr(&uq, p);
2372 p = uq.buf;
2373 }
b715cfbb 2374 read_next_command();
5eef828b 2375 parse_and_store_blob(&last_blob, sha1, 0);
7111feed 2376 } else {
334fba65
JN
2377 enum object_type expected = S_ISDIR(mode) ?
2378 OBJ_TREE: OBJ_BLOB;
2379 enum object_type type = oe ? oe->type :
2380 sha1_object_info(sha1, NULL);
21666f1a 2381 if (type < 0)
334fba65
JN
2382 die("%s not found: %s",
2383 S_ISDIR(mode) ? "Tree" : "Blob",
2384 command_buf.buf);
2385 if (type != expected)
2386 die("Not a %s (actually a %s): %s",
2387 typename(expected), typename(type),
2388 command_buf.buf);
7111feed 2389 }
6bb5b329 2390
34215783
JN
2391 if (!*p) {
2392 tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2393 return;
2394 }
3d1d81eb 2395 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
463acbe1 2396}
6bb5b329 2397
97313bef 2398static void file_change_d(const char *p, struct branch *b)
463acbe1 2399{
7fb1011e 2400 static struct strbuf uq = STRBUF_INIT;
c44cdc7e
SP
2401 const char *endp;
2402
7fb1011e
PH
2403 strbuf_reset(&uq);
2404 if (!unquote_c_style(&uq, p, &endp)) {
c44cdc7e
SP
2405 if (*endp)
2406 die("Garbage after path in: %s", command_buf.buf);
7fb1011e 2407 p = uq.buf;
c44cdc7e 2408 }
62bfa11c 2409 tree_content_remove(&b->branch_tree, p, NULL, 1);
6bb5b329
SP
2410}
2411
97313bef 2412static void file_change_cr(const char *s, struct branch *b, int rename)
f39a946a 2413{
97313bef 2414 const char *d;
7fb1011e
PH
2415 static struct strbuf s_uq = STRBUF_INIT;
2416 static struct strbuf d_uq = STRBUF_INIT;
f39a946a
SP
2417 const char *endp;
2418 struct tree_entry leaf;
2419
7fb1011e
PH
2420 strbuf_reset(&s_uq);
2421 if (!unquote_c_style(&s_uq, s, &endp)) {
f39a946a
SP
2422 if (*endp != ' ')
2423 die("Missing space after source: %s", command_buf.buf);
7fb1011e 2424 } else {
f39a946a
SP
2425 endp = strchr(s, ' ');
2426 if (!endp)
2427 die("Missing space after source: %s", command_buf.buf);
7fb1011e 2428 strbuf_add(&s_uq, s, endp - s);
f39a946a 2429 }
7fb1011e 2430 s = s_uq.buf;
f39a946a
SP
2431
2432 endp++;
2433 if (!*endp)
2434 die("Missing dest: %s", command_buf.buf);
2435
2436 d = endp;
7fb1011e
PH
2437 strbuf_reset(&d_uq);
2438 if (!unquote_c_style(&d_uq, d, &endp)) {
f39a946a
SP
2439 if (*endp)
2440 die("Garbage after dest in: %s", command_buf.buf);
7fb1011e 2441 d = d_uq.buf;
f39a946a
SP
2442 }
2443
2444 memset(&leaf, 0, sizeof(leaf));
b6f3481b 2445 if (rename)
62bfa11c 2446 tree_content_remove(&b->branch_tree, s, &leaf, 1);
b6f3481b 2447 else
e0eb6b97 2448 tree_content_get(&b->branch_tree, s, &leaf, 1);
f39a946a
SP
2449 if (!leaf.versions[1].mode)
2450 die("Path %s not in branch", s);
34215783
JN
2451 if (!*d) { /* C "path/to/subdir" "" */
2452 tree_content_replace(&b->branch_tree,
2453 leaf.versions[1].sha1,
2454 leaf.versions[1].mode,
2455 leaf.tree);
2456 return;
2457 }
f39a946a
SP
2458 tree_content_set(&b->branch_tree, d,
2459 leaf.versions[1].sha1,
2460 leaf.versions[1].mode,
2461 leaf.tree);
f39a946a
SP
2462}
2463
97313bef 2464static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout)
a8dd2e7d 2465{
a8dd2e7d 2466 static struct strbuf uq = STRBUF_INIT;
cbfd5e1c 2467 struct object_entry *oe;
a8dd2e7d
JH
2468 struct branch *s;
2469 unsigned char sha1[20], commit_sha1[20];
2a113aee 2470 char path[60];
a8dd2e7d 2471 uint16_t inline_data = 0;
2a113aee 2472 unsigned char new_fanout;
a8dd2e7d 2473
18386857
JH
2474 /*
2475 * When loading a branch, we don't traverse its tree to count the real
2476 * number of notes (too expensive to do this for all non-note refs).
2477 * This means that recently loaded notes refs might incorrectly have
2478 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2479 *
2480 * Fix this by traversing the tree and counting the number of notes
2481 * when b->num_notes == 0. If the notes tree is truly empty, the
2482 * calculation should not take long.
2483 */
2484 if (b->num_notes == 0 && *old_fanout == 0) {
2485 /* Invoke change_note_fanout() in "counting mode". */
2486 b->num_notes = change_note_fanout(&b->branch_tree, 0xff);
2487 *old_fanout = convert_num_notes_to_fanout(b->num_notes);
2488 }
2489
2490 /* Now parse the notemodify command. */
a8dd2e7d
JH
2491 /* <dataref> or 'inline' */
2492 if (*p == ':') {
06454cb9 2493 oe = find_mark(parse_mark_ref_space(&p));
3fc366bd 2494 hashcpy(sha1, oe->idx.sha1);
e814c39c 2495 } else if (skip_prefix(p, "inline ", &p)) {
a8dd2e7d 2496 inline_data = 1;
0a34594c 2497 oe = NULL; /* not used with inline_data, but makes gcc happy */
a8dd2e7d
JH
2498 } else {
2499 if (get_sha1_hex(p, sha1))
06454cb9 2500 die("Invalid dataref: %s", command_buf.buf);
a8dd2e7d
JH
2501 oe = find_object(sha1);
2502 p += 40;
e814c39c 2503 if (*p++ != ' ')
06454cb9 2504 die("Missing space after SHA1: %s", command_buf.buf);
a8dd2e7d 2505 }
a8dd2e7d 2506
a8a5406a 2507 /* <commit-ish> */
a8dd2e7d
JH
2508 s = lookup_branch(p);
2509 if (s) {
0bc69881
DI
2510 if (is_null_sha1(s->sha1))
2511 die("Can't add a note on empty branch.");
a8dd2e7d
JH
2512 hashcpy(commit_sha1, s->sha1);
2513 } else if (*p == ':') {
06454cb9 2514 uintmax_t commit_mark = parse_mark_ref_eol(p);
a8dd2e7d
JH
2515 struct object_entry *commit_oe = find_mark(commit_mark);
2516 if (commit_oe->type != OBJ_COMMIT)
2517 die("Mark :%" PRIuMAX " not a commit", commit_mark);
3fc366bd 2518 hashcpy(commit_sha1, commit_oe->idx.sha1);
a8dd2e7d
JH
2519 } else if (!get_sha1(p, commit_sha1)) {
2520 unsigned long size;
2521 char *buf = read_object_with_reference(commit_sha1,
2522 commit_type, &size, commit_sha1);
2523 if (!buf || size < 46)
2524 die("Not a valid commit: %s", p);
2525 free(buf);
2526 } else
2527 die("Invalid ref name or SHA1 expression: %s", p);
2528
2529 if (inline_data) {
a8dd2e7d
JH
2530 if (p != uq.buf) {
2531 strbuf_addstr(&uq, p);
2532 p = uq.buf;
2533 }
2534 read_next_command();
5eef828b 2535 parse_and_store_blob(&last_blob, sha1, 0);
a8dd2e7d
JH
2536 } else if (oe) {
2537 if (oe->type != OBJ_BLOB)
2538 die("Not a blob (actually a %s): %s",
2539 typename(oe->type), command_buf.buf);
2a113aee 2540 } else if (!is_null_sha1(sha1)) {
a8dd2e7d
JH
2541 enum object_type type = sha1_object_info(sha1, NULL);
2542 if (type < 0)
2543 die("Blob not found: %s", command_buf.buf);
2544 if (type != OBJ_BLOB)
2545 die("Not a blob (actually a %s): %s",
2546 typename(type), command_buf.buf);
2547 }
2548
18386857 2549 construct_path_with_fanout(sha1_to_hex(commit_sha1), *old_fanout, path);
62bfa11c 2550 if (tree_content_remove(&b->branch_tree, path, NULL, 0))
2a113aee
JH
2551 b->num_notes--;
2552
2553 if (is_null_sha1(sha1))
2554 return; /* nothing to insert */
2555
2556 b->num_notes++;
2557 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2558 construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2559 tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
a8dd2e7d
JH
2560}
2561
825769a8
SP
2562static void file_change_deleteall(struct branch *b)
2563{
2564 release_tree_content_recursive(b->branch_tree.tree);
2565 hashclr(b->branch_tree.versions[0].sha1);
2566 hashclr(b->branch_tree.versions[1].sha1);
2567 load_tree(&b->branch_tree);
2a113aee 2568 b->num_notes = 0;
825769a8
SP
2569}
2570
b3031781 2571static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
654aaa37
SP
2572{
2573 if (!buf || size < 46)
2574 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2575 if (memcmp("tree ", buf, 5)
2576 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2577 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2578 hashcpy(b->branch_tree.versions[0].sha1,
2579 b->branch_tree.versions[1].sha1);
2580}
2581
b3031781 2582static void parse_from_existing(struct branch *b)
654aaa37
SP
2583{
2584 if (is_null_sha1(b->sha1)) {
2585 hashclr(b->branch_tree.versions[0].sha1);
2586 hashclr(b->branch_tree.versions[1].sha1);
2587 } else {
2588 unsigned long size;
2589 char *buf;
2590
2591 buf = read_object_with_reference(b->sha1,
2592 commit_type, &size, b->sha1);
b3031781 2593 parse_from_commit(b, buf, size);
654aaa37
SP
2594 free(buf);
2595 }
2596}
2597
b3031781 2598static int parse_from(struct branch *b)
00e2b884 2599{
6c3aac1c 2600 const char *from;
00e2b884 2601 struct branch *s;
0df32457 2602 unsigned char sha1[20];
00e2b884 2603
97313bef 2604 if (!skip_prefix(command_buf.buf, "from ", &from))
1fdb649c 2605 return 0;
00e2b884 2606
0df32457 2607 hashcpy(sha1, b->branch_tree.versions[1].sha1);
00e2b884 2608
00e2b884
SP
2609 s = lookup_branch(from);
2610 if (b == s)
2611 die("Can't create a branch from itself: %s", b->name);
2612 else if (s) {
4cabf858 2613 unsigned char *t = s->branch_tree.versions[1].sha1;
445b8599 2614 hashcpy(b->sha1, s->sha1);
4cabf858
SP
2615 hashcpy(b->branch_tree.versions[0].sha1, t);
2616 hashcpy(b->branch_tree.versions[1].sha1, t);
00e2b884 2617 } else if (*from == ':') {
06454cb9 2618 uintmax_t idnum = parse_mark_ref_eol(from);
00e2b884 2619 struct object_entry *oe = find_mark(idnum);
00e2b884 2620 if (oe->type != OBJ_COMMIT)
3efb1f34 2621 die("Mark :%" PRIuMAX " not a commit", idnum);
0df32457
MH
2622 if (hashcmp(b->sha1, oe->idx.sha1)) {
2623 hashcpy(b->sha1, oe->idx.sha1);
2624 if (oe->pack_id != MAX_PACK_ID) {
2625 unsigned long size;
2626 char *buf = gfi_unpack_entry(oe, &size);
2627 parse_from_commit(b, buf, size);
2628 free(buf);
2629 } else
2630 parse_from_existing(b);
2631 }
4ee1b225 2632 } else if (!get_sha1(from, b->sha1)) {
b3031781 2633 parse_from_existing(b);
4ee1b225
FC
2634 if (is_null_sha1(b->sha1))
2635 b->delete = 1;
2636 }
654aaa37 2637 else
00e2b884
SP
2638 die("Invalid ref name or SHA1 expression: %s", from);
2639
0df32457
MH
2640 if (b->branch_tree.tree && hashcmp(sha1, b->branch_tree.versions[1].sha1)) {
2641 release_tree_content_recursive(b->branch_tree.tree);
2642 b->branch_tree.tree = NULL;
2643 }
2644
00e2b884 2645 read_next_command();
1fdb649c 2646 return 1;
00e2b884
SP
2647}
2648
b3031781 2649static struct hash_list *parse_merge(unsigned int *count)
62b6f483 2650{
4db34cc1 2651 struct hash_list *list = NULL, **tail = &list, *n;
6c3aac1c 2652 const char *from;
62b6f483
SP
2653 struct branch *s;
2654
2655 *count = 0;
97313bef 2656 while (skip_prefix(command_buf.buf, "merge ", &from)) {
62b6f483
SP
2657 n = xmalloc(sizeof(*n));
2658 s = lookup_branch(from);
2659 if (s)
2660 hashcpy(n->sha1, s->sha1);
2661 else if (*from == ':') {
06454cb9 2662 uintmax_t idnum = parse_mark_ref_eol(from);
62b6f483
SP
2663 struct object_entry *oe = find_mark(idnum);
2664 if (oe->type != OBJ_COMMIT)
3efb1f34 2665 die("Mark :%" PRIuMAX " not a commit", idnum);
3fc366bd 2666 hashcpy(n->sha1, oe->idx.sha1);
2f6dc35d
SP
2667 } else if (!get_sha1(from, n->sha1)) {
2668 unsigned long size;
2669 char *buf = read_object_with_reference(n->sha1,
6b4318e6 2670 commit_type, &size, n->sha1);
2f6dc35d
SP
2671 if (!buf || size < 46)
2672 die("Not a valid commit: %s", from);
2673 free(buf);
2674 } else
62b6f483
SP
2675 die("Invalid ref name or SHA1 expression: %s", from);
2676
2677 n->next = NULL;
4db34cc1
JK
2678 *tail = n;
2679 tail = &n->next;
2680
10e8d688 2681 (*count)++;
62b6f483
SP
2682 read_next_command();
2683 }
2684 return list;
2685}
2686
97313bef 2687static void parse_new_commit(const char *arg)
6bb5b329 2688{
eec813cf 2689 static struct strbuf msg = STRBUF_INIT;
c44cdc7e 2690 struct branch *b;
c44cdc7e
SP
2691 char *author = NULL;
2692 char *committer = NULL;
62b6f483
SP
2693 struct hash_list *merge_list = NULL;
2694 unsigned int merge_count;
2a113aee 2695 unsigned char prev_fanout, new_fanout;
ae021d87 2696 const char *v;
c44cdc7e 2697
97313bef 2698 b = lookup_branch(arg);
463acbe1 2699 if (!b)
97313bef 2700 b = new_branch(arg);
c44cdc7e
SP
2701
2702 read_next_command();
b3031781 2703 parse_mark();
ae021d87
JK
2704 if (skip_prefix(command_buf.buf, "author ", &v)) {
2705 author = parse_ident(v);
c44cdc7e
SP
2706 read_next_command();
2707 }
ae021d87
JK
2708 if (skip_prefix(command_buf.buf, "committer ", &v)) {
2709 committer = parse_ident(v);
c44cdc7e
SP
2710 read_next_command();
2711 }
2712 if (!committer)
2713 die("Expected committer but didn't get one");
5eef828b 2714 parse_data(&msg, 0, NULL);
02f3389d 2715 read_next_command();
b3031781
MV
2716 parse_from(b);
2717 merge_list = parse_merge(&merge_count);
c44cdc7e
SP
2718
2719 /* ensure the branch is active/loaded */
41e5257f 2720 if (!b->branch_tree.tree || !max_active_branches) {
463acbe1
SP
2721 unload_one_branch();
2722 load_branch(b);
2723 }
6bb5b329 2724
2a113aee
JH
2725 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2726
463acbe1 2727 /* file_change* */
e6c019d0 2728 while (command_buf.len > 0) {
97313bef
JK
2729 if (skip_prefix(command_buf.buf, "M ", &v))
2730 file_change_m(v, b);
2731 else if (skip_prefix(command_buf.buf, "D ", &v))
2732 file_change_d(v, b);
2733 else if (skip_prefix(command_buf.buf, "R ", &v))
2734 file_change_cr(v, b, 1);
2735 else if (skip_prefix(command_buf.buf, "C ", &v))
2736 file_change_cr(v, b, 0);
2737 else if (skip_prefix(command_buf.buf, "N ", &v))
2738 note_change_n(v, b, &prev_fanout);
825769a8
SP
2739 else if (!strcmp("deleteall", command_buf.buf))
2740 file_change_deleteall(b);
97313bef
JK
2741 else if (skip_prefix(command_buf.buf, "ls ", &v))
2742 parse_ls(v, b);
1fdb649c
SP
2743 else {
2744 unread_command_buf = 1;
2745 break;
2746 }
e6c019d0
PH
2747 if (read_next_command() == EOF)
2748 break;
6bb5b329 2749 }
6bb5b329 2750
2a113aee
JH
2751 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2752 if (new_fanout != prev_fanout)
2753 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2754
c44cdc7e 2755 /* build the tree and the commit */
463acbe1 2756 store_tree(&b->branch_tree);
8a8c55ea
SP
2757 hashcpy(b->branch_tree.versions[0].sha1,
2758 b->branch_tree.versions[1].sha1);
eec813cf
PH
2759
2760 strbuf_reset(&new_data);
2761 strbuf_addf(&new_data, "tree %s\n",
4cabf858 2762 sha1_to_hex(b->branch_tree.versions[1].sha1));
445b8599 2763 if (!is_null_sha1(b->sha1))
eec813cf 2764 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
62b6f483
SP
2765 while (merge_list) {
2766 struct hash_list *next = merge_list->next;
eec813cf 2767 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
62b6f483
SP
2768 free(merge_list);
2769 merge_list = next;
2770 }
eec813cf
PH
2771 strbuf_addf(&new_data,
2772 "author %s\n"
2773 "committer %s\n"
2774 "\n",
2775 author ? author : committer, committer);
2776 strbuf_addbuf(&new_data, &msg);
e7d06a4b 2777 free(author);
c44cdc7e 2778 free(committer);
c44cdc7e 2779
eec813cf 2780 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
69e74e74 2781 b->pack_id = pack_id;
463acbe1 2782 b->last_commit = object_count_by_type[OBJ_COMMIT];
6bb5b329
SP
2783}
2784
97313bef 2785static void parse_new_tag(const char *arg)
72303d44 2786{
eec813cf 2787 static struct strbuf msg = STRBUF_INIT;
72303d44
SP
2788 const char *from;
2789 char *tagger;
2790 struct branch *s;
72303d44 2791 struct tag *t;
0ea9f045 2792 uintmax_t from_mark = 0;
72303d44 2793 unsigned char sha1[20];
8db751a8 2794 enum object_type type;
ae021d87 2795 const char *v;
72303d44 2796
72303d44 2797 t = pool_alloc(sizeof(struct tag));
a8ea1b7a 2798 memset(t, 0, sizeof(struct tag));
97313bef 2799 t->name = pool_strdup(arg);
72303d44
SP
2800 if (last_tag)
2801 last_tag->next_tag = t;
2802 else
2803 first_tag = t;
2804 last_tag = t;
72303d44
SP
2805 read_next_command();
2806
2807 /* from ... */
97313bef 2808 if (!skip_prefix(command_buf.buf, "from ", &from))
72303d44 2809 die("Expected from command, got %s", command_buf.buf);
72303d44
SP
2810 s = lookup_branch(from);
2811 if (s) {
2c9c8ee2
DI
2812 if (is_null_sha1(s->sha1))
2813 die("Can't tag an empty branch.");
445b8599 2814 hashcpy(sha1, s->sha1);
8db751a8 2815 type = OBJ_COMMIT;
72303d44 2816 } else if (*from == ':') {
10e8d688 2817 struct object_entry *oe;
06454cb9 2818 from_mark = parse_mark_ref_eol(from);
10e8d688 2819 oe = find_mark(from_mark);
8db751a8 2820 type = oe->type;
3fc366bd 2821 hashcpy(sha1, oe->idx.sha1);
72303d44 2822 } else if (!get_sha1(from, sha1)) {
6c447f63
DI
2823 struct object_entry *oe = find_object(sha1);
2824 if (!oe) {
2825 type = sha1_object_info(sha1, NULL);
2826 if (type < 0)
2827 die("Not a valid object: %s", from);
2828 } else
2829 type = oe->type;
72303d44
SP
2830 } else
2831 die("Invalid ref name or SHA1 expression: %s", from);
72303d44
SP
2832 read_next_command();
2833
2834 /* tagger ... */
ae021d87
JK
2835 if (skip_prefix(command_buf.buf, "tagger ", &v)) {
2836 tagger = parse_ident(v);
88fbf67b
JH
2837 read_next_command();
2838 } else
2839 tagger = NULL;
72303d44
SP
2840
2841 /* tag payload/message */
5eef828b 2842 parse_data(&msg, 0, NULL);
72303d44
SP
2843
2844 /* build the tag object */
eec813cf 2845 strbuf_reset(&new_data);
88fbf67b 2846
eec813cf 2847 strbuf_addf(&new_data,
88fbf67b
JH
2848 "object %s\n"
2849 "type %s\n"
2850 "tag %s\n",
8db751a8 2851 sha1_to_hex(sha1), typename(type), t->name);
88fbf67b
JH
2852 if (tagger)
2853 strbuf_addf(&new_data,
2854 "tagger %s\n", tagger);
2855 strbuf_addch(&new_data, '\n');
eec813cf 2856 strbuf_addbuf(&new_data, &msg);
72303d44 2857 free(tagger);
72303d44 2858
eec813cf 2859 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
69e74e74
SP
2860 t->pack_id = MAX_PACK_ID;
2861 else
2862 t->pack_id = pack_id;
72303d44
SP
2863}
2864
97313bef 2865static void parse_reset_branch(const char *arg)
5fced8dc
SP
2866{
2867 struct branch *b;
5fced8dc 2868
97313bef 2869 b = lookup_branch(arg);
5fced8dc 2870 if (b) {
ea5e370a
SP
2871 hashclr(b->sha1);
2872 hashclr(b->branch_tree.versions[0].sha1);
2873 hashclr(b->branch_tree.versions[1].sha1);
5fced8dc
SP
2874 if (b->branch_tree.tree) {
2875 release_tree_content_recursive(b->branch_tree.tree);
2876 b->branch_tree.tree = NULL;
2877 }
2878 }
9938ffc5 2879 else
97313bef 2880 b = new_branch(arg);
9938ffc5 2881 read_next_command();
b3031781 2882 parse_from(b);
655e8515 2883 if (command_buf.len > 0)
1fdb649c 2884 unread_command_buf = 1;
5fced8dc
SP
2885}
2886
85c62395
DB
2887static void cat_blob_write(const char *buf, unsigned long size)
2888{
2889 if (write_in_full(cat_blob_fd, buf, size) != size)
2890 die_errno("Write to frontend failed");
2891}
2892
2893static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
2894{
2895 struct strbuf line = STRBUF_INIT;
2896 unsigned long size;
2897 enum object_type type = 0;
2898 char *buf;
2899
2900 if (!oe || oe->pack_id == MAX_PACK_ID) {
2901 buf = read_sha1_file(sha1, &type, &size);
2902 } else {
2903 type = oe->type;
2904 buf = gfi_unpack_entry(oe, &size);
2905 }
2906
2907 /*
2908 * Output based on batch_one_object() from cat-file.c.
2909 */
2910 if (type <= 0) {
2911 strbuf_reset(&line);
2912 strbuf_addf(&line, "%s missing\n", sha1_to_hex(sha1));
2913 cat_blob_write(line.buf, line.len);
2914 strbuf_release(&line);
2915 free(buf);
2916 return;
2917 }
2918 if (!buf)
2919 die("Can't read object %s", sha1_to_hex(sha1));
2920 if (type != OBJ_BLOB)
2921 die("Object %s is a %s but a blob was expected.",
2922 sha1_to_hex(sha1), typename(type));
2923 strbuf_reset(&line);
2924 strbuf_addf(&line, "%s %s %lu\n", sha1_to_hex(sha1),
2925 typename(type), size);
2926 cat_blob_write(line.buf, line.len);
2927 strbuf_release(&line);
2928 cat_blob_write(buf, size);
2929 cat_blob_write("\n", 1);
a7e9c341
DI
2930 if (oe && oe->pack_id == pack_id) {
2931 last_blob.offset = oe->idx.offset;
2932 strbuf_attach(&last_blob.data, buf, size, size);
2933 last_blob.depth = oe->depth;
2934 } else
2935 free(buf);
85c62395
DB
2936}
2937
28c7b1f7
MH
2938static void parse_get_mark(const char *p)
2939{
2940 struct object_entry *oe = oe;
2941 char output[42];
2942
2943 /* get-mark SP <object> LF */
2944 if (*p != ':')
2945 die("Not a mark: %s", p);
2946
2947 oe = find_mark(parse_mark_ref_eol(p));
2948 if (!oe)
2949 die("Unknown mark: %s", command_buf.buf);
2950
2951 snprintf(output, sizeof(output), "%s\n", sha1_to_hex(oe->idx.sha1));
2952 cat_blob_write(output, 41);
2953}
2954
97313bef 2955static void parse_cat_blob(const char *p)
85c62395 2956{
85c62395
DB
2957 struct object_entry *oe = oe;
2958 unsigned char sha1[20];
2959
2960 /* cat-blob SP <object> LF */
85c62395 2961 if (*p == ':') {
06454cb9 2962 oe = find_mark(parse_mark_ref_eol(p));
85c62395
DB
2963 if (!oe)
2964 die("Unknown mark: %s", command_buf.buf);
85c62395
DB
2965 hashcpy(sha1, oe->idx.sha1);
2966 } else {
2967 if (get_sha1_hex(p, sha1))
06454cb9 2968 die("Invalid dataref: %s", command_buf.buf);
85c62395
DB
2969 if (p[40])
2970 die("Garbage after SHA1: %s", command_buf.buf);
2971 oe = find_object(sha1);
2972 }
2973
2974 cat_blob(oe, sha1);
2975}
2976
8dc6a373
DB
2977static struct object_entry *dereference(struct object_entry *oe,
2978 unsigned char sha1[20])
2979{
2980 unsigned long size;
6288e3e1 2981 char *buf = NULL;
8dc6a373
DB
2982 if (!oe) {
2983 enum object_type type = sha1_object_info(sha1, NULL);
2984 if (type < 0)
2985 die("object not found: %s", sha1_to_hex(sha1));
2986 /* cache it! */
2987 oe = insert_object(sha1);
2988 oe->type = type;
2989 oe->pack_id = MAX_PACK_ID;
2990 oe->idx.offset = 1;
2991 }
2992 switch (oe->type) {
2993 case OBJ_TREE: /* easy case. */
2994 return oe;
2995 case OBJ_COMMIT:
2996 case OBJ_TAG:
2997 break;
2998 default:
bb8040f9 2999 die("Not a tree-ish: %s", command_buf.buf);
8dc6a373
DB
3000 }
3001
3002 if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
3003 buf = gfi_unpack_entry(oe, &size);
3004 } else {
3005 enum object_type unused;
3006 buf = read_sha1_file(sha1, &unused, &size);
3007 }
3008 if (!buf)
3009 die("Can't load object %s", sha1_to_hex(sha1));
3010
3011 /* Peel one layer. */
3012 switch (oe->type) {
3013 case OBJ_TAG:
3014 if (size < 40 + strlen("object ") ||
3015 get_sha1_hex(buf + strlen("object "), sha1))
3016 die("Invalid SHA1 in tag: %s", command_buf.buf);
3017 break;
3018 case OBJ_COMMIT:
3019 if (size < 40 + strlen("tree ") ||
3020 get_sha1_hex(buf + strlen("tree "), sha1))
3021 die("Invalid SHA1 in commit: %s", command_buf.buf);
3022 }
3023
3024 free(buf);
3025 return find_object(sha1);
3026}
3027
3028static struct object_entry *parse_treeish_dataref(const char **p)
3029{
3030 unsigned char sha1[20];
3031 struct object_entry *e;
3032
3033 if (**p == ':') { /* <mark> */
06454cb9 3034 e = find_mark(parse_mark_ref_space(p));
8dc6a373
DB
3035 if (!e)
3036 die("Unknown mark: %s", command_buf.buf);
8dc6a373
DB
3037 hashcpy(sha1, e->idx.sha1);
3038 } else { /* <sha1> */
3039 if (get_sha1_hex(*p, sha1))
06454cb9 3040 die("Invalid dataref: %s", command_buf.buf);
8dc6a373
DB
3041 e = find_object(sha1);
3042 *p += 40;
e814c39c
JK
3043 if (*(*p)++ != ' ')
3044 die("Missing space after tree-ish: %s", command_buf.buf);
8dc6a373
DB
3045 }
3046
3047 while (!e || e->type != OBJ_TREE)
3048 e = dereference(e, sha1);
3049 return e;
3050}
3051
3052static void print_ls(int mode, const unsigned char *sha1, const char *path)
3053{
3054 static struct strbuf line = STRBUF_INIT;
3055
3056 /* See show_tree(). */
3057 const char *type =
3058 S_ISGITLINK(mode) ? commit_type :
3059 S_ISDIR(mode) ? tree_type :
3060 blob_type;
3061
3062 if (!mode) {
3063 /* missing SP path LF */
3064 strbuf_reset(&line);
3065 strbuf_addstr(&line, "missing ");
3066 quote_c_style(path, &line, NULL, 0);
3067 strbuf_addch(&line, '\n');
3068 } else {
3069 /* mode SP type SP object_name TAB path LF */
3070 strbuf_reset(&line);
3071 strbuf_addf(&line, "%06o %s %s\t",
8fb3ad76 3072 mode & ~NO_DELTA, type, sha1_to_hex(sha1));
8dc6a373
DB
3073 quote_c_style(path, &line, NULL, 0);
3074 strbuf_addch(&line, '\n');
3075 }
3076 cat_blob_write(line.buf, line.len);
3077}
3078
97313bef 3079static void parse_ls(const char *p, struct branch *b)
8dc6a373 3080{
8dc6a373 3081 struct tree_entry *root = NULL;
c2e86add 3082 struct tree_entry leaf = {NULL};
8dc6a373 3083
bb8040f9 3084 /* ls SP (<tree-ish> SP)? <path> */
8dc6a373
DB
3085 if (*p == '"') {
3086 if (!b)
3087 die("Not in a commit: %s", command_buf.buf);
3088 root = &b->branch_tree;
3089 } else {
3090 struct object_entry *e = parse_treeish_dataref(&p);
3091 root = new_tree_entry();
3092 hashcpy(root->versions[1].sha1, e->idx.sha1);
adefdba5
JK
3093 if (!is_null_sha1(root->versions[1].sha1))
3094 root->versions[1].mode = S_IFDIR;
8dc6a373 3095 load_tree(root);
8dc6a373
DB
3096 }
3097 if (*p == '"') {
3098 static struct strbuf uq = STRBUF_INIT;
3099 const char *endp;
3100 strbuf_reset(&uq);
3101 if (unquote_c_style(&uq, p, &endp))
3102 die("Invalid path: %s", command_buf.buf);
3103 if (*endp)
3104 die("Garbage after path in: %s", command_buf.buf);
3105 p = uq.buf;
3106 }
e0eb6b97 3107 tree_content_get(root, p, &leaf, 1);
8dc6a373
DB
3108 /*
3109 * A directory in preparation would have a sha1 of zero
3110 * until it is saved. Save, for simplicity.
3111 */
3112 if (S_ISDIR(leaf.versions[1].mode))
3113 store_tree(&leaf);
3114
3115 print_ls(leaf.versions[1].mode, leaf.versions[1].sha1, p);
c27e559d
JN
3116 if (leaf.tree)
3117 release_tree_content_recursive(leaf.tree);
8dc6a373
DB
3118 if (!b || root != &b->branch_tree)
3119 release_tree_entry(root);
3120}
3121
dc01f59d 3122static void checkpoint(void)
7bfe6e26 3123{
dc01f59d 3124 checkpoint_requested = 0;
820b9310
SP
3125 if (object_count) {
3126 cycle_packfile();
3127 dump_branches();
3128 dump_tags();
3129 dump_marks();
3130 }
dc01f59d
JN
3131}
3132
3133static void parse_checkpoint(void)
3134{
3135 checkpoint_requested = 1;
1fdb649c 3136 skip_optional_lf();
7bfe6e26
SP
3137}
3138
b3031781 3139static void parse_progress(void)
ac053c02 3140{
b449f4cf 3141 fwrite(command_buf.buf, 1, command_buf.len, stdout);
ac053c02
SP
3142 fputc('\n', stdout);
3143 fflush(stdout);
3144 skip_optional_lf();
3145}
3146
bc3c79ae 3147static char* make_fast_import_path(const char *path)
e8438420 3148{
bc3c79ae
SR
3149 if (!relative_marks_paths || is_absolute_path(path))
3150 return xstrdup(path);
aaa26805 3151 return xstrdup(git_path("info/fast-import/%s", path));
bc3c79ae
SR
3152}
3153
dded4f12
RR
3154static void option_import_marks(const char *marks,
3155 int from_stream, int ignore_missing)
e8438420 3156{
081751c8
SR
3157 if (import_marks_file) {
3158 if (from_stream)
3159 die("Only one import-marks command allowed per stream");
3160
3161 /* read previous mark file */
3162 if(!import_marks_file_from_stream)
3163 read_marks();
e8438420 3164 }
081751c8 3165
bc3c79ae 3166 import_marks_file = make_fast_import_path(marks);
580d5f83 3167 safe_create_leading_directories_const(import_marks_file);
081751c8 3168 import_marks_file_from_stream = from_stream;
dded4f12 3169 import_marks_file_ignore_missing = ignore_missing;
e8438420
SP
3170}
3171
0f6927c2
SR
3172static void option_date_format(const char *fmt)
3173{
3174 if (!strcmp(fmt, "raw"))
3175 whenspec = WHENSPEC_RAW;
3176 else if (!strcmp(fmt, "rfc2822"))
3177 whenspec = WHENSPEC_RFC2822;
3178 else if (!strcmp(fmt, "now"))
3179 whenspec = WHENSPEC_NOW;
3180 else
3181 die("unknown --date-format argument %s", fmt);
3182}
3183
a9ff277e
JN
3184static unsigned long ulong_arg(const char *option, const char *arg)
3185{
3186 char *endptr;
3187 unsigned long rv = strtoul(arg, &endptr, 0);
3188 if (strchr(arg, '-') || endptr == arg || *endptr)
3189 die("%s: argument must be a non-negative integer", option);
3190 return rv;
3191}
3192
0f6927c2
SR
3193static void option_depth(const char *depth)
3194{
a9ff277e 3195 max_depth = ulong_arg("--depth", depth);
0f6927c2
SR
3196 if (max_depth > MAX_DEPTH)
3197 die("--depth cannot exceed %u", MAX_DEPTH);
3198}
3199
3200static void option_active_branches(const char *branches)
3201{
a9ff277e 3202 max_active_branches = ulong_arg("--active-branches", branches);
0f6927c2
SR
3203}
3204
3205static void option_export_marks(const char *marks)
3206{
bc3c79ae 3207 export_marks_file = make_fast_import_path(marks);
580d5f83 3208 safe_create_leading_directories_const(export_marks_file);
0f6927c2
SR
3209}
3210
85c62395
DB
3211static void option_cat_blob_fd(const char *fd)
3212{
3213 unsigned long n = ulong_arg("--cat-blob-fd", fd);
3214 if (n > (unsigned long) INT_MAX)
3215 die("--cat-blob-fd cannot exceed %d", INT_MAX);
3216 cat_blob_fd = (int) n;
3217}
3218
0f6927c2
SR
3219static void option_export_pack_edges(const char *edges)
3220{
3221 if (pack_edges)
3222 fclose(pack_edges);
3223 pack_edges = fopen(edges, "a");
3224 if (!pack_edges)
3225 die_errno("Cannot open '%s'", edges);
3226}
3227
9c8398f0 3228static int parse_one_option(const char *option)
0f6927c2 3229{
ae021d87 3230 if (skip_prefix(option, "max-pack-size=", &option)) {
4d0cc224 3231 unsigned long v;
ae021d87 3232 if (!git_parse_ulong(option, &v))
4d0cc224
JH
3233 return 0;
3234 if (v < 8192) {
3235 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
3236 v *= 1024 * 1024;
3237 } else if (v < 1024 * 1024) {
3238 warning("minimum max-pack-size is 1 MiB");
3239 v = 1024 * 1024;
3240 }
3241 max_packsize = v;
ae021d87 3242 } else if (skip_prefix(option, "big-file-threshold=", &option)) {
76ea93cc 3243 unsigned long v;
ae021d87 3244 if (!git_parse_ulong(option, &v))
76ea93cc
JH
3245 return 0;
3246 big_file_threshold = v;
ae021d87
JK
3247 } else if (skip_prefix(option, "depth=", &option)) {
3248 option_depth(option);
3249 } else if (skip_prefix(option, "active-branches=", &option)) {
3250 option_active_branches(option);
3251 } else if (skip_prefix(option, "export-pack-edges=", &option)) {
3252 option_export_pack_edges(option);
59556548 3253 } else if (starts_with(option, "quiet")) {
0f6927c2 3254 show_stats = 0;
59556548 3255 } else if (starts_with(option, "stats")) {
0f6927c2
SR
3256 show_stats = 1;
3257 } else {
9c8398f0 3258 return 0;
0f6927c2 3259 }
9c8398f0
SR
3260
3261 return 1;
0f6927c2
SR
3262}
3263
081751c8 3264static int parse_one_feature(const char *feature, int from_stream)
f963bd5d 3265{
ae021d87
JK
3266 const char *arg;
3267
3268 if (skip_prefix(feature, "date-format=", &arg)) {
3269 option_date_format(arg);
3270 } else if (skip_prefix(feature, "import-marks=", &arg)) {
3271 option_import_marks(arg, from_stream, 0);
3272 } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
3273 option_import_marks(arg, from_stream, 1);
3274 } else if (skip_prefix(feature, "export-marks=", &arg)) {
3275 option_export_marks(arg);
28c7b1f7
MH
3276 } else if (!strcmp(feature, "get-mark")) {
3277 ; /* Don't die - this feature is supported */
85c62395
DB
3278 } else if (!strcmp(feature, "cat-blob")) {
3279 ; /* Don't die - this feature is supported */
4cce4ef2 3280 } else if (!strcmp(feature, "relative-marks")) {
bc3c79ae 3281 relative_marks_paths = 1;
4cce4ef2 3282 } else if (!strcmp(feature, "no-relative-marks")) {
bc3c79ae 3283 relative_marks_paths = 0;
be56862f
SR
3284 } else if (!strcmp(feature, "done")) {
3285 require_explicit_termination = 1;
4cce4ef2 3286 } else if (!strcmp(feature, "force")) {
f963bd5d 3287 force_update = 1;
8dc6a373 3288 } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
547e8b92 3289 ; /* do nothing; we have the feature */
f963bd5d
SR
3290 } else {
3291 return 0;
3292 }
3293
3294 return 1;
3295}
3296
97313bef 3297static void parse_feature(const char *feature)
f963bd5d 3298{
f963bd5d
SR
3299 if (seen_data_command)
3300 die("Got feature command '%s' after data command", feature);
3301
081751c8 3302 if (parse_one_feature(feature, 1))
f963bd5d
SR
3303 return;
3304
3305 die("This version of fast-import does not support feature %s.", feature);
3306}
3307
97313bef 3308static void parse_option(const char *option)
9c8398f0 3309{
9c8398f0
SR
3310 if (seen_data_command)
3311 die("Got option command '%s' after data command", option);
3312
3313 if (parse_one_option(option))
3314 return;
3315
3316 die("This version of fast-import does not support option: %s", option);
e8438420
SP
3317}
3318
536900e5 3319static void git_pack_config(void)
bb23fdfa 3320{
536900e5
TA
3321 int indexversion_value;
3322 unsigned long packsizelimit_value;
3323
3324 if (!git_config_get_ulong("pack.depth", &max_depth)) {
bb23fdfa
SP
3325 if (max_depth > MAX_DEPTH)
3326 max_depth = MAX_DEPTH;
bb23fdfa 3327 }
536900e5
TA
3328 if (!git_config_get_int("pack.compression", &pack_compression_level)) {
3329 if (pack_compression_level == -1)
3330 pack_compression_level = Z_DEFAULT_COMPRESSION;
3331 else if (pack_compression_level < 0 ||
3332 pack_compression_level > Z_BEST_COMPRESSION)
3333 git_die_config("pack.compression",
3334 "bad pack compression level %d", pack_compression_level);
bb23fdfa 3335 pack_compression_seen = 1;
bb23fdfa 3336 }
536900e5
TA
3337 if (!git_config_get_int("pack.indexversion", &indexversion_value)) {
3338 pack_idx_opts.version = indexversion_value;
ebcfb379 3339 if (pack_idx_opts.version > 2)
536900e5
TA
3340 git_die_config("pack.indexversion",
3341 "bad pack.indexversion=%"PRIu32, pack_idx_opts.version);
8c2ca8dd 3342 }
536900e5
TA
3343 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
3344 max_packsize = packsizelimit_value;
3345
3346 git_config(git_default_config, NULL);
bb23fdfa
SP
3347}
3348
d5c57b28 3349static const char fast_import_usage[] =
62b4698e 3350"git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
d5c57b28 3351
9c8398f0
SR
3352static void parse_argv(void)
3353{
3354 unsigned int i;
3355
3356 for (i = 1; i < global_argc; i++) {
3357 const char *a = global_argv[i];
3358
3359 if (*a != '-' || !strcmp(a, "--"))
3360 break;
3361
ff45c0d4
JK
3362 if (!skip_prefix(a, "--", &a))
3363 die("unknown option %s", a);
3364
3365 if (parse_one_option(a))
9c8398f0
SR
3366 continue;
3367
ff45c0d4 3368 if (parse_one_feature(a, 0))
9c8398f0
SR
3369 continue;
3370
ff45c0d4
JK
3371 if (skip_prefix(a, "cat-blob-fd=", &a)) {
3372 option_cat_blob_fd(a);
85c62395
DB
3373 continue;
3374 }
3375
ff45c0d4 3376 die("unknown option --%s", a);
9c8398f0
SR
3377 }
3378 if (i != global_argc)
3379 usage(fast_import_usage);
3380
3381 seen_data_command = 1;
3382 if (import_marks_file)
3383 read_marks();
3384}
3385
84d32bf7 3386int main(int argc, char **argv)
8bcce301 3387{
0f6927c2 3388 unsigned int i;
8bcce301 3389
2fb3f6db
SP
3390 git_extract_argv0_path(argv[0]);
3391
5e9637c6
ÆAB
3392 git_setup_gettext();
3393
71a04a8b
JN
3394 if (argc == 2 && !strcmp(argv[1], "-h"))
3395 usage(fast_import_usage);
3396
733ee2b7 3397 setup_git_directory();
ebcfb379 3398 reset_pack_idx_option(&pack_idx_opts);
536900e5 3399 git_pack_config();
bb23fdfa
SP
3400 if (!pack_compression_seen && core_compression_seen)
3401 pack_compression_level = core_compression_level;
3402
93e72d8d 3403 alloc_objects(object_entry_alloc);
f1696ee3 3404