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