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