2 Format of STDIN stream:
14 new_blob ::= 'blob' lf
17 file_content ::= data;
19 new_commit ::= 'commit' sp ref_str lf
21 ('author' sp name '<' email '>' when lf)?
22 'committer' sp name '<' email '>' when lf
24 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
25 ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
30 file_change ::= file_clr
36 file_clr ::= 'deleteall' lf;
37 file_del ::= 'D' sp path_str lf;
38 file_rnm ::= 'R' sp path_str sp path_str lf;
39 file_cpy ::= 'C' sp path_str sp path_str lf;
40 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
41 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
44 new_tag ::= 'tag' sp tag_str lf
45 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
46 ('tagger' sp name '<' email '>' when lf)?
50 reset_branch ::= 'reset' sp ref_str lf
51 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
54 checkpoint ::= 'checkpoint' lf
57 progress ::= 'progress' sp not_lf* lf
60 # note: the first idnum in a stream should be 1 and subsequent
61 # idnums should not have gaps between values as this will cause
62 # the stream parser to reserve space for the gapped values. An
63 # idnum can be updated in the future to a new object by issuing
64 # a new mark directive with the old idnum.
66 mark ::= 'mark' sp idnum lf;
67 data ::= (delimited_data | exact_data)
70 # note: delim may be any string but must not contain lf.
71 # data_line may contain any data but must not be exactly
73 delimited_data ::= 'data' sp '<<' delim lf
77 # note: declen indicates the length of binary_data in bytes.
78 # declen does not include the lf preceeding the binary data.
80 exact_data ::= 'data' sp declen lf
83 # note: quoted strings are C-style quoting supporting \c for
84 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
85 # is the signed byte value in octal. Note that the only
86 # characters which must actually be escaped to protect the
87 # stream formatting is: \, " and LF. Otherwise these values
91 sha1exp_str ::= sha1exp;
93 path_str ::= path | '"' quoted(path) '"' ;
94 mode ::= '100644' | '644'
99 declen ::= # unsigned 32 bit value, ascii base10 notation;
100 bigint ::= # unsigned integer value, ascii base10 notation;
101 binary_data ::= # file content, not interpreted;
103 when ::= raw_when | rfc2822_when;
104 raw_when ::= ts sp tz;
105 rfc2822_when ::= # Valid RFC 2822 date and time;
107 sp ::= # ASCII space character;
108 lf ::= # ASCII newline (LF) character;
110 # note: a colon (':') must precede the numerical value assigned to
111 # an idnum. This is to distinguish it from a ref or tag name as
112 # GIT does not permit ':' in ref or tag strings.
114 idnum ::= ':' bigint;
115 path ::= # GIT style file path, e.g. "a/b/c";
116 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
117 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
118 sha1exp ::= # Any valid GIT SHA1 expression;
119 hexsha1 ::= # SHA1 in hexadecimal format;
121 # note: name and email are UTF8 strings, however name must not
122 # contain '<' or lf and email must not contain any of the
123 # following: '<', '>', lf.
125 name ::= # valid GIT author/committer name;
126 email ::= # valid GIT author/committer email;
127 ts ::= # time since the epoch in seconds, ascii base10 notation;
128 tz ::= # GIT style timezone;
130 # note: comments may appear anywhere in the input, except
131 # within a data command. Any form of the data command
132 # always escapes the related input from comment processing.
134 # In case it is not clear, the '#' that starts the comment
135 # must be the first character on that the line (an lf have
138 comment ::= '#' not_lf* lf;
139 not_lf ::= # Any byte that is not ASCII newline (LF);
151 #include "csum-file.h"
153 #include "exec_cmd.h"
155 #define PACK_ID_BITS 16
156 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
157 #define DEPTH_BITS 13
158 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
162 struct object_entry *next;
164 uint32_t type : TYPE_BITS,
165 pack_id : PACK_ID_BITS,
167 unsigned char sha1[20];
170 struct object_entry_pool
172 struct object_entry_pool *next_pool;
173 struct object_entry *next_free;
174 struct object_entry *end;
175 struct object_entry entries[FLEX_ARRAY]; /* more */
181 struct object_entry *marked[1024];
182 struct mark_set *sets[1024];
192 unsigned no_swap : 1;
197 struct mem_pool *next_pool;
200 uintmax_t space[FLEX_ARRAY]; /* more */
205 struct atom_str *next_atom;
206 unsigned short str_len;
207 char str_dat[FLEX_ARRAY]; /* more */
213 struct tree_content *tree;
214 struct atom_str* name;
218 unsigned char sha1[20];
224 unsigned int entry_capacity; /* must match avail_tree_content */
225 unsigned int entry_count;
226 unsigned int delta_depth;
227 struct tree_entry *entries[FLEX_ARRAY]; /* more */
230 struct avail_tree_content
232 unsigned int entry_capacity; /* must match tree_content */
233 struct avail_tree_content *next_avail;
238 struct branch *table_next_branch;
239 struct branch *active_next_branch;
241 struct tree_entry branch_tree;
242 uintmax_t last_commit;
244 unsigned pack_id : PACK_ID_BITS;
245 unsigned char sha1[20];
250 struct tag *next_tag;
252 unsigned int pack_id;
253 unsigned char sha1[20];
258 struct hash_list *next;
259 unsigned char sha1[20];
268 struct recent_command
270 struct recent_command *prev;
271 struct recent_command *next;
275 /* Configured limits on output */
276 static unsigned long max_depth = 10;
277 static off_t max_packsize = (1LL << 32) - 1;
278 static int force_update;
279 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
280 static int pack_compression_seen;
282 /* Stats and misc. counters */
283 static uintmax_t alloc_count;
284 static uintmax_t marks_set_count;
285 static uintmax_t object_count_by_type[1 << TYPE_BITS];
286 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
287 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
288 static unsigned long object_count;
289 static unsigned long branch_count;
290 static unsigned long branch_load_count;
292 static FILE *pack_edges;
295 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
296 static size_t total_allocd;
297 static struct mem_pool *mem_pool;
299 /* Atom management */
300 static unsigned int atom_table_sz = 4451;
301 static unsigned int atom_cnt;
302 static struct atom_str **atom_table;
304 /* The .pack file being generated */
305 static unsigned int pack_id;
306 static struct packed_git *pack_data;
307 static struct packed_git **all_packs;
308 static unsigned long pack_size;
310 /* Table of objects we've written. */
311 static unsigned int object_entry_alloc = 5000;
312 static struct object_entry_pool *blocks;
313 static struct object_entry *object_table[1 << 16];
314 static struct mark_set *marks;
315 static const char* mark_file;
318 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
320 /* Tree management */
321 static unsigned int tree_entry_alloc = 1000;
322 static void *avail_tree_entry;
323 static unsigned int avail_tree_table_sz = 100;
324 static struct avail_tree_content **avail_tree_table;
325 static struct strbuf old_tree = STRBUF_INIT;
326 static struct strbuf new_tree = STRBUF_INIT;
329 static unsigned long max_active_branches = 5;
330 static unsigned long cur_active_branches;
331 static unsigned long branch_table_sz = 1039;
332 static struct branch **branch_table;
333 static struct branch *active_branches;
336 static struct tag *first_tag;
337 static struct tag *last_tag;
339 /* Input stream parsing */
340 static whenspec_type whenspec = WHENSPEC_RAW;
341 static struct strbuf command_buf = STRBUF_INIT;
342 static int unread_command_buf;
343 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
344 static struct recent_command *cmd_tail = &cmd_hist;
345 static struct recent_command *rc_free;
346 static unsigned int cmd_save = 100;
347 static uintmax_t next_mark;
348 static struct strbuf new_data = STRBUF_INIT;
350 static void write_branch_report(FILE *rpt, struct branch *b)
352 fprintf(rpt, "%s:\n", b->name);
354 fprintf(rpt, " status :");
356 fputs(" active", rpt);
357 if (b->branch_tree.tree)
358 fputs(" loaded", rpt);
359 if (is_null_sha1(b->branch_tree.versions[1].sha1))
360 fputs(" dirty", rpt);
363 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
364 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
365 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
366 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
368 fputs(" last pack : ", rpt);
369 if (b->pack_id < MAX_PACK_ID)
370 fprintf(rpt, "%u", b->pack_id);
376 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
378 static void write_crash_report(const char *err)
380 char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
381 FILE *rpt = fopen(loc, "w");
384 struct recent_command *rc;
387 error("can't write crash report %s: %s", loc, strerror(errno));
391 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
393 fprintf(rpt, "fast-import crash report:\n");
394 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
395 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
396 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
399 fputs("fatal: ", rpt);
404 fputs("Most Recent Commands Before Crash\n", rpt);
405 fputs("---------------------------------\n", rpt);
406 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
407 if (rc->next == &cmd_hist)
416 fputs("Active Branch LRU\n", rpt);
417 fputs("-----------------\n", rpt);
418 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
420 max_active_branches);
422 fputs(" pos clock name\n", rpt);
423 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
424 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
425 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
426 ++lu, b->last_commit, b->name);
429 fputs("Inactive Branches\n", rpt);
430 fputs("-----------------\n", rpt);
431 for (lu = 0; lu < branch_table_sz; lu++) {
432 for (b = branch_table[lu]; b; b = b->table_next_branch)
433 write_branch_report(rpt, b);
439 fputs("Annotated Tags\n", rpt);
440 fputs("--------------\n", rpt);
441 for (tg = first_tag; tg; tg = tg->next_tag) {
442 fputs(sha1_to_hex(tg->sha1), rpt);
444 fputs(tg->name, rpt);
450 fputs("Marks\n", rpt);
451 fputs("-----\n", rpt);
453 fprintf(rpt, " exported to %s\n", mark_file);
455 dump_marks_helper(rpt, 0, marks);
458 fputs("-------------------\n", rpt);
459 fputs("END OF CRASH REPORT\n", rpt);
463 static void end_packfile(void);
464 static void unkeep_all_packs(void);
465 static void dump_marks(void);
467 static NORETURN void die_nicely(const char *err, va_list params)
470 char message[2 * PATH_MAX];
472 vsnprintf(message, sizeof(message), err, params);
473 fputs("fatal: ", stderr);
474 fputs(message, stderr);
479 write_crash_report(message);
487 static void alloc_objects(unsigned int cnt)
489 struct object_entry_pool *b;
491 b = xmalloc(sizeof(struct object_entry_pool)
492 + cnt * sizeof(struct object_entry));
493 b->next_pool = blocks;
494 b->next_free = b->entries;
495 b->end = b->entries + cnt;
500 static struct object_entry *new_object(unsigned char *sha1)
502 struct object_entry *e;
504 if (blocks->next_free == blocks->end)
505 alloc_objects(object_entry_alloc);
507 e = blocks->next_free++;
508 hashcpy(e->sha1, sha1);
512 static struct object_entry *find_object(unsigned char *sha1)
514 unsigned int h = sha1[0] << 8 | sha1[1];
515 struct object_entry *e;
516 for (e = object_table[h]; e; e = e->next)
517 if (!hashcmp(sha1, e->sha1))
522 static struct object_entry *insert_object(unsigned char *sha1)
524 unsigned int h = sha1[0] << 8 | sha1[1];
525 struct object_entry *e = object_table[h];
526 struct object_entry *p = NULL;
529 if (!hashcmp(sha1, e->sha1))
535 e = new_object(sha1);
545 static unsigned int hc_str(const char *s, size_t len)
553 static void *pool_alloc(size_t len)
558 /* round up to a 'uintmax_t' alignment */
559 if (len & (sizeof(uintmax_t) - 1))
560 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
562 for (p = mem_pool; p; p = p->next_pool)
563 if ((p->end - p->next_free >= len))
567 if (len >= (mem_pool_alloc/2)) {
571 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
572 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
573 p->next_pool = mem_pool;
574 p->next_free = (char *) p->space;
575 p->end = p->next_free + mem_pool_alloc;
584 static void *pool_calloc(size_t count, size_t size)
586 size_t len = count * size;
587 void *r = pool_alloc(len);
592 static char *pool_strdup(const char *s)
594 char *r = pool_alloc(strlen(s) + 1);
599 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
601 struct mark_set *s = marks;
602 while ((idnum >> s->shift) >= 1024) {
603 s = pool_calloc(1, sizeof(struct mark_set));
604 s->shift = marks->shift + 10;
605 s->data.sets[0] = marks;
609 uintmax_t i = idnum >> s->shift;
610 idnum -= i << s->shift;
611 if (!s->data.sets[i]) {
612 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
613 s->data.sets[i]->shift = s->shift - 10;
617 if (!s->data.marked[idnum])
619 s->data.marked[idnum] = oe;
622 static struct object_entry *find_mark(uintmax_t idnum)
624 uintmax_t orig_idnum = idnum;
625 struct mark_set *s = marks;
626 struct object_entry *oe = NULL;
627 if ((idnum >> s->shift) < 1024) {
628 while (s && s->shift) {
629 uintmax_t i = idnum >> s->shift;
630 idnum -= i << s->shift;
634 oe = s->data.marked[idnum];
637 die("mark :%" PRIuMAX " not declared", orig_idnum);
641 static struct atom_str *to_atom(const char *s, unsigned short len)
643 unsigned int hc = hc_str(s, len) % atom_table_sz;
646 for (c = atom_table[hc]; c; c = c->next_atom)
647 if (c->str_len == len && !strncmp(s, c->str_dat, len))
650 c = pool_alloc(sizeof(struct atom_str) + len + 1);
652 strncpy(c->str_dat, s, len);
654 c->next_atom = atom_table[hc];
660 static struct branch *lookup_branch(const char *name)
662 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
665 for (b = branch_table[hc]; b; b = b->table_next_branch)
666 if (!strcmp(name, b->name))
671 static struct branch *new_branch(const char *name)
673 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
674 struct branch* b = lookup_branch(name);
677 die("Invalid attempt to create duplicate branch: %s", name);
678 switch (check_ref_format(name)) {
679 case 0: break; /* its valid */
680 case CHECK_REF_FORMAT_ONELEVEL:
681 break; /* valid, but too few '/', allow anyway */
683 die("Branch name doesn't conform to GIT standards: %s", name);
686 b = pool_calloc(1, sizeof(struct branch));
687 b->name = pool_strdup(name);
688 b->table_next_branch = branch_table[hc];
689 b->branch_tree.versions[0].mode = S_IFDIR;
690 b->branch_tree.versions[1].mode = S_IFDIR;
692 b->pack_id = MAX_PACK_ID;
693 branch_table[hc] = b;
698 static unsigned int hc_entries(unsigned int cnt)
700 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
701 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
704 static struct tree_content *new_tree_content(unsigned int cnt)
706 struct avail_tree_content *f, *l = NULL;
707 struct tree_content *t;
708 unsigned int hc = hc_entries(cnt);
710 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
711 if (f->entry_capacity >= cnt)
716 l->next_avail = f->next_avail;
718 avail_tree_table[hc] = f->next_avail;
720 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
721 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
722 f->entry_capacity = cnt;
725 t = (struct tree_content*)f;
731 static void release_tree_entry(struct tree_entry *e);
732 static void release_tree_content(struct tree_content *t)
734 struct avail_tree_content *f = (struct avail_tree_content*)t;
735 unsigned int hc = hc_entries(f->entry_capacity);
736 f->next_avail = avail_tree_table[hc];
737 avail_tree_table[hc] = f;
740 static void release_tree_content_recursive(struct tree_content *t)
743 for (i = 0; i < t->entry_count; i++)
744 release_tree_entry(t->entries[i]);
745 release_tree_content(t);
748 static struct tree_content *grow_tree_content(
749 struct tree_content *t,
752 struct tree_content *r = new_tree_content(t->entry_count + amt);
753 r->entry_count = t->entry_count;
754 r->delta_depth = t->delta_depth;
755 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
756 release_tree_content(t);
760 static struct tree_entry *new_tree_entry(void)
762 struct tree_entry *e;
764 if (!avail_tree_entry) {
765 unsigned int n = tree_entry_alloc;
766 total_allocd += n * sizeof(struct tree_entry);
767 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
769 *((void**)e) = e + 1;
775 e = avail_tree_entry;
776 avail_tree_entry = *((void**)e);
780 static void release_tree_entry(struct tree_entry *e)
783 release_tree_content_recursive(e->tree);
784 *((void**)e) = avail_tree_entry;
785 avail_tree_entry = e;
788 static struct tree_content *dup_tree_content(struct tree_content *s)
790 struct tree_content *d;
791 struct tree_entry *a, *b;
796 d = new_tree_content(s->entry_count);
797 for (i = 0; i < s->entry_count; i++) {
799 b = new_tree_entry();
800 memcpy(b, a, sizeof(*a));
801 if (a->tree && is_null_sha1(b->versions[1].sha1))
802 b->tree = dup_tree_content(a->tree);
807 d->entry_count = s->entry_count;
808 d->delta_depth = s->delta_depth;
813 static void start_packfile(void)
815 static char tmpfile[PATH_MAX];
816 struct packed_git *p;
817 struct pack_header hdr;
820 pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
821 "pack/tmp_pack_XXXXXX");
822 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
823 strcpy(p->pack_name, tmpfile);
824 p->pack_fd = pack_fd;
826 hdr.hdr_signature = htonl(PACK_SIGNATURE);
827 hdr.hdr_version = htonl(2);
829 write_or_die(p->pack_fd, &hdr, sizeof(hdr));
832 pack_size = sizeof(hdr);
835 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
836 all_packs[pack_id] = p;
839 static int oecmp (const void *a_, const void *b_)
841 struct object_entry *a = *((struct object_entry**)a_);
842 struct object_entry *b = *((struct object_entry**)b_);
843 return hashcmp(a->sha1, b->sha1);
846 static char *create_index(void)
848 static char tmpfile[PATH_MAX];
851 struct object_entry **idx, **c, **last, *e;
852 struct object_entry_pool *o;
856 /* Build the sorted table of object IDs. */
857 idx = xmalloc(object_count * sizeof(struct object_entry*));
859 for (o = blocks; o; o = o->next_pool)
860 for (e = o->next_free; e-- != o->entries;)
861 if (pack_id == e->pack_id)
863 last = idx + object_count;
865 die("internal consistency error creating the index");
866 qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
868 /* Generate the fan-out array. */
870 for (i = 0; i < 256; i++) {
871 struct object_entry **next = c;
872 while (next < last) {
873 if ((*next)->sha1[0] != i)
877 array[i] = htonl(next - idx);
881 idx_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
882 "pack/tmp_idx_XXXXXX");
883 f = sha1fd(idx_fd, tmpfile);
884 sha1write(f, array, 256 * sizeof(int));
886 for (c = idx; c != last; c++) {
887 uint32_t offset = htonl((*c)->offset);
888 sha1write(f, &offset, 4);
889 sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
890 git_SHA1_Update(&ctx, (*c)->sha1, 20);
892 sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
893 sha1close(f, NULL, CSUM_FSYNC);
895 git_SHA1_Final(pack_data->sha1, &ctx);
899 static char *keep_pack(char *curr_index_name)
901 static char name[PATH_MAX];
902 static const char *keep_msg = "fast-import";
905 chmod(pack_data->pack_name, 0444);
906 chmod(curr_index_name, 0444);
908 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
910 die("cannot create keep file");
911 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
913 die("failed to write keep file");
915 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
916 get_object_directory(), sha1_to_hex(pack_data->sha1));
917 if (move_temp_to_file(pack_data->pack_name, name))
918 die("cannot store pack file");
920 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
921 get_object_directory(), sha1_to_hex(pack_data->sha1));
922 if (move_temp_to_file(curr_index_name, name))
923 die("cannot store index file");
927 static void unkeep_all_packs(void)
929 static char name[PATH_MAX];
932 for (k = 0; k < pack_id; k++) {
933 struct packed_git *p = all_packs[k];
934 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
935 get_object_directory(), sha1_to_hex(p->sha1));
940 static void end_packfile(void)
942 struct packed_git *old_p = pack_data, *new_p;
944 clear_delta_base_cache();
951 close_pack_windows(pack_data);
952 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
953 pack_data->pack_name, object_count,
955 close(pack_data->pack_fd);
956 idx_name = keep_pack(create_index());
958 /* Register the packfile with core git's machinary. */
959 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
961 die("core git rejected index %s", idx_name);
962 all_packs[pack_id] = new_p;
963 install_packed_git(new_p);
965 /* Print the boundary */
967 fprintf(pack_edges, "%s:", new_p->pack_name);
968 for (i = 0; i < branch_table_sz; i++) {
969 for (b = branch_table[i]; b; b = b->table_next_branch) {
970 if (b->pack_id == pack_id)
971 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
974 for (t = first_tag; t; t = t->next_tag) {
975 if (t->pack_id == pack_id)
976 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
978 fputc('\n', pack_edges);
985 close(old_p->pack_fd);
986 unlink(old_p->pack_name);
990 /* We can't carry a delta across packfiles. */
991 strbuf_release(&last_blob.data);
992 last_blob.offset = 0;
996 static void cycle_packfile(void)
1002 static size_t encode_header(
1003 enum object_type type,
1010 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
1011 die("bad type %d", type);
1013 c = (type << 4) | (size & 15);
1025 static int store_object(
1026 enum object_type type,
1028 struct last_object *last,
1029 unsigned char *sha1out,
1033 struct object_entry *e;
1034 unsigned char hdr[96];
1035 unsigned char sha1[20];
1036 unsigned long hdrlen, deltalen;
1040 hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1041 (unsigned long)dat->len) + 1;
1043 git_SHA1_Update(&c, hdr, hdrlen);
1044 git_SHA1_Update(&c, dat->buf, dat->len);
1045 git_SHA1_Final(sha1, &c);
1047 hashcpy(sha1out, sha1);
1049 e = insert_object(sha1);
1051 insert_mark(mark, e);
1053 duplicate_count_by_type[type]++;
1055 } else if (find_sha1_pack(sha1, packed_git)) {
1057 e->pack_id = MAX_PACK_ID;
1058 e->offset = 1; /* just not zero! */
1059 duplicate_count_by_type[type]++;
1063 if (last && last->data.buf && last->depth < max_depth) {
1064 delta = diff_delta(last->data.buf, last->data.len,
1067 if (delta && deltalen >= dat->len) {
1074 memset(&s, 0, sizeof(s));
1075 deflateInit(&s, pack_compression_level);
1078 s.avail_in = deltalen;
1080 s.next_in = (void *)dat->buf;
1081 s.avail_in = dat->len;
1083 s.avail_out = deflateBound(&s, s.avail_in);
1084 s.next_out = out = xmalloc(s.avail_out);
1085 while (deflate(&s, Z_FINISH) == Z_OK)
1089 /* Determine if we should auto-checkpoint. */
1090 if ((pack_size + 60 + s.total_out) > max_packsize
1091 || (pack_size + 60 + s.total_out) < pack_size) {
1093 /* This new object needs to *not* have the current pack_id. */
1094 e->pack_id = pack_id + 1;
1097 /* We cannot carry a delta into the new pack. */
1102 memset(&s, 0, sizeof(s));
1103 deflateInit(&s, pack_compression_level);
1104 s.next_in = (void *)dat->buf;
1105 s.avail_in = dat->len;
1106 s.avail_out = deflateBound(&s, s.avail_in);
1107 s.next_out = out = xrealloc(out, s.avail_out);
1108 while (deflate(&s, Z_FINISH) == Z_OK)
1115 e->pack_id = pack_id;
1116 e->offset = pack_size;
1118 object_count_by_type[type]++;
1121 unsigned long ofs = e->offset - last->offset;
1122 unsigned pos = sizeof(hdr) - 1;
1124 delta_count_by_type[type]++;
1125 e->depth = last->depth + 1;
1127 hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1128 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1129 pack_size += hdrlen;
1131 hdr[pos] = ofs & 127;
1133 hdr[--pos] = 128 | (--ofs & 127);
1134 write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1135 pack_size += sizeof(hdr) - pos;
1138 hdrlen = encode_header(type, dat->len, hdr);
1139 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1140 pack_size += hdrlen;
1143 write_or_die(pack_data->pack_fd, out, s.total_out);
1144 pack_size += s.total_out;
1149 if (last->no_swap) {
1152 strbuf_swap(&last->data, dat);
1154 last->offset = e->offset;
1155 last->depth = e->depth;
1160 /* All calls must be guarded by find_object() or find_mark() to
1161 * ensure the 'struct object_entry' passed was written by this
1162 * process instance. We unpack the entry by the offset, avoiding
1163 * the need for the corresponding .idx file. This unpacking rule
1164 * works because we only use OBJ_REF_DELTA within the packfiles
1165 * created by fast-import.
1167 * oe must not be NULL. Such an oe usually comes from giving
1168 * an unknown SHA-1 to find_object() or an undefined mark to
1169 * find_mark(). Callers must test for this condition and use
1170 * the standard read_sha1_file() when it happens.
1172 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1173 * find_mark(), where the mark was reloaded from an existing marks
1174 * file and is referencing an object that this fast-import process
1175 * instance did not write out to a packfile. Callers must test for
1176 * this condition and use read_sha1_file() instead.
1178 static void *gfi_unpack_entry(
1179 struct object_entry *oe,
1180 unsigned long *sizep)
1182 enum object_type type;
1183 struct packed_git *p = all_packs[oe->pack_id];
1184 if (p == pack_data && p->pack_size < (pack_size + 20)) {
1185 /* The object is stored in the packfile we are writing to
1186 * and we have modified it since the last time we scanned
1187 * back to read a previously written object. If an old
1188 * window covered [p->pack_size, p->pack_size + 20) its
1189 * data is stale and is not valid. Closing all windows
1190 * and updating the packfile length ensures we can read
1191 * the newly written data.
1193 close_pack_windows(p);
1195 /* We have to offer 20 bytes additional on the end of
1196 * the packfile as the core unpacker code assumes the
1197 * footer is present at the file end and must promise
1198 * at least 20 bytes within any window it maps. But
1199 * we don't actually create the footer here.
1201 p->pack_size = pack_size + 20;
1203 return unpack_entry(p, oe->offset, &type, sizep);
1206 static const char *get_mode(const char *str, uint16_t *modep)
1211 while ((c = *str++) != ' ') {
1212 if (c < '0' || c > '7')
1214 mode = (mode << 3) + (c - '0');
1220 static void load_tree(struct tree_entry *root)
1222 unsigned char* sha1 = root->versions[1].sha1;
1223 struct object_entry *myoe;
1224 struct tree_content *t;
1229 root->tree = t = new_tree_content(8);
1230 if (is_null_sha1(sha1))
1233 myoe = find_object(sha1);
1234 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1235 if (myoe->type != OBJ_TREE)
1236 die("Not a tree: %s", sha1_to_hex(sha1));
1237 t->delta_depth = myoe->depth;
1238 buf = gfi_unpack_entry(myoe, &size);
1240 die("Can't load tree %s", sha1_to_hex(sha1));
1242 enum object_type type;
1243 buf = read_sha1_file(sha1, &type, &size);
1244 if (!buf || type != OBJ_TREE)
1245 die("Can't load tree %s", sha1_to_hex(sha1));
1249 while (c != (buf + size)) {
1250 struct tree_entry *e = new_tree_entry();
1252 if (t->entry_count == t->entry_capacity)
1253 root->tree = t = grow_tree_content(t, t->entry_count);
1254 t->entries[t->entry_count++] = e;
1257 c = get_mode(c, &e->versions[1].mode);
1259 die("Corrupt mode in %s", sha1_to_hex(sha1));
1260 e->versions[0].mode = e->versions[1].mode;
1261 e->name = to_atom(c, strlen(c));
1262 c += e->name->str_len + 1;
1263 hashcpy(e->versions[0].sha1, (unsigned char*)c);
1264 hashcpy(e->versions[1].sha1, (unsigned char*)c);
1270 static int tecmp0 (const void *_a, const void *_b)
1272 struct tree_entry *a = *((struct tree_entry**)_a);
1273 struct tree_entry *b = *((struct tree_entry**)_b);
1274 return base_name_compare(
1275 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1276 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1279 static int tecmp1 (const void *_a, const void *_b)
1281 struct tree_entry *a = *((struct tree_entry**)_a);
1282 struct tree_entry *b = *((struct tree_entry**)_b);
1283 return base_name_compare(
1284 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1285 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1288 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1294 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1296 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1298 for (i = 0; i < t->entry_count; i++) {
1299 if (t->entries[i]->versions[v].mode)
1300 maxlen += t->entries[i]->name->str_len + 34;
1304 strbuf_grow(b, maxlen);
1305 for (i = 0; i < t->entry_count; i++) {
1306 struct tree_entry *e = t->entries[i];
1307 if (!e->versions[v].mode)
1309 strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1310 e->name->str_dat, '\0');
1311 strbuf_add(b, e->versions[v].sha1, 20);
1315 static void store_tree(struct tree_entry *root)
1317 struct tree_content *t = root->tree;
1318 unsigned int i, j, del;
1319 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1320 struct object_entry *le;
1322 if (!is_null_sha1(root->versions[1].sha1))
1325 for (i = 0; i < t->entry_count; i++) {
1326 if (t->entries[i]->tree)
1327 store_tree(t->entries[i]);
1330 le = find_object(root->versions[0].sha1);
1331 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1332 mktree(t, 0, &old_tree);
1334 lo.offset = le->offset;
1335 lo.depth = t->delta_depth;
1338 mktree(t, 1, &new_tree);
1339 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1341 t->delta_depth = lo.depth;
1342 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1343 struct tree_entry *e = t->entries[i];
1344 if (e->versions[1].mode) {
1345 e->versions[0].mode = e->versions[1].mode;
1346 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1347 t->entries[j++] = e;
1349 release_tree_entry(e);
1353 t->entry_count -= del;
1356 static int tree_content_set(
1357 struct tree_entry *root,
1359 const unsigned char *sha1,
1360 const uint16_t mode,
1361 struct tree_content *subtree)
1363 struct tree_content *t = root->tree;
1366 struct tree_entry *e;
1368 slash1 = strchr(p, '/');
1374 die("Empty path component found in input");
1375 if (!slash1 && !S_ISDIR(mode) && subtree)
1376 die("Non-directories cannot have subtrees");
1378 for (i = 0; i < t->entry_count; i++) {
1380 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1383 && e->versions[1].mode == mode
1384 && !hashcmp(e->versions[1].sha1, sha1))
1386 e->versions[1].mode = mode;
1387 hashcpy(e->versions[1].sha1, sha1);
1389 release_tree_content_recursive(e->tree);
1391 hashclr(root->versions[1].sha1);
1394 if (!S_ISDIR(e->versions[1].mode)) {
1395 e->tree = new_tree_content(8);
1396 e->versions[1].mode = S_IFDIR;
1400 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1401 hashclr(root->versions[1].sha1);
1408 if (t->entry_count == t->entry_capacity)
1409 root->tree = t = grow_tree_content(t, t->entry_count);
1410 e = new_tree_entry();
1411 e->name = to_atom(p, n);
1412 e->versions[0].mode = 0;
1413 hashclr(e->versions[0].sha1);
1414 t->entries[t->entry_count++] = e;
1416 e->tree = new_tree_content(8);
1417 e->versions[1].mode = S_IFDIR;
1418 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1421 e->versions[1].mode = mode;
1422 hashcpy(e->versions[1].sha1, sha1);
1424 hashclr(root->versions[1].sha1);
1428 static int tree_content_remove(
1429 struct tree_entry *root,
1431 struct tree_entry *backup_leaf)
1433 struct tree_content *t = root->tree;
1436 struct tree_entry *e;
1438 slash1 = strchr(p, '/');
1444 for (i = 0; i < t->entry_count; i++) {
1446 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1447 if (!slash1 || !S_ISDIR(e->versions[1].mode))
1451 if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1452 for (n = 0; n < e->tree->entry_count; n++) {
1453 if (e->tree->entries[n]->versions[1].mode) {
1454 hashclr(root->versions[1].sha1);
1468 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1470 release_tree_content_recursive(e->tree);
1472 e->versions[1].mode = 0;
1473 hashclr(e->versions[1].sha1);
1474 hashclr(root->versions[1].sha1);
1478 static int tree_content_get(
1479 struct tree_entry *root,
1481 struct tree_entry *leaf)
1483 struct tree_content *t = root->tree;
1486 struct tree_entry *e;
1488 slash1 = strchr(p, '/');
1494 for (i = 0; i < t->entry_count; i++) {
1496 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1498 memcpy(leaf, e, sizeof(*leaf));
1499 if (e->tree && is_null_sha1(e->versions[1].sha1))
1500 leaf->tree = dup_tree_content(e->tree);
1505 if (!S_ISDIR(e->versions[1].mode))
1509 return tree_content_get(e, slash1 + 1, leaf);
1515 static int update_branch(struct branch *b)
1517 static const char *msg = "fast-import";
1518 struct ref_lock *lock;
1519 unsigned char old_sha1[20];
1521 if (is_null_sha1(b->sha1))
1523 if (read_ref(b->name, old_sha1))
1525 lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1527 return error("Unable to lock %s", b->name);
1528 if (!force_update && !is_null_sha1(old_sha1)) {
1529 struct commit *old_cmit, *new_cmit;
1531 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1532 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1533 if (!old_cmit || !new_cmit) {
1535 return error("Branch %s is missing commits.", b->name);
1538 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1540 warning("Not updating %s"
1541 " (new tip %s does not contain %s)",
1542 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1546 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1547 return error("Unable to update %s", b->name);
1551 static void dump_branches(void)
1556 for (i = 0; i < branch_table_sz; i++) {
1557 for (b = branch_table[i]; b; b = b->table_next_branch)
1558 failure |= update_branch(b);
1562 static void dump_tags(void)
1564 static const char *msg = "fast-import";
1566 struct ref_lock *lock;
1567 char ref_name[PATH_MAX];
1569 for (t = first_tag; t; t = t->next_tag) {
1570 sprintf(ref_name, "tags/%s", t->name);
1571 lock = lock_ref_sha1(ref_name, NULL);
1572 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1573 failure |= error("Unable to update %s", ref_name);
1577 static void dump_marks_helper(FILE *f,
1583 for (k = 0; k < 1024; k++) {
1584 if (m->data.sets[k])
1585 dump_marks_helper(f, (base + k) << m->shift,
1589 for (k = 0; k < 1024; k++) {
1590 if (m->data.marked[k])
1591 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1592 sha1_to_hex(m->data.marked[k]->sha1));
1597 static void dump_marks(void)
1599 static struct lock_file mark_lock;
1606 mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
1608 failure |= error("Unable to write marks file %s: %s",
1609 mark_file, strerror(errno));
1613 f = fdopen(mark_fd, "w");
1615 int saved_errno = errno;
1616 rollback_lock_file(&mark_lock);
1617 failure |= error("Unable to write marks file %s: %s",
1618 mark_file, strerror(saved_errno));
1623 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1624 * Assign -1 to the lock file descriptor so that commit_lock_file()
1625 * won't try to close() it.
1629 dump_marks_helper(f, 0, marks);
1630 if (ferror(f) || fclose(f)) {
1631 int saved_errno = errno;
1632 rollback_lock_file(&mark_lock);
1633 failure |= error("Unable to write marks file %s: %s",
1634 mark_file, strerror(saved_errno));
1638 if (commit_lock_file(&mark_lock)) {
1639 int saved_errno = errno;
1640 rollback_lock_file(&mark_lock);
1641 failure |= error("Unable to commit marks file %s: %s",
1642 mark_file, strerror(saved_errno));
1647 static int read_next_command(void)
1649 static int stdin_eof = 0;
1652 unread_command_buf = 0;
1657 if (unread_command_buf) {
1658 unread_command_buf = 0;
1660 struct recent_command *rc;
1662 strbuf_detach(&command_buf, NULL);
1663 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1672 cmd_hist.next = rc->next;
1673 cmd_hist.next->prev = &cmd_hist;
1677 rc->buf = command_buf.buf;
1678 rc->prev = cmd_tail;
1679 rc->next = cmd_hist.prev;
1680 rc->prev->next = rc;
1683 } while (command_buf.buf[0] == '#');
1688 static void skip_optional_lf(void)
1690 int term_char = fgetc(stdin);
1691 if (term_char != '\n' && term_char != EOF)
1692 ungetc(term_char, stdin);
1695 static void parse_mark(void)
1697 if (!prefixcmp(command_buf.buf, "mark :")) {
1698 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1699 read_next_command();
1705 static void parse_data(struct strbuf *sb)
1709 if (prefixcmp(command_buf.buf, "data "))
1710 die("Expected 'data n' command, found: %s", command_buf.buf);
1712 if (!prefixcmp(command_buf.buf + 5, "<<")) {
1713 char *term = xstrdup(command_buf.buf + 5 + 2);
1714 size_t term_len = command_buf.len - 5 - 2;
1716 strbuf_detach(&command_buf, NULL);
1718 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1719 die("EOF in data (terminator '%s' not found)", term);
1720 if (term_len == command_buf.len
1721 && !strcmp(term, command_buf.buf))
1723 strbuf_addbuf(sb, &command_buf);
1724 strbuf_addch(sb, '\n');
1729 size_t n = 0, length;
1731 length = strtoul(command_buf.buf + 5, NULL, 10);
1733 while (n < length) {
1734 size_t s = strbuf_fread(sb, length - n, stdin);
1735 if (!s && feof(stdin))
1736 die("EOF in data (%lu bytes remaining)",
1737 (unsigned long)(length - n));
1745 static int validate_raw_date(const char *src, char *result, int maxlen)
1747 const char *orig_src = src;
1753 date = strtoul(src, &endp, 10);
1754 if (errno || endp == src || *endp != ' ')
1758 if (*src != '-' && *src != '+')
1762 date = strtoul(src + 1, &endp, 10);
1763 if (errno || endp == src || *endp || (endp - orig_src) >= maxlen)
1766 strcpy(result, orig_src);
1770 static char *parse_ident(const char *buf)
1776 gt = strrchr(buf, '>');
1778 die("Missing > in ident string: %s", buf);
1781 die("Missing space after > in ident string: %s", buf);
1783 name_len = gt - buf;
1784 ident = xmalloc(name_len + 24);
1785 strncpy(ident, buf, name_len);
1789 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1790 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1792 case WHENSPEC_RFC2822:
1793 if (parse_date(gt, ident + name_len, 24) < 0)
1794 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1797 if (strcmp("now", gt))
1798 die("Date in ident must be 'now': %s", buf);
1799 datestamp(ident + name_len, 24);
1806 static void parse_new_blob(void)
1808 static struct strbuf buf = STRBUF_INIT;
1810 read_next_command();
1813 store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1816 static void unload_one_branch(void)
1818 while (cur_active_branches
1819 && cur_active_branches >= max_active_branches) {
1820 uintmax_t min_commit = ULONG_MAX;
1821 struct branch *e, *l = NULL, *p = NULL;
1823 for (e = active_branches; e; e = e->active_next_branch) {
1824 if (e->last_commit < min_commit) {
1826 min_commit = e->last_commit;
1832 e = p->active_next_branch;
1833 p->active_next_branch = e->active_next_branch;
1835 e = active_branches;
1836 active_branches = e->active_next_branch;
1839 e->active_next_branch = NULL;
1840 if (e->branch_tree.tree) {
1841 release_tree_content_recursive(e->branch_tree.tree);
1842 e->branch_tree.tree = NULL;
1844 cur_active_branches--;
1848 static void load_branch(struct branch *b)
1850 load_tree(&b->branch_tree);
1853 b->active_next_branch = active_branches;
1854 active_branches = b;
1855 cur_active_branches++;
1856 branch_load_count++;
1860 static void file_change_m(struct branch *b)
1862 const char *p = command_buf.buf + 2;
1863 static struct strbuf uq = STRBUF_INIT;
1865 struct object_entry *oe = oe;
1866 unsigned char sha1[20];
1867 uint16_t mode, inline_data = 0;
1869 p = get_mode(p, &mode);
1871 die("Corrupt mode: %s", command_buf.buf);
1876 case S_IFREG | 0644:
1877 case S_IFREG | 0755:
1883 die("Corrupt mode: %s", command_buf.buf);
1888 oe = find_mark(strtoumax(p + 1, &x, 10));
1889 hashcpy(sha1, oe->sha1);
1891 } else if (!prefixcmp(p, "inline")) {
1895 if (get_sha1_hex(p, sha1))
1896 die("Invalid SHA1: %s", command_buf.buf);
1897 oe = find_object(sha1);
1901 die("Missing space after SHA1: %s", command_buf.buf);
1904 if (!unquote_c_style(&uq, p, &endp)) {
1906 die("Garbage after path in: %s", command_buf.buf);
1910 if (S_ISGITLINK(mode)) {
1912 die("Git links cannot be specified 'inline': %s",
1915 if (oe->type != OBJ_COMMIT)
1916 die("Not a commit (actually a %s): %s",
1917 typename(oe->type), command_buf.buf);
1920 * Accept the sha1 without checking; it expected to be in
1921 * another repository.
1923 } else if (inline_data) {
1924 static struct strbuf buf = STRBUF_INIT;
1927 strbuf_addstr(&uq, p);
1930 read_next_command();
1932 store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1934 if (oe->type != OBJ_BLOB)
1935 die("Not a blob (actually a %s): %s",
1936 typename(oe->type), command_buf.buf);
1938 enum object_type type = sha1_object_info(sha1, NULL);
1940 die("Blob not found: %s", command_buf.buf);
1941 if (type != OBJ_BLOB)
1942 die("Not a blob (actually a %s): %s",
1943 typename(type), command_buf.buf);
1946 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
1949 static void file_change_d(struct branch *b)
1951 const char *p = command_buf.buf + 2;
1952 static struct strbuf uq = STRBUF_INIT;
1956 if (!unquote_c_style(&uq, p, &endp)) {
1958 die("Garbage after path in: %s", command_buf.buf);
1961 tree_content_remove(&b->branch_tree, p, NULL);
1964 static void file_change_cr(struct branch *b, int rename)
1967 static struct strbuf s_uq = STRBUF_INIT;
1968 static struct strbuf d_uq = STRBUF_INIT;
1970 struct tree_entry leaf;
1972 s = command_buf.buf + 2;
1973 strbuf_reset(&s_uq);
1974 if (!unquote_c_style(&s_uq, s, &endp)) {
1976 die("Missing space after source: %s", command_buf.buf);
1978 endp = strchr(s, ' ');
1980 die("Missing space after source: %s", command_buf.buf);
1981 strbuf_add(&s_uq, s, endp - s);
1987 die("Missing dest: %s", command_buf.buf);
1990 strbuf_reset(&d_uq);
1991 if (!unquote_c_style(&d_uq, d, &endp)) {
1993 die("Garbage after dest in: %s", command_buf.buf);
1997 memset(&leaf, 0, sizeof(leaf));
1999 tree_content_remove(&b->branch_tree, s, &leaf);
2001 tree_content_get(&b->branch_tree, s, &leaf);
2002 if (!leaf.versions[1].mode)
2003 die("Path %s not in branch", s);
2004 tree_content_set(&b->branch_tree, d,
2005 leaf.versions[1].sha1,
2006 leaf.versions[1].mode,
2010 static void file_change_deleteall(struct branch *b)
2012 release_tree_content_recursive(b->branch_tree.tree);
2013 hashclr(b->branch_tree.versions[0].sha1);
2014 hashclr(b->branch_tree.versions[1].sha1);
2015 load_tree(&b->branch_tree);
2018 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2020 if (!buf || size < 46)
2021 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2022 if (memcmp("tree ", buf, 5)
2023 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2024 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2025 hashcpy(b->branch_tree.versions[0].sha1,
2026 b->branch_tree.versions[1].sha1);
2029 static void parse_from_existing(struct branch *b)
2031 if (is_null_sha1(b->sha1)) {
2032 hashclr(b->branch_tree.versions[0].sha1);
2033 hashclr(b->branch_tree.versions[1].sha1);
2038 buf = read_object_with_reference(b->sha1,
2039 commit_type, &size, b->sha1);
2040 parse_from_commit(b, buf, size);
2045 static int parse_from(struct branch *b)
2050 if (prefixcmp(command_buf.buf, "from "))
2053 if (b->branch_tree.tree) {
2054 release_tree_content_recursive(b->branch_tree.tree);
2055 b->branch_tree.tree = NULL;
2058 from = strchr(command_buf.buf, ' ') + 1;
2059 s = lookup_branch(from);
2061 die("Can't create a branch from itself: %s", b->name);
2063 unsigned char *t = s->branch_tree.versions[1].sha1;
2064 hashcpy(b->sha1, s->sha1);
2065 hashcpy(b->branch_tree.versions[0].sha1, t);
2066 hashcpy(b->branch_tree.versions[1].sha1, t);
2067 } else if (*from == ':') {
2068 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2069 struct object_entry *oe = find_mark(idnum);
2070 if (oe->type != OBJ_COMMIT)
2071 die("Mark :%" PRIuMAX " not a commit", idnum);
2072 hashcpy(b->sha1, oe->sha1);
2073 if (oe->pack_id != MAX_PACK_ID) {
2075 char *buf = gfi_unpack_entry(oe, &size);
2076 parse_from_commit(b, buf, size);
2079 parse_from_existing(b);
2080 } else if (!get_sha1(from, b->sha1))
2081 parse_from_existing(b);
2083 die("Invalid ref name or SHA1 expression: %s", from);
2085 read_next_command();
2089 static struct hash_list *parse_merge(unsigned int *count)
2091 struct hash_list *list = NULL, *n, *e = e;
2096 while (!prefixcmp(command_buf.buf, "merge ")) {
2097 from = strchr(command_buf.buf, ' ') + 1;
2098 n = xmalloc(sizeof(*n));
2099 s = lookup_branch(from);
2101 hashcpy(n->sha1, s->sha1);
2102 else if (*from == ':') {
2103 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2104 struct object_entry *oe = find_mark(idnum);
2105 if (oe->type != OBJ_COMMIT)
2106 die("Mark :%" PRIuMAX " not a commit", idnum);
2107 hashcpy(n->sha1, oe->sha1);
2108 } else if (!get_sha1(from, n->sha1)) {
2110 char *buf = read_object_with_reference(n->sha1,
2111 commit_type, &size, n->sha1);
2112 if (!buf || size < 46)
2113 die("Not a valid commit: %s", from);
2116 die("Invalid ref name or SHA1 expression: %s", from);
2125 read_next_command();
2130 static void parse_new_commit(void)
2132 static struct strbuf msg = STRBUF_INIT;
2135 char *author = NULL;
2136 char *committer = NULL;
2137 struct hash_list *merge_list = NULL;
2138 unsigned int merge_count;
2140 /* Obtain the branch name from the rest of our command */
2141 sp = strchr(command_buf.buf, ' ') + 1;
2142 b = lookup_branch(sp);
2146 read_next_command();
2148 if (!prefixcmp(command_buf.buf, "author ")) {
2149 author = parse_ident(command_buf.buf + 7);
2150 read_next_command();
2152 if (!prefixcmp(command_buf.buf, "committer ")) {
2153 committer = parse_ident(command_buf.buf + 10);
2154 read_next_command();
2157 die("Expected committer but didn't get one");
2159 read_next_command();
2161 merge_list = parse_merge(&merge_count);
2163 /* ensure the branch is active/loaded */
2164 if (!b->branch_tree.tree || !max_active_branches) {
2165 unload_one_branch();
2170 while (command_buf.len > 0) {
2171 if (!prefixcmp(command_buf.buf, "M "))
2173 else if (!prefixcmp(command_buf.buf, "D "))
2175 else if (!prefixcmp(command_buf.buf, "R "))
2176 file_change_cr(b, 1);
2177 else if (!prefixcmp(command_buf.buf, "C "))
2178 file_change_cr(b, 0);
2179 else if (!strcmp("deleteall", command_buf.buf))
2180 file_change_deleteall(b);
2182 unread_command_buf = 1;
2185 if (read_next_command() == EOF)
2189 /* build the tree and the commit */
2190 store_tree(&b->branch_tree);
2191 hashcpy(b->branch_tree.versions[0].sha1,
2192 b->branch_tree.versions[1].sha1);
2194 strbuf_reset(&new_data);
2195 strbuf_addf(&new_data, "tree %s\n",
2196 sha1_to_hex(b->branch_tree.versions[1].sha1));
2197 if (!is_null_sha1(b->sha1))
2198 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2199 while (merge_list) {
2200 struct hash_list *next = merge_list->next;
2201 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2205 strbuf_addf(&new_data,
2209 author ? author : committer, committer);
2210 strbuf_addbuf(&new_data, &msg);
2214 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2215 b->pack_id = pack_id;
2216 b->last_commit = object_count_by_type[OBJ_COMMIT];
2219 static void parse_new_tag(void)
2221 static struct strbuf msg = STRBUF_INIT;
2227 uintmax_t from_mark = 0;
2228 unsigned char sha1[20];
2230 /* Obtain the new tag name from the rest of our command */
2231 sp = strchr(command_buf.buf, ' ') + 1;
2232 t = pool_alloc(sizeof(struct tag));
2234 t->name = pool_strdup(sp);
2236 last_tag->next_tag = t;
2240 read_next_command();
2243 if (prefixcmp(command_buf.buf, "from "))
2244 die("Expected from command, got %s", command_buf.buf);
2245 from = strchr(command_buf.buf, ' ') + 1;
2246 s = lookup_branch(from);
2248 hashcpy(sha1, s->sha1);
2249 } else if (*from == ':') {
2250 struct object_entry *oe;
2251 from_mark = strtoumax(from + 1, NULL, 10);
2252 oe = find_mark(from_mark);
2253 if (oe->type != OBJ_COMMIT)
2254 die("Mark :%" PRIuMAX " not a commit", from_mark);
2255 hashcpy(sha1, oe->sha1);
2256 } else if (!get_sha1(from, sha1)) {
2260 buf = read_object_with_reference(sha1,
2261 commit_type, &size, sha1);
2262 if (!buf || size < 46)
2263 die("Not a valid commit: %s", from);
2266 die("Invalid ref name or SHA1 expression: %s", from);
2267 read_next_command();
2270 if (!prefixcmp(command_buf.buf, "tagger ")) {
2271 tagger = parse_ident(command_buf.buf + 7);
2272 read_next_command();
2276 /* tag payload/message */
2279 /* build the tag object */
2280 strbuf_reset(&new_data);
2282 strbuf_addf(&new_data,
2286 sha1_to_hex(sha1), commit_type, t->name);
2288 strbuf_addf(&new_data,
2289 "tagger %s\n", tagger);
2290 strbuf_addch(&new_data, '\n');
2291 strbuf_addbuf(&new_data, &msg);
2294 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2295 t->pack_id = MAX_PACK_ID;
2297 t->pack_id = pack_id;
2300 static void parse_reset_branch(void)
2305 /* Obtain the branch name from the rest of our command */
2306 sp = strchr(command_buf.buf, ' ') + 1;
2307 b = lookup_branch(sp);
2310 hashclr(b->branch_tree.versions[0].sha1);
2311 hashclr(b->branch_tree.versions[1].sha1);
2312 if (b->branch_tree.tree) {
2313 release_tree_content_recursive(b->branch_tree.tree);
2314 b->branch_tree.tree = NULL;
2319 read_next_command();
2321 if (command_buf.len > 0)
2322 unread_command_buf = 1;
2325 static void parse_checkpoint(void)
2336 static void parse_progress(void)
2338 fwrite(command_buf.buf, 1, command_buf.len, stdout);
2339 fputc('\n', stdout);
2344 static void import_marks(const char *input_file)
2347 FILE *f = fopen(input_file, "r");
2349 die("cannot read %s: %s", input_file, strerror(errno));
2350 while (fgets(line, sizeof(line), f)) {
2353 unsigned char sha1[20];
2354 struct object_entry *e;
2356 end = strchr(line, '\n');
2357 if (line[0] != ':' || !end)
2358 die("corrupt mark line: %s", line);
2360 mark = strtoumax(line + 1, &end, 10);
2361 if (!mark || end == line + 1
2362 || *end != ' ' || get_sha1(end + 1, sha1))
2363 die("corrupt mark line: %s", line);
2364 e = find_object(sha1);
2366 enum object_type type = sha1_object_info(sha1, NULL);
2368 die("object not found: %s", sha1_to_hex(sha1));
2369 e = insert_object(sha1);
2371 e->pack_id = MAX_PACK_ID;
2372 e->offset = 1; /* just not zero! */
2374 insert_mark(mark, e);
2379 static int git_pack_config(const char *k, const char *v, void *cb)
2381 if (!strcmp(k, "pack.depth")) {
2382 max_depth = git_config_int(k, v);
2383 if (max_depth > MAX_DEPTH)
2384 max_depth = MAX_DEPTH;
2387 if (!strcmp(k, "pack.compression")) {
2388 int level = git_config_int(k, v);
2390 level = Z_DEFAULT_COMPRESSION;
2391 else if (level < 0 || level > Z_BEST_COMPRESSION)
2392 die("bad pack compression level %d", level);
2393 pack_compression_level = level;
2394 pack_compression_seen = 1;
2397 return git_default_config(k, v, cb);
2400 static const char fast_import_usage[] =
2401 "git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2403 int main(int argc, const char **argv)
2405 unsigned int i, show_stats = 1;
2407 git_extract_argv0_path(argv[0]);
2409 setup_git_directory();
2410 git_config(git_pack_config, NULL);
2411 if (!pack_compression_seen && core_compression_seen)
2412 pack_compression_level = core_compression_level;
2414 alloc_objects(object_entry_alloc);
2415 strbuf_init(&command_buf, 0);
2416 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2417 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2418 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2419 marks = pool_calloc(1, sizeof(struct mark_set));
2421 for (i = 1; i < argc; i++) {
2422 const char *a = argv[i];
2424 if (*a != '-' || !strcmp(a, "--"))
2426 else if (!prefixcmp(a, "--date-format=")) {
2427 const char *fmt = a + 14;
2428 if (!strcmp(fmt, "raw"))
2429 whenspec = WHENSPEC_RAW;
2430 else if (!strcmp(fmt, "rfc2822"))
2431 whenspec = WHENSPEC_RFC2822;
2432 else if (!strcmp(fmt, "now"))
2433 whenspec = WHENSPEC_NOW;
2435 die("unknown --date-format argument %s", fmt);
2437 else if (!prefixcmp(a, "--max-pack-size="))
2438 max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2439 else if (!prefixcmp(a, "--depth=")) {
2440 max_depth = strtoul(a + 8, NULL, 0);
2441 if (max_depth > MAX_DEPTH)
2442 die("--depth cannot exceed %u", MAX_DEPTH);
2444 else if (!prefixcmp(a, "--active-branches="))
2445 max_active_branches = strtoul(a + 18, NULL, 0);
2446 else if (!prefixcmp(a, "--import-marks="))
2447 import_marks(a + 15);
2448 else if (!prefixcmp(a, "--export-marks="))
2450 else if (!prefixcmp(a, "--export-pack-edges=")) {
2453 pack_edges = fopen(a + 20, "a");
2455 die("Cannot open %s: %s", a + 20, strerror(errno));
2456 } else if (!strcmp(a, "--force"))
2458 else if (!strcmp(a, "--quiet"))
2460 else if (!strcmp(a, "--stats"))
2463 die("unknown option %s", a);
2466 usage(fast_import_usage);
2468 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2469 for (i = 0; i < (cmd_save - 1); i++)
2470 rc_free[i].next = &rc_free[i + 1];
2471 rc_free[cmd_save - 1].next = NULL;
2473 prepare_packed_git();
2475 set_die_routine(die_nicely);
2476 while (read_next_command() != EOF) {
2477 if (!strcmp("blob", command_buf.buf))
2479 else if (!prefixcmp(command_buf.buf, "commit "))
2481 else if (!prefixcmp(command_buf.buf, "tag "))
2483 else if (!prefixcmp(command_buf.buf, "reset "))
2484 parse_reset_branch();
2485 else if (!strcmp("checkpoint", command_buf.buf))
2487 else if (!prefixcmp(command_buf.buf, "progress "))
2490 die("Unsupported command: %s", command_buf.buf);
2503 uintmax_t total_count = 0, duplicate_count = 0;
2504 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2505 total_count += object_count_by_type[i];
2506 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2507 duplicate_count += duplicate_count_by_type[i];
2509 fprintf(stderr, "%s statistics:\n", argv[0]);
2510 fprintf(stderr, "---------------------------------------------------------------------\n");
2511 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2512 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
2513 fprintf(stderr, " blobs : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB]);
2514 fprintf(stderr, " trees : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE]);
2515 fprintf(stderr, " commits: %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT]);
2516 fprintf(stderr, " tags : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG]);
2517 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
2518 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2519 fprintf(stderr, " atoms: %10u\n", atom_cnt);
2520 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2521 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
2522 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2523 fprintf(stderr, "---------------------------------------------------------------------\n");
2525 fprintf(stderr, "---------------------------------------------------------------------\n");
2526 fprintf(stderr, "\n");
2529 return failure ? 1 : 0;