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