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