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"
154 #define PACK_ID_BITS 16
155 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
156 #define DEPTH_BITS 13
157 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
161 struct object_entry *next;
163 uint32_t type : TYPE_BITS,
164 pack_id : PACK_ID_BITS,
166 unsigned char sha1[20];
169 struct object_entry_pool
171 struct object_entry_pool *next_pool;
172 struct object_entry *next_free;
173 struct object_entry *end;
174 struct object_entry entries[FLEX_ARRAY]; /* more */
180 struct object_entry *marked[1024];
181 struct mark_set *sets[1024];
191 unsigned no_swap : 1;
196 struct mem_pool *next_pool;
199 uintmax_t space[FLEX_ARRAY]; /* more */
204 struct atom_str *next_atom;
205 unsigned short str_len;
206 char str_dat[FLEX_ARRAY]; /* more */
212 struct tree_content *tree;
213 struct atom_str* name;
217 unsigned char sha1[20];
223 unsigned int entry_capacity; /* must match avail_tree_content */
224 unsigned int entry_count;
225 unsigned int delta_depth;
226 struct tree_entry *entries[FLEX_ARRAY]; /* more */
229 struct avail_tree_content
231 unsigned int entry_capacity; /* must match tree_content */
232 struct avail_tree_content *next_avail;
237 struct branch *table_next_branch;
238 struct branch *active_next_branch;
240 struct tree_entry branch_tree;
241 uintmax_t last_commit;
243 unsigned pack_id : PACK_ID_BITS;
244 unsigned char sha1[20];
249 struct tag *next_tag;
251 unsigned int pack_id;
252 unsigned char sha1[20];
257 struct hash_list *next;
258 unsigned char sha1[20];
267 struct recent_command
269 struct recent_command *prev;
270 struct recent_command *next;
274 /* Configured limits on output */
275 static unsigned long max_depth = 10;
276 static off_t max_packsize = (1LL << 32) - 1;
277 static int force_update;
279 /* Stats and misc. counters */
280 static uintmax_t alloc_count;
281 static uintmax_t marks_set_count;
282 static uintmax_t object_count_by_type[1 << TYPE_BITS];
283 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
284 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
285 static unsigned long object_count;
286 static unsigned long branch_count;
287 static unsigned long branch_load_count;
289 static FILE *pack_edges;
292 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
293 static size_t total_allocd;
294 static struct mem_pool *mem_pool;
296 /* Atom management */
297 static unsigned int atom_table_sz = 4451;
298 static unsigned int atom_cnt;
299 static struct atom_str **atom_table;
301 /* The .pack file being generated */
302 static unsigned int pack_id;
303 static struct packed_git *pack_data;
304 static struct packed_git **all_packs;
305 static unsigned long pack_size;
307 /* Table of objects we've written. */
308 static unsigned int object_entry_alloc = 5000;
309 static struct object_entry_pool *blocks;
310 static struct object_entry *object_table[1 << 16];
311 static struct mark_set *marks;
312 static const char* mark_file;
315 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
317 /* Tree management */
318 static unsigned int tree_entry_alloc = 1000;
319 static void *avail_tree_entry;
320 static unsigned int avail_tree_table_sz = 100;
321 static struct avail_tree_content **avail_tree_table;
322 static struct strbuf old_tree = STRBUF_INIT;
323 static struct strbuf new_tree = STRBUF_INIT;
326 static unsigned long max_active_branches = 5;
327 static unsigned long cur_active_branches;
328 static unsigned long branch_table_sz = 1039;
329 static struct branch **branch_table;
330 static struct branch *active_branches;
333 static struct tag *first_tag;
334 static struct tag *last_tag;
336 /* Input stream parsing */
337 static whenspec_type whenspec = WHENSPEC_RAW;
338 static struct strbuf command_buf = STRBUF_INIT;
339 static int unread_command_buf;
340 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
341 static struct recent_command *cmd_tail = &cmd_hist;
342 static struct recent_command *rc_free;
343 static unsigned int cmd_save = 100;
344 static uintmax_t next_mark;
345 static struct strbuf new_data = STRBUF_INIT;
347 static void write_branch_report(FILE *rpt, struct branch *b)
349 fprintf(rpt, "%s:\n", b->name);
351 fprintf(rpt, " status :");
353 fputs(" active", rpt);
354 if (b->branch_tree.tree)
355 fputs(" loaded", rpt);
356 if (is_null_sha1(b->branch_tree.versions[1].sha1))
357 fputs(" dirty", rpt);
360 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
361 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
362 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
363 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
365 fputs(" last pack : ", rpt);
366 if (b->pack_id < MAX_PACK_ID)
367 fprintf(rpt, "%u", b->pack_id);
373 static void write_crash_report(const char *err)
375 char *loc = git_path("fast_import_crash_%d", getpid());
376 FILE *rpt = fopen(loc, "w");
379 struct recent_command *rc;
382 error("can't write crash report %s: %s", loc, strerror(errno));
386 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
388 fprintf(rpt, "fast-import crash report:\n");
389 fprintf(rpt, " fast-import process: %d\n", getpid());
390 fprintf(rpt, " parent process : %d\n", getppid());
391 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
394 fputs("fatal: ", rpt);
399 fputs("Most Recent Commands Before Crash\n", rpt);
400 fputs("---------------------------------\n", rpt);
401 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
402 if (rc->next == &cmd_hist)
411 fputs("Active Branch LRU\n", rpt);
412 fputs("-----------------\n", rpt);
413 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
415 max_active_branches);
417 fputs(" pos clock name\n", rpt);
418 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
419 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
420 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
421 ++lu, b->last_commit, b->name);
424 fputs("Inactive Branches\n", rpt);
425 fputs("-----------------\n", rpt);
426 for (lu = 0; lu < branch_table_sz; lu++) {
427 for (b = branch_table[lu]; b; b = b->table_next_branch)
428 write_branch_report(rpt, b);
432 fputs("-------------------\n", rpt);
433 fputs("END OF CRASH REPORT\n", rpt);
437 static NORETURN void die_nicely(const char *err, va_list params)
440 char message[2 * PATH_MAX];
442 vsnprintf(message, sizeof(message), err, params);
443 fputs("fatal: ", stderr);
444 fputs(message, stderr);
449 write_crash_report(message);
454 static void alloc_objects(unsigned int cnt)
456 struct object_entry_pool *b;
458 b = xmalloc(sizeof(struct object_entry_pool)
459 + cnt * sizeof(struct object_entry));
460 b->next_pool = blocks;
461 b->next_free = b->entries;
462 b->end = b->entries + cnt;
467 static struct object_entry *new_object(unsigned char *sha1)
469 struct object_entry *e;
471 if (blocks->next_free == blocks->end)
472 alloc_objects(object_entry_alloc);
474 e = blocks->next_free++;
475 hashcpy(e->sha1, sha1);
479 static struct object_entry *find_object(unsigned char *sha1)
481 unsigned int h = sha1[0] << 8 | sha1[1];
482 struct object_entry *e;
483 for (e = object_table[h]; e; e = e->next)
484 if (!hashcmp(sha1, e->sha1))
489 static struct object_entry *insert_object(unsigned char *sha1)
491 unsigned int h = sha1[0] << 8 | sha1[1];
492 struct object_entry *e = object_table[h];
493 struct object_entry *p = NULL;
496 if (!hashcmp(sha1, e->sha1))
502 e = new_object(sha1);
512 static unsigned int hc_str(const char *s, size_t len)
520 static void *pool_alloc(size_t len)
525 for (p = mem_pool; p; p = p->next_pool)
526 if ((p->end - p->next_free >= len))
530 if (len >= (mem_pool_alloc/2)) {
534 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
535 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
536 p->next_pool = mem_pool;
537 p->next_free = (char *) p->space;
538 p->end = p->next_free + mem_pool_alloc;
543 /* round out to a 'uintmax_t' alignment */
544 if (len & (sizeof(uintmax_t) - 1))
545 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
550 static void *pool_calloc(size_t count, size_t size)
552 size_t len = count * size;
553 void *r = pool_alloc(len);
558 static char *pool_strdup(const char *s)
560 char *r = pool_alloc(strlen(s) + 1);
565 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
567 struct mark_set *s = marks;
568 while ((idnum >> s->shift) >= 1024) {
569 s = pool_calloc(1, sizeof(struct mark_set));
570 s->shift = marks->shift + 10;
571 s->data.sets[0] = marks;
575 uintmax_t i = idnum >> s->shift;
576 idnum -= i << s->shift;
577 if (!s->data.sets[i]) {
578 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
579 s->data.sets[i]->shift = s->shift - 10;
583 if (!s->data.marked[idnum])
585 s->data.marked[idnum] = oe;
588 static struct object_entry *find_mark(uintmax_t idnum)
590 uintmax_t orig_idnum = idnum;
591 struct mark_set *s = marks;
592 struct object_entry *oe = NULL;
593 if ((idnum >> s->shift) < 1024) {
594 while (s && s->shift) {
595 uintmax_t i = idnum >> s->shift;
596 idnum -= i << s->shift;
600 oe = s->data.marked[idnum];
603 die("mark :%" PRIuMAX " not declared", orig_idnum);
607 static struct atom_str *to_atom(const char *s, unsigned short len)
609 unsigned int hc = hc_str(s, len) % atom_table_sz;
612 for (c = atom_table[hc]; c; c = c->next_atom)
613 if (c->str_len == len && !strncmp(s, c->str_dat, len))
616 c = pool_alloc(sizeof(struct atom_str) + len + 1);
618 strncpy(c->str_dat, s, len);
620 c->next_atom = atom_table[hc];
626 static struct branch *lookup_branch(const char *name)
628 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
631 for (b = branch_table[hc]; b; b = b->table_next_branch)
632 if (!strcmp(name, b->name))
637 static struct branch *new_branch(const char *name)
639 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
640 struct branch* b = lookup_branch(name);
643 die("Invalid attempt to create duplicate branch: %s", name);
644 switch (check_ref_format(name)) {
645 case 0: break; /* its valid */
646 case CHECK_REF_FORMAT_ONELEVEL:
647 break; /* valid, but too few '/', allow anyway */
649 die("Branch name doesn't conform to GIT standards: %s", name);
652 b = pool_calloc(1, sizeof(struct branch));
653 b->name = pool_strdup(name);
654 b->table_next_branch = branch_table[hc];
655 b->branch_tree.versions[0].mode = S_IFDIR;
656 b->branch_tree.versions[1].mode = S_IFDIR;
658 b->pack_id = MAX_PACK_ID;
659 branch_table[hc] = b;
664 static unsigned int hc_entries(unsigned int cnt)
666 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
667 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
670 static struct tree_content *new_tree_content(unsigned int cnt)
672 struct avail_tree_content *f, *l = NULL;
673 struct tree_content *t;
674 unsigned int hc = hc_entries(cnt);
676 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
677 if (f->entry_capacity >= cnt)
682 l->next_avail = f->next_avail;
684 avail_tree_table[hc] = f->next_avail;
686 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
687 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
688 f->entry_capacity = cnt;
691 t = (struct tree_content*)f;
697 static void release_tree_entry(struct tree_entry *e);
698 static void release_tree_content(struct tree_content *t)
700 struct avail_tree_content *f = (struct avail_tree_content*)t;
701 unsigned int hc = hc_entries(f->entry_capacity);
702 f->next_avail = avail_tree_table[hc];
703 avail_tree_table[hc] = f;
706 static void release_tree_content_recursive(struct tree_content *t)
709 for (i = 0; i < t->entry_count; i++)
710 release_tree_entry(t->entries[i]);
711 release_tree_content(t);
714 static struct tree_content *grow_tree_content(
715 struct tree_content *t,
718 struct tree_content *r = new_tree_content(t->entry_count + amt);
719 r->entry_count = t->entry_count;
720 r->delta_depth = t->delta_depth;
721 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
722 release_tree_content(t);
726 static struct tree_entry *new_tree_entry(void)
728 struct tree_entry *e;
730 if (!avail_tree_entry) {
731 unsigned int n = tree_entry_alloc;
732 total_allocd += n * sizeof(struct tree_entry);
733 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
735 *((void**)e) = e + 1;
741 e = avail_tree_entry;
742 avail_tree_entry = *((void**)e);
746 static void release_tree_entry(struct tree_entry *e)
749 release_tree_content_recursive(e->tree);
750 *((void**)e) = avail_tree_entry;
751 avail_tree_entry = e;
754 static struct tree_content *dup_tree_content(struct tree_content *s)
756 struct tree_content *d;
757 struct tree_entry *a, *b;
762 d = new_tree_content(s->entry_count);
763 for (i = 0; i < s->entry_count; i++) {
765 b = new_tree_entry();
766 memcpy(b, a, sizeof(*a));
767 if (a->tree && is_null_sha1(b->versions[1].sha1))
768 b->tree = dup_tree_content(a->tree);
773 d->entry_count = s->entry_count;
774 d->delta_depth = s->delta_depth;
779 static void start_packfile(void)
781 static char tmpfile[PATH_MAX];
782 struct packed_git *p;
783 struct pack_header hdr;
786 snprintf(tmpfile, sizeof(tmpfile),
787 "%s/tmp_pack_XXXXXX", get_object_directory());
788 pack_fd = xmkstemp(tmpfile);
789 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
790 strcpy(p->pack_name, tmpfile);
791 p->pack_fd = pack_fd;
793 hdr.hdr_signature = htonl(PACK_SIGNATURE);
794 hdr.hdr_version = htonl(2);
796 write_or_die(p->pack_fd, &hdr, sizeof(hdr));
799 pack_size = sizeof(hdr);
802 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
803 all_packs[pack_id] = p;
806 static int oecmp (const void *a_, const void *b_)
808 struct object_entry *a = *((struct object_entry**)a_);
809 struct object_entry *b = *((struct object_entry**)b_);
810 return hashcmp(a->sha1, b->sha1);
813 static char *create_index(void)
815 static char tmpfile[PATH_MAX];
818 struct object_entry **idx, **c, **last, *e;
819 struct object_entry_pool *o;
823 /* Build the sorted table of object IDs. */
824 idx = xmalloc(object_count * sizeof(struct object_entry*));
826 for (o = blocks; o; o = o->next_pool)
827 for (e = o->next_free; e-- != o->entries;)
828 if (pack_id == e->pack_id)
830 last = idx + object_count;
832 die("internal consistency error creating the index");
833 qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
835 /* Generate the fan-out array. */
837 for (i = 0; i < 256; i++) {
838 struct object_entry **next = c;;
839 while (next < last) {
840 if ((*next)->sha1[0] != i)
844 array[i] = htonl(next - idx);
848 snprintf(tmpfile, sizeof(tmpfile),
849 "%s/tmp_idx_XXXXXX", get_object_directory());
850 idx_fd = xmkstemp(tmpfile);
851 f = sha1fd(idx_fd, tmpfile);
852 sha1write(f, array, 256 * sizeof(int));
854 for (c = idx; c != last; c++) {
855 uint32_t offset = htonl((*c)->offset);
856 sha1write(f, &offset, 4);
857 sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
858 SHA1_Update(&ctx, (*c)->sha1, 20);
860 sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
861 sha1close(f, NULL, 1);
863 SHA1_Final(pack_data->sha1, &ctx);
867 static char *keep_pack(char *curr_index_name)
869 static char name[PATH_MAX];
870 static const char *keep_msg = "fast-import";
873 chmod(pack_data->pack_name, 0444);
874 chmod(curr_index_name, 0444);
876 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
877 get_object_directory(), sha1_to_hex(pack_data->sha1));
878 keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
880 die("cannot create keep file");
881 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
883 die("failed to write keep file");
885 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
886 get_object_directory(), sha1_to_hex(pack_data->sha1));
887 if (move_temp_to_file(pack_data->pack_name, name))
888 die("cannot store pack file");
890 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
891 get_object_directory(), sha1_to_hex(pack_data->sha1));
892 if (move_temp_to_file(curr_index_name, name))
893 die("cannot store index file");
897 static void unkeep_all_packs(void)
899 static char name[PATH_MAX];
902 for (k = 0; k < pack_id; k++) {
903 struct packed_git *p = all_packs[k];
904 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
905 get_object_directory(), sha1_to_hex(p->sha1));
910 static void end_packfile(void)
912 struct packed_git *old_p = pack_data, *new_p;
920 close_pack_windows(pack_data);
921 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
922 pack_data->pack_name, object_count);
923 close(pack_data->pack_fd);
924 idx_name = keep_pack(create_index());
926 /* Register the packfile with core git's machinary. */
927 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
929 die("core git rejected index %s", idx_name);
930 all_packs[pack_id] = new_p;
931 install_packed_git(new_p);
933 /* Print the boundary */
935 fprintf(pack_edges, "%s:", new_p->pack_name);
936 for (i = 0; i < branch_table_sz; i++) {
937 for (b = branch_table[i]; b; b = b->table_next_branch) {
938 if (b->pack_id == pack_id)
939 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
942 for (t = first_tag; t; t = t->next_tag) {
943 if (t->pack_id == pack_id)
944 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
946 fputc('\n', pack_edges);
953 unlink(old_p->pack_name);
956 /* We can't carry a delta across packfiles. */
957 strbuf_release(&last_blob.data);
958 last_blob.offset = 0;
962 static void cycle_packfile(void)
968 static size_t encode_header(
969 enum object_type type,
976 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
977 die("bad type %d", type);
979 c = (type << 4) | (size & 15);
991 static int store_object(
992 enum object_type type,
994 struct last_object *last,
995 unsigned char *sha1out,
999 struct object_entry *e;
1000 unsigned char hdr[96];
1001 unsigned char sha1[20];
1002 unsigned long hdrlen, deltalen;
1006 hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1007 (unsigned long)dat->len) + 1;
1009 SHA1_Update(&c, hdr, hdrlen);
1010 SHA1_Update(&c, dat->buf, dat->len);
1011 SHA1_Final(sha1, &c);
1013 hashcpy(sha1out, sha1);
1015 e = insert_object(sha1);
1017 insert_mark(mark, e);
1019 duplicate_count_by_type[type]++;
1021 } else if (find_sha1_pack(sha1, packed_git)) {
1023 e->pack_id = MAX_PACK_ID;
1024 e->offset = 1; /* just not zero! */
1025 duplicate_count_by_type[type]++;
1029 if (last && last->data.buf && last->depth < max_depth) {
1030 delta = diff_delta(last->data.buf, last->data.len,
1033 if (delta && deltalen >= dat->len) {
1040 memset(&s, 0, sizeof(s));
1041 deflateInit(&s, zlib_compression_level);
1044 s.avail_in = deltalen;
1046 s.next_in = (void *)dat->buf;
1047 s.avail_in = dat->len;
1049 s.avail_out = deflateBound(&s, s.avail_in);
1050 s.next_out = out = xmalloc(s.avail_out);
1051 while (deflate(&s, Z_FINISH) == Z_OK)
1055 /* Determine if we should auto-checkpoint. */
1056 if ((pack_size + 60 + s.total_out) > max_packsize
1057 || (pack_size + 60 + s.total_out) < pack_size) {
1059 /* This new object needs to *not* have the current pack_id. */
1060 e->pack_id = pack_id + 1;
1063 /* We cannot carry a delta into the new pack. */
1068 memset(&s, 0, sizeof(s));
1069 deflateInit(&s, zlib_compression_level);
1070 s.next_in = (void *)dat->buf;
1071 s.avail_in = dat->len;
1072 s.avail_out = deflateBound(&s, s.avail_in);
1073 s.next_out = out = xrealloc(out, s.avail_out);
1074 while (deflate(&s, Z_FINISH) == Z_OK)
1081 e->pack_id = pack_id;
1082 e->offset = pack_size;
1084 object_count_by_type[type]++;
1087 unsigned long ofs = e->offset - last->offset;
1088 unsigned pos = sizeof(hdr) - 1;
1090 delta_count_by_type[type]++;
1091 e->depth = last->depth + 1;
1093 hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1094 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1095 pack_size += hdrlen;
1097 hdr[pos] = ofs & 127;
1099 hdr[--pos] = 128 | (--ofs & 127);
1100 write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1101 pack_size += sizeof(hdr) - pos;
1104 hdrlen = encode_header(type, dat->len, hdr);
1105 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1106 pack_size += hdrlen;
1109 write_or_die(pack_data->pack_fd, out, s.total_out);
1110 pack_size += s.total_out;
1115 if (last->no_swap) {
1118 strbuf_swap(&last->data, dat);
1120 last->offset = e->offset;
1121 last->depth = e->depth;
1126 static void *gfi_unpack_entry(
1127 struct object_entry *oe,
1128 unsigned long *sizep)
1130 enum object_type type;
1131 struct packed_git *p = all_packs[oe->pack_id];
1132 if (p == pack_data && p->pack_size < (pack_size + 20)) {
1133 close_pack_windows(p);
1134 p->pack_size = pack_size + 20;
1136 return unpack_entry(p, oe->offset, &type, sizep);
1139 static const char *get_mode(const char *str, uint16_t *modep)
1144 while ((c = *str++) != ' ') {
1145 if (c < '0' || c > '7')
1147 mode = (mode << 3) + (c - '0');
1153 static void load_tree(struct tree_entry *root)
1155 unsigned char* sha1 = root->versions[1].sha1;
1156 struct object_entry *myoe;
1157 struct tree_content *t;
1162 root->tree = t = new_tree_content(8);
1163 if (is_null_sha1(sha1))
1166 myoe = find_object(sha1);
1167 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1168 if (myoe->type != OBJ_TREE)
1169 die("Not a tree: %s", sha1_to_hex(sha1));
1170 t->delta_depth = myoe->depth;
1171 buf = gfi_unpack_entry(myoe, &size);
1173 enum object_type type;
1174 buf = read_sha1_file(sha1, &type, &size);
1175 if (!buf || type != OBJ_TREE)
1176 die("Can't load tree %s", sha1_to_hex(sha1));
1180 while (c != (buf + size)) {
1181 struct tree_entry *e = new_tree_entry();
1183 if (t->entry_count == t->entry_capacity)
1184 root->tree = t = grow_tree_content(t, t->entry_count);
1185 t->entries[t->entry_count++] = e;
1188 c = get_mode(c, &e->versions[1].mode);
1190 die("Corrupt mode in %s", sha1_to_hex(sha1));
1191 e->versions[0].mode = e->versions[1].mode;
1192 e->name = to_atom(c, strlen(c));
1193 c += e->name->str_len + 1;
1194 hashcpy(e->versions[0].sha1, (unsigned char*)c);
1195 hashcpy(e->versions[1].sha1, (unsigned char*)c);
1201 static int tecmp0 (const void *_a, const void *_b)
1203 struct tree_entry *a = *((struct tree_entry**)_a);
1204 struct tree_entry *b = *((struct tree_entry**)_b);
1205 return base_name_compare(
1206 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1207 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1210 static int tecmp1 (const void *_a, const void *_b)
1212 struct tree_entry *a = *((struct tree_entry**)_a);
1213 struct tree_entry *b = *((struct tree_entry**)_b);
1214 return base_name_compare(
1215 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1216 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1219 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1225 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1227 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1229 for (i = 0; i < t->entry_count; i++) {
1230 if (t->entries[i]->versions[v].mode)
1231 maxlen += t->entries[i]->name->str_len + 34;
1235 strbuf_grow(b, maxlen);
1236 for (i = 0; i < t->entry_count; i++) {
1237 struct tree_entry *e = t->entries[i];
1238 if (!e->versions[v].mode)
1240 strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1241 e->name->str_dat, '\0');
1242 strbuf_add(b, e->versions[v].sha1, 20);
1246 static void store_tree(struct tree_entry *root)
1248 struct tree_content *t = root->tree;
1249 unsigned int i, j, del;
1250 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1251 struct object_entry *le;
1253 if (!is_null_sha1(root->versions[1].sha1))
1256 for (i = 0; i < t->entry_count; i++) {
1257 if (t->entries[i]->tree)
1258 store_tree(t->entries[i]);
1261 le = find_object(root->versions[0].sha1);
1262 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1263 mktree(t, 0, &old_tree);
1265 lo.offset = le->offset;
1266 lo.depth = t->delta_depth;
1269 mktree(t, 1, &new_tree);
1270 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1272 t->delta_depth = lo.depth;
1273 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1274 struct tree_entry *e = t->entries[i];
1275 if (e->versions[1].mode) {
1276 e->versions[0].mode = e->versions[1].mode;
1277 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1278 t->entries[j++] = e;
1280 release_tree_entry(e);
1284 t->entry_count -= del;
1287 static int tree_content_set(
1288 struct tree_entry *root,
1290 const unsigned char *sha1,
1291 const uint16_t mode,
1292 struct tree_content *subtree)
1294 struct tree_content *t = root->tree;
1297 struct tree_entry *e;
1299 slash1 = strchr(p, '/');
1305 die("Empty path component found in input");
1306 if (!slash1 && !S_ISDIR(mode) && subtree)
1307 die("Non-directories cannot have subtrees");
1309 for (i = 0; i < t->entry_count; i++) {
1311 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1314 && e->versions[1].mode == mode
1315 && !hashcmp(e->versions[1].sha1, sha1))
1317 e->versions[1].mode = mode;
1318 hashcpy(e->versions[1].sha1, sha1);
1320 release_tree_content_recursive(e->tree);
1322 hashclr(root->versions[1].sha1);
1325 if (!S_ISDIR(e->versions[1].mode)) {
1326 e->tree = new_tree_content(8);
1327 e->versions[1].mode = S_IFDIR;
1331 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1332 hashclr(root->versions[1].sha1);
1339 if (t->entry_count == t->entry_capacity)
1340 root->tree = t = grow_tree_content(t, t->entry_count);
1341 e = new_tree_entry();
1342 e->name = to_atom(p, n);
1343 e->versions[0].mode = 0;
1344 hashclr(e->versions[0].sha1);
1345 t->entries[t->entry_count++] = e;
1347 e->tree = new_tree_content(8);
1348 e->versions[1].mode = S_IFDIR;
1349 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1352 e->versions[1].mode = mode;
1353 hashcpy(e->versions[1].sha1, sha1);
1355 hashclr(root->versions[1].sha1);
1359 static int tree_content_remove(
1360 struct tree_entry *root,
1362 struct tree_entry *backup_leaf)
1364 struct tree_content *t = root->tree;
1367 struct tree_entry *e;
1369 slash1 = strchr(p, '/');
1375 for (i = 0; i < t->entry_count; i++) {
1377 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1378 if (!slash1 || !S_ISDIR(e->versions[1].mode))
1382 if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1383 for (n = 0; n < e->tree->entry_count; n++) {
1384 if (e->tree->entries[n]->versions[1].mode) {
1385 hashclr(root->versions[1].sha1);
1399 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1401 release_tree_content_recursive(e->tree);
1403 e->versions[1].mode = 0;
1404 hashclr(e->versions[1].sha1);
1405 hashclr(root->versions[1].sha1);
1409 static int tree_content_get(
1410 struct tree_entry *root,
1412 struct tree_entry *leaf)
1414 struct tree_content *t = root->tree;
1417 struct tree_entry *e;
1419 slash1 = strchr(p, '/');
1425 for (i = 0; i < t->entry_count; i++) {
1427 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1429 memcpy(leaf, e, sizeof(*leaf));
1430 if (e->tree && is_null_sha1(e->versions[1].sha1))
1431 leaf->tree = dup_tree_content(e->tree);
1436 if (!S_ISDIR(e->versions[1].mode))
1440 return tree_content_get(e, slash1 + 1, leaf);
1446 static int update_branch(struct branch *b)
1448 static const char *msg = "fast-import";
1449 struct ref_lock *lock;
1450 unsigned char old_sha1[20];
1452 if (read_ref(b->name, old_sha1))
1454 lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1456 return error("Unable to lock %s", b->name);
1457 if (!force_update && !is_null_sha1(old_sha1)) {
1458 struct commit *old_cmit, *new_cmit;
1460 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1461 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1462 if (!old_cmit || !new_cmit) {
1464 return error("Branch %s is missing commits.", b->name);
1467 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1469 warning("Not updating %s"
1470 " (new tip %s does not contain %s)",
1471 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1475 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1476 return error("Unable to update %s", b->name);
1480 static void dump_branches(void)
1485 for (i = 0; i < branch_table_sz; i++) {
1486 for (b = branch_table[i]; b; b = b->table_next_branch)
1487 failure |= update_branch(b);
1491 static void dump_tags(void)
1493 static const char *msg = "fast-import";
1495 struct ref_lock *lock;
1496 char ref_name[PATH_MAX];
1498 for (t = first_tag; t; t = t->next_tag) {
1499 sprintf(ref_name, "tags/%s", t->name);
1500 lock = lock_ref_sha1(ref_name, NULL);
1501 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1502 failure |= error("Unable to update %s", ref_name);
1506 static void dump_marks_helper(FILE *f,
1512 for (k = 0; k < 1024; k++) {
1513 if (m->data.sets[k])
1514 dump_marks_helper(f, (base + k) << m->shift,
1518 for (k = 0; k < 1024; k++) {
1519 if (m->data.marked[k])
1520 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1521 sha1_to_hex(m->data.marked[k]->sha1));
1526 static void dump_marks(void)
1528 static struct lock_file mark_lock;
1535 mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
1537 failure |= error("Unable to write marks file %s: %s",
1538 mark_file, strerror(errno));
1542 f = fdopen(mark_fd, "w");
1544 int saved_errno = errno;
1545 rollback_lock_file(&mark_lock);
1546 failure |= error("Unable to write marks file %s: %s",
1547 mark_file, strerror(saved_errno));
1552 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1553 * Assign -1 to the lock file descriptor so that commit_lock_file()
1554 * won't try to close() it.
1558 dump_marks_helper(f, 0, marks);
1559 if (ferror(f) || fclose(f)) {
1560 int saved_errno = errno;
1561 rollback_lock_file(&mark_lock);
1562 failure |= error("Unable to write marks file %s: %s",
1563 mark_file, strerror(saved_errno));
1567 if (commit_lock_file(&mark_lock)) {
1568 int saved_errno = errno;
1569 rollback_lock_file(&mark_lock);
1570 failure |= error("Unable to commit marks file %s: %s",
1571 mark_file, strerror(saved_errno));
1576 static int read_next_command(void)
1578 static int stdin_eof = 0;
1581 unread_command_buf = 0;
1586 if (unread_command_buf) {
1587 unread_command_buf = 0;
1589 struct recent_command *rc;
1591 strbuf_detach(&command_buf, NULL);
1592 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1601 cmd_hist.next = rc->next;
1602 cmd_hist.next->prev = &cmd_hist;
1606 rc->buf = command_buf.buf;
1607 rc->prev = cmd_tail;
1608 rc->next = cmd_hist.prev;
1609 rc->prev->next = rc;
1612 } while (command_buf.buf[0] == '#');
1617 static void skip_optional_lf(void)
1619 int term_char = fgetc(stdin);
1620 if (term_char != '\n' && term_char != EOF)
1621 ungetc(term_char, stdin);
1624 static void cmd_mark(void)
1626 if (!prefixcmp(command_buf.buf, "mark :")) {
1627 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1628 read_next_command();
1634 static void cmd_data(struct strbuf *sb)
1638 if (prefixcmp(command_buf.buf, "data "))
1639 die("Expected 'data n' command, found: %s", command_buf.buf);
1641 if (!prefixcmp(command_buf.buf + 5, "<<")) {
1642 char *term = xstrdup(command_buf.buf + 5 + 2);
1643 size_t term_len = command_buf.len - 5 - 2;
1645 strbuf_detach(&command_buf, NULL);
1647 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1648 die("EOF in data (terminator '%s' not found)", term);
1649 if (term_len == command_buf.len
1650 && !strcmp(term, command_buf.buf))
1652 strbuf_addbuf(sb, &command_buf);
1653 strbuf_addch(sb, '\n');
1658 size_t n = 0, length;
1660 length = strtoul(command_buf.buf + 5, NULL, 10);
1662 while (n < length) {
1663 size_t s = strbuf_fread(sb, length - n, stdin);
1664 if (!s && feof(stdin))
1665 die("EOF in data (%lu bytes remaining)",
1666 (unsigned long)(length - n));
1674 static int validate_raw_date(const char *src, char *result, int maxlen)
1676 const char *orig_src = src;
1679 strtoul(src, &endp, 10);
1680 if (endp == src || *endp != ' ')
1684 if (*src != '-' && *src != '+')
1688 strtoul(src + 1, &endp, 10);
1689 if (endp == src || *endp || (endp - orig_src) >= maxlen)
1692 strcpy(result, orig_src);
1696 static char *parse_ident(const char *buf)
1702 gt = strrchr(buf, '>');
1704 die("Missing > in ident string: %s", buf);
1707 die("Missing space after > in ident string: %s", buf);
1709 name_len = gt - buf;
1710 ident = xmalloc(name_len + 24);
1711 strncpy(ident, buf, name_len);
1715 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1716 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1718 case WHENSPEC_RFC2822:
1719 if (parse_date(gt, ident + name_len, 24) < 0)
1720 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1723 if (strcmp("now", gt))
1724 die("Date in ident must be 'now': %s", buf);
1725 datestamp(ident + name_len, 24);
1732 static void cmd_new_blob(void)
1734 static struct strbuf buf = STRBUF_INIT;
1736 read_next_command();
1739 store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1742 static void unload_one_branch(void)
1744 while (cur_active_branches
1745 && cur_active_branches >= max_active_branches) {
1746 uintmax_t min_commit = ULONG_MAX;
1747 struct branch *e, *l = NULL, *p = NULL;
1749 for (e = active_branches; e; e = e->active_next_branch) {
1750 if (e->last_commit < min_commit) {
1752 min_commit = e->last_commit;
1758 e = p->active_next_branch;
1759 p->active_next_branch = e->active_next_branch;
1761 e = active_branches;
1762 active_branches = e->active_next_branch;
1765 e->active_next_branch = NULL;
1766 if (e->branch_tree.tree) {
1767 release_tree_content_recursive(e->branch_tree.tree);
1768 e->branch_tree.tree = NULL;
1770 cur_active_branches--;
1774 static void load_branch(struct branch *b)
1776 load_tree(&b->branch_tree);
1779 b->active_next_branch = active_branches;
1780 active_branches = b;
1781 cur_active_branches++;
1782 branch_load_count++;
1786 static void file_change_m(struct branch *b)
1788 const char *p = command_buf.buf + 2;
1789 static struct strbuf uq = STRBUF_INIT;
1791 struct object_entry *oe = oe;
1792 unsigned char sha1[20];
1793 uint16_t mode, inline_data = 0;
1795 p = get_mode(p, &mode);
1797 die("Corrupt mode: %s", command_buf.buf);
1799 case S_IFREG | 0644:
1800 case S_IFREG | 0755:
1807 die("Corrupt mode: %s", command_buf.buf);
1812 oe = find_mark(strtoumax(p + 1, &x, 10));
1813 hashcpy(sha1, oe->sha1);
1815 } else if (!prefixcmp(p, "inline")) {
1819 if (get_sha1_hex(p, sha1))
1820 die("Invalid SHA1: %s", command_buf.buf);
1821 oe = find_object(sha1);
1825 die("Missing space after SHA1: %s", command_buf.buf);
1828 if (!unquote_c_style(&uq, p, &endp)) {
1830 die("Garbage after path in: %s", command_buf.buf);
1835 static struct strbuf buf = STRBUF_INIT;
1838 strbuf_addstr(&uq, p);
1841 read_next_command();
1843 store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1845 if (oe->type != OBJ_BLOB)
1846 die("Not a blob (actually a %s): %s",
1847 typename(oe->type), command_buf.buf);
1849 enum object_type type = sha1_object_info(sha1, NULL);
1851 die("Blob not found: %s", command_buf.buf);
1852 if (type != OBJ_BLOB)
1853 die("Not a blob (actually a %s): %s",
1854 typename(type), command_buf.buf);
1857 tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1860 static void file_change_d(struct branch *b)
1862 const char *p = command_buf.buf + 2;
1863 static struct strbuf uq = STRBUF_INIT;
1867 if (!unquote_c_style(&uq, p, &endp)) {
1869 die("Garbage after path in: %s", command_buf.buf);
1872 tree_content_remove(&b->branch_tree, p, NULL);
1875 static void file_change_cr(struct branch *b, int rename)
1878 static struct strbuf s_uq = STRBUF_INIT;
1879 static struct strbuf d_uq = STRBUF_INIT;
1881 struct tree_entry leaf;
1883 s = command_buf.buf + 2;
1884 strbuf_reset(&s_uq);
1885 if (!unquote_c_style(&s_uq, s, &endp)) {
1887 die("Missing space after source: %s", command_buf.buf);
1889 endp = strchr(s, ' ');
1891 die("Missing space after source: %s", command_buf.buf);
1892 strbuf_add(&s_uq, s, endp - s);
1898 die("Missing dest: %s", command_buf.buf);
1901 strbuf_reset(&d_uq);
1902 if (!unquote_c_style(&d_uq, d, &endp)) {
1904 die("Garbage after dest in: %s", command_buf.buf);
1908 memset(&leaf, 0, sizeof(leaf));
1910 tree_content_remove(&b->branch_tree, s, &leaf);
1912 tree_content_get(&b->branch_tree, s, &leaf);
1913 if (!leaf.versions[1].mode)
1914 die("Path %s not in branch", s);
1915 tree_content_set(&b->branch_tree, d,
1916 leaf.versions[1].sha1,
1917 leaf.versions[1].mode,
1921 static void file_change_deleteall(struct branch *b)
1923 release_tree_content_recursive(b->branch_tree.tree);
1924 hashclr(b->branch_tree.versions[0].sha1);
1925 hashclr(b->branch_tree.versions[1].sha1);
1926 load_tree(&b->branch_tree);
1929 static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
1931 if (!buf || size < 46)
1932 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
1933 if (memcmp("tree ", buf, 5)
1934 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
1935 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
1936 hashcpy(b->branch_tree.versions[0].sha1,
1937 b->branch_tree.versions[1].sha1);
1940 static void cmd_from_existing(struct branch *b)
1942 if (is_null_sha1(b->sha1)) {
1943 hashclr(b->branch_tree.versions[0].sha1);
1944 hashclr(b->branch_tree.versions[1].sha1);
1949 buf = read_object_with_reference(b->sha1,
1950 commit_type, &size, b->sha1);
1951 cmd_from_commit(b, buf, size);
1956 static int cmd_from(struct branch *b)
1961 if (prefixcmp(command_buf.buf, "from "))
1964 if (b->branch_tree.tree) {
1965 release_tree_content_recursive(b->branch_tree.tree);
1966 b->branch_tree.tree = NULL;
1969 from = strchr(command_buf.buf, ' ') + 1;
1970 s = lookup_branch(from);
1972 die("Can't create a branch from itself: %s", b->name);
1974 unsigned char *t = s->branch_tree.versions[1].sha1;
1975 hashcpy(b->sha1, s->sha1);
1976 hashcpy(b->branch_tree.versions[0].sha1, t);
1977 hashcpy(b->branch_tree.versions[1].sha1, t);
1978 } else if (*from == ':') {
1979 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1980 struct object_entry *oe = find_mark(idnum);
1981 if (oe->type != OBJ_COMMIT)
1982 die("Mark :%" PRIuMAX " not a commit", idnum);
1983 hashcpy(b->sha1, oe->sha1);
1984 if (oe->pack_id != MAX_PACK_ID) {
1986 char *buf = gfi_unpack_entry(oe, &size);
1987 cmd_from_commit(b, buf, size);
1990 cmd_from_existing(b);
1991 } else if (!get_sha1(from, b->sha1))
1992 cmd_from_existing(b);
1994 die("Invalid ref name or SHA1 expression: %s", from);
1996 read_next_command();
2000 static struct hash_list *cmd_merge(unsigned int *count)
2002 struct hash_list *list = NULL, *n, *e = e;
2007 while (!prefixcmp(command_buf.buf, "merge ")) {
2008 from = strchr(command_buf.buf, ' ') + 1;
2009 n = xmalloc(sizeof(*n));
2010 s = lookup_branch(from);
2012 hashcpy(n->sha1, s->sha1);
2013 else if (*from == ':') {
2014 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2015 struct object_entry *oe = find_mark(idnum);
2016 if (oe->type != OBJ_COMMIT)
2017 die("Mark :%" PRIuMAX " not a commit", idnum);
2018 hashcpy(n->sha1, oe->sha1);
2019 } else if (!get_sha1(from, n->sha1)) {
2021 char *buf = read_object_with_reference(n->sha1,
2022 commit_type, &size, n->sha1);
2023 if (!buf || size < 46)
2024 die("Not a valid commit: %s", from);
2027 die("Invalid ref name or SHA1 expression: %s", from);
2036 read_next_command();
2041 static void cmd_new_commit(void)
2043 static struct strbuf msg = STRBUF_INIT;
2046 char *author = NULL;
2047 char *committer = NULL;
2048 struct hash_list *merge_list = NULL;
2049 unsigned int merge_count;
2051 /* Obtain the branch name from the rest of our command */
2052 sp = strchr(command_buf.buf, ' ') + 1;
2053 b = lookup_branch(sp);
2057 read_next_command();
2059 if (!prefixcmp(command_buf.buf, "author ")) {
2060 author = parse_ident(command_buf.buf + 7);
2061 read_next_command();
2063 if (!prefixcmp(command_buf.buf, "committer ")) {
2064 committer = parse_ident(command_buf.buf + 10);
2065 read_next_command();
2068 die("Expected committer but didn't get one");
2070 read_next_command();
2072 merge_list = cmd_merge(&merge_count);
2074 /* ensure the branch is active/loaded */
2075 if (!b->branch_tree.tree || !max_active_branches) {
2076 unload_one_branch();
2081 while (command_buf.len > 0) {
2082 if (!prefixcmp(command_buf.buf, "M "))
2084 else if (!prefixcmp(command_buf.buf, "D "))
2086 else if (!prefixcmp(command_buf.buf, "R "))
2087 file_change_cr(b, 1);
2088 else if (!prefixcmp(command_buf.buf, "C "))
2089 file_change_cr(b, 0);
2090 else if (!strcmp("deleteall", command_buf.buf))
2091 file_change_deleteall(b);
2093 unread_command_buf = 1;
2096 if (read_next_command() == EOF)
2100 /* build the tree and the commit */
2101 store_tree(&b->branch_tree);
2102 hashcpy(b->branch_tree.versions[0].sha1,
2103 b->branch_tree.versions[1].sha1);
2105 strbuf_reset(&new_data);
2106 strbuf_addf(&new_data, "tree %s\n",
2107 sha1_to_hex(b->branch_tree.versions[1].sha1));
2108 if (!is_null_sha1(b->sha1))
2109 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2110 while (merge_list) {
2111 struct hash_list *next = merge_list->next;
2112 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2116 strbuf_addf(&new_data,
2120 author ? author : committer, committer);
2121 strbuf_addbuf(&new_data, &msg);
2125 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2126 b->pack_id = pack_id;
2127 b->last_commit = object_count_by_type[OBJ_COMMIT];
2130 static void cmd_new_tag(void)
2132 static struct strbuf msg = STRBUF_INIT;
2138 uintmax_t from_mark = 0;
2139 unsigned char sha1[20];
2141 /* Obtain the new tag name from the rest of our command */
2142 sp = strchr(command_buf.buf, ' ') + 1;
2143 t = pool_alloc(sizeof(struct tag));
2145 t->name = pool_strdup(sp);
2147 last_tag->next_tag = t;
2151 read_next_command();
2154 if (prefixcmp(command_buf.buf, "from "))
2155 die("Expected from command, got %s", command_buf.buf);
2156 from = strchr(command_buf.buf, ' ') + 1;
2157 s = lookup_branch(from);
2159 hashcpy(sha1, s->sha1);
2160 } else if (*from == ':') {
2161 struct object_entry *oe;
2162 from_mark = strtoumax(from + 1, NULL, 10);
2163 oe = find_mark(from_mark);
2164 if (oe->type != OBJ_COMMIT)
2165 die("Mark :%" PRIuMAX " not a commit", from_mark);
2166 hashcpy(sha1, oe->sha1);
2167 } else if (!get_sha1(from, sha1)) {
2171 buf = read_object_with_reference(sha1,
2172 commit_type, &size, sha1);
2173 if (!buf || size < 46)
2174 die("Not a valid commit: %s", from);
2177 die("Invalid ref name or SHA1 expression: %s", from);
2178 read_next_command();
2181 if (prefixcmp(command_buf.buf, "tagger "))
2182 die("Expected tagger command, got %s", command_buf.buf);
2183 tagger = parse_ident(command_buf.buf + 7);
2185 /* tag payload/message */
2186 read_next_command();
2189 /* build the tag object */
2190 strbuf_reset(&new_data);
2191 strbuf_addf(&new_data,
2197 sha1_to_hex(sha1), commit_type, t->name, tagger);
2198 strbuf_addbuf(&new_data, &msg);
2201 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2202 t->pack_id = MAX_PACK_ID;
2204 t->pack_id = pack_id;
2207 static void cmd_reset_branch(void)
2212 /* Obtain the branch name from the rest of our command */
2213 sp = strchr(command_buf.buf, ' ') + 1;
2214 b = lookup_branch(sp);
2217 hashclr(b->branch_tree.versions[0].sha1);
2218 hashclr(b->branch_tree.versions[1].sha1);
2219 if (b->branch_tree.tree) {
2220 release_tree_content_recursive(b->branch_tree.tree);
2221 b->branch_tree.tree = NULL;
2226 read_next_command();
2227 if (!cmd_from(b) && command_buf.len > 0)
2228 unread_command_buf = 1;
2231 static void cmd_checkpoint(void)
2242 static void cmd_progress(void)
2244 fwrite(command_buf.buf, 1, command_buf.len, stdout);
2245 fputc('\n', stdout);
2250 static void import_marks(const char *input_file)
2253 FILE *f = fopen(input_file, "r");
2255 die("cannot read %s: %s", input_file, strerror(errno));
2256 while (fgets(line, sizeof(line), f)) {
2259 unsigned char sha1[20];
2260 struct object_entry *e;
2262 end = strchr(line, '\n');
2263 if (line[0] != ':' || !end)
2264 die("corrupt mark line: %s", line);
2266 mark = strtoumax(line + 1, &end, 10);
2267 if (!mark || end == line + 1
2268 || *end != ' ' || get_sha1(end + 1, sha1))
2269 die("corrupt mark line: %s", line);
2270 e = find_object(sha1);
2272 enum object_type type = sha1_object_info(sha1, NULL);
2274 die("object not found: %s", sha1_to_hex(sha1));
2275 e = insert_object(sha1);
2277 e->pack_id = MAX_PACK_ID;
2278 e->offset = 1; /* just not zero! */
2280 insert_mark(mark, e);
2285 static const char fast_import_usage[] =
2286 "git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2288 int main(int argc, const char **argv)
2290 unsigned int i, show_stats = 1;
2292 git_config(git_default_config);
2293 alloc_objects(object_entry_alloc);
2294 strbuf_init(&command_buf, 0);
2295 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2296 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2297 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2298 marks = pool_calloc(1, sizeof(struct mark_set));
2300 for (i = 1; i < argc; i++) {
2301 const char *a = argv[i];
2303 if (*a != '-' || !strcmp(a, "--"))
2305 else if (!prefixcmp(a, "--date-format=")) {
2306 const char *fmt = a + 14;
2307 if (!strcmp(fmt, "raw"))
2308 whenspec = WHENSPEC_RAW;
2309 else if (!strcmp(fmt, "rfc2822"))
2310 whenspec = WHENSPEC_RFC2822;
2311 else if (!strcmp(fmt, "now"))
2312 whenspec = WHENSPEC_NOW;
2314 die("unknown --date-format argument %s", fmt);
2316 else if (!prefixcmp(a, "--max-pack-size="))
2317 max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2318 else if (!prefixcmp(a, "--depth=")) {
2319 max_depth = strtoul(a + 8, NULL, 0);
2320 if (max_depth > MAX_DEPTH)
2321 die("--depth cannot exceed %u", MAX_DEPTH);
2323 else if (!prefixcmp(a, "--active-branches="))
2324 max_active_branches = strtoul(a + 18, NULL, 0);
2325 else if (!prefixcmp(a, "--import-marks="))
2326 import_marks(a + 15);
2327 else if (!prefixcmp(a, "--export-marks="))
2329 else if (!prefixcmp(a, "--export-pack-edges=")) {
2332 pack_edges = fopen(a + 20, "a");
2334 die("Cannot open %s: %s", a + 20, strerror(errno));
2335 } else if (!strcmp(a, "--force"))
2337 else if (!strcmp(a, "--quiet"))
2339 else if (!strcmp(a, "--stats"))
2342 die("unknown option %s", a);
2345 usage(fast_import_usage);
2347 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2348 for (i = 0; i < (cmd_save - 1); i++)
2349 rc_free[i].next = &rc_free[i + 1];
2350 rc_free[cmd_save - 1].next = NULL;
2352 prepare_packed_git();
2354 set_die_routine(die_nicely);
2355 while (read_next_command() != EOF) {
2356 if (!strcmp("blob", command_buf.buf))
2358 else if (!prefixcmp(command_buf.buf, "commit "))
2360 else if (!prefixcmp(command_buf.buf, "tag "))
2362 else if (!prefixcmp(command_buf.buf, "reset "))
2364 else if (!strcmp("checkpoint", command_buf.buf))
2366 else if (!prefixcmp(command_buf.buf, "progress "))
2369 die("Unsupported command: %s", command_buf.buf);
2382 uintmax_t total_count = 0, duplicate_count = 0;
2383 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2384 total_count += object_count_by_type[i];
2385 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2386 duplicate_count += duplicate_count_by_type[i];
2388 fprintf(stderr, "%s statistics:\n", argv[0]);
2389 fprintf(stderr, "---------------------------------------------------------------------\n");
2390 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2391 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
2392 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]);
2393 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]);
2394 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]);
2395 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]);
2396 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
2397 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2398 fprintf(stderr, " atoms: %10u\n", atom_cnt);
2399 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2400 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
2401 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2402 fprintf(stderr, "---------------------------------------------------------------------\n");
2404 fprintf(stderr, "---------------------------------------------------------------------\n");
2405 fprintf(stderr, "\n");
2408 return failure ? 1 : 0;