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