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