2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
31 file_change ::= file_clr
37 file_clr ::= 'deleteall' lf;
38 file_del ::= 'D' sp path_str lf;
39 file_rnm ::= 'R' sp path_str sp path_str lf;
40 file_cpy ::= 'C' sp path_str sp path_str lf;
41 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
42 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
44 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
45 note_inm ::= 'N' sp 'inline' sp committish lf
48 new_tag ::= 'tag' sp tag_str lf
49 'from' sp committish lf
50 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
54 reset_branch ::= 'reset' sp ref_str lf
55 ('from' sp committish lf)?
58 checkpoint ::= 'checkpoint' lf
61 progress ::= 'progress' sp not_lf* lf
64 # note: the first idnum in a stream should be 1 and subsequent
65 # idnums should not have gaps between values as this will cause
66 # the stream parser to reserve space for the gapped values. An
67 # idnum can be updated in the future to a new object by issuing
68 # a new mark directive with the old idnum.
70 mark ::= 'mark' sp idnum lf;
71 data ::= (delimited_data | exact_data)
74 # note: delim may be any string but must not contain lf.
75 # data_line may contain any data but must not be exactly
77 delimited_data ::= 'data' sp '<<' delim lf
81 # note: declen indicates the length of binary_data in bytes.
82 # declen does not include the lf preceding the binary data.
84 exact_data ::= 'data' sp declen lf
87 # note: quoted strings are C-style quoting supporting \c for
88 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
89 # is the signed byte value in octal. Note that the only
90 # characters which must actually be escaped to protect the
91 # stream formatting is: \, " and LF. Otherwise these values
94 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
96 sha1exp_str ::= sha1exp;
98 path_str ::= path | '"' quoted(path) '"' ;
99 mode ::= '100644' | '644'
104 declen ::= # unsigned 32 bit value, ascii base10 notation;
105 bigint ::= # unsigned integer value, ascii base10 notation;
106 binary_data ::= # file content, not interpreted;
108 when ::= raw_when | rfc2822_when;
109 raw_when ::= ts sp tz;
110 rfc2822_when ::= # Valid RFC 2822 date and time;
112 sp ::= # ASCII space character;
113 lf ::= # ASCII newline (LF) character;
115 # note: a colon (':') must precede the numerical value assigned to
116 # an idnum. This is to distinguish it from a ref or tag name as
117 # GIT does not permit ':' in ref or tag strings.
119 idnum ::= ':' bigint;
120 path ::= # GIT style file path, e.g. "a/b/c";
121 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
122 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
123 sha1exp ::= # Any valid GIT SHA1 expression;
124 hexsha1 ::= # SHA1 in hexadecimal format;
126 # note: name and email are UTF8 strings, however name must not
127 # contain '<' or lf and email must not contain any of the
128 # following: '<', '>', lf.
130 name ::= # valid GIT author/committer name;
131 email ::= # valid GIT author/committer email;
132 ts ::= # time since the epoch in seconds, ascii base10 notation;
133 tz ::= # GIT style timezone;
135 # note: comments and cat requests may appear anywhere
136 # in the input, except within a data command. Any form
137 # of the data command always escapes the related input
138 # from comment processing.
140 # In case it is not clear, the '#' that starts the comment
141 # must be the first character on that line (an lf
144 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
146 comment ::= '#' not_lf* lf;
147 not_lf ::= # Any byte that is not ASCII newline (LF);
159 #include "csum-file.h"
161 #include "exec_cmd.h"
164 #define PACK_ID_BITS 16
165 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
166 #define DEPTH_BITS 13
167 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
171 struct pack_idx_entry idx;
172 struct object_entry *next;
173 uint32_t type : TYPE_BITS,
174 pack_id : PACK_ID_BITS,
178 struct object_entry_pool
180 struct object_entry_pool *next_pool;
181 struct object_entry *next_free;
182 struct object_entry *end;
183 struct object_entry entries[FLEX_ARRAY]; /* more */
189 struct object_entry *marked[1024];
190 struct mark_set *sets[1024];
200 unsigned no_swap : 1;
205 struct mem_pool *next_pool;
208 uintmax_t space[FLEX_ARRAY]; /* more */
213 struct atom_str *next_atom;
214 unsigned short str_len;
215 char str_dat[FLEX_ARRAY]; /* more */
221 struct tree_content *tree;
222 struct atom_str *name;
226 unsigned char sha1[20];
232 unsigned int entry_capacity; /* must match avail_tree_content */
233 unsigned int entry_count;
234 unsigned int delta_depth;
235 struct tree_entry *entries[FLEX_ARRAY]; /* more */
238 struct avail_tree_content
240 unsigned int entry_capacity; /* must match tree_content */
241 struct avail_tree_content *next_avail;
246 struct branch *table_next_branch;
247 struct branch *active_next_branch;
249 struct tree_entry branch_tree;
250 uintmax_t last_commit;
253 unsigned pack_id : PACK_ID_BITS;
254 unsigned char sha1[20];
259 struct tag *next_tag;
261 unsigned int pack_id;
262 unsigned char sha1[20];
267 struct hash_list *next;
268 unsigned char sha1[20];
277 struct recent_command
279 struct recent_command *prev;
280 struct recent_command *next;
284 /* Configured limits on output */
285 static unsigned long max_depth = 10;
286 static off_t max_packsize;
287 static uintmax_t big_file_threshold = 512 * 1024 * 1024;
288 static int force_update;
289 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
290 static int pack_compression_seen;
292 /* Stats and misc. counters */
293 static uintmax_t alloc_count;
294 static uintmax_t marks_set_count;
295 static uintmax_t object_count_by_type[1 << TYPE_BITS];
296 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
297 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
298 static unsigned long object_count;
299 static unsigned long branch_count;
300 static unsigned long branch_load_count;
302 static FILE *pack_edges;
303 static unsigned int show_stats = 1;
304 static int global_argc;
305 static const char **global_argv;
308 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
309 static size_t total_allocd;
310 static struct mem_pool *mem_pool;
312 /* Atom management */
313 static unsigned int atom_table_sz = 4451;
314 static unsigned int atom_cnt;
315 static struct atom_str **atom_table;
317 /* The .pack file being generated */
318 static unsigned int pack_id;
319 static struct sha1file *pack_file;
320 static struct packed_git *pack_data;
321 static struct packed_git **all_packs;
322 static off_t pack_size;
324 /* Table of objects we've written. */
325 static unsigned int object_entry_alloc = 5000;
326 static struct object_entry_pool *blocks;
327 static struct object_entry *object_table[1 << 16];
328 static struct mark_set *marks;
329 static const char *export_marks_file;
330 static const char *import_marks_file;
331 static int import_marks_file_from_stream;
332 static int relative_marks_paths;
335 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
337 /* Tree management */
338 static unsigned int tree_entry_alloc = 1000;
339 static void *avail_tree_entry;
340 static unsigned int avail_tree_table_sz = 100;
341 static struct avail_tree_content **avail_tree_table;
342 static struct strbuf old_tree = STRBUF_INIT;
343 static struct strbuf new_tree = STRBUF_INIT;
346 static unsigned long max_active_branches = 5;
347 static unsigned long cur_active_branches;
348 static unsigned long branch_table_sz = 1039;
349 static struct branch **branch_table;
350 static struct branch *active_branches;
353 static struct tag *first_tag;
354 static struct tag *last_tag;
356 /* Input stream parsing */
357 static whenspec_type whenspec = WHENSPEC_RAW;
358 static struct strbuf command_buf = STRBUF_INIT;
359 static int unread_command_buf;
360 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
361 static struct recent_command *cmd_tail = &cmd_hist;
362 static struct recent_command *rc_free;
363 static unsigned int cmd_save = 100;
364 static uintmax_t next_mark;
365 static struct strbuf new_data = STRBUF_INIT;
366 static int seen_data_command;
368 /* Signal handling */
369 static volatile sig_atomic_t checkpoint_requested;
371 /* Where to write output of cat-blob commands */
372 static int cat_blob_fd = STDOUT_FILENO;
374 static void parse_argv(void);
375 static void parse_cat_blob(void);
377 static void write_branch_report(FILE *rpt, struct branch *b)
379 fprintf(rpt, "%s:\n", b->name);
381 fprintf(rpt, " status :");
383 fputs(" active", rpt);
384 if (b->branch_tree.tree)
385 fputs(" loaded", rpt);
386 if (is_null_sha1(b->branch_tree.versions[1].sha1))
387 fputs(" dirty", rpt);
390 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
391 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
392 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
393 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
395 fputs(" last pack : ", rpt);
396 if (b->pack_id < MAX_PACK_ID)
397 fprintf(rpt, "%u", b->pack_id);
403 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
405 static void write_crash_report(const char *err)
407 char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
408 FILE *rpt = fopen(loc, "w");
411 struct recent_command *rc;
414 error("can't write crash report %s: %s", loc, strerror(errno));
418 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
420 fprintf(rpt, "fast-import crash report:\n");
421 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
422 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
423 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
426 fputs("fatal: ", rpt);
431 fputs("Most Recent Commands Before Crash\n", rpt);
432 fputs("---------------------------------\n", rpt);
433 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
434 if (rc->next == &cmd_hist)
443 fputs("Active Branch LRU\n", rpt);
444 fputs("-----------------\n", rpt);
445 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
447 max_active_branches);
449 fputs(" pos clock name\n", rpt);
450 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
451 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
452 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
453 ++lu, b->last_commit, b->name);
456 fputs("Inactive Branches\n", rpt);
457 fputs("-----------------\n", rpt);
458 for (lu = 0; lu < branch_table_sz; lu++) {
459 for (b = branch_table[lu]; b; b = b->table_next_branch)
460 write_branch_report(rpt, b);
466 fputs("Annotated Tags\n", rpt);
467 fputs("--------------\n", rpt);
468 for (tg = first_tag; tg; tg = tg->next_tag) {
469 fputs(sha1_to_hex(tg->sha1), rpt);
471 fputs(tg->name, rpt);
477 fputs("Marks\n", rpt);
478 fputs("-----\n", rpt);
479 if (export_marks_file)
480 fprintf(rpt, " exported to %s\n", export_marks_file);
482 dump_marks_helper(rpt, 0, marks);
485 fputs("-------------------\n", rpt);
486 fputs("END OF CRASH REPORT\n", rpt);
490 static void end_packfile(void);
491 static void unkeep_all_packs(void);
492 static void dump_marks(void);
494 static NORETURN void die_nicely(const char *err, va_list params)
497 char message[2 * PATH_MAX];
499 vsnprintf(message, sizeof(message), err, params);
500 fputs("fatal: ", stderr);
501 fputs(message, stderr);
506 write_crash_report(message);
514 #ifndef SIGUSR1 /* Windows, for example */
516 static void set_checkpoint_signal(void)
522 static void checkpoint_signal(int signo)
524 checkpoint_requested = 1;
527 static void set_checkpoint_signal(void)
531 memset(&sa, 0, sizeof(sa));
532 sa.sa_handler = checkpoint_signal;
533 sigemptyset(&sa.sa_mask);
534 sa.sa_flags = SA_RESTART;
535 sigaction(SIGUSR1, &sa, NULL);
540 static void alloc_objects(unsigned int cnt)
542 struct object_entry_pool *b;
544 b = xmalloc(sizeof(struct object_entry_pool)
545 + cnt * sizeof(struct object_entry));
546 b->next_pool = blocks;
547 b->next_free = b->entries;
548 b->end = b->entries + cnt;
553 static struct object_entry *new_object(unsigned char *sha1)
555 struct object_entry *e;
557 if (blocks->next_free == blocks->end)
558 alloc_objects(object_entry_alloc);
560 e = blocks->next_free++;
561 hashcpy(e->idx.sha1, sha1);
565 static struct object_entry *find_object(unsigned char *sha1)
567 unsigned int h = sha1[0] << 8 | sha1[1];
568 struct object_entry *e;
569 for (e = object_table[h]; e; e = e->next)
570 if (!hashcmp(sha1, e->idx.sha1))
575 static struct object_entry *insert_object(unsigned char *sha1)
577 unsigned int h = sha1[0] << 8 | sha1[1];
578 struct object_entry *e = object_table[h];
581 if (!hashcmp(sha1, e->idx.sha1))
586 e = new_object(sha1);
587 e->next = object_table[h];
593 static unsigned int hc_str(const char *s, size_t len)
601 static void *pool_alloc(size_t len)
606 /* round up to a 'uintmax_t' alignment */
607 if (len & (sizeof(uintmax_t) - 1))
608 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
610 for (p = mem_pool; p; p = p->next_pool)
611 if ((p->end - p->next_free >= len))
615 if (len >= (mem_pool_alloc/2)) {
619 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
620 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
621 p->next_pool = mem_pool;
622 p->next_free = (char *) p->space;
623 p->end = p->next_free + mem_pool_alloc;
632 static void *pool_calloc(size_t count, size_t size)
634 size_t len = count * size;
635 void *r = pool_alloc(len);
640 static char *pool_strdup(const char *s)
642 char *r = pool_alloc(strlen(s) + 1);
647 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
649 struct mark_set *s = marks;
650 while ((idnum >> s->shift) >= 1024) {
651 s = pool_calloc(1, sizeof(struct mark_set));
652 s->shift = marks->shift + 10;
653 s->data.sets[0] = marks;
657 uintmax_t i = idnum >> s->shift;
658 idnum -= i << s->shift;
659 if (!s->data.sets[i]) {
660 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
661 s->data.sets[i]->shift = s->shift - 10;
665 if (!s->data.marked[idnum])
667 s->data.marked[idnum] = oe;
670 static struct object_entry *find_mark(uintmax_t idnum)
672 uintmax_t orig_idnum = idnum;
673 struct mark_set *s = marks;
674 struct object_entry *oe = NULL;
675 if ((idnum >> s->shift) < 1024) {
676 while (s && s->shift) {
677 uintmax_t i = idnum >> s->shift;
678 idnum -= i << s->shift;
682 oe = s->data.marked[idnum];
685 die("mark :%" PRIuMAX " not declared", orig_idnum);
689 static struct atom_str *to_atom(const char *s, unsigned short len)
691 unsigned int hc = hc_str(s, len) % atom_table_sz;
694 for (c = atom_table[hc]; c; c = c->next_atom)
695 if (c->str_len == len && !strncmp(s, c->str_dat, len))
698 c = pool_alloc(sizeof(struct atom_str) + len + 1);
700 strncpy(c->str_dat, s, len);
702 c->next_atom = atom_table[hc];
708 static struct branch *lookup_branch(const char *name)
710 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
713 for (b = branch_table[hc]; b; b = b->table_next_branch)
714 if (!strcmp(name, b->name))
719 static struct branch *new_branch(const char *name)
721 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
722 struct branch *b = lookup_branch(name);
725 die("Invalid attempt to create duplicate branch: %s", name);
726 switch (check_ref_format(name)) {
727 case 0: break; /* its valid */
728 case CHECK_REF_FORMAT_ONELEVEL:
729 break; /* valid, but too few '/', allow anyway */
731 die("Branch name doesn't conform to GIT standards: %s", name);
734 b = pool_calloc(1, sizeof(struct branch));
735 b->name = pool_strdup(name);
736 b->table_next_branch = branch_table[hc];
737 b->branch_tree.versions[0].mode = S_IFDIR;
738 b->branch_tree.versions[1].mode = S_IFDIR;
741 b->pack_id = MAX_PACK_ID;
742 branch_table[hc] = b;
747 static unsigned int hc_entries(unsigned int cnt)
749 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
750 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
753 static struct tree_content *new_tree_content(unsigned int cnt)
755 struct avail_tree_content *f, *l = NULL;
756 struct tree_content *t;
757 unsigned int hc = hc_entries(cnt);
759 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
760 if (f->entry_capacity >= cnt)
765 l->next_avail = f->next_avail;
767 avail_tree_table[hc] = f->next_avail;
769 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
770 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
771 f->entry_capacity = cnt;
774 t = (struct tree_content*)f;
780 static void release_tree_entry(struct tree_entry *e);
781 static void release_tree_content(struct tree_content *t)
783 struct avail_tree_content *f = (struct avail_tree_content*)t;
784 unsigned int hc = hc_entries(f->entry_capacity);
785 f->next_avail = avail_tree_table[hc];
786 avail_tree_table[hc] = f;
789 static void release_tree_content_recursive(struct tree_content *t)
792 for (i = 0; i < t->entry_count; i++)
793 release_tree_entry(t->entries[i]);
794 release_tree_content(t);
797 static struct tree_content *grow_tree_content(
798 struct tree_content *t,
801 struct tree_content *r = new_tree_content(t->entry_count + amt);
802 r->entry_count = t->entry_count;
803 r->delta_depth = t->delta_depth;
804 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
805 release_tree_content(t);
809 static struct tree_entry *new_tree_entry(void)
811 struct tree_entry *e;
813 if (!avail_tree_entry) {
814 unsigned int n = tree_entry_alloc;
815 total_allocd += n * sizeof(struct tree_entry);
816 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
818 *((void**)e) = e + 1;
824 e = avail_tree_entry;
825 avail_tree_entry = *((void**)e);
829 static void release_tree_entry(struct tree_entry *e)
832 release_tree_content_recursive(e->tree);
833 *((void**)e) = avail_tree_entry;
834 avail_tree_entry = e;
837 static struct tree_content *dup_tree_content(struct tree_content *s)
839 struct tree_content *d;
840 struct tree_entry *a, *b;
845 d = new_tree_content(s->entry_count);
846 for (i = 0; i < s->entry_count; i++) {
848 b = new_tree_entry();
849 memcpy(b, a, sizeof(*a));
850 if (a->tree && is_null_sha1(b->versions[1].sha1))
851 b->tree = dup_tree_content(a->tree);
856 d->entry_count = s->entry_count;
857 d->delta_depth = s->delta_depth;
862 static void start_packfile(void)
864 static char tmpfile[PATH_MAX];
865 struct packed_git *p;
866 struct pack_header hdr;
869 pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
870 "pack/tmp_pack_XXXXXX");
871 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
872 strcpy(p->pack_name, tmpfile);
873 p->pack_fd = pack_fd;
874 pack_file = sha1fd(pack_fd, p->pack_name);
876 hdr.hdr_signature = htonl(PACK_SIGNATURE);
877 hdr.hdr_version = htonl(2);
879 sha1write(pack_file, &hdr, sizeof(hdr));
882 pack_size = sizeof(hdr);
885 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
886 all_packs[pack_id] = p;
889 static const char *create_index(void)
892 struct pack_idx_entry **idx, **c, **last;
893 struct object_entry *e;
894 struct object_entry_pool *o;
896 /* Build the table of object IDs. */
897 idx = xmalloc(object_count * sizeof(*idx));
899 for (o = blocks; o; o = o->next_pool)
900 for (e = o->next_free; e-- != o->entries;)
901 if (pack_id == e->pack_id)
903 last = idx + object_count;
905 die("internal consistency error creating the index");
907 tmpfile = write_idx_file(NULL, idx, object_count, pack_data->sha1);
912 static char *keep_pack(const char *curr_index_name)
914 static char name[PATH_MAX];
915 static const char *keep_msg = "fast-import";
918 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
920 die_errno("cannot create keep file");
921 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
923 die_errno("failed to write keep file");
925 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
926 get_object_directory(), sha1_to_hex(pack_data->sha1));
927 if (move_temp_to_file(pack_data->pack_name, name))
928 die("cannot store pack file");
930 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
931 get_object_directory(), sha1_to_hex(pack_data->sha1));
932 if (move_temp_to_file(curr_index_name, name))
933 die("cannot store index file");
934 free((void *)curr_index_name);
938 static void unkeep_all_packs(void)
940 static char name[PATH_MAX];
943 for (k = 0; k < pack_id; k++) {
944 struct packed_git *p = all_packs[k];
945 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
946 get_object_directory(), sha1_to_hex(p->sha1));
947 unlink_or_warn(name);
951 static void end_packfile(void)
953 struct packed_git *old_p = pack_data, *new_p;
955 clear_delta_base_cache();
957 unsigned char cur_pack_sha1[20];
963 close_pack_windows(pack_data);
964 sha1close(pack_file, cur_pack_sha1, 0);
965 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
966 pack_data->pack_name, object_count,
967 cur_pack_sha1, pack_size);
968 close(pack_data->pack_fd);
969 idx_name = keep_pack(create_index());
971 /* Register the packfile with core git's machinery. */
972 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
974 die("core git rejected index %s", idx_name);
975 all_packs[pack_id] = new_p;
976 install_packed_git(new_p);
978 /* Print the boundary */
980 fprintf(pack_edges, "%s:", new_p->pack_name);
981 for (i = 0; i < branch_table_sz; i++) {
982 for (b = branch_table[i]; b; b = b->table_next_branch) {
983 if (b->pack_id == pack_id)
984 fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
987 for (t = first_tag; t; t = t->next_tag) {
988 if (t->pack_id == pack_id)
989 fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
991 fputc('\n', pack_edges);
998 close(old_p->pack_fd);
999 unlink_or_warn(old_p->pack_name);
1003 /* We can't carry a delta across packfiles. */
1004 strbuf_release(&last_blob.data);
1005 last_blob.offset = 0;
1006 last_blob.depth = 0;
1009 static void cycle_packfile(void)
1015 static int store_object(
1016 enum object_type type,
1018 struct last_object *last,
1019 unsigned char *sha1out,
1023 struct object_entry *e;
1024 unsigned char hdr[96];
1025 unsigned char sha1[20];
1026 unsigned long hdrlen, deltalen;
1030 hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
1031 (unsigned long)dat->len) + 1;
1033 git_SHA1_Update(&c, hdr, hdrlen);
1034 git_SHA1_Update(&c, dat->buf, dat->len);
1035 git_SHA1_Final(sha1, &c);
1037 hashcpy(sha1out, sha1);
1039 e = insert_object(sha1);
1041 insert_mark(mark, e);
1042 if (e->idx.offset) {
1043 duplicate_count_by_type[type]++;
1045 } else if (find_sha1_pack(sha1, packed_git)) {
1047 e->pack_id = MAX_PACK_ID;
1048 e->idx.offset = 1; /* just not zero! */
1049 duplicate_count_by_type[type]++;
1053 if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
1054 delta = diff_delta(last->data.buf, last->data.len,
1056 &deltalen, dat->len - 20);
1060 memset(&s, 0, sizeof(s));
1061 deflateInit(&s, pack_compression_level);
1064 s.avail_in = deltalen;
1066 s.next_in = (void *)dat->buf;
1067 s.avail_in = dat->len;
1069 s.avail_out = deflateBound(&s, s.avail_in);
1070 s.next_out = out = xmalloc(s.avail_out);
1071 while (deflate(&s, Z_FINISH) == Z_OK)
1075 /* Determine if we should auto-checkpoint. */
1076 if ((max_packsize && (pack_size + 60 + s.total_out) > max_packsize)
1077 || (pack_size + 60 + s.total_out) < pack_size) {
1079 /* This new object needs to *not* have the current pack_id. */
1080 e->pack_id = pack_id + 1;
1083 /* We cannot carry a delta into the new pack. */
1088 memset(&s, 0, sizeof(s));
1089 deflateInit(&s, pack_compression_level);
1090 s.next_in = (void *)dat->buf;
1091 s.avail_in = dat->len;
1092 s.avail_out = deflateBound(&s, s.avail_in);
1093 s.next_out = out = xrealloc(out, s.avail_out);
1094 while (deflate(&s, Z_FINISH) == Z_OK)
1101 e->pack_id = pack_id;
1102 e->idx.offset = pack_size;
1104 object_count_by_type[type]++;
1106 crc32_begin(pack_file);
1109 off_t ofs = e->idx.offset - last->offset;
1110 unsigned pos = sizeof(hdr) - 1;
1112 delta_count_by_type[type]++;
1113 e->depth = last->depth + 1;
1115 hdrlen = encode_in_pack_object_header(OBJ_OFS_DELTA, deltalen, hdr);
1116 sha1write(pack_file, hdr, hdrlen);
1117 pack_size += hdrlen;
1119 hdr[pos] = ofs & 127;
1121 hdr[--pos] = 128 | (--ofs & 127);
1122 sha1write(pack_file, hdr + pos, sizeof(hdr) - pos);
1123 pack_size += sizeof(hdr) - pos;
1126 hdrlen = encode_in_pack_object_header(type, dat->len, hdr);
1127 sha1write(pack_file, hdr, hdrlen);
1128 pack_size += hdrlen;
1131 sha1write(pack_file, out, s.total_out);
1132 pack_size += s.total_out;
1134 e->idx.crc32 = crc32_end(pack_file);
1139 if (last->no_swap) {
1142 strbuf_swap(&last->data, dat);
1144 last->offset = e->idx.offset;
1145 last->depth = e->depth;
1150 static void truncate_pack(off_t to, git_SHA_CTX *ctx)
1152 if (ftruncate(pack_data->pack_fd, to)
1153 || lseek(pack_data->pack_fd, to, SEEK_SET) != to)
1154 die_errno("cannot truncate pack to skip duplicate");
1157 /* yes this is a layering violation */
1158 pack_file->total = to;
1159 pack_file->offset = 0;
1160 pack_file->ctx = *ctx;
1163 static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
1165 size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1166 unsigned char *in_buf = xmalloc(in_sz);
1167 unsigned char *out_buf = xmalloc(out_sz);
1168 struct object_entry *e;
1169 unsigned char sha1[20];
1170 unsigned long hdrlen;
1173 git_SHA_CTX pack_file_ctx;
1177 /* Determine if we should auto-checkpoint. */
1178 if ((max_packsize && (pack_size + 60 + len) > max_packsize)
1179 || (pack_size + 60 + len) < pack_size)
1184 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1185 sha1flush(pack_file);
1186 pack_file_ctx = pack_file->ctx;
1188 hdrlen = snprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1189 if (out_sz <= hdrlen)
1190 die("impossibly large object header");
1193 git_SHA1_Update(&c, out_buf, hdrlen);
1195 crc32_begin(pack_file);
1197 memset(&s, 0, sizeof(s));
1198 deflateInit(&s, pack_compression_level);
1200 hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);
1201 if (out_sz <= hdrlen)
1202 die("impossibly large object header");
1204 s.next_out = out_buf + hdrlen;
1205 s.avail_out = out_sz - hdrlen;
1207 while (status != Z_STREAM_END) {
1208 if (0 < len && !s.avail_in) {
1209 size_t cnt = in_sz < len ? in_sz : (size_t)len;
1210 size_t n = fread(in_buf, 1, cnt, stdin);
1211 if (!n && feof(stdin))
1212 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1214 git_SHA1_Update(&c, in_buf, n);
1220 status = deflate(&s, len ? 0 : Z_FINISH);
1222 if (!s.avail_out || status == Z_STREAM_END) {
1223 size_t n = s.next_out - out_buf;
1224 sha1write(pack_file, out_buf, n);
1226 s.next_out = out_buf;
1227 s.avail_out = out_sz;
1236 die("unexpected deflate failure: %d", status);
1240 git_SHA1_Final(sha1, &c);
1243 hashcpy(sha1out, sha1);
1245 e = insert_object(sha1);
1248 insert_mark(mark, e);
1250 if (e->idx.offset) {
1251 duplicate_count_by_type[OBJ_BLOB]++;
1252 truncate_pack(offset, &pack_file_ctx);
1254 } else if (find_sha1_pack(sha1, packed_git)) {
1256 e->pack_id = MAX_PACK_ID;
1257 e->idx.offset = 1; /* just not zero! */
1258 duplicate_count_by_type[OBJ_BLOB]++;
1259 truncate_pack(offset, &pack_file_ctx);
1264 e->pack_id = pack_id;
1265 e->idx.offset = offset;
1266 e->idx.crc32 = crc32_end(pack_file);
1268 object_count_by_type[OBJ_BLOB]++;
1275 /* All calls must be guarded by find_object() or find_mark() to
1276 * ensure the 'struct object_entry' passed was written by this
1277 * process instance. We unpack the entry by the offset, avoiding
1278 * the need for the corresponding .idx file. This unpacking rule
1279 * works because we only use OBJ_REF_DELTA within the packfiles
1280 * created by fast-import.
1282 * oe must not be NULL. Such an oe usually comes from giving
1283 * an unknown SHA-1 to find_object() or an undefined mark to
1284 * find_mark(). Callers must test for this condition and use
1285 * the standard read_sha1_file() when it happens.
1287 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1288 * find_mark(), where the mark was reloaded from an existing marks
1289 * file and is referencing an object that this fast-import process
1290 * instance did not write out to a packfile. Callers must test for
1291 * this condition and use read_sha1_file() instead.
1293 static void *gfi_unpack_entry(
1294 struct object_entry *oe,
1295 unsigned long *sizep)
1297 enum object_type type;
1298 struct packed_git *p = all_packs[oe->pack_id];
1299 if (p == pack_data && p->pack_size < (pack_size + 20)) {
1300 /* The object is stored in the packfile we are writing to
1301 * and we have modified it since the last time we scanned
1302 * back to read a previously written object. If an old
1303 * window covered [p->pack_size, p->pack_size + 20) its
1304 * data is stale and is not valid. Closing all windows
1305 * and updating the packfile length ensures we can read
1306 * the newly written data.
1308 close_pack_windows(p);
1309 sha1flush(pack_file);
1311 /* We have to offer 20 bytes additional on the end of
1312 * the packfile as the core unpacker code assumes the
1313 * footer is present at the file end and must promise
1314 * at least 20 bytes within any window it maps. But
1315 * we don't actually create the footer here.
1317 p->pack_size = pack_size + 20;
1319 return unpack_entry(p, oe->idx.offset, &type, sizep);
1322 static const char *get_mode(const char *str, uint16_t *modep)
1327 while ((c = *str++) != ' ') {
1328 if (c < '0' || c > '7')
1330 mode = (mode << 3) + (c - '0');
1336 static void load_tree(struct tree_entry *root)
1338 unsigned char *sha1 = root->versions[1].sha1;
1339 struct object_entry *myoe;
1340 struct tree_content *t;
1345 root->tree = t = new_tree_content(8);
1346 if (is_null_sha1(sha1))
1349 myoe = find_object(sha1);
1350 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1351 if (myoe->type != OBJ_TREE)
1352 die("Not a tree: %s", sha1_to_hex(sha1));
1353 t->delta_depth = myoe->depth;
1354 buf = gfi_unpack_entry(myoe, &size);
1356 die("Can't load tree %s", sha1_to_hex(sha1));
1358 enum object_type type;
1359 buf = read_sha1_file(sha1, &type, &size);
1360 if (!buf || type != OBJ_TREE)
1361 die("Can't load tree %s", sha1_to_hex(sha1));
1365 while (c != (buf + size)) {
1366 struct tree_entry *e = new_tree_entry();
1368 if (t->entry_count == t->entry_capacity)
1369 root->tree = t = grow_tree_content(t, t->entry_count);
1370 t->entries[t->entry_count++] = e;
1373 c = get_mode(c, &e->versions[1].mode);
1375 die("Corrupt mode in %s", sha1_to_hex(sha1));
1376 e->versions[0].mode = e->versions[1].mode;
1377 e->name = to_atom(c, strlen(c));
1378 c += e->name->str_len + 1;
1379 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1380 hashcpy(e->versions[1].sha1, (unsigned char *)c);
1386 static int tecmp0 (const void *_a, const void *_b)
1388 struct tree_entry *a = *((struct tree_entry**)_a);
1389 struct tree_entry *b = *((struct tree_entry**)_b);
1390 return base_name_compare(
1391 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1392 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1395 static int tecmp1 (const void *_a, const void *_b)
1397 struct tree_entry *a = *((struct tree_entry**)_a);
1398 struct tree_entry *b = *((struct tree_entry**)_b);
1399 return base_name_compare(
1400 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1401 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1404 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1410 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1412 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1414 for (i = 0; i < t->entry_count; i++) {
1415 if (t->entries[i]->versions[v].mode)
1416 maxlen += t->entries[i]->name->str_len + 34;
1420 strbuf_grow(b, maxlen);
1421 for (i = 0; i < t->entry_count; i++) {
1422 struct tree_entry *e = t->entries[i];
1423 if (!e->versions[v].mode)
1425 strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1426 e->name->str_dat, '\0');
1427 strbuf_add(b, e->versions[v].sha1, 20);
1431 static void store_tree(struct tree_entry *root)
1433 struct tree_content *t = root->tree;
1434 unsigned int i, j, del;
1435 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1436 struct object_entry *le;
1438 if (!is_null_sha1(root->versions[1].sha1))
1441 for (i = 0; i < t->entry_count; i++) {
1442 if (t->entries[i]->tree)
1443 store_tree(t->entries[i]);
1446 le = find_object(root->versions[0].sha1);
1447 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1448 mktree(t, 0, &old_tree);
1450 lo.offset = le->idx.offset;
1451 lo.depth = t->delta_depth;
1454 mktree(t, 1, &new_tree);
1455 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1457 t->delta_depth = lo.depth;
1458 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1459 struct tree_entry *e = t->entries[i];
1460 if (e->versions[1].mode) {
1461 e->versions[0].mode = e->versions[1].mode;
1462 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1463 t->entries[j++] = e;
1465 release_tree_entry(e);
1469 t->entry_count -= del;
1472 static void tree_content_replace(
1473 struct tree_entry *root,
1474 const unsigned char *sha1,
1475 const uint16_t mode,
1476 struct tree_content *newtree)
1479 die("Root cannot be a non-directory");
1480 hashcpy(root->versions[1].sha1, sha1);
1482 release_tree_content_recursive(root->tree);
1483 root->tree = newtree;
1486 static int tree_content_set(
1487 struct tree_entry *root,
1489 const unsigned char *sha1,
1490 const uint16_t mode,
1491 struct tree_content *subtree)
1493 struct tree_content *t;
1496 struct tree_entry *e;
1498 slash1 = strchr(p, '/');
1504 die("Empty path component found in input");
1505 if (!slash1 && !S_ISDIR(mode) && subtree)
1506 die("Non-directories cannot have subtrees");
1511 for (i = 0; i < t->entry_count; i++) {
1513 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1516 && e->versions[1].mode == mode
1517 && !hashcmp(e->versions[1].sha1, sha1))
1519 e->versions[1].mode = mode;
1520 hashcpy(e->versions[1].sha1, sha1);
1522 release_tree_content_recursive(e->tree);
1524 hashclr(root->versions[1].sha1);
1527 if (!S_ISDIR(e->versions[1].mode)) {
1528 e->tree = new_tree_content(8);
1529 e->versions[1].mode = S_IFDIR;
1533 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1534 hashclr(root->versions[1].sha1);
1541 if (t->entry_count == t->entry_capacity)
1542 root->tree = t = grow_tree_content(t, t->entry_count);
1543 e = new_tree_entry();
1544 e->name = to_atom(p, n);
1545 e->versions[0].mode = 0;
1546 hashclr(e->versions[0].sha1);
1547 t->entries[t->entry_count++] = e;
1549 e->tree = new_tree_content(8);
1550 e->versions[1].mode = S_IFDIR;
1551 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1554 e->versions[1].mode = mode;
1555 hashcpy(e->versions[1].sha1, sha1);
1557 hashclr(root->versions[1].sha1);
1561 static int tree_content_remove(
1562 struct tree_entry *root,
1564 struct tree_entry *backup_leaf)
1566 struct tree_content *t;
1569 struct tree_entry *e;
1571 slash1 = strchr(p, '/');
1580 for (i = 0; i < t->entry_count; i++) {
1582 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1583 if (slash1 && !S_ISDIR(e->versions[1].mode))
1585 * If p names a file in some subdirectory, and a
1586 * file or symlink matching the name of the
1587 * parent directory of p exists, then p cannot
1588 * exist and need not be deleted.
1591 if (!slash1 || !S_ISDIR(e->versions[1].mode))
1595 if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1596 for (n = 0; n < e->tree->entry_count; n++) {
1597 if (e->tree->entries[n]->versions[1].mode) {
1598 hashclr(root->versions[1].sha1);
1612 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1614 release_tree_content_recursive(e->tree);
1616 e->versions[1].mode = 0;
1617 hashclr(e->versions[1].sha1);
1618 hashclr(root->versions[1].sha1);
1622 static int tree_content_get(
1623 struct tree_entry *root,
1625 struct tree_entry *leaf)
1627 struct tree_content *t;
1630 struct tree_entry *e;
1632 slash1 = strchr(p, '/');
1641 for (i = 0; i < t->entry_count; i++) {
1643 if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
1645 memcpy(leaf, e, sizeof(*leaf));
1646 if (e->tree && is_null_sha1(e->versions[1].sha1))
1647 leaf->tree = dup_tree_content(e->tree);
1652 if (!S_ISDIR(e->versions[1].mode))
1656 return tree_content_get(e, slash1 + 1, leaf);
1662 static int update_branch(struct branch *b)
1664 static const char *msg = "fast-import";
1665 struct ref_lock *lock;
1666 unsigned char old_sha1[20];
1668 if (is_null_sha1(b->sha1))
1670 if (read_ref(b->name, old_sha1))
1672 lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1674 return error("Unable to lock %s", b->name);
1675 if (!force_update && !is_null_sha1(old_sha1)) {
1676 struct commit *old_cmit, *new_cmit;
1678 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1679 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1680 if (!old_cmit || !new_cmit) {
1682 return error("Branch %s is missing commits.", b->name);
1685 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1687 warning("Not updating %s"
1688 " (new tip %s does not contain %s)",
1689 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1693 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1694 return error("Unable to update %s", b->name);
1698 static void dump_branches(void)
1703 for (i = 0; i < branch_table_sz; i++) {
1704 for (b = branch_table[i]; b; b = b->table_next_branch)
1705 failure |= update_branch(b);
1709 static void dump_tags(void)
1711 static const char *msg = "fast-import";
1713 struct ref_lock *lock;
1714 char ref_name[PATH_MAX];
1716 for (t = first_tag; t; t = t->next_tag) {
1717 sprintf(ref_name, "tags/%s", t->name);
1718 lock = lock_ref_sha1(ref_name, NULL);
1719 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1720 failure |= error("Unable to update %s", ref_name);
1724 static void dump_marks_helper(FILE *f,
1730 for (k = 0; k < 1024; k++) {
1731 if (m->data.sets[k])
1732 dump_marks_helper(f, base + (k << m->shift),
1736 for (k = 0; k < 1024; k++) {
1737 if (m->data.marked[k])
1738 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1739 sha1_to_hex(m->data.marked[k]->idx.sha1));
1744 static void dump_marks(void)
1746 static struct lock_file mark_lock;
1750 if (!export_marks_file)
1753 mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
1755 failure |= error("Unable to write marks file %s: %s",
1756 export_marks_file, strerror(errno));
1760 f = fdopen(mark_fd, "w");
1762 int saved_errno = errno;
1763 rollback_lock_file(&mark_lock);
1764 failure |= error("Unable to write marks file %s: %s",
1765 export_marks_file, strerror(saved_errno));
1770 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1771 * Assign -1 to the lock file descriptor so that commit_lock_file()
1772 * won't try to close() it.
1776 dump_marks_helper(f, 0, marks);
1777 if (ferror(f) || fclose(f)) {
1778 int saved_errno = errno;
1779 rollback_lock_file(&mark_lock);
1780 failure |= error("Unable to write marks file %s: %s",
1781 export_marks_file, strerror(saved_errno));
1785 if (commit_lock_file(&mark_lock)) {
1786 int saved_errno = errno;
1787 rollback_lock_file(&mark_lock);
1788 failure |= error("Unable to commit marks file %s: %s",
1789 export_marks_file, strerror(saved_errno));
1794 static void read_marks(void)
1797 FILE *f = fopen(import_marks_file, "r");
1799 die_errno("cannot read '%s'", import_marks_file);
1800 while (fgets(line, sizeof(line), f)) {
1803 unsigned char sha1[20];
1804 struct object_entry *e;
1806 end = strchr(line, '\n');
1807 if (line[0] != ':' || !end)
1808 die("corrupt mark line: %s", line);
1810 mark = strtoumax(line + 1, &end, 10);
1811 if (!mark || end == line + 1
1812 || *end != ' ' || get_sha1(end + 1, sha1))
1813 die("corrupt mark line: %s", line);
1814 e = find_object(sha1);
1816 enum object_type type = sha1_object_info(sha1, NULL);
1818 die("object not found: %s", sha1_to_hex(sha1));
1819 e = insert_object(sha1);
1821 e->pack_id = MAX_PACK_ID;
1822 e->idx.offset = 1; /* just not zero! */
1824 insert_mark(mark, e);
1830 static int read_next_command(void)
1832 static int stdin_eof = 0;
1835 unread_command_buf = 0;
1840 if (unread_command_buf) {
1841 unread_command_buf = 0;
1843 struct recent_command *rc;
1845 strbuf_detach(&command_buf, NULL);
1846 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1850 if (!seen_data_command
1851 && prefixcmp(command_buf.buf, "feature ")
1852 && prefixcmp(command_buf.buf, "option ")) {
1861 cmd_hist.next = rc->next;
1862 cmd_hist.next->prev = &cmd_hist;
1866 rc->buf = command_buf.buf;
1867 rc->prev = cmd_tail;
1868 rc->next = cmd_hist.prev;
1869 rc->prev->next = rc;
1872 if (!prefixcmp(command_buf.buf, "cat-blob ")) {
1876 if (command_buf.buf[0] == '#')
1882 static void skip_optional_lf(void)
1884 int term_char = fgetc(stdin);
1885 if (term_char != '\n' && term_char != EOF)
1886 ungetc(term_char, stdin);
1889 static void parse_mark(void)
1891 if (!prefixcmp(command_buf.buf, "mark :")) {
1892 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1893 read_next_command();
1899 static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
1903 if (prefixcmp(command_buf.buf, "data "))
1904 die("Expected 'data n' command, found: %s", command_buf.buf);
1906 if (!prefixcmp(command_buf.buf + 5, "<<")) {
1907 char *term = xstrdup(command_buf.buf + 5 + 2);
1908 size_t term_len = command_buf.len - 5 - 2;
1910 strbuf_detach(&command_buf, NULL);
1912 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1913 die("EOF in data (terminator '%s' not found)", term);
1914 if (term_len == command_buf.len
1915 && !strcmp(term, command_buf.buf))
1917 strbuf_addbuf(sb, &command_buf);
1918 strbuf_addch(sb, '\n');
1923 uintmax_t len = strtoumax(command_buf.buf + 5, NULL, 10);
1924 size_t n = 0, length = (size_t)len;
1926 if (limit && limit < len) {
1931 die("data is too large to use in this context");
1933 while (n < length) {
1934 size_t s = strbuf_fread(sb, length - n, stdin);
1935 if (!s && feof(stdin))
1936 die("EOF in data (%lu bytes remaining)",
1937 (unsigned long)(length - n));
1946 static int validate_raw_date(const char *src, char *result, int maxlen)
1948 const char *orig_src = src;
1954 num = strtoul(src, &endp, 10);
1955 /* NEEDSWORK: perhaps check for reasonable values? */
1956 if (errno || endp == src || *endp != ' ')
1960 if (*src != '-' && *src != '+')
1963 num = strtoul(src + 1, &endp, 10);
1964 if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
1968 strcpy(result, orig_src);
1972 static char *parse_ident(const char *buf)
1978 gt = strrchr(buf, '>');
1980 die("Missing > in ident string: %s", buf);
1983 die("Missing space after > in ident string: %s", buf);
1985 name_len = gt - buf;
1986 ident = xmalloc(name_len + 24);
1987 strncpy(ident, buf, name_len);
1991 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1992 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1994 case WHENSPEC_RFC2822:
1995 if (parse_date(gt, ident + name_len, 24) < 0)
1996 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1999 if (strcmp("now", gt))
2000 die("Date in ident must be 'now': %s", buf);
2001 datestamp(ident + name_len, 24);
2008 static void parse_and_store_blob(
2009 struct last_object *last,
2010 unsigned char *sha1out,
2013 static struct strbuf buf = STRBUF_INIT;
2016 if (parse_data(&buf, big_file_threshold, &len))
2017 store_object(OBJ_BLOB, &buf, last, sha1out, mark);
2020 strbuf_release(&last->data);
2024 stream_blob(len, sha1out, mark);
2029 static void parse_new_blob(void)
2031 read_next_command();
2033 parse_and_store_blob(&last_blob, NULL, next_mark);
2036 static void unload_one_branch(void)
2038 while (cur_active_branches
2039 && cur_active_branches >= max_active_branches) {
2040 uintmax_t min_commit = ULONG_MAX;
2041 struct branch *e, *l = NULL, *p = NULL;
2043 for (e = active_branches; e; e = e->active_next_branch) {
2044 if (e->last_commit < min_commit) {
2046 min_commit = e->last_commit;
2052 e = p->active_next_branch;
2053 p->active_next_branch = e->active_next_branch;
2055 e = active_branches;
2056 active_branches = e->active_next_branch;
2059 e->active_next_branch = NULL;
2060 if (e->branch_tree.tree) {
2061 release_tree_content_recursive(e->branch_tree.tree);
2062 e->branch_tree.tree = NULL;
2064 cur_active_branches--;
2068 static void load_branch(struct branch *b)
2070 load_tree(&b->branch_tree);
2073 b->active_next_branch = active_branches;
2074 active_branches = b;
2075 cur_active_branches++;
2076 branch_load_count++;
2080 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2082 unsigned char fanout = 0;
2083 while ((num_notes >>= 8))
2088 static void construct_path_with_fanout(const char *hex_sha1,
2089 unsigned char fanout, char *path)
2091 unsigned int i = 0, j = 0;
2093 die("Too large fanout (%u)", fanout);
2095 path[i++] = hex_sha1[j++];
2096 path[i++] = hex_sha1[j++];
2100 memcpy(path + i, hex_sha1 + j, 40 - j);
2101 path[i + 40 - j] = '\0';
2104 static uintmax_t do_change_note_fanout(
2105 struct tree_entry *orig_root, struct tree_entry *root,
2106 char *hex_sha1, unsigned int hex_sha1_len,
2107 char *fullpath, unsigned int fullpath_len,
2108 unsigned char fanout)
2110 struct tree_content *t = root->tree;
2111 struct tree_entry *e, leaf;
2112 unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
2113 uintmax_t num_notes = 0;
2114 unsigned char sha1[20];
2117 for (i = 0; t && i < t->entry_count; i++) {
2119 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
2120 tmp_fullpath_len = fullpath_len;
2123 * We're interested in EITHER existing note entries (entries
2124 * with exactly 40 hex chars in path, not including directory
2125 * separators), OR directory entries that may contain note
2126 * entries (with < 40 hex chars in path).
2127 * Also, each path component in a note entry must be a multiple
2130 if (!e->versions[1].mode ||
2131 tmp_hex_sha1_len > 40 ||
2132 e->name->str_len % 2)
2135 /* This _may_ be a note entry, or a subdir containing notes */
2136 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
2138 if (tmp_fullpath_len)
2139 fullpath[tmp_fullpath_len++] = '/';
2140 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2142 tmp_fullpath_len += e->name->str_len;
2143 fullpath[tmp_fullpath_len] = '\0';
2145 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
2146 /* This is a note entry */
2147 construct_path_with_fanout(hex_sha1, fanout, realpath);
2148 if (!strcmp(fullpath, realpath)) {
2149 /* Note entry is in correct location */
2154 /* Rename fullpath to realpath */
2155 if (!tree_content_remove(orig_root, fullpath, &leaf))
2156 die("Failed to remove path %s", fullpath);
2157 tree_content_set(orig_root, realpath,
2158 leaf.versions[1].sha1,
2159 leaf.versions[1].mode,
2161 } else if (S_ISDIR(e->versions[1].mode)) {
2162 /* This is a subdir that may contain note entries */
2165 num_notes += do_change_note_fanout(orig_root, e,
2166 hex_sha1, tmp_hex_sha1_len,
2167 fullpath, tmp_fullpath_len, fanout);
2170 /* The above may have reallocated the current tree_content */
2176 static uintmax_t change_note_fanout(struct tree_entry *root,
2177 unsigned char fanout)
2179 char hex_sha1[40], path[60];
2180 return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2183 static void file_change_m(struct branch *b)
2185 const char *p = command_buf.buf + 2;
2186 static struct strbuf uq = STRBUF_INIT;
2188 struct object_entry *oe = oe;
2189 unsigned char sha1[20];
2190 uint16_t mode, inline_data = 0;
2192 p = get_mode(p, &mode);
2194 die("Corrupt mode: %s", command_buf.buf);
2199 case S_IFREG | 0644:
2200 case S_IFREG | 0755:
2207 die("Corrupt mode: %s", command_buf.buf);
2212 oe = find_mark(strtoumax(p + 1, &x, 10));
2213 hashcpy(sha1, oe->idx.sha1);
2215 } else if (!prefixcmp(p, "inline")) {
2219 if (get_sha1_hex(p, sha1))
2220 die("Invalid SHA1: %s", command_buf.buf);
2221 oe = find_object(sha1);
2225 die("Missing space after SHA1: %s", command_buf.buf);
2228 if (!unquote_c_style(&uq, p, &endp)) {
2230 die("Garbage after path in: %s", command_buf.buf);
2234 /* Git does not track empty, non-toplevel directories. */
2235 if (S_ISDIR(mode) && !memcmp(sha1, EMPTY_TREE_SHA1_BIN, 20) && *p) {
2236 tree_content_remove(&b->branch_tree, p, NULL);
2240 if (S_ISGITLINK(mode)) {
2242 die("Git links cannot be specified 'inline': %s",
2245 if (oe->type != OBJ_COMMIT)
2246 die("Not a commit (actually a %s): %s",
2247 typename(oe->type), command_buf.buf);
2250 * Accept the sha1 without checking; it expected to be in
2251 * another repository.
2253 } else if (inline_data) {
2255 die("Directories cannot be specified 'inline': %s",
2258 strbuf_addstr(&uq, p);
2261 read_next_command();
2262 parse_and_store_blob(&last_blob, sha1, 0);
2264 enum object_type expected = S_ISDIR(mode) ?
2266 enum object_type type = oe ? oe->type :
2267 sha1_object_info(sha1, NULL);
2269 die("%s not found: %s",
2270 S_ISDIR(mode) ? "Tree" : "Blob",
2272 if (type != expected)
2273 die("Not a %s (actually a %s): %s",
2274 typename(expected), typename(type),
2279 tree_content_replace(&b->branch_tree, sha1, mode, NULL);
2282 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
2285 static void file_change_d(struct branch *b)
2287 const char *p = command_buf.buf + 2;
2288 static struct strbuf uq = STRBUF_INIT;
2292 if (!unquote_c_style(&uq, p, &endp)) {
2294 die("Garbage after path in: %s", command_buf.buf);
2297 tree_content_remove(&b->branch_tree, p, NULL);
2300 static void file_change_cr(struct branch *b, int rename)
2303 static struct strbuf s_uq = STRBUF_INIT;
2304 static struct strbuf d_uq = STRBUF_INIT;
2306 struct tree_entry leaf;
2308 s = command_buf.buf + 2;
2309 strbuf_reset(&s_uq);
2310 if (!unquote_c_style(&s_uq, s, &endp)) {
2312 die("Missing space after source: %s", command_buf.buf);
2314 endp = strchr(s, ' ');
2316 die("Missing space after source: %s", command_buf.buf);
2317 strbuf_add(&s_uq, s, endp - s);
2323 die("Missing dest: %s", command_buf.buf);
2326 strbuf_reset(&d_uq);
2327 if (!unquote_c_style(&d_uq, d, &endp)) {
2329 die("Garbage after dest in: %s", command_buf.buf);
2333 memset(&leaf, 0, sizeof(leaf));
2335 tree_content_remove(&b->branch_tree, s, &leaf);
2337 tree_content_get(&b->branch_tree, s, &leaf);
2338 if (!leaf.versions[1].mode)
2339 die("Path %s not in branch", s);
2340 if (!*d) { /* C "path/to/subdir" "" */
2341 tree_content_replace(&b->branch_tree,
2342 leaf.versions[1].sha1,
2343 leaf.versions[1].mode,
2347 tree_content_set(&b->branch_tree, d,
2348 leaf.versions[1].sha1,
2349 leaf.versions[1].mode,
2353 static void note_change_n(struct branch *b, unsigned char old_fanout)
2355 const char *p = command_buf.buf + 2;
2356 static struct strbuf uq = STRBUF_INIT;
2357 struct object_entry *oe = oe;
2359 unsigned char sha1[20], commit_sha1[20];
2361 uint16_t inline_data = 0;
2362 unsigned char new_fanout;
2364 /* <dataref> or 'inline' */
2367 oe = find_mark(strtoumax(p + 1, &x, 10));
2368 hashcpy(sha1, oe->idx.sha1);
2370 } else if (!prefixcmp(p, "inline")) {
2374 if (get_sha1_hex(p, sha1))
2375 die("Invalid SHA1: %s", command_buf.buf);
2376 oe = find_object(sha1);
2380 die("Missing space after SHA1: %s", command_buf.buf);
2383 s = lookup_branch(p);
2385 hashcpy(commit_sha1, s->sha1);
2386 } else if (*p == ':') {
2387 uintmax_t commit_mark = strtoumax(p + 1, NULL, 10);
2388 struct object_entry *commit_oe = find_mark(commit_mark);
2389 if (commit_oe->type != OBJ_COMMIT)
2390 die("Mark :%" PRIuMAX " not a commit", commit_mark);
2391 hashcpy(commit_sha1, commit_oe->idx.sha1);
2392 } else if (!get_sha1(p, commit_sha1)) {
2394 char *buf = read_object_with_reference(commit_sha1,
2395 commit_type, &size, commit_sha1);
2396 if (!buf || size < 46)
2397 die("Not a valid commit: %s", p);
2400 die("Invalid ref name or SHA1 expression: %s", p);
2404 strbuf_addstr(&uq, p);
2407 read_next_command();
2408 parse_and_store_blob(&last_blob, sha1, 0);
2410 if (oe->type != OBJ_BLOB)
2411 die("Not a blob (actually a %s): %s",
2412 typename(oe->type), command_buf.buf);
2413 } else if (!is_null_sha1(sha1)) {
2414 enum object_type type = sha1_object_info(sha1, NULL);
2416 die("Blob not found: %s", command_buf.buf);
2417 if (type != OBJ_BLOB)
2418 die("Not a blob (actually a %s): %s",
2419 typename(type), command_buf.buf);
2422 construct_path_with_fanout(sha1_to_hex(commit_sha1), old_fanout, path);
2423 if (tree_content_remove(&b->branch_tree, path, NULL))
2426 if (is_null_sha1(sha1))
2427 return; /* nothing to insert */
2430 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2431 construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2432 tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
2435 static void file_change_deleteall(struct branch *b)
2437 release_tree_content_recursive(b->branch_tree.tree);
2438 hashclr(b->branch_tree.versions[0].sha1);
2439 hashclr(b->branch_tree.versions[1].sha1);
2440 load_tree(&b->branch_tree);
2444 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2446 if (!buf || size < 46)
2447 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2448 if (memcmp("tree ", buf, 5)
2449 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2450 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2451 hashcpy(b->branch_tree.versions[0].sha1,
2452 b->branch_tree.versions[1].sha1);
2455 static void parse_from_existing(struct branch *b)
2457 if (is_null_sha1(b->sha1)) {
2458 hashclr(b->branch_tree.versions[0].sha1);
2459 hashclr(b->branch_tree.versions[1].sha1);
2464 buf = read_object_with_reference(b->sha1,
2465 commit_type, &size, b->sha1);
2466 parse_from_commit(b, buf, size);
2471 static int parse_from(struct branch *b)
2476 if (prefixcmp(command_buf.buf, "from "))
2479 if (b->branch_tree.tree) {
2480 release_tree_content_recursive(b->branch_tree.tree);
2481 b->branch_tree.tree = NULL;
2484 from = strchr(command_buf.buf, ' ') + 1;
2485 s = lookup_branch(from);
2487 die("Can't create a branch from itself: %s", b->name);
2489 unsigned char *t = s->branch_tree.versions[1].sha1;
2490 hashcpy(b->sha1, s->sha1);
2491 hashcpy(b->branch_tree.versions[0].sha1, t);
2492 hashcpy(b->branch_tree.versions[1].sha1, t);
2493 } else if (*from == ':') {
2494 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2495 struct object_entry *oe = find_mark(idnum);
2496 if (oe->type != OBJ_COMMIT)
2497 die("Mark :%" PRIuMAX " not a commit", idnum);
2498 hashcpy(b->sha1, oe->idx.sha1);
2499 if (oe->pack_id != MAX_PACK_ID) {
2501 char *buf = gfi_unpack_entry(oe, &size);
2502 parse_from_commit(b, buf, size);
2505 parse_from_existing(b);
2506 } else if (!get_sha1(from, b->sha1))
2507 parse_from_existing(b);
2509 die("Invalid ref name or SHA1 expression: %s", from);
2511 read_next_command();
2515 static struct hash_list *parse_merge(unsigned int *count)
2517 struct hash_list *list = NULL, *n, *e = e;
2522 while (!prefixcmp(command_buf.buf, "merge ")) {
2523 from = strchr(command_buf.buf, ' ') + 1;
2524 n = xmalloc(sizeof(*n));
2525 s = lookup_branch(from);
2527 hashcpy(n->sha1, s->sha1);
2528 else if (*from == ':') {
2529 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2530 struct object_entry *oe = find_mark(idnum);
2531 if (oe->type != OBJ_COMMIT)
2532 die("Mark :%" PRIuMAX " not a commit", idnum);
2533 hashcpy(n->sha1, oe->idx.sha1);
2534 } else if (!get_sha1(from, n->sha1)) {
2536 char *buf = read_object_with_reference(n->sha1,
2537 commit_type, &size, n->sha1);
2538 if (!buf || size < 46)
2539 die("Not a valid commit: %s", from);
2542 die("Invalid ref name or SHA1 expression: %s", from);
2551 read_next_command();
2556 static void parse_new_commit(void)
2558 static struct strbuf msg = STRBUF_INIT;
2561 char *author = NULL;
2562 char *committer = NULL;
2563 struct hash_list *merge_list = NULL;
2564 unsigned int merge_count;
2565 unsigned char prev_fanout, new_fanout;
2567 /* Obtain the branch name from the rest of our command */
2568 sp = strchr(command_buf.buf, ' ') + 1;
2569 b = lookup_branch(sp);
2573 read_next_command();
2575 if (!prefixcmp(command_buf.buf, "author ")) {
2576 author = parse_ident(command_buf.buf + 7);
2577 read_next_command();
2579 if (!prefixcmp(command_buf.buf, "committer ")) {
2580 committer = parse_ident(command_buf.buf + 10);
2581 read_next_command();
2584 die("Expected committer but didn't get one");
2585 parse_data(&msg, 0, NULL);
2586 read_next_command();
2588 merge_list = parse_merge(&merge_count);
2590 /* ensure the branch is active/loaded */
2591 if (!b->branch_tree.tree || !max_active_branches) {
2592 unload_one_branch();
2596 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2599 while (command_buf.len > 0) {
2600 if (!prefixcmp(command_buf.buf, "M "))
2602 else if (!prefixcmp(command_buf.buf, "D "))
2604 else if (!prefixcmp(command_buf.buf, "R "))
2605 file_change_cr(b, 1);
2606 else if (!prefixcmp(command_buf.buf, "C "))
2607 file_change_cr(b, 0);
2608 else if (!prefixcmp(command_buf.buf, "N "))
2609 note_change_n(b, prev_fanout);
2610 else if (!strcmp("deleteall", command_buf.buf))
2611 file_change_deleteall(b);
2613 unread_command_buf = 1;
2616 if (read_next_command() == EOF)
2620 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2621 if (new_fanout != prev_fanout)
2622 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2624 /* build the tree and the commit */
2625 store_tree(&b->branch_tree);
2626 hashcpy(b->branch_tree.versions[0].sha1,
2627 b->branch_tree.versions[1].sha1);
2629 strbuf_reset(&new_data);
2630 strbuf_addf(&new_data, "tree %s\n",
2631 sha1_to_hex(b->branch_tree.versions[1].sha1));
2632 if (!is_null_sha1(b->sha1))
2633 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2634 while (merge_list) {
2635 struct hash_list *next = merge_list->next;
2636 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2640 strbuf_addf(&new_data,
2644 author ? author : committer, committer);
2645 strbuf_addbuf(&new_data, &msg);
2649 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2650 b->pack_id = pack_id;
2651 b->last_commit = object_count_by_type[OBJ_COMMIT];
2654 static void parse_new_tag(void)
2656 static struct strbuf msg = STRBUF_INIT;
2662 uintmax_t from_mark = 0;
2663 unsigned char sha1[20];
2664 enum object_type type;
2666 /* Obtain the new tag name from the rest of our command */
2667 sp = strchr(command_buf.buf, ' ') + 1;
2668 t = pool_alloc(sizeof(struct tag));
2670 t->name = pool_strdup(sp);
2672 last_tag->next_tag = t;
2676 read_next_command();
2679 if (prefixcmp(command_buf.buf, "from "))
2680 die("Expected from command, got %s", command_buf.buf);
2681 from = strchr(command_buf.buf, ' ') + 1;
2682 s = lookup_branch(from);
2684 hashcpy(sha1, s->sha1);
2686 } else if (*from == ':') {
2687 struct object_entry *oe;
2688 from_mark = strtoumax(from + 1, NULL, 10);
2689 oe = find_mark(from_mark);
2691 hashcpy(sha1, oe->idx.sha1);
2692 } else if (!get_sha1(from, sha1)) {
2696 buf = read_sha1_file(sha1, &type, &size);
2697 if (!buf || size < 46)
2698 die("Not a valid commit: %s", from);
2701 die("Invalid ref name or SHA1 expression: %s", from);
2702 read_next_command();
2705 if (!prefixcmp(command_buf.buf, "tagger ")) {
2706 tagger = parse_ident(command_buf.buf + 7);
2707 read_next_command();
2711 /* tag payload/message */
2712 parse_data(&msg, 0, NULL);
2714 /* build the tag object */
2715 strbuf_reset(&new_data);
2717 strbuf_addf(&new_data,
2721 sha1_to_hex(sha1), typename(type), t->name);
2723 strbuf_addf(&new_data,
2724 "tagger %s\n", tagger);
2725 strbuf_addch(&new_data, '\n');
2726 strbuf_addbuf(&new_data, &msg);
2729 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2730 t->pack_id = MAX_PACK_ID;
2732 t->pack_id = pack_id;
2735 static void parse_reset_branch(void)
2740 /* Obtain the branch name from the rest of our command */
2741 sp = strchr(command_buf.buf, ' ') + 1;
2742 b = lookup_branch(sp);
2745 hashclr(b->branch_tree.versions[0].sha1);
2746 hashclr(b->branch_tree.versions[1].sha1);
2747 if (b->branch_tree.tree) {
2748 release_tree_content_recursive(b->branch_tree.tree);
2749 b->branch_tree.tree = NULL;
2754 read_next_command();
2756 if (command_buf.len > 0)
2757 unread_command_buf = 1;
2760 static void cat_blob_write(const char *buf, unsigned long size)
2762 if (write_in_full(cat_blob_fd, buf, size) != size)
2763 die_errno("Write to frontend failed");
2766 static void cat_blob(struct object_entry *oe, unsigned char sha1[20])
2768 struct strbuf line = STRBUF_INIT;
2770 enum object_type type = 0;
2773 if (!oe || oe->pack_id == MAX_PACK_ID) {
2774 buf = read_sha1_file(sha1, &type, &size);
2777 buf = gfi_unpack_entry(oe, &size);
2781 * Output based on batch_one_object() from cat-file.c.
2784 strbuf_reset(&line);
2785 strbuf_addf(&line, "%s missing\n", sha1_to_hex(sha1));
2786 cat_blob_write(line.buf, line.len);
2787 strbuf_release(&line);
2792 die("Can't read object %s", sha1_to_hex(sha1));
2793 if (type != OBJ_BLOB)
2794 die("Object %s is a %s but a blob was expected.",
2795 sha1_to_hex(sha1), typename(type));
2796 strbuf_reset(&line);
2797 strbuf_addf(&line, "%s %s %lu\n", sha1_to_hex(sha1),
2798 typename(type), size);
2799 cat_blob_write(line.buf, line.len);
2800 strbuf_release(&line);
2801 cat_blob_write(buf, size);
2802 cat_blob_write("\n", 1);
2806 static void parse_cat_blob(void)
2809 struct object_entry *oe = oe;
2810 unsigned char sha1[20];
2812 /* cat-blob SP <object> LF */
2813 p = command_buf.buf + strlen("cat-blob ");
2816 oe = find_mark(strtoumax(p + 1, &x, 10));
2818 die("Invalid mark: %s", command_buf.buf);
2820 die("Unknown mark: %s", command_buf.buf);
2822 die("Garbage after mark: %s", command_buf.buf);
2823 hashcpy(sha1, oe->idx.sha1);
2825 if (get_sha1_hex(p, sha1))
2826 die("Invalid SHA1: %s", command_buf.buf);
2828 die("Garbage after SHA1: %s", command_buf.buf);
2829 oe = find_object(sha1);
2835 static void checkpoint(void)
2837 checkpoint_requested = 0;
2846 static void parse_checkpoint(void)
2848 checkpoint_requested = 1;
2852 static void parse_progress(void)
2854 fwrite(command_buf.buf, 1, command_buf.len, stdout);
2855 fputc('\n', stdout);
2860 static char* make_fast_import_path(const char *path)
2862 struct strbuf abs_path = STRBUF_INIT;
2864 if (!relative_marks_paths || is_absolute_path(path))
2865 return xstrdup(path);
2866 strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
2867 return strbuf_detach(&abs_path, NULL);
2870 static void option_import_marks(const char *marks, int from_stream)
2872 if (import_marks_file) {
2874 die("Only one import-marks command allowed per stream");
2876 /* read previous mark file */
2877 if(!import_marks_file_from_stream)
2881 import_marks_file = make_fast_import_path(marks);
2882 safe_create_leading_directories_const(import_marks_file);
2883 import_marks_file_from_stream = from_stream;
2886 static void option_date_format(const char *fmt)
2888 if (!strcmp(fmt, "raw"))
2889 whenspec = WHENSPEC_RAW;
2890 else if (!strcmp(fmt, "rfc2822"))
2891 whenspec = WHENSPEC_RFC2822;
2892 else if (!strcmp(fmt, "now"))
2893 whenspec = WHENSPEC_NOW;
2895 die("unknown --date-format argument %s", fmt);
2898 static unsigned long ulong_arg(const char *option, const char *arg)
2901 unsigned long rv = strtoul(arg, &endptr, 0);
2902 if (strchr(arg, '-') || endptr == arg || *endptr)
2903 die("%s: argument must be a non-negative integer", option);
2907 static void option_depth(const char *depth)
2909 max_depth = ulong_arg("--depth", depth);
2910 if (max_depth > MAX_DEPTH)
2911 die("--depth cannot exceed %u", MAX_DEPTH);
2914 static void option_active_branches(const char *branches)
2916 max_active_branches = ulong_arg("--active-branches", branches);
2919 static void option_export_marks(const char *marks)
2921 export_marks_file = make_fast_import_path(marks);
2922 safe_create_leading_directories_const(export_marks_file);
2925 static void option_cat_blob_fd(const char *fd)
2927 unsigned long n = ulong_arg("--cat-blob-fd", fd);
2928 if (n > (unsigned long) INT_MAX)
2929 die("--cat-blob-fd cannot exceed %d", INT_MAX);
2930 cat_blob_fd = (int) n;
2933 static void option_export_pack_edges(const char *edges)
2937 pack_edges = fopen(edges, "a");
2939 die_errno("Cannot open '%s'", edges);
2942 static int parse_one_option(const char *option)
2944 if (!prefixcmp(option, "max-pack-size=")) {
2946 if (!git_parse_ulong(option + 14, &v))
2949 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
2951 } else if (v < 1024 * 1024) {
2952 warning("minimum max-pack-size is 1 MiB");
2956 } else if (!prefixcmp(option, "big-file-threshold=")) {
2958 if (!git_parse_ulong(option + 19, &v))
2960 big_file_threshold = v;
2961 } else if (!prefixcmp(option, "depth=")) {
2962 option_depth(option + 6);
2963 } else if (!prefixcmp(option, "active-branches=")) {
2964 option_active_branches(option + 16);
2965 } else if (!prefixcmp(option, "export-pack-edges=")) {
2966 option_export_pack_edges(option + 18);
2967 } else if (!prefixcmp(option, "quiet")) {
2969 } else if (!prefixcmp(option, "stats")) {
2978 static int parse_one_feature(const char *feature, int from_stream)
2980 if (!prefixcmp(feature, "date-format=")) {
2981 option_date_format(feature + 12);
2982 } else if (!prefixcmp(feature, "import-marks=")) {
2983 option_import_marks(feature + 13, from_stream);
2984 } else if (!prefixcmp(feature, "export-marks=")) {
2985 option_export_marks(feature + 13);
2986 } else if (!strcmp(feature, "cat-blob")) {
2987 ; /* Don't die - this feature is supported */
2988 } else if (!prefixcmp(feature, "relative-marks")) {
2989 relative_marks_paths = 1;
2990 } else if (!prefixcmp(feature, "no-relative-marks")) {
2991 relative_marks_paths = 0;
2992 } else if (!prefixcmp(feature, "force")) {
3001 static void parse_feature(void)
3003 char *feature = command_buf.buf + 8;
3005 if (seen_data_command)
3006 die("Got feature command '%s' after data command", feature);
3008 if (parse_one_feature(feature, 1))
3011 die("This version of fast-import does not support feature %s.", feature);
3014 static void parse_option(void)
3016 char *option = command_buf.buf + 11;
3018 if (seen_data_command)
3019 die("Got option command '%s' after data command", option);
3021 if (parse_one_option(option))
3024 die("This version of fast-import does not support option: %s", option);
3027 static int git_pack_config(const char *k, const char *v, void *cb)
3029 if (!strcmp(k, "pack.depth")) {
3030 max_depth = git_config_int(k, v);
3031 if (max_depth > MAX_DEPTH)
3032 max_depth = MAX_DEPTH;
3035 if (!strcmp(k, "pack.compression")) {
3036 int level = git_config_int(k, v);
3038 level = Z_DEFAULT_COMPRESSION;
3039 else if (level < 0 || level > Z_BEST_COMPRESSION)
3040 die("bad pack compression level %d", level);
3041 pack_compression_level = level;
3042 pack_compression_seen = 1;
3045 if (!strcmp(k, "pack.indexversion")) {
3046 pack_idx_default_version = git_config_int(k, v);
3047 if (pack_idx_default_version > 2)
3048 die("bad pack.indexversion=%"PRIu32,
3049 pack_idx_default_version);
3052 if (!strcmp(k, "pack.packsizelimit")) {
3053 max_packsize = git_config_ulong(k, v);
3056 if (!strcmp(k, "core.bigfilethreshold")) {
3057 long n = git_config_int(k, v);
3058 big_file_threshold = 0 < n ? n : 0;
3060 return git_default_config(k, v, cb);
3063 static const char fast_import_usage[] =
3064 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3066 static void parse_argv(void)
3070 for (i = 1; i < global_argc; i++) {
3071 const char *a = global_argv[i];
3073 if (*a != '-' || !strcmp(a, "--"))
3076 if (parse_one_option(a + 2))
3079 if (parse_one_feature(a + 2, 0))
3082 if (!prefixcmp(a + 2, "cat-blob-fd=")) {
3083 option_cat_blob_fd(a + 2 + strlen("cat-blob-fd="));
3087 die("unknown option %s", a);
3089 if (i != global_argc)
3090 usage(fast_import_usage);
3092 seen_data_command = 1;
3093 if (import_marks_file)
3097 int main(int argc, const char **argv)
3101 git_extract_argv0_path(argv[0]);
3103 if (argc == 2 && !strcmp(argv[1], "-h"))
3104 usage(fast_import_usage);
3106 setup_git_directory();
3107 git_config(git_pack_config, NULL);
3108 if (!pack_compression_seen && core_compression_seen)
3109 pack_compression_level = core_compression_level;
3111 alloc_objects(object_entry_alloc);
3112 strbuf_init(&command_buf, 0);
3113 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
3114 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
3115 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
3116 marks = pool_calloc(1, sizeof(struct mark_set));
3121 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
3122 for (i = 0; i < (cmd_save - 1); i++)
3123 rc_free[i].next = &rc_free[i + 1];
3124 rc_free[cmd_save - 1].next = NULL;
3126 prepare_packed_git();
3128 set_die_routine(die_nicely);
3129 set_checkpoint_signal();
3130 while (read_next_command() != EOF) {
3131 if (!strcmp("blob", command_buf.buf))
3133 else if (!prefixcmp(command_buf.buf, "commit "))
3135 else if (!prefixcmp(command_buf.buf, "tag "))
3137 else if (!prefixcmp(command_buf.buf, "reset "))
3138 parse_reset_branch();
3139 else if (!strcmp("checkpoint", command_buf.buf))
3141 else if (!prefixcmp(command_buf.buf, "progress "))
3143 else if (!prefixcmp(command_buf.buf, "feature "))
3145 else if (!prefixcmp(command_buf.buf, "option git "))
3147 else if (!prefixcmp(command_buf.buf, "option "))
3148 /* ignore non-git options*/;
3150 die("Unsupported command: %s", command_buf.buf);
3152 if (checkpoint_requested)
3156 /* argv hasn't been parsed yet, do so */
3157 if (!seen_data_command)
3171 uintmax_t total_count = 0, duplicate_count = 0;
3172 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3173 total_count += object_count_by_type[i];
3174 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3175 duplicate_count += duplicate_count_by_type[i];
3177 fprintf(stderr, "%s statistics:\n", argv[0]);
3178 fprintf(stderr, "---------------------------------------------------------------------\n");
3179 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3180 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
3181 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]);
3182 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]);
3183 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]);
3184 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]);
3185 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
3186 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
3187 fprintf(stderr, " atoms: %10u\n", atom_cnt);
3188 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
3189 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
3190 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
3191 fprintf(stderr, "---------------------------------------------------------------------\n");
3193 fprintf(stderr, "---------------------------------------------------------------------\n");
3194 fprintf(stderr, "\n");
3197 return failure ? 1 : 0;