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)
159 struct object_entry *next;
161 unsigned type : TYPE_BITS;
162 unsigned pack_id : PACK_ID_BITS;
163 unsigned char sha1[20];
166 struct object_entry_pool
168 struct object_entry_pool *next_pool;
169 struct object_entry *next_free;
170 struct object_entry *end;
171 struct object_entry entries[FLEX_ARRAY]; /* more */
177 struct object_entry *marked[1024];
178 struct mark_set *sets[1024];
188 unsigned no_swap : 1;
193 struct mem_pool *next_pool;
196 char space[FLEX_ARRAY]; /* more */
201 struct atom_str *next_atom;
202 unsigned short str_len;
203 char str_dat[FLEX_ARRAY]; /* more */
209 struct tree_content *tree;
210 struct atom_str* name;
214 unsigned char sha1[20];
220 unsigned int entry_capacity; /* must match avail_tree_content */
221 unsigned int entry_count;
222 unsigned int delta_depth;
223 struct tree_entry *entries[FLEX_ARRAY]; /* more */
226 struct avail_tree_content
228 unsigned int entry_capacity; /* must match tree_content */
229 struct avail_tree_content *next_avail;
234 struct branch *table_next_branch;
235 struct branch *active_next_branch;
237 struct tree_entry branch_tree;
238 uintmax_t last_commit;
240 unsigned pack_id : PACK_ID_BITS;
241 unsigned char sha1[20];
246 struct tag *next_tag;
248 unsigned int pack_id;
249 unsigned char sha1[20];
254 struct hash_list *next;
255 unsigned char sha1[20];
264 struct recent_command
266 struct recent_command *prev;
267 struct recent_command *next;
271 /* Configured limits on output */
272 static unsigned long max_depth = 10;
273 static off_t max_packsize = (1LL << 32) - 1;
274 static int force_update;
276 /* Stats and misc. counters */
277 static uintmax_t alloc_count;
278 static uintmax_t marks_set_count;
279 static uintmax_t object_count_by_type[1 << TYPE_BITS];
280 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
281 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
282 static unsigned long object_count;
283 static unsigned long branch_count;
284 static unsigned long branch_load_count;
286 static FILE *pack_edges;
289 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
290 static size_t total_allocd;
291 static struct mem_pool *mem_pool;
293 /* Atom management */
294 static unsigned int atom_table_sz = 4451;
295 static unsigned int atom_cnt;
296 static struct atom_str **atom_table;
298 /* The .pack file being generated */
299 static unsigned int pack_id;
300 static struct packed_git *pack_data;
301 static struct packed_git **all_packs;
302 static unsigned long pack_size;
304 /* Table of objects we've written. */
305 static unsigned int object_entry_alloc = 5000;
306 static struct object_entry_pool *blocks;
307 static struct object_entry *object_table[1 << 16];
308 static struct mark_set *marks;
309 static const char* mark_file;
312 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
314 /* Tree management */
315 static unsigned int tree_entry_alloc = 1000;
316 static void *avail_tree_entry;
317 static unsigned int avail_tree_table_sz = 100;
318 static struct avail_tree_content **avail_tree_table;
319 static struct strbuf old_tree = STRBUF_INIT;
320 static struct strbuf new_tree = STRBUF_INIT;
323 static unsigned long max_active_branches = 5;
324 static unsigned long cur_active_branches;
325 static unsigned long branch_table_sz = 1039;
326 static struct branch **branch_table;
327 static struct branch *active_branches;
330 static struct tag *first_tag;
331 static struct tag *last_tag;
333 /* Input stream parsing */
334 static whenspec_type whenspec = WHENSPEC_RAW;
335 static struct strbuf command_buf = STRBUF_INIT;
336 static int unread_command_buf;
337 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
338 static struct recent_command *cmd_tail = &cmd_hist;
339 static struct recent_command *rc_free;
340 static unsigned int cmd_save = 100;
341 static uintmax_t next_mark;
342 static struct strbuf new_data = STRBUF_INIT;
344 static void write_branch_report(FILE *rpt, struct branch *b)
346 fprintf(rpt, "%s:\n", b->name);
348 fprintf(rpt, " status :");
350 fputs(" active", rpt);
351 if (b->branch_tree.tree)
352 fputs(" loaded", rpt);
353 if (is_null_sha1(b->branch_tree.versions[1].sha1))
354 fputs(" dirty", rpt);
357 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
358 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
359 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
360 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
362 fputs(" last pack : ", rpt);
363 if (b->pack_id < MAX_PACK_ID)
364 fprintf(rpt, "%u", b->pack_id);
370 static void write_crash_report(const char *err)
372 char *loc = git_path("fast_import_crash_%d", getpid());
373 FILE *rpt = fopen(loc, "w");
376 struct recent_command *rc;
379 error("can't write crash report %s: %s", loc, strerror(errno));
383 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
385 fprintf(rpt, "fast-import crash report:\n");
386 fprintf(rpt, " fast-import process: %d\n", getpid());
387 fprintf(rpt, " parent process : %d\n", getppid());
388 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
391 fputs("fatal: ", rpt);
396 fputs("Most Recent Commands Before Crash\n", rpt);
397 fputs("---------------------------------\n", rpt);
398 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
399 if (rc->next == &cmd_hist)
408 fputs("Active Branch LRU\n", rpt);
409 fputs("-----------------\n", rpt);
410 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
412 max_active_branches);
414 fputs(" pos clock name\n", rpt);
415 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
416 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
417 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
418 ++lu, b->last_commit, b->name);
421 fputs("Inactive Branches\n", rpt);
422 fputs("-----------------\n", rpt);
423 for (lu = 0; lu < branch_table_sz; lu++) {
424 for (b = branch_table[lu]; b; b = b->table_next_branch)
425 write_branch_report(rpt, b);
429 fputs("-------------------\n", rpt);
430 fputs("END OF CRASH REPORT\n", rpt);
434 static NORETURN void die_nicely(const char *err, va_list params)
437 char message[2 * PATH_MAX];
439 vsnprintf(message, sizeof(message), err, params);
440 fputs("fatal: ", stderr);
441 fputs(message, stderr);
446 write_crash_report(message);
451 static void alloc_objects(unsigned int cnt)
453 struct object_entry_pool *b;
455 b = xmalloc(sizeof(struct object_entry_pool)
456 + cnt * sizeof(struct object_entry));
457 b->next_pool = blocks;
458 b->next_free = b->entries;
459 b->end = b->entries + cnt;
464 static struct object_entry *new_object(unsigned char *sha1)
466 struct object_entry *e;
468 if (blocks->next_free == blocks->end)
469 alloc_objects(object_entry_alloc);
471 e = blocks->next_free++;
472 hashcpy(e->sha1, sha1);
476 static struct object_entry *find_object(unsigned char *sha1)
478 unsigned int h = sha1[0] << 8 | sha1[1];
479 struct object_entry *e;
480 for (e = object_table[h]; e; e = e->next)
481 if (!hashcmp(sha1, e->sha1))
486 static struct object_entry *insert_object(unsigned char *sha1)
488 unsigned int h = sha1[0] << 8 | sha1[1];
489 struct object_entry *e = object_table[h];
490 struct object_entry *p = NULL;
493 if (!hashcmp(sha1, e->sha1))
499 e = new_object(sha1);
509 static unsigned int hc_str(const char *s, size_t len)
517 static void *pool_alloc(size_t len)
522 for (p = mem_pool; p; p = p->next_pool)
523 if ((p->end - p->next_free >= len))
527 if (len >= (mem_pool_alloc/2)) {
531 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
532 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
533 p->next_pool = mem_pool;
534 p->next_free = p->space;
535 p->end = p->next_free + mem_pool_alloc;
540 /* round out to a pointer alignment */
541 if (len & (sizeof(void*) - 1))
542 len += sizeof(void*) - (len & (sizeof(void*) - 1));
547 static void *pool_calloc(size_t count, size_t size)
549 size_t len = count * size;
550 void *r = pool_alloc(len);
555 static char *pool_strdup(const char *s)
557 char *r = pool_alloc(strlen(s) + 1);
562 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
564 struct mark_set *s = marks;
565 while ((idnum >> s->shift) >= 1024) {
566 s = pool_calloc(1, sizeof(struct mark_set));
567 s->shift = marks->shift + 10;
568 s->data.sets[0] = marks;
572 uintmax_t i = idnum >> s->shift;
573 idnum -= i << s->shift;
574 if (!s->data.sets[i]) {
575 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
576 s->data.sets[i]->shift = s->shift - 10;
580 if (!s->data.marked[idnum])
582 s->data.marked[idnum] = oe;
585 static struct object_entry *find_mark(uintmax_t idnum)
587 uintmax_t orig_idnum = idnum;
588 struct mark_set *s = marks;
589 struct object_entry *oe = NULL;
590 if ((idnum >> s->shift) < 1024) {
591 while (s && s->shift) {
592 uintmax_t i = idnum >> s->shift;
593 idnum -= i << s->shift;
597 oe = s->data.marked[idnum];
600 die("mark :%" PRIuMAX " not declared", orig_idnum);
604 static struct atom_str *to_atom(const char *s, unsigned short len)
606 unsigned int hc = hc_str(s, len) % atom_table_sz;
609 for (c = atom_table[hc]; c; c = c->next_atom)
610 if (c->str_len == len && !strncmp(s, c->str_dat, len))
613 c = pool_alloc(sizeof(struct atom_str) + len + 1);
615 strncpy(c->str_dat, s, len);
617 c->next_atom = atom_table[hc];
623 static struct branch *lookup_branch(const char *name)
625 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
628 for (b = branch_table[hc]; b; b = b->table_next_branch)
629 if (!strcmp(name, b->name))
634 static struct branch *new_branch(const char *name)
636 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
637 struct branch* b = lookup_branch(name);
640 die("Invalid attempt to create duplicate branch: %s", name);
641 switch (check_ref_format(name)) {
642 case 0: break; /* its valid */
643 case -2: break; /* valid, but too few '/', allow anyway */
645 die("Branch name doesn't conform to GIT standards: %s", name);
648 b = pool_calloc(1, sizeof(struct branch));
649 b->name = pool_strdup(name);
650 b->table_next_branch = branch_table[hc];
651 b->branch_tree.versions[0].mode = S_IFDIR;
652 b->branch_tree.versions[1].mode = S_IFDIR;
654 b->pack_id = MAX_PACK_ID;
655 branch_table[hc] = b;
660 static unsigned int hc_entries(unsigned int cnt)
662 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
663 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
666 static struct tree_content *new_tree_content(unsigned int cnt)
668 struct avail_tree_content *f, *l = NULL;
669 struct tree_content *t;
670 unsigned int hc = hc_entries(cnt);
672 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
673 if (f->entry_capacity >= cnt)
678 l->next_avail = f->next_avail;
680 avail_tree_table[hc] = f->next_avail;
682 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
683 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
684 f->entry_capacity = cnt;
687 t = (struct tree_content*)f;
693 static void release_tree_entry(struct tree_entry *e);
694 static void release_tree_content(struct tree_content *t)
696 struct avail_tree_content *f = (struct avail_tree_content*)t;
697 unsigned int hc = hc_entries(f->entry_capacity);
698 f->next_avail = avail_tree_table[hc];
699 avail_tree_table[hc] = f;
702 static void release_tree_content_recursive(struct tree_content *t)
705 for (i = 0; i < t->entry_count; i++)
706 release_tree_entry(t->entries[i]);
707 release_tree_content(t);
710 static struct tree_content *grow_tree_content(
711 struct tree_content *t,
714 struct tree_content *r = new_tree_content(t->entry_count + amt);
715 r->entry_count = t->entry_count;
716 r->delta_depth = t->delta_depth;
717 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
718 release_tree_content(t);
722 static struct tree_entry *new_tree_entry(void)
724 struct tree_entry *e;
726 if (!avail_tree_entry) {
727 unsigned int n = tree_entry_alloc;
728 total_allocd += n * sizeof(struct tree_entry);
729 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
731 *((void**)e) = e + 1;
737 e = avail_tree_entry;
738 avail_tree_entry = *((void**)e);
742 static void release_tree_entry(struct tree_entry *e)
745 release_tree_content_recursive(e->tree);
746 *((void**)e) = avail_tree_entry;
747 avail_tree_entry = e;
750 static struct tree_content *dup_tree_content(struct tree_content *s)
752 struct tree_content *d;
753 struct tree_entry *a, *b;
758 d = new_tree_content(s->entry_count);
759 for (i = 0; i < s->entry_count; i++) {
761 b = new_tree_entry();
762 memcpy(b, a, sizeof(*a));
763 if (a->tree && is_null_sha1(b->versions[1].sha1))
764 b->tree = dup_tree_content(a->tree);
769 d->entry_count = s->entry_count;
770 d->delta_depth = s->delta_depth;
775 static void start_packfile(void)
777 static char tmpfile[PATH_MAX];
778 struct packed_git *p;
779 struct pack_header hdr;
782 snprintf(tmpfile, sizeof(tmpfile),
783 "%s/tmp_pack_XXXXXX", get_object_directory());
784 pack_fd = xmkstemp(tmpfile);
785 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
786 strcpy(p->pack_name, tmpfile);
787 p->pack_fd = pack_fd;
789 hdr.hdr_signature = htonl(PACK_SIGNATURE);
790 hdr.hdr_version = htonl(2);
792 write_or_die(p->pack_fd, &hdr, sizeof(hdr));
795 pack_size = sizeof(hdr);
798 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
799 all_packs[pack_id] = p;
802 static int oecmp (const void *a_, const void *b_)
804 struct object_entry *a = *((struct object_entry**)a_);
805 struct object_entry *b = *((struct object_entry**)b_);
806 return hashcmp(a->sha1, b->sha1);
809 static char *create_index(void)
811 static char tmpfile[PATH_MAX];
814 struct object_entry **idx, **c, **last, *e;
815 struct object_entry_pool *o;
819 /* Build the sorted table of object IDs. */
820 idx = xmalloc(object_count * sizeof(struct object_entry*));
822 for (o = blocks; o; o = o->next_pool)
823 for (e = o->next_free; e-- != o->entries;)
824 if (pack_id == e->pack_id)
826 last = idx + object_count;
828 die("internal consistency error creating the index");
829 qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
831 /* Generate the fan-out array. */
833 for (i = 0; i < 256; i++) {
834 struct object_entry **next = c;;
835 while (next < last) {
836 if ((*next)->sha1[0] != i)
840 array[i] = htonl(next - idx);
844 snprintf(tmpfile, sizeof(tmpfile),
845 "%s/tmp_idx_XXXXXX", get_object_directory());
846 idx_fd = xmkstemp(tmpfile);
847 f = sha1fd(idx_fd, tmpfile);
848 sha1write(f, array, 256 * sizeof(int));
850 for (c = idx; c != last; c++) {
851 uint32_t offset = htonl((*c)->offset);
852 sha1write(f, &offset, 4);
853 sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
854 SHA1_Update(&ctx, (*c)->sha1, 20);
856 sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
857 sha1close(f, NULL, 1);
859 SHA1_Final(pack_data->sha1, &ctx);
863 static char *keep_pack(char *curr_index_name)
865 static char name[PATH_MAX];
866 static const char *keep_msg = "fast-import";
869 chmod(pack_data->pack_name, 0444);
870 chmod(curr_index_name, 0444);
872 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
873 get_object_directory(), sha1_to_hex(pack_data->sha1));
874 keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
876 die("cannot create keep file");
877 write(keep_fd, keep_msg, strlen(keep_msg));
880 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
881 get_object_directory(), sha1_to_hex(pack_data->sha1));
882 if (move_temp_to_file(pack_data->pack_name, name))
883 die("cannot store pack file");
885 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
886 get_object_directory(), sha1_to_hex(pack_data->sha1));
887 if (move_temp_to_file(curr_index_name, name))
888 die("cannot store index file");
892 static void unkeep_all_packs(void)
894 static char name[PATH_MAX];
897 for (k = 0; k < pack_id; k++) {
898 struct packed_git *p = all_packs[k];
899 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
900 get_object_directory(), sha1_to_hex(p->sha1));
905 static void end_packfile(void)
907 struct packed_git *old_p = pack_data, *new_p;
915 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
916 pack_data->pack_name, object_count);
917 close(pack_data->pack_fd);
918 idx_name = keep_pack(create_index());
920 /* Register the packfile with core git's machinary. */
921 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
923 die("core git rejected index %s", idx_name);
924 new_p->windows = old_p->windows;
925 all_packs[pack_id] = new_p;
926 install_packed_git(new_p);
928 /* Print the boundary */
930 fprintf(pack_edges, "%s:", new_p->pack_name);
931 for (i = 0; i < branch_table_sz; i++) {
932 for (b = branch_table[i]; b; b = b->table_next_branch) {
933 if (b->pack_id == pack_id)
934 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
937 for (t = first_tag; t; t = t->next_tag) {
938 if (t->pack_id == pack_id)
939 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
941 fputc('\n', pack_edges);
948 unlink(old_p->pack_name);
951 /* We can't carry a delta across packfiles. */
952 strbuf_release(&last_blob.data);
953 last_blob.offset = 0;
957 static void cycle_packfile(void)
963 static size_t encode_header(
964 enum object_type type,
971 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
972 die("bad type %d", type);
974 c = (type << 4) | (size & 15);
986 static int store_object(
987 enum object_type type,
989 struct last_object *last,
990 unsigned char *sha1out,
994 struct object_entry *e;
995 unsigned char hdr[96];
996 unsigned char sha1[20];
997 unsigned long hdrlen, deltalen;
1001 hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1002 (unsigned long)dat->len) + 1;
1004 SHA1_Update(&c, hdr, hdrlen);
1005 SHA1_Update(&c, dat->buf, dat->len);
1006 SHA1_Final(sha1, &c);
1008 hashcpy(sha1out, sha1);
1010 e = insert_object(sha1);
1012 insert_mark(mark, e);
1014 duplicate_count_by_type[type]++;
1016 } else if (find_sha1_pack(sha1, packed_git)) {
1018 e->pack_id = MAX_PACK_ID;
1019 e->offset = 1; /* just not zero! */
1020 duplicate_count_by_type[type]++;
1024 if (last && last->data.buf && last->depth < max_depth) {
1025 delta = diff_delta(last->data.buf, last->data.len,
1028 if (delta && deltalen >= dat->len) {
1035 memset(&s, 0, sizeof(s));
1036 deflateInit(&s, zlib_compression_level);
1039 s.avail_in = deltalen;
1041 s.next_in = (void *)dat->buf;
1042 s.avail_in = dat->len;
1044 s.avail_out = deflateBound(&s, s.avail_in);
1045 s.next_out = out = xmalloc(s.avail_out);
1046 while (deflate(&s, Z_FINISH) == Z_OK)
1050 /* Determine if we should auto-checkpoint. */
1051 if ((pack_size + 60 + s.total_out) > max_packsize
1052 || (pack_size + 60 + s.total_out) < pack_size) {
1054 /* This new object needs to *not* have the current pack_id. */
1055 e->pack_id = pack_id + 1;
1058 /* We cannot carry a delta into the new pack. */
1063 memset(&s, 0, sizeof(s));
1064 deflateInit(&s, zlib_compression_level);
1065 s.next_in = (void *)dat->buf;
1066 s.avail_in = dat->len;
1067 s.avail_out = deflateBound(&s, s.avail_in);
1068 s.next_out = out = xrealloc(out, s.avail_out);
1069 while (deflate(&s, Z_FINISH) == Z_OK)
1076 e->pack_id = pack_id;
1077 e->offset = pack_size;
1079 object_count_by_type[type]++;
1082 unsigned long ofs = e->offset - last->offset;
1083 unsigned pos = sizeof(hdr) - 1;
1085 delta_count_by_type[type]++;
1088 hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1089 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1090 pack_size += hdrlen;
1092 hdr[pos] = ofs & 127;
1094 hdr[--pos] = 128 | (--ofs & 127);
1095 write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1096 pack_size += sizeof(hdr) - pos;
1100 hdrlen = encode_header(type, dat->len, hdr);
1101 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1102 pack_size += hdrlen;
1105 write_or_die(pack_data->pack_fd, out, s.total_out);
1106 pack_size += s.total_out;
1111 if (last->no_swap) {
1114 strbuf_swap(&last->data, dat);
1116 last->offset = e->offset;
1121 static void *gfi_unpack_entry(
1122 struct object_entry *oe,
1123 unsigned long *sizep)
1125 enum object_type type;
1126 struct packed_git *p = all_packs[oe->pack_id];
1128 p->pack_size = pack_size + 20;
1129 return unpack_entry(p, oe->offset, &type, sizep);
1132 static const char *get_mode(const char *str, uint16_t *modep)
1137 while ((c = *str++) != ' ') {
1138 if (c < '0' || c > '7')
1140 mode = (mode << 3) + (c - '0');
1146 static void load_tree(struct tree_entry *root)
1148 unsigned char* sha1 = root->versions[1].sha1;
1149 struct object_entry *myoe;
1150 struct tree_content *t;
1155 root->tree = t = new_tree_content(8);
1156 if (is_null_sha1(sha1))
1159 myoe = find_object(sha1);
1160 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1161 if (myoe->type != OBJ_TREE)
1162 die("Not a tree: %s", sha1_to_hex(sha1));
1164 buf = gfi_unpack_entry(myoe, &size);
1166 enum object_type type;
1167 buf = read_sha1_file(sha1, &type, &size);
1168 if (!buf || type != OBJ_TREE)
1169 die("Can't load tree %s", sha1_to_hex(sha1));
1173 while (c != (buf + size)) {
1174 struct tree_entry *e = new_tree_entry();
1176 if (t->entry_count == t->entry_capacity)
1177 root->tree = t = grow_tree_content(t, t->entry_count);
1178 t->entries[t->entry_count++] = e;
1181 c = get_mode(c, &e->versions[1].mode);
1183 die("Corrupt mode in %s", sha1_to_hex(sha1));
1184 e->versions[0].mode = e->versions[1].mode;
1185 e->name = to_atom(c, strlen(c));
1186 c += e->name->str_len + 1;
1187 hashcpy(e->versions[0].sha1, (unsigned char*)c);
1188 hashcpy(e->versions[1].sha1, (unsigned char*)c);
1194 static int tecmp0 (const void *_a, const void *_b)
1196 struct tree_entry *a = *((struct tree_entry**)_a);
1197 struct tree_entry *b = *((struct tree_entry**)_b);
1198 return base_name_compare(
1199 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1200 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1203 static int tecmp1 (const void *_a, const void *_b)
1205 struct tree_entry *a = *((struct tree_entry**)_a);
1206 struct tree_entry *b = *((struct tree_entry**)_b);
1207 return base_name_compare(
1208 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1209 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1212 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1218 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1220 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1222 for (i = 0; i < t->entry_count; i++) {
1223 if (t->entries[i]->versions[v].mode)
1224 maxlen += t->entries[i]->name->str_len + 34;
1228 strbuf_grow(b, maxlen);
1229 for (i = 0; i < t->entry_count; i++) {
1230 struct tree_entry *e = t->entries[i];
1231 if (!e->versions[v].mode)
1233 strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1234 e->name->str_dat, '\0');
1235 strbuf_add(b, e->versions[v].sha1, 20);
1239 static void store_tree(struct tree_entry *root)
1241 struct tree_content *t = root->tree;
1242 unsigned int i, j, del;
1243 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1244 struct object_entry *le;
1246 if (!is_null_sha1(root->versions[1].sha1))
1249 for (i = 0; i < t->entry_count; i++) {
1250 if (t->entries[i]->tree)
1251 store_tree(t->entries[i]);
1254 le = find_object(root->versions[0].sha1);
1255 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1256 mktree(t, 0, &old_tree);
1258 lo.offset = le->offset;
1259 lo.depth = t->delta_depth;
1262 mktree(t, 1, &new_tree);
1263 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1265 t->delta_depth = lo.depth;
1266 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1267 struct tree_entry *e = t->entries[i];
1268 if (e->versions[1].mode) {
1269 e->versions[0].mode = e->versions[1].mode;
1270 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1271 t->entries[j++] = e;
1273 release_tree_entry(e);
1277 t->entry_count -= del;
1280 static int tree_content_set(
1281 struct tree_entry *root,
1283 const unsigned char *sha1,
1284 const uint16_t mode,
1285 struct tree_content *subtree)
1287 struct tree_content *t = root->tree;
1290 struct tree_entry *e;
1292 slash1 = strchr(p, '/');
1298 die("Empty path component found in input");
1299 if (!slash1 && !S_ISDIR(mode) && subtree)
1300 die("Non-directories cannot have subtrees");
1302 for (i = 0; i < t->entry_count; i++) {
1304 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1307 && e->versions[1].mode == mode
1308 && !hashcmp(e->versions[1].sha1, sha1))
1310 e->versions[1].mode = mode;
1311 hashcpy(e->versions[1].sha1, sha1);
1313 release_tree_content_recursive(e->tree);
1315 hashclr(root->versions[1].sha1);
1318 if (!S_ISDIR(e->versions[1].mode)) {
1319 e->tree = new_tree_content(8);
1320 e->versions[1].mode = S_IFDIR;
1324 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1325 hashclr(root->versions[1].sha1);
1332 if (t->entry_count == t->entry_capacity)
1333 root->tree = t = grow_tree_content(t, t->entry_count);
1334 e = new_tree_entry();
1335 e->name = to_atom(p, n);
1336 e->versions[0].mode = 0;
1337 hashclr(e->versions[0].sha1);
1338 t->entries[t->entry_count++] = e;
1340 e->tree = new_tree_content(8);
1341 e->versions[1].mode = S_IFDIR;
1342 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1345 e->versions[1].mode = mode;
1346 hashcpy(e->versions[1].sha1, sha1);
1348 hashclr(root->versions[1].sha1);
1352 static int tree_content_remove(
1353 struct tree_entry *root,
1355 struct tree_entry *backup_leaf)
1357 struct tree_content *t = root->tree;
1360 struct tree_entry *e;
1362 slash1 = strchr(p, '/');
1368 for (i = 0; i < t->entry_count; i++) {
1370 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1371 if (!slash1 || !S_ISDIR(e->versions[1].mode))
1375 if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1376 for (n = 0; n < e->tree->entry_count; n++) {
1377 if (e->tree->entries[n]->versions[1].mode) {
1378 hashclr(root->versions[1].sha1);
1392 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1394 release_tree_content_recursive(e->tree);
1396 e->versions[1].mode = 0;
1397 hashclr(e->versions[1].sha1);
1398 hashclr(root->versions[1].sha1);
1402 static int tree_content_get(
1403 struct tree_entry *root,
1405 struct tree_entry *leaf)
1407 struct tree_content *t = root->tree;
1410 struct tree_entry *e;
1412 slash1 = strchr(p, '/');
1418 for (i = 0; i < t->entry_count; i++) {
1420 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1422 memcpy(leaf, e, sizeof(*leaf));
1423 if (e->tree && is_null_sha1(e->versions[1].sha1))
1424 leaf->tree = dup_tree_content(e->tree);
1429 if (!S_ISDIR(e->versions[1].mode))
1433 return tree_content_get(e, slash1 + 1, leaf);
1439 static int update_branch(struct branch *b)
1441 static const char *msg = "fast-import";
1442 struct ref_lock *lock;
1443 unsigned char old_sha1[20];
1445 if (read_ref(b->name, old_sha1))
1447 lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1449 return error("Unable to lock %s", b->name);
1450 if (!force_update && !is_null_sha1(old_sha1)) {
1451 struct commit *old_cmit, *new_cmit;
1453 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1454 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1455 if (!old_cmit || !new_cmit) {
1457 return error("Branch %s is missing commits.", b->name);
1460 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1462 warning("Not updating %s"
1463 " (new tip %s does not contain %s)",
1464 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1468 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1469 return error("Unable to update %s", b->name);
1473 static void dump_branches(void)
1478 for (i = 0; i < branch_table_sz; i++) {
1479 for (b = branch_table[i]; b; b = b->table_next_branch)
1480 failure |= update_branch(b);
1484 static void dump_tags(void)
1486 static const char *msg = "fast-import";
1488 struct ref_lock *lock;
1489 char ref_name[PATH_MAX];
1491 for (t = first_tag; t; t = t->next_tag) {
1492 sprintf(ref_name, "tags/%s", t->name);
1493 lock = lock_ref_sha1(ref_name, NULL);
1494 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1495 failure |= error("Unable to update %s", ref_name);
1499 static void dump_marks_helper(FILE *f,
1505 for (k = 0; k < 1024; k++) {
1506 if (m->data.sets[k])
1507 dump_marks_helper(f, (base + k) << m->shift,
1511 for (k = 0; k < 1024; k++) {
1512 if (m->data.marked[k])
1513 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1514 sha1_to_hex(m->data.marked[k]->sha1));
1519 static void dump_marks(void)
1521 static struct lock_file mark_lock;
1528 mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
1530 failure |= error("Unable to write marks file %s: %s",
1531 mark_file, strerror(errno));
1535 f = fdopen(mark_fd, "w");
1537 rollback_lock_file(&mark_lock);
1538 failure |= error("Unable to write marks file %s: %s",
1539 mark_file, strerror(errno));
1543 dump_marks_helper(f, 0, marks);
1545 if (commit_lock_file(&mark_lock))
1546 failure |= error("Unable to write marks file %s: %s",
1547 mark_file, strerror(errno));
1550 static int read_next_command(void)
1552 static int stdin_eof = 0;
1555 unread_command_buf = 0;
1560 if (unread_command_buf) {
1561 unread_command_buf = 0;
1563 struct recent_command *rc;
1565 strbuf_detach(&command_buf, NULL);
1566 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1575 cmd_hist.next = rc->next;
1576 cmd_hist.next->prev = &cmd_hist;
1580 rc->buf = command_buf.buf;
1581 rc->prev = cmd_tail;
1582 rc->next = cmd_hist.prev;
1583 rc->prev->next = rc;
1586 } while (command_buf.buf[0] == '#');
1591 static void skip_optional_lf(void)
1593 int term_char = fgetc(stdin);
1594 if (term_char != '\n' && term_char != EOF)
1595 ungetc(term_char, stdin);
1598 static void cmd_mark(void)
1600 if (!prefixcmp(command_buf.buf, "mark :")) {
1601 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1602 read_next_command();
1608 static void cmd_data(struct strbuf *sb)
1612 if (prefixcmp(command_buf.buf, "data "))
1613 die("Expected 'data n' command, found: %s", command_buf.buf);
1615 if (!prefixcmp(command_buf.buf + 5, "<<")) {
1616 char *term = xstrdup(command_buf.buf + 5 + 2);
1617 size_t term_len = command_buf.len - 5 - 2;
1619 strbuf_detach(&command_buf, NULL);
1621 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1622 die("EOF in data (terminator '%s' not found)", term);
1623 if (term_len == command_buf.len
1624 && !strcmp(term, command_buf.buf))
1626 strbuf_addbuf(sb, &command_buf);
1627 strbuf_addch(sb, '\n');
1632 size_t n = 0, length;
1634 length = strtoul(command_buf.buf + 5, NULL, 10);
1636 while (n < length) {
1637 size_t s = strbuf_fread(sb, length - n, stdin);
1638 if (!s && feof(stdin))
1639 die("EOF in data (%lu bytes remaining)",
1640 (unsigned long)(length - n));
1648 static int validate_raw_date(const char *src, char *result, int maxlen)
1650 const char *orig_src = src;
1653 strtoul(src, &endp, 10);
1654 if (endp == src || *endp != ' ')
1658 if (*src != '-' && *src != '+')
1662 strtoul(src + 1, &endp, 10);
1663 if (endp == src || *endp || (endp - orig_src) >= maxlen)
1666 strcpy(result, orig_src);
1670 static char *parse_ident(const char *buf)
1676 gt = strrchr(buf, '>');
1678 die("Missing > in ident string: %s", buf);
1681 die("Missing space after > in ident string: %s", buf);
1683 name_len = gt - buf;
1684 ident = xmalloc(name_len + 24);
1685 strncpy(ident, buf, name_len);
1689 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1690 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1692 case WHENSPEC_RFC2822:
1693 if (parse_date(gt, ident + name_len, 24) < 0)
1694 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1697 if (strcmp("now", gt))
1698 die("Date in ident must be 'now': %s", buf);
1699 datestamp(ident + name_len, 24);
1706 static void cmd_new_blob(void)
1708 static struct strbuf buf = STRBUF_INIT;
1710 read_next_command();
1713 store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1716 static void unload_one_branch(void)
1718 while (cur_active_branches
1719 && cur_active_branches >= max_active_branches) {
1720 uintmax_t min_commit = ULONG_MAX;
1721 struct branch *e, *l = NULL, *p = NULL;
1723 for (e = active_branches; e; e = e->active_next_branch) {
1724 if (e->last_commit < min_commit) {
1726 min_commit = e->last_commit;
1732 e = p->active_next_branch;
1733 p->active_next_branch = e->active_next_branch;
1735 e = active_branches;
1736 active_branches = e->active_next_branch;
1739 e->active_next_branch = NULL;
1740 if (e->branch_tree.tree) {
1741 release_tree_content_recursive(e->branch_tree.tree);
1742 e->branch_tree.tree = NULL;
1744 cur_active_branches--;
1748 static void load_branch(struct branch *b)
1750 load_tree(&b->branch_tree);
1753 b->active_next_branch = active_branches;
1754 active_branches = b;
1755 cur_active_branches++;
1756 branch_load_count++;
1760 static void file_change_m(struct branch *b)
1762 const char *p = command_buf.buf + 2;
1763 static struct strbuf uq = STRBUF_INIT;
1765 struct object_entry *oe = oe;
1766 unsigned char sha1[20];
1767 uint16_t mode, inline_data = 0;
1769 p = get_mode(p, &mode);
1771 die("Corrupt mode: %s", command_buf.buf);
1773 case S_IFREG | 0644:
1774 case S_IFREG | 0755:
1781 die("Corrupt mode: %s", command_buf.buf);
1786 oe = find_mark(strtoumax(p + 1, &x, 10));
1787 hashcpy(sha1, oe->sha1);
1789 } else if (!prefixcmp(p, "inline")) {
1793 if (get_sha1_hex(p, sha1))
1794 die("Invalid SHA1: %s", command_buf.buf);
1795 oe = find_object(sha1);
1799 die("Missing space after SHA1: %s", command_buf.buf);
1802 if (!unquote_c_style(&uq, p, &endp)) {
1804 die("Garbage after path in: %s", command_buf.buf);
1809 static struct strbuf buf = STRBUF_INIT;
1812 strbuf_addstr(&uq, p);
1815 read_next_command();
1817 store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1819 if (oe->type != OBJ_BLOB)
1820 die("Not a blob (actually a %s): %s",
1821 typename(oe->type), command_buf.buf);
1823 enum object_type type = sha1_object_info(sha1, NULL);
1825 die("Blob not found: %s", command_buf.buf);
1826 if (type != OBJ_BLOB)
1827 die("Not a blob (actually a %s): %s",
1828 typename(type), command_buf.buf);
1831 tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1834 static void file_change_d(struct branch *b)
1836 const char *p = command_buf.buf + 2;
1837 static struct strbuf uq = STRBUF_INIT;
1841 if (!unquote_c_style(&uq, p, &endp)) {
1843 die("Garbage after path in: %s", command_buf.buf);
1846 tree_content_remove(&b->branch_tree, p, NULL);
1849 static void file_change_cr(struct branch *b, int rename)
1852 static struct strbuf s_uq = STRBUF_INIT;
1853 static struct strbuf d_uq = STRBUF_INIT;
1855 struct tree_entry leaf;
1857 s = command_buf.buf + 2;
1858 strbuf_reset(&s_uq);
1859 if (!unquote_c_style(&s_uq, s, &endp)) {
1861 die("Missing space after source: %s", command_buf.buf);
1863 endp = strchr(s, ' ');
1865 die("Missing space after source: %s", command_buf.buf);
1866 strbuf_add(&s_uq, s, endp - s);
1872 die("Missing dest: %s", command_buf.buf);
1875 strbuf_reset(&d_uq);
1876 if (!unquote_c_style(&d_uq, d, &endp)) {
1878 die("Garbage after dest in: %s", command_buf.buf);
1882 memset(&leaf, 0, sizeof(leaf));
1884 tree_content_remove(&b->branch_tree, s, &leaf);
1886 tree_content_get(&b->branch_tree, s, &leaf);
1887 if (!leaf.versions[1].mode)
1888 die("Path %s not in branch", s);
1889 tree_content_set(&b->branch_tree, d,
1890 leaf.versions[1].sha1,
1891 leaf.versions[1].mode,
1895 static void file_change_deleteall(struct branch *b)
1897 release_tree_content_recursive(b->branch_tree.tree);
1898 hashclr(b->branch_tree.versions[0].sha1);
1899 hashclr(b->branch_tree.versions[1].sha1);
1900 load_tree(&b->branch_tree);
1903 static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
1905 if (!buf || size < 46)
1906 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
1907 if (memcmp("tree ", buf, 5)
1908 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
1909 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
1910 hashcpy(b->branch_tree.versions[0].sha1,
1911 b->branch_tree.versions[1].sha1);
1914 static void cmd_from_existing(struct branch *b)
1916 if (is_null_sha1(b->sha1)) {
1917 hashclr(b->branch_tree.versions[0].sha1);
1918 hashclr(b->branch_tree.versions[1].sha1);
1923 buf = read_object_with_reference(b->sha1,
1924 commit_type, &size, b->sha1);
1925 cmd_from_commit(b, buf, size);
1930 static int cmd_from(struct branch *b)
1935 if (prefixcmp(command_buf.buf, "from "))
1938 if (b->branch_tree.tree) {
1939 release_tree_content_recursive(b->branch_tree.tree);
1940 b->branch_tree.tree = NULL;
1943 from = strchr(command_buf.buf, ' ') + 1;
1944 s = lookup_branch(from);
1946 die("Can't create a branch from itself: %s", b->name);
1948 unsigned char *t = s->branch_tree.versions[1].sha1;
1949 hashcpy(b->sha1, s->sha1);
1950 hashcpy(b->branch_tree.versions[0].sha1, t);
1951 hashcpy(b->branch_tree.versions[1].sha1, t);
1952 } else if (*from == ':') {
1953 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1954 struct object_entry *oe = find_mark(idnum);
1955 if (oe->type != OBJ_COMMIT)
1956 die("Mark :%" PRIuMAX " not a commit", idnum);
1957 hashcpy(b->sha1, oe->sha1);
1958 if (oe->pack_id != MAX_PACK_ID) {
1960 char *buf = gfi_unpack_entry(oe, &size);
1961 cmd_from_commit(b, buf, size);
1964 cmd_from_existing(b);
1965 } else if (!get_sha1(from, b->sha1))
1966 cmd_from_existing(b);
1968 die("Invalid ref name or SHA1 expression: %s", from);
1970 read_next_command();
1974 static struct hash_list *cmd_merge(unsigned int *count)
1976 struct hash_list *list = NULL, *n, *e = e;
1981 while (!prefixcmp(command_buf.buf, "merge ")) {
1982 from = strchr(command_buf.buf, ' ') + 1;
1983 n = xmalloc(sizeof(*n));
1984 s = lookup_branch(from);
1986 hashcpy(n->sha1, s->sha1);
1987 else if (*from == ':') {
1988 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1989 struct object_entry *oe = find_mark(idnum);
1990 if (oe->type != OBJ_COMMIT)
1991 die("Mark :%" PRIuMAX " not a commit", idnum);
1992 hashcpy(n->sha1, oe->sha1);
1993 } else if (!get_sha1(from, n->sha1)) {
1995 char *buf = read_object_with_reference(n->sha1,
1996 commit_type, &size, n->sha1);
1997 if (!buf || size < 46)
1998 die("Not a valid commit: %s", from);
2001 die("Invalid ref name or SHA1 expression: %s", from);
2010 read_next_command();
2015 static void cmd_new_commit(void)
2017 static struct strbuf msg = STRBUF_INIT;
2020 char *author = NULL;
2021 char *committer = NULL;
2022 struct hash_list *merge_list = NULL;
2023 unsigned int merge_count;
2025 /* Obtain the branch name from the rest of our command */
2026 sp = strchr(command_buf.buf, ' ') + 1;
2027 b = lookup_branch(sp);
2031 read_next_command();
2033 if (!prefixcmp(command_buf.buf, "author ")) {
2034 author = parse_ident(command_buf.buf + 7);
2035 read_next_command();
2037 if (!prefixcmp(command_buf.buf, "committer ")) {
2038 committer = parse_ident(command_buf.buf + 10);
2039 read_next_command();
2042 die("Expected committer but didn't get one");
2044 read_next_command();
2046 merge_list = cmd_merge(&merge_count);
2048 /* ensure the branch is active/loaded */
2049 if (!b->branch_tree.tree || !max_active_branches) {
2050 unload_one_branch();
2055 while (command_buf.len > 0) {
2056 if (!prefixcmp(command_buf.buf, "M "))
2058 else if (!prefixcmp(command_buf.buf, "D "))
2060 else if (!prefixcmp(command_buf.buf, "R "))
2061 file_change_cr(b, 1);
2062 else if (!prefixcmp(command_buf.buf, "C "))
2063 file_change_cr(b, 0);
2064 else if (!strcmp("deleteall", command_buf.buf))
2065 file_change_deleteall(b);
2067 unread_command_buf = 1;
2070 if (read_next_command() == EOF)
2074 /* build the tree and the commit */
2075 store_tree(&b->branch_tree);
2076 hashcpy(b->branch_tree.versions[0].sha1,
2077 b->branch_tree.versions[1].sha1);
2079 strbuf_reset(&new_data);
2080 strbuf_addf(&new_data, "tree %s\n",
2081 sha1_to_hex(b->branch_tree.versions[1].sha1));
2082 if (!is_null_sha1(b->sha1))
2083 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2084 while (merge_list) {
2085 struct hash_list *next = merge_list->next;
2086 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2090 strbuf_addf(&new_data,
2094 author ? author : committer, committer);
2095 strbuf_addbuf(&new_data, &msg);
2099 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2100 b->pack_id = pack_id;
2101 b->last_commit = object_count_by_type[OBJ_COMMIT];
2104 static void cmd_new_tag(void)
2106 static struct strbuf msg = STRBUF_INIT;
2112 uintmax_t from_mark = 0;
2113 unsigned char sha1[20];
2115 /* Obtain the new tag name from the rest of our command */
2116 sp = strchr(command_buf.buf, ' ') + 1;
2117 t = pool_alloc(sizeof(struct tag));
2119 t->name = pool_strdup(sp);
2121 last_tag->next_tag = t;
2125 read_next_command();
2128 if (prefixcmp(command_buf.buf, "from "))
2129 die("Expected from command, got %s", command_buf.buf);
2130 from = strchr(command_buf.buf, ' ') + 1;
2131 s = lookup_branch(from);
2133 hashcpy(sha1, s->sha1);
2134 } else if (*from == ':') {
2135 struct object_entry *oe;
2136 from_mark = strtoumax(from + 1, NULL, 10);
2137 oe = find_mark(from_mark);
2138 if (oe->type != OBJ_COMMIT)
2139 die("Mark :%" PRIuMAX " not a commit", from_mark);
2140 hashcpy(sha1, oe->sha1);
2141 } else if (!get_sha1(from, sha1)) {
2145 buf = read_object_with_reference(sha1,
2146 commit_type, &size, sha1);
2147 if (!buf || size < 46)
2148 die("Not a valid commit: %s", from);
2151 die("Invalid ref name or SHA1 expression: %s", from);
2152 read_next_command();
2155 if (prefixcmp(command_buf.buf, "tagger "))
2156 die("Expected tagger command, got %s", command_buf.buf);
2157 tagger = parse_ident(command_buf.buf + 7);
2159 /* tag payload/message */
2160 read_next_command();
2163 /* build the tag object */
2164 strbuf_reset(&new_data);
2165 strbuf_addf(&new_data,
2171 sha1_to_hex(sha1), commit_type, t->name, tagger);
2172 strbuf_addbuf(&new_data, &msg);
2175 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2176 t->pack_id = MAX_PACK_ID;
2178 t->pack_id = pack_id;
2181 static void cmd_reset_branch(void)
2186 /* Obtain the branch name from the rest of our command */
2187 sp = strchr(command_buf.buf, ' ') + 1;
2188 b = lookup_branch(sp);
2191 hashclr(b->branch_tree.versions[0].sha1);
2192 hashclr(b->branch_tree.versions[1].sha1);
2193 if (b->branch_tree.tree) {
2194 release_tree_content_recursive(b->branch_tree.tree);
2195 b->branch_tree.tree = NULL;
2200 read_next_command();
2201 if (!cmd_from(b) && command_buf.len > 0)
2202 unread_command_buf = 1;
2205 static void cmd_checkpoint(void)
2216 static void cmd_progress(void)
2218 fwrite(command_buf.buf, 1, command_buf.len, stdout);
2219 fputc('\n', stdout);
2224 static void import_marks(const char *input_file)
2227 FILE *f = fopen(input_file, "r");
2229 die("cannot read %s: %s", input_file, strerror(errno));
2230 while (fgets(line, sizeof(line), f)) {
2233 unsigned char sha1[20];
2234 struct object_entry *e;
2236 end = strchr(line, '\n');
2237 if (line[0] != ':' || !end)
2238 die("corrupt mark line: %s", line);
2240 mark = strtoumax(line + 1, &end, 10);
2241 if (!mark || end == line + 1
2242 || *end != ' ' || get_sha1(end + 1, sha1))
2243 die("corrupt mark line: %s", line);
2244 e = find_object(sha1);
2246 enum object_type type = sha1_object_info(sha1, NULL);
2248 die("object not found: %s", sha1_to_hex(sha1));
2249 e = insert_object(sha1);
2251 e->pack_id = MAX_PACK_ID;
2252 e->offset = 1; /* just not zero! */
2254 insert_mark(mark, e);
2259 static const char fast_import_usage[] =
2260 "git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2262 int main(int argc, const char **argv)
2264 unsigned int i, show_stats = 1;
2266 git_config(git_default_config);
2267 alloc_objects(object_entry_alloc);
2268 strbuf_init(&command_buf, 0);
2269 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2270 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2271 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2272 marks = pool_calloc(1, sizeof(struct mark_set));
2274 for (i = 1; i < argc; i++) {
2275 const char *a = argv[i];
2277 if (*a != '-' || !strcmp(a, "--"))
2279 else if (!prefixcmp(a, "--date-format=")) {
2280 const char *fmt = a + 14;
2281 if (!strcmp(fmt, "raw"))
2282 whenspec = WHENSPEC_RAW;
2283 else if (!strcmp(fmt, "rfc2822"))
2284 whenspec = WHENSPEC_RFC2822;
2285 else if (!strcmp(fmt, "now"))
2286 whenspec = WHENSPEC_NOW;
2288 die("unknown --date-format argument %s", fmt);
2290 else if (!prefixcmp(a, "--max-pack-size="))
2291 max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2292 else if (!prefixcmp(a, "--depth="))
2293 max_depth = strtoul(a + 8, NULL, 0);
2294 else if (!prefixcmp(a, "--active-branches="))
2295 max_active_branches = strtoul(a + 18, NULL, 0);
2296 else if (!prefixcmp(a, "--import-marks="))
2297 import_marks(a + 15);
2298 else if (!prefixcmp(a, "--export-marks="))
2300 else if (!prefixcmp(a, "--export-pack-edges=")) {
2303 pack_edges = fopen(a + 20, "a");
2305 die("Cannot open %s: %s", a + 20, strerror(errno));
2306 } else if (!strcmp(a, "--force"))
2308 else if (!strcmp(a, "--quiet"))
2310 else if (!strcmp(a, "--stats"))
2313 die("unknown option %s", a);
2316 usage(fast_import_usage);
2318 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2319 for (i = 0; i < (cmd_save - 1); i++)
2320 rc_free[i].next = &rc_free[i + 1];
2321 rc_free[cmd_save - 1].next = NULL;
2323 prepare_packed_git();
2325 set_die_routine(die_nicely);
2326 while (read_next_command() != EOF) {
2327 if (!strcmp("blob", command_buf.buf))
2329 else if (!prefixcmp(command_buf.buf, "commit "))
2331 else if (!prefixcmp(command_buf.buf, "tag "))
2333 else if (!prefixcmp(command_buf.buf, "reset "))
2335 else if (!strcmp("checkpoint", command_buf.buf))
2337 else if (!prefixcmp(command_buf.buf, "progress "))
2340 die("Unsupported command: %s", command_buf.buf);
2353 uintmax_t total_count = 0, duplicate_count = 0;
2354 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2355 total_count += object_count_by_type[i];
2356 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2357 duplicate_count += duplicate_count_by_type[i];
2359 fprintf(stderr, "%s statistics:\n", argv[0]);
2360 fprintf(stderr, "---------------------------------------------------------------------\n");
2361 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2362 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
2363 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]);
2364 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]);
2365 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]);
2366 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]);
2367 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
2368 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2369 fprintf(stderr, " atoms: %10u\n", atom_cnt);
2370 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2371 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
2372 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2373 fprintf(stderr, "---------------------------------------------------------------------\n");
2375 fprintf(stderr, "---------------------------------------------------------------------\n");
2376 fprintf(stderr, "\n");
2379 return failure ? 1 : 0;