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