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