2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp commit-ish lf)?
26 ('merge' sp commit-ish lf)*
31 ls ::= 'ls' sp '"' quoted(path) '"' lf;
33 file_change ::= file_clr
39 file_clr ::= 'deleteall' lf;
40 file_del ::= 'D' sp path_str lf;
41 file_rnm ::= 'R' sp path_str sp path_str lf;
42 file_cpy ::= 'C' sp path_str sp path_str lf;
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
46 note_obm ::= 'N' sp (hexsha1 | idnum) sp commit-ish lf;
47 note_inm ::= 'N' sp 'inline' sp commit-ish lf
50 new_tag ::= 'tag' sp tag_str lf
51 'from' sp commit-ish lf
52 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
56 reset_branch ::= 'reset' sp ref_str lf
57 ('from' sp commit-ish lf)?
60 checkpoint ::= 'checkpoint' lf
63 progress ::= 'progress' sp not_lf* lf
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
69 # idnum can be updated in the future to a new object by issuing
70 # a new mark directive with the old idnum.
72 mark ::= 'mark' sp idnum lf;
73 data ::= (delimited_data | exact_data)
76 # note: delim may be any string but must not contain lf.
77 # data_line may contain any data but must not be exactly
79 delimited_data ::= 'data' sp '<<' delim lf
83 # note: declen indicates the length of binary_data in bytes.
84 # declen does not include the lf preceding the binary data.
86 exact_data ::= 'data' sp declen lf
89 # note: quoted strings are C-style quoting supporting \c for
90 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
91 # is the signed byte value in octal. Note that the only
92 # characters which must actually be escaped to protect the
93 # stream formatting is: \, " and LF. Otherwise these values
96 commit-ish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
98 sha1exp_str ::= sha1exp;
100 path_str ::= path | '"' quoted(path) '"' ;
101 mode ::= '100644' | '644'
106 declen ::= # unsigned 32 bit value, ascii base10 notation;
107 bigint ::= # unsigned integer value, ascii base10 notation;
108 binary_data ::= # file content, not interpreted;
110 when ::= raw_when | rfc2822_when;
111 raw_when ::= ts sp tz;
112 rfc2822_when ::= # Valid RFC 2822 date and time;
114 sp ::= # ASCII space character;
115 lf ::= # ASCII newline (LF) character;
117 # note: a colon (':') must precede the numerical value assigned to
118 # an idnum. This is to distinguish it from a ref or tag name as
119 # GIT does not permit ':' in ref or tag strings.
121 idnum ::= ':' bigint;
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";
125 sha1exp ::= # Any valid GIT SHA1 expression;
126 hexsha1 ::= # SHA1 in hexadecimal format;
128 # note: name and email are UTF8 strings, however name must not
129 # contain '<' or lf and email must not contain any of the
130 # following: '<', '>', lf.
132 name ::= # valid GIT author/committer name;
133 email ::= # valid GIT author/committer email;
134 ts ::= # time since the epoch in seconds, ascii base10 notation;
135 tz ::= # GIT style timezone;
137 # note: comments, get-mark, ls-tree, and cat-blob requests may
138 # appear anywhere in the input, except within a data command. Any
139 # form of the data command always escapes the related input from
140 # comment processing.
142 # In case it is not clear, the '#' that starts the comment
143 # must be the first character on that line (an lf
147 get_mark ::= 'get-mark' sp idnum lf;
148 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
149 ls_tree ::= 'ls' sp (hexsha1 | idnum) sp path_str lf;
151 comment ::= '#' not_lf* lf;
152 not_lf ::= # Any byte that is not ASCII newline (LF);
157 #include "lockfile.h"
165 #include "csum-file.h"
167 #include "exec_cmd.h"
169 #include "run-command.h"
171 #define PACK_ID_BITS 16
172 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
173 #define DEPTH_BITS 13
174 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
177 * We abuse the setuid bit on directories to mean "do not delta".
179 #define NO_DELTA S_ISUID
181 struct object_entry {
182 struct pack_idx_entry idx;
183 struct object_entry *next;
184 uint32_t type : TYPE_BITS,
185 pack_id : PACK_ID_BITS,
189 struct object_entry_pool {
190 struct object_entry_pool *next_pool;
191 struct object_entry *next_free;
192 struct object_entry *end;
193 struct object_entry entries[FLEX_ARRAY]; /* more */
198 struct object_entry *marked[1024];
199 struct mark_set *sets[1024];
208 unsigned no_swap : 1;
212 struct mem_pool *next_pool;
215 uintmax_t space[FLEX_ARRAY]; /* more */
219 struct atom_str *next_atom;
220 unsigned short str_len;
221 char str_dat[FLEX_ARRAY]; /* more */
226 struct tree_content *tree;
227 struct atom_str *name;
228 struct tree_entry_ms {
230 unsigned char sha1[20];
234 struct tree_content {
235 unsigned int entry_capacity; /* must match avail_tree_content */
236 unsigned int entry_count;
237 unsigned int delta_depth;
238 struct tree_entry *entries[FLEX_ARRAY]; /* more */
241 struct avail_tree_content {
242 unsigned int entry_capacity; /* must match tree_content */
243 struct avail_tree_content *next_avail;
247 struct branch *table_next_branch;
248 struct branch *active_next_branch;
250 struct tree_entry branch_tree;
251 uintmax_t last_commit;
255 unsigned pack_id : PACK_ID_BITS;
256 unsigned char sha1[20];
260 struct tag *next_tag;
262 unsigned int pack_id;
263 unsigned char sha1[20];
267 struct hash_list *next;
268 unsigned char sha1[20];
277 struct recent_command {
278 struct recent_command *prev;
279 struct recent_command *next;
283 /* Configured limits on output */
284 static unsigned long max_depth = 10;
285 static off_t max_packsize;
286 static int unpack_limit = 100;
287 static int force_update;
288 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
289 static int pack_compression_seen;
291 /* Stats and misc. counters */
292 static uintmax_t alloc_count;
293 static uintmax_t marks_set_count;
294 static uintmax_t object_count_by_type[1 << TYPE_BITS];
295 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
296 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
297 static uintmax_t delta_count_attempts_by_type[1 << TYPE_BITS];
298 static unsigned long object_count;
299 static unsigned long branch_count;
300 static unsigned long branch_load_count;
302 static FILE *pack_edges;
303 static unsigned int show_stats = 1;
304 static int global_argc;
305 static char **global_argv;
308 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
309 static size_t total_allocd;
310 static struct mem_pool *mem_pool;
312 /* Atom management */
313 static unsigned int atom_table_sz = 4451;
314 static unsigned int atom_cnt;
315 static struct atom_str **atom_table;
317 /* The .pack file being generated */
318 static struct pack_idx_option pack_idx_opts;
319 static unsigned int pack_id;
320 static struct sha1file *pack_file;
321 static struct packed_git *pack_data;
322 static struct packed_git **all_packs;
323 static off_t pack_size;
325 /* Table of objects we've written. */
326 static unsigned int object_entry_alloc = 5000;
327 static struct object_entry_pool *blocks;
328 static struct object_entry *object_table[1 << 16];
329 static struct mark_set *marks;
330 static const char *export_marks_file;
331 static const char *import_marks_file;
332 static int import_marks_file_from_stream;
333 static int import_marks_file_ignore_missing;
334 static int relative_marks_paths;
337 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
339 /* Tree management */
340 static unsigned int tree_entry_alloc = 1000;
341 static void *avail_tree_entry;
342 static unsigned int avail_tree_table_sz = 100;
343 static struct avail_tree_content **avail_tree_table;
344 static struct strbuf old_tree = STRBUF_INIT;
345 static struct strbuf new_tree = STRBUF_INIT;
348 static unsigned long max_active_branches = 5;
349 static unsigned long cur_active_branches;
350 static unsigned long branch_table_sz = 1039;
351 static struct branch **branch_table;
352 static struct branch *active_branches;
355 static struct tag *first_tag;
356 static struct tag *last_tag;
358 /* Input stream parsing */
359 static whenspec_type whenspec = WHENSPEC_RAW;
360 static struct strbuf command_buf = STRBUF_INIT;
361 static int unread_command_buf;
362 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
363 static struct recent_command *cmd_tail = &cmd_hist;
364 static struct recent_command *rc_free;
365 static unsigned int cmd_save = 100;
366 static uintmax_t next_mark;
367 static struct strbuf new_data = STRBUF_INIT;
368 static int seen_data_command;
369 static int require_explicit_termination;
371 /* Signal handling */
372 static volatile sig_atomic_t checkpoint_requested;
374 /* Where to write output of cat-blob commands */
375 static int cat_blob_fd = STDOUT_FILENO;
377 static void parse_argv(void);
378 static void parse_get_mark(const char *p);
379 static void parse_cat_blob(const char *p);
380 static void parse_ls(const char *p, struct branch *b);
382 static void write_branch_report(FILE *rpt, struct branch *b)
384 fprintf(rpt, "%s:\n", b->name);
386 fprintf(rpt, " status :");
388 fputs(" active", rpt);
389 if (b->branch_tree.tree)
390 fputs(" loaded", rpt);
391 if (is_null_sha1(b->branch_tree.versions[1].sha1))
392 fputs(" dirty", rpt);
395 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
396 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
397 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
398 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
400 fputs(" last pack : ", rpt);
401 if (b->pack_id < MAX_PACK_ID)
402 fprintf(rpt, "%u", b->pack_id);
408 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
410 static void write_crash_report(const char *err)
412 char *loc = git_pathdup("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
413 FILE *rpt = fopen(loc, "w");
416 struct recent_command *rc;
419 error("can't write crash report %s: %s", loc, strerror(errno));
424 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
426 fprintf(rpt, "fast-import crash report:\n");
427 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
428 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
429 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_MODE(ISO8601)));
432 fputs("fatal: ", rpt);
437 fputs("Most Recent Commands Before Crash\n", rpt);
438 fputs("---------------------------------\n", rpt);
439 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
440 if (rc->next == &cmd_hist)
449 fputs("Active Branch LRU\n", rpt);
450 fputs("-----------------\n", rpt);
451 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
453 max_active_branches);
455 fputs(" pos clock name\n", rpt);
456 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
457 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
458 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
459 ++lu, b->last_commit, b->name);
462 fputs("Inactive Branches\n", rpt);
463 fputs("-----------------\n", rpt);
464 for (lu = 0; lu < branch_table_sz; lu++) {
465 for (b = branch_table[lu]; b; b = b->table_next_branch)
466 write_branch_report(rpt, b);
472 fputs("Annotated Tags\n", rpt);
473 fputs("--------------\n", rpt);
474 for (tg = first_tag; tg; tg = tg->next_tag) {
475 fputs(sha1_to_hex(tg->sha1), rpt);
477 fputs(tg->name, rpt);
483 fputs("Marks\n", rpt);
484 fputs("-----\n", rpt);
485 if (export_marks_file)
486 fprintf(rpt, " exported to %s\n", export_marks_file);
488 dump_marks_helper(rpt, 0, marks);
491 fputs("-------------------\n", rpt);
492 fputs("END OF CRASH REPORT\n", rpt);
497 static void end_packfile(void);
498 static void unkeep_all_packs(void);
499 static void dump_marks(void);
501 static NORETURN void die_nicely(const char *err, va_list params)
504 char message[2 * PATH_MAX];
506 vsnprintf(message, sizeof(message), err, params);
507 fputs("fatal: ", stderr);
508 fputs(message, stderr);
513 write_crash_report(message);
521 #ifndef SIGUSR1 /* Windows, for example */
523 static void set_checkpoint_signal(void)
529 static void checkpoint_signal(int signo)
531 checkpoint_requested = 1;
534 static void set_checkpoint_signal(void)
538 memset(&sa, 0, sizeof(sa));
539 sa.sa_handler = checkpoint_signal;
540 sigemptyset(&sa.sa_mask);
541 sa.sa_flags = SA_RESTART;
542 sigaction(SIGUSR1, &sa, NULL);
547 static void alloc_objects(unsigned int cnt)
549 struct object_entry_pool *b;
551 b = xmalloc(sizeof(struct object_entry_pool)
552 + cnt * sizeof(struct object_entry));
553 b->next_pool = blocks;
554 b->next_free = b->entries;
555 b->end = b->entries + cnt;
560 static struct object_entry *new_object(unsigned char *sha1)
562 struct object_entry *e;
564 if (blocks->next_free == blocks->end)
565 alloc_objects(object_entry_alloc);
567 e = blocks->next_free++;
568 hashcpy(e->idx.sha1, sha1);
572 static struct object_entry *find_object(unsigned char *sha1)
574 unsigned int h = sha1[0] << 8 | sha1[1];
575 struct object_entry *e;
576 for (e = object_table[h]; e; e = e->next)
577 if (!hashcmp(sha1, e->idx.sha1))
582 static struct object_entry *insert_object(unsigned char *sha1)
584 unsigned int h = sha1[0] << 8 | sha1[1];
585 struct object_entry *e = object_table[h];
588 if (!hashcmp(sha1, e->idx.sha1))
593 e = new_object(sha1);
594 e->next = object_table[h];
600 static void invalidate_pack_id(unsigned int id)
606 for (h = 0; h < ARRAY_SIZE(object_table); h++) {
607 struct object_entry *e;
609 for (e = object_table[h]; e; e = e->next)
610 if (e->pack_id == id)
611 e->pack_id = MAX_PACK_ID;
614 for (lu = 0; lu < branch_table_sz; lu++) {
617 for (b = branch_table[lu]; b; b = b->table_next_branch)
618 if (b->pack_id == id)
619 b->pack_id = MAX_PACK_ID;
622 for (t = first_tag; t; t = t->next_tag)
623 if (t->pack_id == id)
624 t->pack_id = MAX_PACK_ID;
627 static unsigned int hc_str(const char *s, size_t len)
635 static void *pool_alloc(size_t len)
640 /* round up to a 'uintmax_t' alignment */
641 if (len & (sizeof(uintmax_t) - 1))
642 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
644 for (p = mem_pool; p; p = p->next_pool)
645 if ((p->end - p->next_free >= len))
649 if (len >= (mem_pool_alloc/2)) {
653 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
654 p = xmalloc(st_add(sizeof(struct mem_pool), mem_pool_alloc));
655 p->next_pool = mem_pool;
656 p->next_free = (char *) p->space;
657 p->end = p->next_free + mem_pool_alloc;
666 static void *pool_calloc(size_t count, size_t size)
668 size_t len = count * size;
669 void *r = pool_alloc(len);
674 static char *pool_strdup(const char *s)
676 size_t len = strlen(s) + 1;
677 char *r = pool_alloc(len);
682 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
684 struct mark_set *s = marks;
685 while ((idnum >> s->shift) >= 1024) {
686 s = pool_calloc(1, sizeof(struct mark_set));
687 s->shift = marks->shift + 10;
688 s->data.sets[0] = marks;
692 uintmax_t i = idnum >> s->shift;
693 idnum -= i << s->shift;
694 if (!s->data.sets[i]) {
695 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
696 s->data.sets[i]->shift = s->shift - 10;
700 if (!s->data.marked[idnum])
702 s->data.marked[idnum] = oe;
705 static struct object_entry *find_mark(uintmax_t idnum)
707 uintmax_t orig_idnum = idnum;
708 struct mark_set *s = marks;
709 struct object_entry *oe = NULL;
710 if ((idnum >> s->shift) < 1024) {
711 while (s && s->shift) {
712 uintmax_t i = idnum >> s->shift;
713 idnum -= i << s->shift;
717 oe = s->data.marked[idnum];
720 die("mark :%" PRIuMAX " not declared", orig_idnum);
724 static struct atom_str *to_atom(const char *s, unsigned short len)
726 unsigned int hc = hc_str(s, len) % atom_table_sz;
729 for (c = atom_table[hc]; c; c = c->next_atom)
730 if (c->str_len == len && !strncmp(s, c->str_dat, len))
733 c = pool_alloc(sizeof(struct atom_str) + len + 1);
735 memcpy(c->str_dat, s, len);
737 c->next_atom = atom_table[hc];
743 static struct branch *lookup_branch(const char *name)
745 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
748 for (b = branch_table[hc]; b; b = b->table_next_branch)
749 if (!strcmp(name, b->name))
754 static struct branch *new_branch(const char *name)
756 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
757 struct branch *b = lookup_branch(name);
760 die("Invalid attempt to create duplicate branch: %s", name);
761 if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL))
762 die("Branch name doesn't conform to GIT standards: %s", name);
764 b = pool_calloc(1, sizeof(struct branch));
765 b->name = pool_strdup(name);
766 b->table_next_branch = branch_table[hc];
767 b->branch_tree.versions[0].mode = S_IFDIR;
768 b->branch_tree.versions[1].mode = S_IFDIR;
771 b->pack_id = MAX_PACK_ID;
772 branch_table[hc] = b;
777 static unsigned int hc_entries(unsigned int cnt)
779 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
780 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
783 static struct tree_content *new_tree_content(unsigned int cnt)
785 struct avail_tree_content *f, *l = NULL;
786 struct tree_content *t;
787 unsigned int hc = hc_entries(cnt);
789 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
790 if (f->entry_capacity >= cnt)
795 l->next_avail = f->next_avail;
797 avail_tree_table[hc] = f->next_avail;
799 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
800 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
801 f->entry_capacity = cnt;
804 t = (struct tree_content*)f;
810 static void release_tree_entry(struct tree_entry *e);
811 static void release_tree_content(struct tree_content *t)
813 struct avail_tree_content *f = (struct avail_tree_content*)t;
814 unsigned int hc = hc_entries(f->entry_capacity);
815 f->next_avail = avail_tree_table[hc];
816 avail_tree_table[hc] = f;
819 static void release_tree_content_recursive(struct tree_content *t)
822 for (i = 0; i < t->entry_count; i++)
823 release_tree_entry(t->entries[i]);
824 release_tree_content(t);
827 static struct tree_content *grow_tree_content(
828 struct tree_content *t,
831 struct tree_content *r = new_tree_content(t->entry_count + amt);
832 r->entry_count = t->entry_count;
833 r->delta_depth = t->delta_depth;
834 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
835 release_tree_content(t);
839 static struct tree_entry *new_tree_entry(void)
841 struct tree_entry *e;
843 if (!avail_tree_entry) {
844 unsigned int n = tree_entry_alloc;
845 total_allocd += n * sizeof(struct tree_entry);
847 avail_tree_entry = e;
849 *((void**)e) = e + 1;
855 e = avail_tree_entry;
856 avail_tree_entry = *((void**)e);
860 static void release_tree_entry(struct tree_entry *e)
863 release_tree_content_recursive(e->tree);
864 *((void**)e) = avail_tree_entry;
865 avail_tree_entry = e;
868 static struct tree_content *dup_tree_content(struct tree_content *s)
870 struct tree_content *d;
871 struct tree_entry *a, *b;
876 d = new_tree_content(s->entry_count);
877 for (i = 0; i < s->entry_count; i++) {
879 b = new_tree_entry();
880 memcpy(b, a, sizeof(*a));
881 if (a->tree && is_null_sha1(b->versions[1].sha1))
882 b->tree = dup_tree_content(a->tree);
887 d->entry_count = s->entry_count;
888 d->delta_depth = s->delta_depth;
893 static void start_packfile(void)
895 static char tmp_file[PATH_MAX];
896 struct packed_git *p;
897 struct pack_header hdr;
900 pack_fd = odb_mkstemp(tmp_file, sizeof(tmp_file),
901 "pack/tmp_pack_XXXXXX");
902 FLEX_ALLOC_STR(p, pack_name, tmp_file);
903 p->pack_fd = pack_fd;
905 pack_file = sha1fd(pack_fd, p->pack_name);
907 hdr.hdr_signature = htonl(PACK_SIGNATURE);
908 hdr.hdr_version = htonl(2);
910 sha1write(pack_file, &hdr, sizeof(hdr));
913 pack_size = sizeof(hdr);
916 REALLOC_ARRAY(all_packs, pack_id + 1);
917 all_packs[pack_id] = p;
920 static const char *create_index(void)
923 struct pack_idx_entry **idx, **c, **last;
924 struct object_entry *e;
925 struct object_entry_pool *o;
927 /* Build the table of object IDs. */
928 ALLOC_ARRAY(idx, object_count);
930 for (o = blocks; o; o = o->next_pool)
931 for (e = o->next_free; e-- != o->entries;)
932 if (pack_id == e->pack_id)
934 last = idx + object_count;
936 die("internal consistency error creating the index");
938 tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, pack_data->sha1);
943 static char *keep_pack(const char *curr_index_name)
945 static char name[PATH_MAX];
946 static const char *keep_msg = "fast-import";
949 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
951 die_errno("cannot create keep file");
952 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
954 die_errno("failed to write keep file");
956 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
957 get_object_directory(), sha1_to_hex(pack_data->sha1));
958 if (finalize_object_file(pack_data->pack_name, name))
959 die("cannot store pack file");
961 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
962 get_object_directory(), sha1_to_hex(pack_data->sha1));
963 if (finalize_object_file(curr_index_name, name))
964 die("cannot store index file");
965 free((void *)curr_index_name);
969 static void unkeep_all_packs(void)
971 static char name[PATH_MAX];
974 for (k = 0; k < pack_id; k++) {
975 struct packed_git *p = all_packs[k];
976 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
977 get_object_directory(), sha1_to_hex(p->sha1));
978 unlink_or_warn(name);
982 static int loosen_small_pack(const struct packed_git *p)
984 struct child_process unpack = CHILD_PROCESS_INIT;
986 if (lseek(p->pack_fd, 0, SEEK_SET) < 0)
987 die_errno("Failed seeking to start of '%s'", p->pack_name);
989 unpack.in = p->pack_fd;
991 unpack.stdout_to_stderr = 1;
992 argv_array_push(&unpack.args, "unpack-objects");
994 argv_array_push(&unpack.args, "-q");
996 return run_command(&unpack);
999 static void end_packfile(void)
1003 if (running || !pack_data)
1007 clear_delta_base_cache();
1009 struct packed_git *new_p;
1010 unsigned char cur_pack_sha1[20];
1016 close_pack_windows(pack_data);
1017 sha1close(pack_file, cur_pack_sha1, 0);
1018 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
1019 pack_data->pack_name, object_count,
1020 cur_pack_sha1, pack_size);
1022 if (object_count <= unpack_limit) {
1023 if (!loosen_small_pack(pack_data)) {
1024 invalidate_pack_id(pack_id);
1029 close(pack_data->pack_fd);
1030 idx_name = keep_pack(create_index());
1032 /* Register the packfile with core git's machinery. */
1033 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
1035 die("core git rejected index %s", idx_name);
1036 all_packs[pack_id] = new_p;
1037 install_packed_git(new_p);
1039 /* Print the boundary */
1041 fprintf(pack_edges, "%s:", new_p->pack_name);
1042 for (i = 0; i < branch_table_sz; i++) {
1043 for (b = branch_table[i]; b; b = b->table_next_branch) {
1044 if (b->pack_id == pack_id)
1045 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
1048 for (t = first_tag; t; t = t->next_tag) {
1049 if (t->pack_id == pack_id)
1050 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
1052 fputc('\n', pack_edges);
1060 close(pack_data->pack_fd);
1061 unlink_or_warn(pack_data->pack_name);
1067 /* We can't carry a delta across packfiles. */
1068 strbuf_release(&last_blob.data);
1069 last_blob.offset = 0;
1070 last_blob.depth = 0;
1073 static void cycle_packfile(void)
1079 static int store_object(
1080 enum object_type type,
1082 struct last_object *last,
1083 unsigned char *sha1out,
1087 struct object_entry *e;
1088 unsigned char hdr[96];
1089 unsigned char sha1[20];
1090 unsigned long hdrlen, deltalen;
1094 hdrlen = xsnprintf((char *)hdr, sizeof(hdr), "%s %lu",
1095 typename(type), (unsigned long)dat->len) + 1;
1097 git_SHA1_Update(&c, hdr, hdrlen);
1098 git_SHA1_Update(&c, dat->buf, dat->len);
1099 git_SHA1_Final(sha1, &c);
1101 hashcpy(sha1out, sha1);
1103 e = insert_object(sha1);
1105 insert_mark(mark, e);
1106 if (e->idx.offset) {
1107 duplicate_count_by_type[type]++;
1109 } else if (find_sha1_pack(sha1, packed_git)) {
1111 e->pack_id = MAX_PACK_ID;
1112 e->idx.offset = 1; /* just not zero! */
1113 duplicate_count_by_type[type]++;
1117 if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
1118 delta_count_attempts_by_type[type]++;
1119 delta = diff_delta(last->data.buf, last->data.len,
1121 &deltalen, dat->len - 20);
1125 git_deflate_init(&s, pack_compression_level);
1128 s.avail_in = deltalen;
1130 s.next_in = (void *)dat->buf;
1131 s.avail_in = dat->len;
1133 s.avail_out = git_deflate_bound(&s, s.avail_in);
1134 s.next_out = out = xmalloc(s.avail_out);
1135 while (git_deflate(&s, Z_FINISH) == Z_OK)
1137 git_deflate_end(&s);
1139 /* Determine if we should auto-checkpoint. */
1140 if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
1141 || (pack_size + 60 + s.total_out) < pack_size) {
1143 /* This new object needs to *not* have the current pack_id. */
1144 e->pack_id = pack_id + 1;
1147 /* We cannot carry a delta into the new pack. */
1152 git_deflate_init(&s, pack_compression_level);
1153 s.next_in = (void *)dat->buf;
1154 s.avail_in = dat->len;
1155 s.avail_out = git_deflate_bound(&s, s.avail_in);
1156 s.next_out = out = xrealloc(out, s.avail_out);
1157 while (git_deflate(&s, Z_FINISH) == Z_OK)
1159 git_deflate_end(&s);
1164 e->pack_id = pack_id;
1165 e->idx.offset = pack_size;
1167 object_count_by_type[type]++;
1169 crc32_begin(pack_file);
1172 off_t ofs = e->idx.offset - last->offset;
1173 unsigned pos = sizeof(hdr) - 1;
1175 delta_count_by_type[type]++;
1176 e->depth = last->depth + 1;
1178 hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
1179 sha1write(pack_file, hdr, hdrlen);
1180 pack_size += hdrlen;
1182 hdr[pos] = ofs & 127;
1184 hdr[--pos] = 128 | (--ofs & 127);
1185 sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
1186 pack_size += sizeof(hdr) - pos;
1189 hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
1190 sha1write(pack_file, hdr, hdrlen);
1191 pack_size += hdrlen;
1194 sha1write(pack_file, out, s.total_out);
1195 pack_size += s.total_out;
1197 e->idx.crc32 = crc32_end(pack_file);
1202 if (last->no_swap) {
1205 strbuf_swap(&last->data, dat);
1207 last->offset = e->idx.offset;
1208 last->depth = e->depth;
1213 static void truncate_pack(struct sha1file_checkpoint *checkpoint)
1215 if (sha1file_truncate(pack_file, checkpoint))
1216 die_errno("cannot truncate pack to skip duplicate");
1217 pack_size = checkpoint->offset;
1220 static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1222 size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1223 unsigned char *in_buf = xmalloc(in_sz);
1224 unsigned char *out_buf = xmalloc(out_sz);
1225 struct object_entry *e;
1226 unsigned char sha1[20];
1227 unsigned long hdrlen;
1231 struct sha1file_checkpoint checkpoint;
1234 /* Determine if we should auto-checkpoint. */
1235 if ((max_packsize && (pack_size + 60 + len) > max_packsize)
1236 || (pack_size + 60 + len) < pack_size)
1239 sha1file_checkpoint(pack_file, &checkpoint);
1240 offset = checkpoint.offset;
1242 hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1243 if (out_sz <= hdrlen)
1244 die("impossibly large object header");
1247 git_SHA1_Update(&c, out_buf, hdrlen);
1249 crc32_begin(pack_file);
1251 git_deflate_init(&s, pack_compression_level);
1253 hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
1254 if (out_sz <= hdrlen)
1255 die("impossibly large object header");
1257 s.next_out = out_buf + hdrlen;
1258 s.avail_out = out_sz - hdrlen;
1260 while (status != Z_STREAM_END) {
1261 if (0 < len && !s.avail_in) {
1262 size_t cnt = in_sz < len ? in_sz : (size_t)len;
1263 size_t n = fread(in_buf, 1, cnt, stdin);
1264 if (!n && feof(stdin))
1265 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1267 git_SHA1_Update(&c, in_buf, n);
1273 status = git_deflate(&s, len ? 0 : Z_FINISH);
1275 if (!s.avail_out || status == Z_STREAM_END) {
1276 size_t n = s.next_out - out_buf;
1277 sha1write(pack_file, out_buf, n);
1279 s.next_out = out_buf;
1280 s.avail_out = out_sz;
1289 die("unexpected deflate failure: %d", status);
1292 git_deflate_end(&s);
1293 git_SHA1_Final(sha1, &c);
1296 hashcpy(sha1out, sha1);
1298 e = insert_object(sha1);
1301 insert_mark(mark, e);
1303 if (e->idx.offset) {
1304 duplicate_count_by_type[OBJ_BLOB]++;
1305 truncate_pack(&checkpoint);
1307 } else if (find_sha1_pack(sha1, packed_git)) {
1309 e->pack_id = MAX_PACK_ID;
1310 e->idx.offset = 1; /* just not zero! */
1311 duplicate_count_by_type[OBJ_BLOB]++;
1312 truncate_pack(&checkpoint);
1317 e->pack_id = pack_id;
1318 e->idx.offset = offset;
1319 e->idx.crc32 = crc32_end(pack_file);
1321 object_count_by_type[OBJ_BLOB]++;
1328 /* All calls must be guarded by find_object() or find_mark() to
1329 * ensure the 'struct object_entry' passed was written by this
1330 * process instance. We unpack the entry by the offset, avoiding
1331 * the need for the corresponding .idx file. This unpacking rule
1332 * works because we only use OBJ_REF_DELTA within the packfiles
1333 * created by fast-import.
1335 * oe must not be NULL. Such an oe usually comes from giving
1336 * an unknown SHA-1 to find_object() or an undefined mark to
1337 * find_mark(). Callers must test for this condition and use
1338 * the standard read_sha1_file() when it happens.
1340 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1341 * find_mark(), where the mark was reloaded from an existing marks
1342 * file and is referencing an object that this fast-import process
1343 * instance did not write out to a packfile. Callers must test for
1344 * this condition and use read_sha1_file() instead.
1346 static void *gfi_unpack_entry(
1347 struct object_entry *oe,
1348 unsigned long *sizep)
1350 enum object_type type;
1351 struct packed_git *p = all_packs[oe->pack_id];
1352 if (p == pack_data && p->pack_size < (pack_size + 20)) {
1353 /* The object is stored in the packfile we are writing to
1354 * and we have modified it since the last time we scanned
1355 * back to read a previously written object. If an old
1356 * window covered [p->pack_size, p->pack_size + 20) its
1357 * data is stale and is not valid. Closing all windows
1358 * and updating the packfile length ensures we can read
1359 * the newly written data.
1361 close_pack_windows(p);
1362 sha1flush(pack_file);
1364 /* We have to offer 20 bytes additional on the end of
1365 * the packfile as the core unpacker code assumes the
1366 * footer is present at the file end and must promise
1367 * at least 20 bytes within any window it maps. But
1368 * we don't actually create the footer here.
1370 p->pack_size = pack_size + 20;
1372 return unpack_entry(p, oe->idx.offset, &type, sizep);
1375 static const char *get_mode(const char *str, uint16_t *modep)
1380 while ((c = *str++) != ' ') {
1381 if (c < '0' || c > '7')
1383 mode = (mode << 3) + (c - '0');
1389 static void load_tree(struct tree_entry *root)
1391 unsigned char *sha1 = root->versions[1].sha1;
1392 struct object_entry *myoe;
1393 struct tree_content *t;
1398 root->tree = t = new_tree_content(8);
1399 if (is_null_sha1(sha1))
1402 myoe = find_object(sha1);
1403 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1404 if (myoe->type != OBJ_TREE)
1405 die("Not a tree: %s", sha1_to_hex(sha1));
1406 t->delta_depth = myoe->depth;
1407 buf = gfi_unpack_entry(myoe, &size);
1409 die("Can't load tree %s", sha1_to_hex(sha1));
1411 enum object_type type;
1412 buf = read_sha1_file(sha1, &type, &size);
1413 if (!buf || type != OBJ_TREE)
1414 die("Can't load tree %s", sha1_to_hex(sha1));
1418 while (c != (buf + size)) {
1419 struct tree_entry *e = new_tree_entry();
1421 if (t->entry_count == t->entry_capacity)
1422 root->tree = t = grow_tree_content(t, t->entry_count);
1423 t->entries[t->entry_count++] = e;
1426 c = get_mode(c, &e->versions[1].mode);
1428 die("Corrupt mode in %s", sha1_to_hex(sha1));
1429 e->versions[0].mode = e->versions[1].mode;
1430 e->name = to_atom(c, strlen(c));
1431 c += e->name->str_len + 1;
1432 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1433 hashcpy(e->versions[1].sha1, (unsigned char *)c);
1439 static int tecmp0 (const void *_a, const void *_b)
1441 struct tree_entry *a = *((struct tree_entry**)_a);
1442 struct tree_entry *b = *((struct tree_entry**)_b);
1443 return base_name_compare(
1444 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1445 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1448 static int tecmp1 (const void *_a, const void *_b)
1450 struct tree_entry *a = *((struct tree_entry**)_a);
1451 struct tree_entry *b = *((struct tree_entry**)_b);
1452 return base_name_compare(
1453 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1454 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1457 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1463 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1465 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1467 for (i = 0; i < t->entry_count; i++) {
1468 if (t->entries[i]->versions[v].mode)
1469 maxlen += t->entries[i]->name->str_len + 34;
1473 strbuf_grow(b, maxlen);
1474 for (i = 0; i < t->entry_count; i++) {
1475 struct tree_entry *e = t->entries[i];
1476 if (!e->versions[v].mode)
1478 strbuf_addf(b, "%o %s%c",
1479 (unsigned int)(e->versions[v].mode & ~NO_DELTA),
1480 e->name->str_dat, '\0');
1481 strbuf_add(b, e->versions[v].sha1, 20);
1485 static void store_tree(struct tree_entry *root)
1487 struct tree_content *t;
1488 unsigned int i, j, del;
1489 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1490 struct object_entry *le = NULL;
1492 if (!is_null_sha1(root->versions[1].sha1))
1499 for (i = 0; i < t->entry_count; i++) {
1500 if (t->entries[i]->tree)
1501 store_tree(t->entries[i]);
1504 if (!(root->versions[0].mode & NO_DELTA))
1505 le = find_object(root->versions[0].sha1);
1506 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1507 mktree(t, 0, &old_tree);
1509 lo.offset = le->idx.offset;
1510 lo.depth = t->delta_depth;
1513 mktree(t, 1, &new_tree);
1514 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1516 t->delta_depth = lo.depth;
1517 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1518 struct tree_entry *e = t->entries[i];
1519 if (e->versions[1].mode) {
1520 e->versions[0].mode = e->versions[1].mode;
1521 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1522 t->entries[j++] = e;
1524 release_tree_entry(e);
1528 t->entry_count -= del;
1531 static void tree_content_replace(
1532 struct tree_entry *root,
1533 const unsigned char *sha1,
1534 const uint16_t mode,
1535 struct tree_content *newtree)
1538 die("Root cannot be a non-directory");
1539 hashclr(root->versions[0].sha1);
1540 hashcpy(root->versions[1].sha1, sha1);
1542 release_tree_content_recursive(root->tree);
1543 root->tree = newtree;
1546 static int tree_content_set(
1547 struct tree_entry *root,
1549 const unsigned char *sha1,
1550 const uint16_t mode,
1551 struct tree_content *subtree)
1553 struct tree_content *t;
1556 struct tree_entry *e;
1558 slash1 = strchrnul(p, '/');
1561 die("Empty path component found in input");
1562 if (!*slash1 && !S_ISDIR(mode) && subtree)
1563 die("Non-directories cannot have subtrees");
1568 for (i = 0; i < t->entry_count; i++) {
1570 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1573 && e->versions[1].mode == mode
1574 && !hashcmp(e->versions[1].sha1, sha1))
1576 e->versions[1].mode = mode;
1577 hashcpy(e->versions[1].sha1, sha1);
1579 release_tree_content_recursive(e->tree);
1583 * We need to leave e->versions[0].sha1 alone
1584 * to avoid modifying the preimage tree used
1585 * when writing out the parent directory.
1586 * But after replacing the subdir with a
1587 * completely different one, it's not a good
1588 * delta base any more, and besides, we've
1589 * thrown away the tree entries needed to
1590 * make a delta against it.
1592 * So let's just explicitly disable deltas
1595 if (S_ISDIR(e->versions[0].mode))
1596 e->versions[0].mode |= NO_DELTA;
1598 hashclr(root->versions[1].sha1);
1601 if (!S_ISDIR(e->versions[1].mode)) {
1602 e->tree = new_tree_content(8);
1603 e->versions[1].mode = S_IFDIR;
1607 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1608 hashclr(root->versions[1].sha1);
1615 if (t->entry_count == t->entry_capacity)
1616 root->tree = t = grow_tree_content(t, t->entry_count);
1617 e = new_tree_entry();
1618 e->name = to_atom(p, n);
1619 e->versions[0].mode = 0;
1620 hashclr(e->versions[0].sha1);
1621 t->entries[t->entry_count++] = e;
1623 e->tree = new_tree_content(8);
1624 e->versions[1].mode = S_IFDIR;
1625 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1628 e->versions[1].mode = mode;
1629 hashcpy(e->versions[1].sha1, sha1);
1631 hashclr(root->versions[1].sha1);
1635 static int tree_content_remove(
1636 struct tree_entry *root,
1638 struct tree_entry *backup_leaf,
1641 struct tree_content *t;
1644 struct tree_entry *e;
1646 slash1 = strchrnul(p, '/');
1652 if (!*p && allow_root) {
1658 for (i = 0; i < t->entry_count; i++) {
1660 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1661 if (*slash1 && !S_ISDIR(e->versions[1].mode))
1663 * If p names a file in some subdirectory, and a
1664 * file or symlink matching the name of the
1665 * parent directory of p exists, then p cannot
1666 * exist and need not be deleted.
1669 if (!*slash1 || !S_ISDIR(e->versions[1].mode))
1673 if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) {
1674 for (n = 0; n < e->tree->entry_count; n++) {
1675 if (e->tree->entries[n]->versions[1].mode) {
1676 hashclr(root->versions[1].sha1);
1690 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1692 release_tree_content_recursive(e->tree);
1694 e->versions[1].mode = 0;
1695 hashclr(e->versions[1].sha1);
1696 hashclr(root->versions[1].sha1);
1700 static int tree_content_get(
1701 struct tree_entry *root,
1703 struct tree_entry *leaf,
1706 struct tree_content *t;
1709 struct tree_entry *e;
1711 slash1 = strchrnul(p, '/');
1713 if (!n && !allow_root)
1714 die("Empty path component found in input");
1725 for (i = 0; i < t->entry_count; i++) {
1727 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1730 if (!S_ISDIR(e->versions[1].mode))
1734 return tree_content_get(e, slash1 + 1, leaf, 0);
1740 memcpy(leaf, e, sizeof(*leaf));
1741 if (e->tree && is_null_sha1(e->versions[1].sha1))
1742 leaf->tree = dup_tree_content(e->tree);
1748 static int update_branch(struct branch *b)
1750 static const char *msg = "fast-import";
1751 struct ref_transaction *transaction;
1752 unsigned char old_sha1[20];
1753 struct strbuf err = STRBUF_INIT;
1755 if (is_null_sha1(b->sha1)) {
1757 delete_ref(b->name, NULL, 0);
1760 if (read_ref(b->name, old_sha1))
1762 if (!force_update && !is_null_sha1(old_sha1)) {
1763 struct commit *old_cmit, *new_cmit;
1765 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1766 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1767 if (!old_cmit || !new_cmit)
1768 return error("Branch %s is missing commits.", b->name);
1770 if (!in_merge_bases(old_cmit, new_cmit)) {
1771 warning("Not updating %s"
1772 " (new tip %s does not contain %s)",
1773 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1777 transaction = ref_transaction_begin(&err);
1779 ref_transaction_update(transaction, b->name, b->sha1, old_sha1,
1781 ref_transaction_commit(transaction, &err)) {
1782 ref_transaction_free(transaction);
1783 error("%s", err.buf);
1784 strbuf_release(&err);
1787 ref_transaction_free(transaction);
1788 strbuf_release(&err);
1792 static void dump_branches(void)
1797 for (i = 0; i < branch_table_sz; i++) {
1798 for (b = branch_table[i]; b; b = b->table_next_branch)
1799 failure |= update_branch(b);
1803 static void dump_tags(void)
1805 static const char *msg = "fast-import";
1807 struct strbuf ref_name = STRBUF_INIT;
1808 struct strbuf err = STRBUF_INIT;
1809 struct ref_transaction *transaction;
1811 transaction = ref_transaction_begin(&err);
1813 failure |= error("%s", err.buf);
1816 for (t = first_tag; t; t = t->next_tag) {
1817 strbuf_reset(&ref_name);
1818 strbuf_addf(&ref_name, "refs/tags/%s", t->name);
1820 if (ref_transaction_update(transaction, ref_name.buf,
1821 t->sha1, NULL, 0, msg, &err)) {
1822 failure |= error("%s", err.buf);
1826 if (ref_transaction_commit(transaction, &err))
1827 failure |= error("%s", err.buf);
1830 ref_transaction_free(transaction);
1831 strbuf_release(&ref_name);
1832 strbuf_release(&err);
1835 static void dump_marks_helper(FILE *f,
1841 for (k = 0; k < 1024; k++) {
1842 if (m->data.sets[k])
1843 dump_marks_helper(f, base + (k << m->shift),
1847 for (k = 0; k < 1024; k++) {
1848 if (m->data.marked[k])
1849 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1850 sha1_to_hex(m->data.marked[k]->idx.sha1));
1855 static void dump_marks(void)
1857 static struct lock_file mark_lock;
1860 if (!export_marks_file)
1863 if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
1864 failure |= error("Unable to write marks file %s: %s",
1865 export_marks_file, strerror(errno));
1869 f = fdopen_lock_file(&mark_lock, "w");
1871 int saved_errno = errno;
1872 rollback_lock_file(&mark_lock);
1873 failure |= error("Unable to write marks file %s: %s",
1874 export_marks_file, strerror(saved_errno));
1878 dump_marks_helper(f, 0, marks);
1879 if (commit_lock_file(&mark_lock)) {
1880 failure |= error("Unable to write file %s: %s",
1881 export_marks_file, strerror(errno));
1886 static void read_marks(void)
1889 FILE *f = fopen(import_marks_file, "r");
1892 else if (import_marks_file_ignore_missing && errno == ENOENT)
1893 return; /* Marks file does not exist */
1895 die_errno("cannot read '%s'", import_marks_file);
1896 while (fgets(line, sizeof(line), f)) {
1899 unsigned char sha1[20];
1900 struct object_entry *e;
1902 end = strchr(line, '\n');
1903 if (line[0] != ':' || !end)
1904 die("corrupt mark line: %s", line);
1906 mark = strtoumax(line + 1, &end, 10);
1907 if (!mark || end == line + 1
1908 || *end != ' ' || get_sha1_hex(end + 1, sha1))
1909 die("corrupt mark line: %s", line);
1910 e = find_object(sha1);
1912 enum object_type type = sha1_object_info(sha1, NULL);
1914 die("object not found: %s", sha1_to_hex(sha1));
1915 e = insert_object(sha1);
1917 e->pack_id = MAX_PACK_ID;
1918 e->idx.offset = 1; /* just not zero! */
1920 insert_mark(mark, e);
1926 static int read_next_command(void)
1928 static int stdin_eof = 0;
1931 unread_command_buf = 0;
1938 if (unread_command_buf) {
1939 unread_command_buf = 0;
1941 struct recent_command *rc;
1943 strbuf_detach(&command_buf, NULL);
1944 stdin_eof = strbuf_getline_lf(&command_buf, stdin);
1948 if (!seen_data_command
1949 && !starts_with(command_buf.buf, "feature ")
1950 && !starts_with(command_buf.buf, "option ")) {
1959 cmd_hist.next = rc->next;
1960 cmd_hist.next->prev = &cmd_hist;
1964 rc->buf = command_buf.buf;
1965 rc->prev = cmd_tail;
1966 rc->next = cmd_hist.prev;
1967 rc->prev->next = rc;
1970 if (skip_prefix(command_buf.buf, "get-mark ", &p)) {
1974 if (skip_prefix(command_buf.buf, "cat-blob ", &p)) {
1978 if (command_buf.buf[0] == '#')
1984 static void skip_optional_lf(void)
1986 int term_char = fgetc(stdin);
1987 if (term_char != '\n' && term_char != EOF)
1988 ungetc(term_char, stdin);
1991 static void parse_mark(void)
1994 if (skip_prefix(command_buf.buf, "mark :", &v)) {
1995 next_mark = strtoumax(v, NULL, 10);
1996 read_next_command();
2002 static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
2007 if (!skip_prefix(command_buf.buf, "data ", &data))
2008 die("Expected 'data n' command, found: %s", command_buf.buf);
2010 if (skip_prefix(data, "<<", &data)) {
2011 char *term = xstrdup(data);
2012 size_t term_len = command_buf.len - (data - command_buf.buf);
2014 strbuf_detach(&command_buf, NULL);
2016 if (strbuf_getline_lf(&command_buf, stdin) == EOF)
2017 die("EOF in data (terminator '%s' not found)", term);
2018 if (term_len == command_buf.len
2019 && !strcmp(term, command_buf.buf))
2021 strbuf_addbuf(sb, &command_buf);
2022 strbuf_addch(sb, '\n');
2027 uintmax_t len = strtoumax(data, NULL, 10);
2028 size_t n = 0, length = (size_t)len;
2030 if (limit && limit < len) {
2035 die("data is too large to use in this context");
2037 while (n < length) {
2038 size_t s = strbuf_fread(sb, length - n, stdin);
2039 if (!s && feof(stdin))
2040 die("EOF in data (%lu bytes remaining)",
2041 (unsigned long)(length - n));
2050 static int validate_raw_date(const char *src, struct strbuf *result)
2052 const char *orig_src = src;
2058 num = strtoul(src, &endp, 10);
2059 /* NEEDSWORK: perhaps check for reasonable values? */
2060 if (errno || endp == src || *endp != ' ')
2064 if (*src != '-' && *src != '+')
2067 num = strtoul(src + 1, &endp, 10);
2068 if (errno || endp == src + 1 || *endp || 1400 < num)
2071 strbuf_addstr(result, orig_src);
2075 static char *parse_ident(const char *buf)
2079 struct strbuf ident = STRBUF_INIT;
2081 /* ensure there is a space delimiter even if there is no name */
2085 ltgt = buf + strcspn(buf, "<>");
2087 die("Missing < in ident string: %s", buf);
2088 if (ltgt != buf && ltgt[-1] != ' ')
2089 die("Missing space before < in ident string: %s", buf);
2090 ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>");
2092 die("Missing > in ident string: %s", buf);
2095 die("Missing space after > in ident string: %s", buf);
2097 name_len = ltgt - buf;
2098 strbuf_add(&ident, buf, name_len);
2102 if (validate_raw_date(ltgt, &ident) < 0)
2103 die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
2105 case WHENSPEC_RFC2822:
2106 if (parse_date(ltgt, &ident) < 0)
2107 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf);
2110 if (strcmp("now", ltgt))
2111 die("Date in ident must be 'now': %s", buf);
2116 return strbuf_detach(&ident, NULL);
2119 static void parse_and_store_blob(
2120 struct last_object *last,
2121 unsigned char *sha1out,
2124 static struct strbuf buf = STRBUF_INIT;
2127 if (parse_data(&buf, big_file_threshold, &len))
2128 store_object(OBJ_BLOB, &buf, last, sha1out, mark);
2131 strbuf_release(&last->data);
2135 stream_blob(len, sha1out, mark);
2140 static void parse_new_blob(void)
2142 read_next_command();
2144 parse_and_store_blob(&last_blob, NULL, next_mark);
2147 static void unload_one_branch(void)
2149 while (cur_active_branches
2150 && cur_active_branches >= max_active_branches) {
2151 uintmax_t min_commit = ULONG_MAX;
2152 struct branch *e, *l = NULL, *p = NULL;
2154 for (e = active_branches; e; e = e->active_next_branch) {
2155 if (e->last_commit < min_commit) {
2157 min_commit = e->last_commit;
2163 e = p->active_next_branch;
2164 p->active_next_branch = e->active_next_branch;
2166 e = active_branches;
2167 active_branches = e->active_next_branch;
2170 e->active_next_branch = NULL;
2171 if (e->branch_tree.tree) {
2172 release_tree_content_recursive(e->branch_tree.tree);
2173 e->branch_tree.tree = NULL;
2175 cur_active_branches--;
2179 static void load_branch(struct branch *b)
2181 load_tree(&b->branch_tree);
2184 b->active_next_branch = active_branches;
2185 active_branches = b;
2186 cur_active_branches++;
2187 branch_load_count++;
2191 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2193 unsigned char fanout = 0;
2194 while ((num_notes >>= 8))
2199 static void construct_path_with_fanout(const char *hex_sha1,
2200 unsigned char fanout, char *path)
2202 unsigned int i = 0, j = 0;
2204 die("Too large fanout (%u)", fanout);
2206 path[i++] = hex_sha1[j++];
2207 path[i++] = hex_sha1[j++];
2211 memcpy(path + i, hex_sha1 + j, 40 - j);
2212 path[i + 40 - j] = '\0';
2215 static uintmax_t do_change_note_fanout(
2216 struct tree_entry *orig_root, struct tree_entry *root,
2217 char *hex_sha1, unsigned int hex_sha1_len,
2218 char *fullpath, unsigned int fullpath_len,
2219 unsigned char fanout)
2221 struct tree_content *t = root->tree;
2222 struct tree_entry *e, leaf;
2223 unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2224 uintmax_t num_notes = 0;
2225 unsigned char sha1[20];
2228 for (i = 0; t && i < t->entry_count; i++) {
2230 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2231 tmp_fullpath_len = fullpath_len;
2234 * We're interested in EITHER existing note entries (entries
2235 * with exactly 40 hex chars in path, not including directory
2236 * separators), OR directory entries that may contain note
2237 * entries (with < 40 hex chars in path).
2238 * Also, each path component in a note entry must be a multiple
2241 if (!e->versions[1].mode ||
2242 tmp_hex_sha1_len > 40 ||
2243 e->name->str_len % 2)
2246 /* This _may_ be a note entry, or a subdir containing notes */
2247 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2249 if (tmp_fullpath_len)
2250 fullpath[tmp_fullpath_len++] = '/';
2251 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2253 tmp_fullpath_len += e->name->str_len;
2254 fullpath[tmp_fullpath_len] = '\0';
2256 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2257 /* This is a note entry */
2258 if (fanout == 0xff) {
2259 /* Counting mode, no rename */
2263 construct_path_with_fanout(hex_sha1, fanout, realpath);
2264 if (!strcmp(fullpath, realpath)) {
2265 /* Note entry is in correct location */
2270 /* Rename fullpath to realpath */
2271 if (!tree_content_remove(orig_root, fullpath, &leaf, 0))
2272 die("Failed to remove path %s", fullpath);
2273 tree_content_set(orig_root, realpath,
2274 leaf.versions[1].sha1,
2275 leaf.versions[1].mode,
2277 } else if (S_ISDIR(e->versions[1].mode)) {
2278 /* This is a subdir that may contain note entries */
2281 num_notes += do_change_note_fanout(orig_root, e,
2282 hex_sha1, tmp_hex_sha1_len,
2283 fullpath, tmp_fullpath_len, fanout);
2286 /* The above may have reallocated the current tree_content */
2292 static uintmax_t change_note_fanout(struct tree_entry *root,
2293 unsigned char fanout)
2295 char hex_sha1[40], path[60];
2296 return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2300 * Given a pointer into a string, parse a mark reference:
2302 * idnum ::= ':' bigint;
2304 * Return the first character after the value in *endptr.
2306 * Complain if the following character is not what is expected,
2307 * either a space or end of the string.
2309 static uintmax_t parse_mark_ref(const char *p, char **endptr)
2315 mark = strtoumax(p, endptr, 10);
2317 die("No value after ':' in mark: %s", command_buf.buf);
2322 * Parse the mark reference, and complain if this is not the end of
2325 static uintmax_t parse_mark_ref_eol(const char *p)
2330 mark = parse_mark_ref(p, &end);
2332 die("Garbage after mark: %s", command_buf.buf);
2337 * Parse the mark reference, demanding a trailing space. Return a
2338 * pointer to the space.
2340 static uintmax_t parse_mark_ref_space(const char **p)
2345 mark = parse_mark_ref(*p, &end);
2347 die("Missing space after mark: %s", command_buf.buf);
2352 static void file_change_m(const char *p, struct branch *b)
2354 static struct strbuf uq = STRBUF_INIT;
2356 struct object_entry *oe;
2357 unsigned char sha1[20];
2358 uint16_t mode, inline_data = 0;
2360 p = get_mode(p, &mode);
2362 die("Corrupt mode: %s", command_buf.buf);
2367 case S_IFREG | 0644:
2368 case S_IFREG | 0755:
2375 die("Corrupt mode: %s", command_buf.buf);
2379 oe = find_mark(parse_mark_ref_space(&p));
2380 hashcpy(sha1, oe->idx.sha1);
2381 } else if (skip_prefix(p, "inline ", &p)) {
2383 oe = NULL; /* not used with inline_data, but makes gcc happy */
2385 if (get_sha1_hex(p, sha1))
2386 die("Invalid dataref: %s", command_buf.buf);
2387 oe = find_object(sha1);
2390 die("Missing space after SHA1: %s", command_buf.buf);
2394 if (!unquote_c_style(&uq, p, &endp)) {
2396 die("Garbage after path in: %s", command_buf.buf);
2400 /* Git does not track empty, non-toplevel directories. */
2401 if (S_ISDIR(mode) && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN) && *p) {
2402 tree_content_remove(&b->branch_tree, p, NULL, 0);
2406 if (S_ISGITLINK(mode)) {
2408 die("Git links cannot be specified 'inline': %s",
2411 if (oe->type != OBJ_COMMIT)
2412 die("Not a commit (actually a %s): %s",
2413 typename(oe->type), command_buf.buf);
2416 * Accept the sha1 without checking; it expected to be in
2417 * another repository.
2419 } else if (inline_data) {
2421 die("Directories cannot be specified 'inline': %s",
2424 strbuf_addstr(&uq, p);
2427 read_next_command();
2428 parse_and_store_blob(&last_blob, sha1, 0);
2430 enum object_type expected = S_ISDIR(mode) ?
2432 enum object_type type = oe ? oe->type :
2433 sha1_object_info(sha1, NULL);
2435 die("%s not found: %s",
2436 S_ISDIR(mode) ? "Tree" : "Blob",
2438 if (type != expected)
2439 die("Not a %s (actually a %s): %s",
2440 typename(expected), typename(type),
2445 tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2448 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
2451 static void file_change_d(const char *p, struct branch *b)
2453 static struct strbuf uq = STRBUF_INIT;
2457 if (!unquote_c_style(&uq, p, &endp)) {
2459 die("Garbage after path in: %s", command_buf.buf);
2462 tree_content_remove(&b->branch_tree, p, NULL, 1);
2465 static void file_change_cr(const char *s, struct branch *b, int rename)
2468 static struct strbuf s_uq = STRBUF_INIT;
2469 static struct strbuf d_uq = STRBUF_INIT;
2471 struct tree_entry leaf;
2473 strbuf_reset(&s_uq);
2474 if (!unquote_c_style(&s_uq, s, &endp)) {
2476 die("Missing space after source: %s", command_buf.buf);
2478 endp = strchr(s, ' ');
2480 die("Missing space after source: %s", command_buf.buf);
2481 strbuf_add(&s_uq, s, endp - s);
2487 die("Missing dest: %s", command_buf.buf);
2490 strbuf_reset(&d_uq);
2491 if (!unquote_c_style(&d_uq, d, &endp)) {
2493 die("Garbage after dest in: %s", command_buf.buf);
2497 memset(&leaf, 0, sizeof(leaf));
2499 tree_content_remove(&b->branch_tree, s, &leaf, 1);
2501 tree_content_get(&b->branch_tree, s, &leaf, 1);
2502 if (!leaf.versions[1].mode)
2503 die("Path %s not in branch", s);
2504 if (!*d) { /* C "path/to/subdir" "" */
2505 tree_content_replace(&b->branch_tree,
2506 leaf.versions[1].sha1,
2507 leaf.versions[1].mode,
2511 tree_content_set(&b->branch_tree, d,
2512 leaf.versions[1].sha1,
2513 leaf.versions[1].mode,
2517 static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout)
2519 static struct strbuf uq = STRBUF_INIT;
2520 struct object_entry *oe;
2522 unsigned char sha1[20], commit_sha1[20];
2524 uint16_t inline_data = 0;
2525 unsigned char new_fanout;
2528 * When loading a branch, we don't traverse its tree to count the real
2529 * number of notes (too expensive to do this for all non-note refs).
2530 * This means that recently loaded notes refs might incorrectly have
2531 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2533 * Fix this by traversing the tree and counting the number of notes
2534 * when b->num_notes == 0. If the notes tree is truly empty, the
2535 * calculation should not take long.
2537 if (b->num_notes == 0 && *old_fanout == 0) {
2538 /* Invoke change_note_fanout() in "counting mode". */
2539 b->num_notes = change_note_fanout(&b->branch_tree, 0xff);
2540 *old_fanout = convert_num_notes_to_fanout(b->num_notes);
2543 /* Now parse the notemodify command. */
2544 /* <dataref> or 'inline' */
2546 oe = find_mark(parse_mark_ref_space(&p));
2547 hashcpy(sha1, oe->idx.sha1);
2548 } else if (skip_prefix(p, "inline ", &p)) {
2550 oe = NULL; /* not used with inline_data, but makes gcc happy */
2552 if (get_sha1_hex(p, sha1))
2553 die("Invalid dataref: %s", command_buf.buf);
2554 oe = find_object(sha1);
2557 die("Missing space after SHA1: %s", command_buf.buf);
2561 s = lookup_branch(p);
2563 if (is_null_sha1(s->sha1))
2564 die("Can't add a note on empty branch.");
2565 hashcpy(commit_sha1, s->sha1);
2566 } else if (*p == ':') {
2567 uintmax_t commit_mark = parse_mark_ref_eol(p);
2568 struct object_entry *commit_oe = find_mark(commit_mark);
2569 if (commit_oe->type != OBJ_COMMIT)
2570 die("Mark :%" PRIuMAX " not a commit", commit_mark);
2571 hashcpy(commit_sha1, commit_oe->idx.sha1);
2572 } else if (!get_sha1(p, commit_sha1)) {
2574 char *buf = read_object_with_reference(commit_sha1,
2575 commit_type, &size, commit_sha1);
2576 if (!buf || size < 46)
2577 die("Not a valid commit: %s", p);
2580 die("Invalid ref name or SHA1 expression: %s", p);
2584 strbuf_addstr(&uq, p);
2587 read_next_command();
2588 parse_and_store_blob(&last_blob, sha1, 0);
2590 if (oe->type != OBJ_BLOB)
2591 die("Not a blob (actually a %s): %s",
2592 typename(oe->type), command_buf.buf);
2593 } else if (!is_null_sha1(sha1)) {
2594 enum object_type type = sha1_object_info(sha1, NULL);
2596 die("Blob not found: %s", command_buf.buf);
2597 if (type != OBJ_BLOB)
2598 die("Not a blob (actually a %s): %s",
2599 typename(type), command_buf.buf);
2602 construct_path_with_fanout(sha1_to_hex(commit_sha1), *old_fanout, path);
2603 if (tree_content_remove(&b->branch_tree, path, NULL, 0))
2606 if (is_null_sha1(sha1))
2607 return; /* nothing to insert */
2610 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2611 construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2612 tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
2615 static void file_change_deleteall(struct branch *b)
2617 release_tree_content_recursive(b->branch_tree.tree);
2618 hashclr(b->branch_tree.versions[0].sha1);
2619 hashclr(b->branch_tree.versions[1].sha1);
2620 load_tree(&b->branch_tree);
2624 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2626 if (!buf || size < 46)
2627 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2628 if (memcmp("tree ", buf, 5)
2629 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2630 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2631 hashcpy(b->branch_tree.versions[0].sha1,
2632 b->branch_tree.versions[1].sha1);
2635 static void parse_from_existing(struct branch *b)
2637 if (is_null_sha1(b->sha1)) {
2638 hashclr(b->branch_tree.versions[0].sha1);
2639 hashclr(b->branch_tree.versions[1].sha1);
2644 buf = read_object_with_reference(b->sha1,
2645 commit_type, &size, b->sha1);
2646 parse_from_commit(b, buf, size);
2651 static int parse_from(struct branch *b)
2655 unsigned char sha1[20];
2657 if (!skip_prefix(command_buf.buf, "from ", &from))
2660 hashcpy(sha1, b->branch_tree.versions[1].sha1);
2662 s = lookup_branch(from);
2664 die("Can't create a branch from itself: %s", b->name);
2666 unsigned char *t = s->branch_tree.versions[1].sha1;
2667 hashcpy(b->sha1, s->sha1);
2668 hashcpy(b->branch_tree.versions[0].sha1, t);
2669 hashcpy(b->branch_tree.versions[1].sha1, t);
2670 } else if (*from == ':') {
2671 uintmax_t idnum = parse_mark_ref_eol(from);
2672 struct object_entry *oe = find_mark(idnum);
2673 if (oe->type != OBJ_COMMIT)
2674 die("Mark :%" PRIuMAX " not a commit", idnum);
2675 if (hashcmp(b->sha1, oe->idx.sha1)) {
2676 hashcpy(b->sha1, oe->idx.sha1);
2677 if (oe->pack_id != MAX_PACK_ID) {
2679 char *buf = gfi_unpack_entry(oe, &size);
2680 parse_from_commit(b, buf, size);
2683 parse_from_existing(b);
2685 } else if (!get_sha1(from, b->sha1)) {
2686 parse_from_existing(b);
2687 if (is_null_sha1(b->sha1))
2691 die("Invalid ref name or SHA1 expression: %s", from);
2693 if (b->branch_tree.tree && hashcmp(sha1, b->branch_tree.versions[1].sha1)) {
2694 release_tree_content_recursive(b->branch_tree.tree);
2695 b->branch_tree.tree = NULL;
2698 read_next_command();
2702 static struct hash_list *parse_merge(unsigned int *count)
2704 struct hash_list *list = NULL, **tail = &list, *n;
2709 while (skip_prefix(command_buf.buf, "merge ", &from)) {
2710 n = xmalloc(sizeof(*n));
2711 s = lookup_branch(from);
2713 hashcpy(n->sha1, s->sha1);
2714 else if (*from == ':') {
2715 uintmax_t idnum = parse_mark_ref_eol(from);
2716 struct object_entry *oe = find_mark(idnum);
2717 if (oe->type != OBJ_COMMIT)
2718 die("Mark :%" PRIuMAX " not a commit", idnum);
2719 hashcpy(n->sha1, oe->idx.sha1);
2720 } else if (!get_sha1(from, n->sha1)) {
2722 char *buf = read_object_with_reference(n->sha1,
2723 commit_type, &size, n->sha1);
2724 if (!buf || size < 46)
2725 die("Not a valid commit: %s", from);
2728 die("Invalid ref name or SHA1 expression: %s", from);
2735 read_next_command();
2740 static void parse_new_commit(const char *arg)
2742 static struct strbuf msg = STRBUF_INIT;
2744 char *author = NULL;
2745 char *committer = NULL;
2746 struct hash_list *merge_list = NULL;
2747 unsigned int merge_count;
2748 unsigned char prev_fanout, new_fanout;
2751 b = lookup_branch(arg);
2753 b = new_branch(arg);
2755 read_next_command();
2757 if (skip_prefix(command_buf.buf, "author ", &v)) {
2758 author = parse_ident(v);
2759 read_next_command();
2761 if (skip_prefix(command_buf.buf, "committer ", &v)) {
2762 committer = parse_ident(v);
2763 read_next_command();
2766 die("Expected committer but didn't get one");
2767 parse_data(&msg, 0, NULL);
2768 read_next_command();
2770 merge_list = parse_merge(&merge_count);
2772 /* ensure the branch is active/loaded */
2773 if (!b->branch_tree.tree || !max_active_branches) {
2774 unload_one_branch();
2778 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2781 while (command_buf.len > 0) {
2782 if (skip_prefix(command_buf.buf, "M ", &v))
2783 file_change_m(v, b);
2784 else if (skip_prefix(command_buf.buf, "D ", &v))
2785 file_change_d(v, b);
2786 else if (skip_prefix(command_buf.buf, "R ", &v))
2787 file_change_cr(v, b, 1);
2788 else if (skip_prefix(command_buf.buf, "C ", &v))
2789 file_change_cr(v, b, 0);
2790 else if (skip_prefix(command_buf.buf, "N ", &v))
2791 note_change_n(v, b, &prev_fanout);
2792 else if (!strcmp("deleteall", command_buf.buf))
2793 file_change_deleteall(b);
2794 else if (skip_prefix(command_buf.buf, "ls ", &v))
2797 unread_command_buf = 1;
2800 if (read_next_command() == EOF)
2804 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2805 if (new_fanout != prev_fanout)
2806 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2808 /* build the tree and the commit */
2809 store_tree(&b->branch_tree);
2810 hashcpy(b->branch_tree.versions[0].sha1,
2811 b->branch_tree.versions[1].sha1);
2813 strbuf_reset(&new_data);
2814 strbuf_addf(&new_data, "tree %s\n",
2815 sha1_to_hex(b->branch_tree.versions[1].sha1));
2816 if (!is_null_sha1(b->sha1))
2817 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2818 while (merge_list) {
2819 struct hash_list *next = merge_list->next;
2820 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2824 strbuf_addf(&new_data,
2828 author ? author : committer, committer);
2829 strbuf_addbuf(&new_data, &msg);
2833 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2834 b->pack_id = pack_id;
2835 b->last_commit = object_count_by_type[OBJ_COMMIT];
2838 static void parse_new_tag(const char *arg)
2840 static struct strbuf msg = STRBUF_INIT;
2845 uintmax_t from_mark = 0;
2846 unsigned char sha1[20];
2847 enum object_type type;
2850 t = pool_alloc(sizeof(struct tag));
2851 memset(t, 0, sizeof(struct tag));
2852 t->name = pool_strdup(arg);
2854 last_tag->next_tag = t;
2858 read_next_command();
2861 if (!skip_prefix(command_buf.buf, "from ", &from))
2862 die("Expected from command, got %s", command_buf.buf);
2863 s = lookup_branch(from);
2865 if (is_null_sha1(s->sha1))
2866 die("Can't tag an empty branch.");
2867 hashcpy(sha1, s->sha1);
2869 } else if (*from == ':') {
2870 struct object_entry *oe;
2871 from_mark = parse_mark_ref_eol(from);
2872 oe = find_mark(from_mark);
2874 hashcpy(sha1, oe->idx.sha1);
2875 } else if (!get_sha1(from, sha1)) {
2876 struct object_entry *oe = find_object(sha1);
2878 type = sha1_object_info(sha1, NULL);
2880 die("Not a valid object: %s", from);
2884 die("Invalid ref name or SHA1 expression: %s", from);
2885 read_next_command();
2888 if (skip_prefix(command_buf.buf, "tagger ", &v)) {
2889 tagger = parse_ident(v);
2890 read_next_command();
2894 /* tag payload/message */
2895 parse_data(&msg, 0, NULL);
2897 /* build the tag object */
2898 strbuf_reset(&new_data);
2900 strbuf_addf(&new_data,
2904 sha1_to_hex(sha1), typename(type), t->name);
2906 strbuf_addf(&new_data,
2907 "tagger %s\n", tagger);
2908 strbuf_addch(&new_data, '\n');
2909 strbuf_addbuf(&new_data, &msg);
2912 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2913 t->pack_id = MAX_PACK_ID;
2915 t->pack_id = pack_id;
2918 static void parse_reset_branch(const char *arg)
2922 b = lookup_branch(arg);
2925 hashclr(b->branch_tree.versions[0].sha1);
2926 hashclr(b->branch_tree.versions[1].sha1);
2927 if (b->branch_tree.tree) {
2928 release_tree_content_recursive(b->branch_tree.tree);
2929 b->branch_tree.tree = NULL;
2933 b = new_branch(arg);
2934 read_next_command();
2936 if (command_buf.len > 0)
2937 unread_command_buf = 1;
2940 static void cat_blob_write(const char *buf, unsigned long size)
2942 if (write_in_full(cat_blob_fd, buf, size) != size)
2943 die_errno("Write to frontend failed");
2946 static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
2948 struct strbuf line = STRBUF_INIT;
2950 enum object_type type = 0;
2953 if (!oe || oe->pack_id == MAX_PACK_ID) {
2954 buf = read_sha1_file(sha1, &type, &size);
2957 buf = gfi_unpack_entry(oe, &size);
2961 * Output based on batch_one_object() from cat-file.c.
2964 strbuf_reset(&line);
2965 strbuf_addf(&line, "%s missing\n", sha1_to_hex(sha1));
2966 cat_blob_write(line.buf, line.len);
2967 strbuf_release(&line);
2972 die("Can't read object %s", sha1_to_hex(sha1));
2973 if (type != OBJ_BLOB)
2974 die("Object %s is a %s but a blob was expected.",
2975 sha1_to_hex(sha1), typename(type));
2976 strbuf_reset(&line);
2977 strbuf_addf(&line, "%s %s %lu\n", sha1_to_hex(sha1),
2978 typename(type), size);
2979 cat_blob_write(line.buf, line.len);
2980 strbuf_release(&line);
2981 cat_blob_write(buf, size);
2982 cat_blob_write("\n", 1);
2983 if (oe && oe->pack_id == pack_id) {
2984 last_blob.offset = oe->idx.offset;
2985 strbuf_attach(&last_blob.data, buf, size, size);
2986 last_blob.depth = oe->depth;
2991 static void parse_get_mark(const char *p)
2993 struct object_entry *oe = oe;
2996 /* get-mark SP <object> LF */
2998 die("Not a mark: %s", p);
3000 oe = find_mark(parse_mark_ref_eol(p));
3002 die("Unknown mark: %s", command_buf.buf);
3004 snprintf(output, sizeof(output), "%s\n", sha1_to_hex(oe->idx.sha1));
3005 cat_blob_write(output, 41);
3008 static void parse_cat_blob(const char *p)
3010 struct object_entry *oe = oe;
3011 unsigned char sha1[20];
3013 /* cat-blob SP <object> LF */
3015 oe = find_mark(parse_mark_ref_eol(p));
3017 die("Unknown mark: %s", command_buf.buf);
3018 hashcpy(sha1, oe->idx.sha1);
3020 if (get_sha1_hex(p, sha1))
3021 die("Invalid dataref: %s", command_buf.buf);
3023 die("Garbage after SHA1: %s", command_buf.buf);
3024 oe = find_object(sha1);
3030 static struct object_entry *dereference(struct object_entry *oe,
3031 unsigned char sha1[20])
3036 enum object_type type = sha1_object_info(sha1, NULL);
3038 die("object not found: %s", sha1_to_hex(sha1));
3040 oe = insert_object(sha1);
3042 oe->pack_id = MAX_PACK_ID;
3046 case OBJ_TREE: /* easy case. */
3052 die("Not a tree-ish: %s", command_buf.buf);
3055 if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
3056 buf = gfi_unpack_entry(oe, &size);
3058 enum object_type unused;
3059 buf = read_sha1_file(sha1, &unused, &size);
3062 die("Can't load object %s", sha1_to_hex(sha1));
3064 /* Peel one layer. */
3067 if (size < 40 + strlen("object ") ||
3068 get_sha1_hex(buf + strlen("object "), sha1))
3069 die("Invalid SHA1 in tag: %s", command_buf.buf);
3072 if (size < 40 + strlen("tree ") ||
3073 get_sha1_hex(buf + strlen("tree "), sha1))
3074 die("Invalid SHA1 in commit: %s", command_buf.buf);
3078 return find_object(sha1);
3081 static struct object_entry *parse_treeish_dataref(const char **p)
3083 unsigned char sha1[20];
3084 struct object_entry *e;
3086 if (**p == ':') { /* <mark> */
3087 e = find_mark(parse_mark_ref_space(p));
3089 die("Unknown mark: %s", command_buf.buf);
3090 hashcpy(sha1, e->idx.sha1);
3091 } else { /* <sha1> */
3092 if (get_sha1_hex(*p, sha1))
3093 die("Invalid dataref: %s", command_buf.buf);
3094 e = find_object(sha1);
3097 die("Missing space after tree-ish: %s", command_buf.buf);
3100 while (!e || e->type != OBJ_TREE)
3101 e = dereference(e, sha1);
3105 static void print_ls(int mode, const unsigned char *sha1, const char *path)
3107 static struct strbuf line = STRBUF_INIT;
3109 /* See show_tree(). */
3111 S_ISGITLINK(mode) ? commit_type :
3112 S_ISDIR(mode) ? tree_type :
3116 /* missing SP path LF */
3117 strbuf_reset(&line);
3118 strbuf_addstr(&line, "missing ");
3119 quote_c_style(path, &line, NULL, 0);
3120 strbuf_addch(&line, '\n');
3122 /* mode SP type SP object_name TAB path LF */
3123 strbuf_reset(&line);
3124 strbuf_addf(&line, "%06o %s %s\t",
3125 mode & ~NO_DELTA, type, sha1_to_hex(sha1));
3126 quote_c_style(path, &line, NULL, 0);
3127 strbuf_addch(&line, '\n');
3129 cat_blob_write(line.buf, line.len);
3132 static void parse_ls(const char *p, struct branch *b)
3134 struct tree_entry *root = NULL;
3135 struct tree_entry leaf = {NULL};
3137 /* ls SP (<tree-ish> SP)? <path> */
3140 die("Not in a commit: %s", command_buf.buf);
3141 root = &b->branch_tree;
3143 struct object_entry *e = parse_treeish_dataref(&p);
3144 root = new_tree_entry();
3145 hashcpy(root->versions[1].sha1, e->idx.sha1);
3146 if (!is_null_sha1(root->versions[1].sha1))
3147 root->versions[1].mode = S_IFDIR;
3151 static struct strbuf uq = STRBUF_INIT;
3154 if (unquote_c_style(&uq, p, &endp))
3155 die("Invalid path: %s", command_buf.buf);
3157 die("Garbage after path in: %s", command_buf.buf);
3160 tree_content_get(root, p, &leaf, 1);
3162 * A directory in preparation would have a sha1 of zero
3163 * until it is saved. Save, for simplicity.
3165 if (S_ISDIR(leaf.versions[1].mode))
3168 print_ls(leaf.versions[1].mode, leaf.versions[1].sha1, p);
3170 release_tree_content_recursive(leaf.tree);
3171 if (!b || root != &b->branch_tree)
3172 release_tree_entry(root);
3175 static void checkpoint(void)
3177 checkpoint_requested = 0;
3186 static void parse_checkpoint(void)
3188 checkpoint_requested = 1;
3192 static void parse_progress(void)
3194 fwrite(command_buf.buf, 1, command_buf.len, stdout);
3195 fputc('\n', stdout);
3200 static char* make_fast_import_path(const char *path)
3202 if (!relative_marks_paths || is_absolute_path(path))
3203 return xstrdup(path);
3204 return xstrdup(git_path("info/fast-import/%s", path));
3207 static void option_import_marks(const char *marks,
3208 int from_stream, int ignore_missing)
3210 if (import_marks_file) {
3212 die("Only one import-marks command allowed per stream");
3214 /* read previous mark file */
3215 if(!import_marks_file_from_stream)
3219 import_marks_file = make_fast_import_path(marks);
3220 safe_create_leading_directories_const(import_marks_file);
3221 import_marks_file_from_stream = from_stream;
3222 import_marks_file_ignore_missing = ignore_missing;
3225 static void option_date_format(const char *fmt)
3227 if (!strcmp(fmt, "raw"))
3228 whenspec = WHENSPEC_RAW;
3229 else if (!strcmp(fmt, "rfc2822"))
3230 whenspec = WHENSPEC_RFC2822;
3231 else if (!strcmp(fmt, "now"))
3232 whenspec = WHENSPEC_NOW;
3234 die("unknown --date-format argument %s", fmt);
3237 static unsigned long ulong_arg(const char *option, const char *arg)
3240 unsigned long rv = strtoul(arg, &endptr, 0);
3241 if (strchr(arg, '-') || endptr == arg || *endptr)
3242 die("%s: argument must be a non-negative integer", option);
3246 static void option_depth(const char *depth)
3248 max_depth = ulong_arg("--depth", depth);
3249 if (max_depth > MAX_DEPTH)
3250 die("--depth cannot exceed %u", MAX_DEPTH);
3253 static void option_active_branches(const char *branches)
3255 max_active_branches = ulong_arg("--active-branches", branches);
3258 static void option_export_marks(const char *marks)
3260 export_marks_file = make_fast_import_path(marks);
3261 safe_create_leading_directories_const(export_marks_file);
3264 static void option_cat_blob_fd(const char *fd)
3266 unsigned long n = ulong_arg("--cat-blob-fd", fd);
3267 if (n > (unsigned long) INT_MAX)
3268 die("--cat-blob-fd cannot exceed %d", INT_MAX);
3269 cat_blob_fd = (int) n;
3272 static void option_export_pack_edges(const char *edges)
3276 pack_edges = fopen(edges, "a");
3278 die_errno("Cannot open '%s'", edges);
3281 static int parse_one_option(const char *option)
3283 if (skip_prefix(option, "max-pack-size=", &option)) {
3285 if (!git_parse_ulong(option, &v))
3288 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
3290 } else if (v < 1024 * 1024) {
3291 warning("minimum max-pack-size is 1 MiB");
3295 } else if (skip_prefix(option, "big-file-threshold=", &option)) {
3297 if (!git_parse_ulong(option, &v))
3299 big_file_threshold = v;
3300 } else if (skip_prefix(option, "depth=", &option)) {
3301 option_depth(option);
3302 } else if (skip_prefix(option, "active-branches=", &option)) {
3303 option_active_branches(option);
3304 } else if (skip_prefix(option, "export-pack-edges=", &option)) {
3305 option_export_pack_edges(option);
3306 } else if (starts_with(option, "quiet")) {
3308 } else if (starts_with(option, "stats")) {
3317 static int parse_one_feature(const char *feature, int from_stream)
3321 if (skip_prefix(feature, "date-format=", &arg)) {
3322 option_date_format(arg);
3323 } else if (skip_prefix(feature, "import-marks=", &arg)) {
3324 option_import_marks(arg, from_stream, 0);
3325 } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
3326 option_import_marks(arg, from_stream, 1);
3327 } else if (skip_prefix(feature, "export-marks=", &arg)) {
3328 option_export_marks(arg);
3329 } else if (!strcmp(feature, "get-mark")) {
3330 ; /* Don't die - this feature is supported */
3331 } else if (!strcmp(feature, "cat-blob")) {
3332 ; /* Don't die - this feature is supported */
3333 } else if (!strcmp(feature, "relative-marks")) {
3334 relative_marks_paths = 1;
3335 } else if (!strcmp(feature, "no-relative-marks")) {
3336 relative_marks_paths = 0;
3337 } else if (!strcmp(feature, "done")) {
3338 require_explicit_termination = 1;
3339 } else if (!strcmp(feature, "force")) {
3341 } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
3342 ; /* do nothing; we have the feature */
3350 static void parse_feature(const char *feature)
3352 if (seen_data_command)
3353 die("Got feature command '%s' after data command", feature);
3355 if (parse_one_feature(feature, 1))
3358 die("This version of fast-import does not support feature %s.", feature);
3361 static void parse_option(const char *option)
3363 if (seen_data_command)
3364 die("Got option command '%s' after data command", option);
3366 if (parse_one_option(option))
3369 die("This version of fast-import does not support option: %s", option);
3372 static void git_pack_config(void)
3374 int indexversion_value;
3376 unsigned long packsizelimit_value;
3378 if (!git_config_get_ulong("pack.depth", &max_depth)) {
3379 if (max_depth > MAX_DEPTH)
3380 max_depth = MAX_DEPTH;
3382 if (!git_config_get_int("pack.compression", &pack_compression_level)) {
3383 if (pack_compression_level == -1)
3384 pack_compression_level = Z_DEFAULT_COMPRESSION;
3385 else if (pack_compression_level < 0 ||
3386 pack_compression_level > Z_BEST_COMPRESSION)
3387 git_die_config("pack.compression",
3388 "bad pack compression level %d", pack_compression_level);
3389 pack_compression_seen = 1;
3391 if (!git_config_get_int("pack.indexversion", &indexversion_value)) {
3392 pack_idx_opts.version = indexversion_value;
3393 if (pack_idx_opts.version > 2)
3394 git_die_config("pack.indexversion",
3395 "bad pack.indexversion=%"PRIu32, pack_idx_opts.version);
3397 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
3398 max_packsize = packsizelimit_value;
3400 if (!git_config_get_int("fastimport.unpacklimit", &limit))
3401 unpack_limit = limit;
3402 else if (!git_config_get_int("transfer.unpacklimit", &limit))
3403 unpack_limit = limit;
3405 git_config(git_default_config, NULL);
3408 static const char fast_import_usage[] =
3409 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3411 static void parse_argv(void)
3415 for (i = 1; i < global_argc; i++) {
3416 const char *a = global_argv[i];
3418 if (*a != '-' || !strcmp(a, "--"))
3421 if (!skip_prefix(a, "--", &a))
3422 die("unknown option %s", a);
3424 if (parse_one_option(a))
3427 if (parse_one_feature(a, 0))
3430 if (skip_prefix(a, "cat-blob-fd=", &a)) {
3431 option_cat_blob_fd(a);
3435 die("unknown option --%s", a);
3437 if (i != global_argc)
3438 usage(fast_import_usage);
3440 seen_data_command = 1;
3441 if (import_marks_file)
3445 int main(int argc, char **argv)
3449 git_extract_argv0_path(argv[0]);
3451 git_setup_gettext();
3453 if (argc == 2 && !strcmp(argv[1], "-h"))
3454 usage(fast_import_usage);
3456 setup_git_directory();
3457 reset_pack_idx_option(&pack_idx_opts);
3459 if (!pack_compression_seen && core_compression_seen)
3460 pack_compression_level = core_compression_level;
3462 alloc_objects(object_entry_alloc);
3463 strbuf_init(&command_buf, 0);
3464 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
3465 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
3466 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
3467 marks = pool_calloc(1, sizeof(struct mark_set));
3472 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
3473 for (i = 0; i < (cmd_save - 1); i++)
3474 rc_free[i].next = &rc_free[i + 1];
3475 rc_free[cmd_save - 1].next = NULL;
3477 prepare_packed_git();
3479 set_die_routine(die_nicely);
3480 set_checkpoint_signal();
3481 while (read_next_command() != EOF) {
3483 if (!strcmp("blob", command_buf.buf))
3485 else if (skip_prefix(command_buf.buf, "ls ", &v))
3487 else if (skip_prefix(command_buf.buf, "commit ", &v))
3488 parse_new_commit(v);
3489 else if (skip_prefix(command_buf.buf, "tag ", &v))
3491 else if (skip_prefix(command_buf.buf, "reset ", &v))
3492 parse_reset_branch(v);
3493 else if (!strcmp("checkpoint", command_buf.buf))
3495 else if (!strcmp("done", command_buf.buf))
3497 else if (starts_with(command_buf.buf, "progress "))
3499 else if (skip_prefix(command_buf.buf, "feature ", &v))
3501 else if (skip_prefix(command_buf.buf, "option git ", &v))
3503 else if (starts_with(command_buf.buf, "option "))
3504 /* ignore non-git options*/;
3506 die("Unsupported command: %s", command_buf.buf);
3508 if (checkpoint_requested)
3512 /* argv hasn't been parsed yet, do so */
3513 if (!seen_data_command)
3516 if (require_explicit_termination && feof(stdin))
3517 die("stream ends early");
3530 uintmax_t total_count = 0, duplicate_count = 0;
3531 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3532 total_count += object_count_by_type[i];
3533 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3534 duplicate_count += duplicate_count_by_type[i];
3536 fprintf(stderr, "%s statistics:\n", argv[0]);
3537 fprintf(stderr, "---------------------------------------------------------------------\n");
3538 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3539 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
3540 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]);
3541 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]);
3542 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]);
3543 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]);
3544 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
3545 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
3546 fprintf(stderr, " atoms: %10u\n", atom_cnt);
3547 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
3548 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
3549 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
3550 fprintf(stderr, "---------------------------------------------------------------------\n");
3552 fprintf(stderr, "---------------------------------------------------------------------\n");
3553 fprintf(stderr, "\n");
3556 return failure ? 1 : 0;