merge-tree: remove unnecessary call of git_extract_argv0_path
[git/ericb.git] / fast-import.c
blob901784fe911567752c872e5433f0295768654b5a
1 /*
2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
5 stream ::= cmd*;
7 cmd ::= new_blob
8 | new_commit
9 | new_tag
10 | reset_branch
11 | checkpoint
12 | progress
15 new_blob ::= 'blob' lf
16 mark?
17 file_content;
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
21 mark?
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
24 commit_msg
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
27 file_change*
28 lf?;
29 commit_msg ::= data;
31 file_change ::= file_clr
32 | file_del
33 | file_rnm
34 | file_cpy
35 | file_obm
36 | file_inm;
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
43 data;
44 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
45 note_inm ::= 'N' sp 'inline' sp committish lf
46 data;
48 new_tag ::= 'tag' sp tag_str lf
49 'from' sp committish lf
50 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
51 tag_msg;
52 tag_msg ::= data;
54 reset_branch ::= 'reset' sp ref_str lf
55 ('from' sp committish lf)?
56 lf?;
58 checkpoint ::= 'checkpoint' lf
59 lf?;
61 progress ::= 'progress' sp not_lf* lf
62 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)
72 lf?;
74 # note: delim may be any string but must not contain lf.
75 # data_line may contain any data but must not be exactly
76 # delim.
77 delimited_data ::= 'data' sp '<<' delim lf
78 (data_line lf)*
79 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
85 binary_data;
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
92 # are UTF8.
94 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
95 ref_str ::= ref;
96 sha1exp_str ::= sha1exp;
97 tag_str ::= tag;
98 path_str ::= path | '"' quoted(path) '"' ;
99 mode ::= '100644' | '644'
100 | '100755' | '755'
101 | '120000'
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 may appear anywhere in the input, except
136 # within a data command. Any form of the data command
137 # always escapes the related input from comment processing.
139 # In case it is not clear, the '#' that starts the comment
140 # must be the first character on that line (an lf
141 # preceded it).
143 comment ::= '#' not_lf* lf;
144 not_lf ::= # Any byte that is not ASCII newline (LF);
147 #include "builtin.h"
148 #include "cache.h"
149 #include "object.h"
150 #include "blob.h"
151 #include "tree.h"
152 #include "commit.h"
153 #include "delta.h"
154 #include "pack.h"
155 #include "refs.h"
156 #include "csum-file.h"
157 #include "quote.h"
158 #include "exec_cmd.h"
160 #define PACK_ID_BITS 16
161 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
162 #define DEPTH_BITS 13
163 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
165 struct object_entry
167 struct object_entry *next;
168 uint32_t offset;
169 uint32_t type : TYPE_BITS,
170 pack_id : PACK_ID_BITS,
171 depth : DEPTH_BITS;
172 unsigned char sha1[20];
175 struct object_entry_pool
177 struct object_entry_pool *next_pool;
178 struct object_entry *next_free;
179 struct object_entry *end;
180 struct object_entry entries[FLEX_ARRAY]; /* more */
183 struct mark_set
185 union {
186 struct object_entry *marked[1024];
187 struct mark_set *sets[1024];
188 } data;
189 unsigned int shift;
192 struct last_object
194 struct strbuf data;
195 uint32_t offset;
196 unsigned int depth;
197 unsigned no_swap : 1;
200 struct mem_pool
202 struct mem_pool *next_pool;
203 char *next_free;
204 char *end;
205 uintmax_t space[FLEX_ARRAY]; /* more */
208 struct atom_str
210 struct atom_str *next_atom;
211 unsigned short str_len;
212 char str_dat[FLEX_ARRAY]; /* more */
215 struct tree_content;
216 struct tree_entry
218 struct tree_content *tree;
219 struct atom_str *name;
220 struct tree_entry_ms
222 uint16_t mode;
223 unsigned char sha1[20];
224 } versions[2];
227 struct tree_content
229 unsigned int entry_capacity; /* must match avail_tree_content */
230 unsigned int entry_count;
231 unsigned int delta_depth;
232 struct tree_entry *entries[FLEX_ARRAY]; /* more */
235 struct avail_tree_content
237 unsigned int entry_capacity; /* must match tree_content */
238 struct avail_tree_content *next_avail;
241 struct branch
243 struct branch *table_next_branch;
244 struct branch *active_next_branch;
245 const char *name;
246 struct tree_entry branch_tree;
247 uintmax_t last_commit;
248 uintmax_t num_notes;
249 unsigned active : 1;
250 unsigned pack_id : PACK_ID_BITS;
251 unsigned char sha1[20];
254 struct tag
256 struct tag *next_tag;
257 const char *name;
258 unsigned int pack_id;
259 unsigned char sha1[20];
262 struct hash_list
264 struct hash_list *next;
265 unsigned char sha1[20];
268 typedef enum {
269 WHENSPEC_RAW = 1,
270 WHENSPEC_RFC2822,
271 WHENSPEC_NOW,
272 } whenspec_type;
274 struct recent_command
276 struct recent_command *prev;
277 struct recent_command *next;
278 char *buf;
281 /* Configured limits on output */
282 static unsigned long max_depth = 10;
283 static off_t max_packsize = (1LL << 32) - 1;
284 static int force_update;
285 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
286 static int pack_compression_seen;
288 /* Stats and misc. counters */
289 static uintmax_t alloc_count;
290 static uintmax_t marks_set_count;
291 static uintmax_t object_count_by_type[1 << TYPE_BITS];
292 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
293 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
294 static unsigned long object_count;
295 static unsigned long branch_count;
296 static unsigned long branch_load_count;
297 static int failure;
298 static FILE *pack_edges;
299 static unsigned int show_stats = 1;
300 static int global_argc;
301 static const char **global_argv;
303 /* Memory pools */
304 static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
305 static size_t total_allocd;
306 static struct mem_pool *mem_pool;
308 /* Atom management */
309 static unsigned int atom_table_sz = 4451;
310 static unsigned int atom_cnt;
311 static struct atom_str **atom_table;
313 /* The .pack file being generated */
314 static unsigned int pack_id;
315 static struct packed_git *pack_data;
316 static struct packed_git **all_packs;
317 static unsigned long pack_size;
319 /* Table of objects we've written. */
320 static unsigned int object_entry_alloc = 5000;
321 static struct object_entry_pool *blocks;
322 static struct object_entry *object_table[1 << 16];
323 static struct mark_set *marks;
324 static const char *export_marks_file;
325 static const char *import_marks_file;
326 static int import_marks_file_from_stream;
327 static int relative_marks_paths;
329 /* Our last blob */
330 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
332 /* Tree management */
333 static unsigned int tree_entry_alloc = 1000;
334 static void *avail_tree_entry;
335 static unsigned int avail_tree_table_sz = 100;
336 static struct avail_tree_content **avail_tree_table;
337 static struct strbuf old_tree = STRBUF_INIT;
338 static struct strbuf new_tree = STRBUF_INIT;
340 /* Branch data */
341 static unsigned long max_active_branches = 5;
342 static unsigned long cur_active_branches;
343 static unsigned long branch_table_sz = 1039;
344 static struct branch **branch_table;
345 static struct branch *active_branches;
347 /* Tag data */
348 static struct tag *first_tag;
349 static struct tag *last_tag;
351 /* Input stream parsing */
352 static whenspec_type whenspec = WHENSPEC_RAW;
353 static struct strbuf command_buf = STRBUF_INIT;
354 static int unread_command_buf;
355 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
356 static struct recent_command *cmd_tail = &cmd_hist;
357 static struct recent_command *rc_free;
358 static unsigned int cmd_save = 100;
359 static uintmax_t next_mark;
360 static struct strbuf new_data = STRBUF_INIT;
361 static int seen_data_command;
363 static void parse_argv(void);
365 static void write_branch_report(FILE *rpt, struct branch *b)
367 fprintf(rpt, "%s:\n", b->name);
369 fprintf(rpt, " status :");
370 if (b->active)
371 fputs(" active", rpt);
372 if (b->branch_tree.tree)
373 fputs(" loaded", rpt);
374 if (is_null_sha1(b->branch_tree.versions[1].sha1))
375 fputs(" dirty", rpt);
376 fputc('\n', rpt);
378 fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1));
379 fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
380 fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
381 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
383 fputs(" last pack : ", rpt);
384 if (b->pack_id < MAX_PACK_ID)
385 fprintf(rpt, "%u", b->pack_id);
386 fputc('\n', rpt);
388 fputc('\n', rpt);
391 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
393 static void write_crash_report(const char *err)
395 char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
396 FILE *rpt = fopen(loc, "w");
397 struct branch *b;
398 unsigned long lu;
399 struct recent_command *rc;
401 if (!rpt) {
402 error("can't write crash report %s: %s", loc, strerror(errno));
403 return;
406 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
408 fprintf(rpt, "fast-import crash report:\n");
409 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
410 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
411 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
412 fputc('\n', rpt);
414 fputs("fatal: ", rpt);
415 fputs(err, rpt);
416 fputc('\n', rpt);
418 fputc('\n', rpt);
419 fputs("Most Recent Commands Before Crash\n", rpt);
420 fputs("---------------------------------\n", rpt);
421 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
422 if (rc->next == &cmd_hist)
423 fputs("* ", rpt);
424 else
425 fputs(" ", rpt);
426 fputs(rc->buf, rpt);
427 fputc('\n', rpt);
430 fputc('\n', rpt);
431 fputs("Active Branch LRU\n", rpt);
432 fputs("-----------------\n", rpt);
433 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
434 cur_active_branches,
435 max_active_branches);
436 fputc('\n', rpt);
437 fputs(" pos clock name\n", rpt);
438 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
439 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
440 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
441 ++lu, b->last_commit, b->name);
443 fputc('\n', rpt);
444 fputs("Inactive Branches\n", rpt);
445 fputs("-----------------\n", rpt);
446 for (lu = 0; lu < branch_table_sz; lu++) {
447 for (b = branch_table[lu]; b; b = b->table_next_branch)
448 write_branch_report(rpt, b);
451 if (first_tag) {
452 struct tag *tg;
453 fputc('\n', rpt);
454 fputs("Annotated Tags\n", rpt);
455 fputs("--------------\n", rpt);
456 for (tg = first_tag; tg; tg = tg->next_tag) {
457 fputs(sha1_to_hex(tg->sha1), rpt);
458 fputc(' ', rpt);
459 fputs(tg->name, rpt);
460 fputc('\n', rpt);
464 fputc('\n', rpt);
465 fputs("Marks\n", rpt);
466 fputs("-----\n", rpt);
467 if (export_marks_file)
468 fprintf(rpt, " exported to %s\n", export_marks_file);
469 else
470 dump_marks_helper(rpt, 0, marks);
472 fputc('\n', rpt);
473 fputs("-------------------\n", rpt);
474 fputs("END OF CRASH REPORT\n", rpt);
475 fclose(rpt);
478 static void end_packfile(void);
479 static void unkeep_all_packs(void);
480 static void dump_marks(void);
482 static NORETURN void die_nicely(const char *err, va_list params)
484 static int zombie;
485 char message[2 * PATH_MAX];
487 vsnprintf(message, sizeof(message), err, params);
488 fputs("fatal: ", stderr);
489 fputs(message, stderr);
490 fputc('\n', stderr);
492 if (!zombie) {
493 zombie = 1;
494 write_crash_report(message);
495 end_packfile();
496 unkeep_all_packs();
497 dump_marks();
499 exit(128);
502 static void alloc_objects(unsigned int cnt)
504 struct object_entry_pool *b;
506 b = xmalloc(sizeof(struct object_entry_pool)
507 + cnt * sizeof(struct object_entry));
508 b->next_pool = blocks;
509 b->next_free = b->entries;
510 b->end = b->entries + cnt;
511 blocks = b;
512 alloc_count += cnt;
515 static struct object_entry *new_object(unsigned char *sha1)
517 struct object_entry *e;
519 if (blocks->next_free == blocks->end)
520 alloc_objects(object_entry_alloc);
522 e = blocks->next_free++;
523 hashcpy(e->sha1, sha1);
524 return e;
527 static struct object_entry *find_object(unsigned char *sha1)
529 unsigned int h = sha1[0] << 8 | sha1[1];
530 struct object_entry *e;
531 for (e = object_table[h]; e; e = e->next)
532 if (!hashcmp(sha1, e->sha1))
533 return e;
534 return NULL;
537 static struct object_entry *insert_object(unsigned char *sha1)
539 unsigned int h = sha1[0] << 8 | sha1[1];
540 struct object_entry *e = object_table[h];
541 struct object_entry *p = NULL;
543 while (e) {
544 if (!hashcmp(sha1, e->sha1))
545 return e;
546 p = e;
547 e = e->next;
550 e = new_object(sha1);
551 e->next = NULL;
552 e->offset = 0;
553 if (p)
554 p->next = e;
555 else
556 object_table[h] = e;
557 return e;
560 static unsigned int hc_str(const char *s, size_t len)
562 unsigned int r = 0;
563 while (len-- > 0)
564 r = r * 31 + *s++;
565 return r;
568 static void *pool_alloc(size_t len)
570 struct mem_pool *p;
571 void *r;
573 /* round up to a 'uintmax_t' alignment */
574 if (len & (sizeof(uintmax_t) - 1))
575 len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
577 for (p = mem_pool; p; p = p->next_pool)
578 if ((p->end - p->next_free >= len))
579 break;
581 if (!p) {
582 if (len >= (mem_pool_alloc/2)) {
583 total_allocd += len;
584 return xmalloc(len);
586 total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
587 p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
588 p->next_pool = mem_pool;
589 p->next_free = (char *) p->space;
590 p->end = p->next_free + mem_pool_alloc;
591 mem_pool = p;
594 r = p->next_free;
595 p->next_free += len;
596 return r;
599 static void *pool_calloc(size_t count, size_t size)
601 size_t len = count * size;
602 void *r = pool_alloc(len);
603 memset(r, 0, len);
604 return r;
607 static char *pool_strdup(const char *s)
609 char *r = pool_alloc(strlen(s) + 1);
610 strcpy(r, s);
611 return r;
614 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
616 struct mark_set *s = marks;
617 while ((idnum >> s->shift) >= 1024) {
618 s = pool_calloc(1, sizeof(struct mark_set));
619 s->shift = marks->shift + 10;
620 s->data.sets[0] = marks;
621 marks = s;
623 while (s->shift) {
624 uintmax_t i = idnum >> s->shift;
625 idnum -= i << s->shift;
626 if (!s->data.sets[i]) {
627 s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
628 s->data.sets[i]->shift = s->shift - 10;
630 s = s->data.sets[i];
632 if (!s->data.marked[idnum])
633 marks_set_count++;
634 s->data.marked[idnum] = oe;
637 static struct object_entry *find_mark(uintmax_t idnum)
639 uintmax_t orig_idnum = idnum;
640 struct mark_set *s = marks;
641 struct object_entry *oe = NULL;
642 if ((idnum >> s->shift) < 1024) {
643 while (s && s->shift) {
644 uintmax_t i = idnum >> s->shift;
645 idnum -= i << s->shift;
646 s = s->data.sets[i];
648 if (s)
649 oe = s->data.marked[idnum];
651 if (!oe)
652 die("mark :%" PRIuMAX " not declared", orig_idnum);
653 return oe;
656 static struct atom_str *to_atom(const char *s, unsigned short len)
658 unsigned int hc = hc_str(s, len) % atom_table_sz;
659 struct atom_str *c;
661 for (c = atom_table[hc]; c; c = c->next_atom)
662 if (c->str_len == len && !strncmp(s, c->str_dat, len))
663 return c;
665 c = pool_alloc(sizeof(struct atom_str) + len + 1);
666 c->str_len = len;
667 strncpy(c->str_dat, s, len);
668 c->str_dat[len] = 0;
669 c->next_atom = atom_table[hc];
670 atom_table[hc] = c;
671 atom_cnt++;
672 return c;
675 static struct branch *lookup_branch(const char *name)
677 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
678 struct branch *b;
680 for (b = branch_table[hc]; b; b = b->table_next_branch)
681 if (!strcmp(name, b->name))
682 return b;
683 return NULL;
686 static struct branch *new_branch(const char *name)
688 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
689 struct branch *b = lookup_branch(name);
691 if (b)
692 die("Invalid attempt to create duplicate branch: %s", name);
693 switch (check_ref_format(name)) {
694 case 0: break; /* its valid */
695 case CHECK_REF_FORMAT_ONELEVEL:
696 break; /* valid, but too few '/', allow anyway */
697 default:
698 die("Branch name doesn't conform to GIT standards: %s", name);
701 b = pool_calloc(1, sizeof(struct branch));
702 b->name = pool_strdup(name);
703 b->table_next_branch = branch_table[hc];
704 b->branch_tree.versions[0].mode = S_IFDIR;
705 b->branch_tree.versions[1].mode = S_IFDIR;
706 b->num_notes = 0;
707 b->active = 0;
708 b->pack_id = MAX_PACK_ID;
709 branch_table[hc] = b;
710 branch_count++;
711 return b;
714 static unsigned int hc_entries(unsigned int cnt)
716 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
717 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
720 static struct tree_content *new_tree_content(unsigned int cnt)
722 struct avail_tree_content *f, *l = NULL;
723 struct tree_content *t;
724 unsigned int hc = hc_entries(cnt);
726 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
727 if (f->entry_capacity >= cnt)
728 break;
730 if (f) {
731 if (l)
732 l->next_avail = f->next_avail;
733 else
734 avail_tree_table[hc] = f->next_avail;
735 } else {
736 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
737 f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
738 f->entry_capacity = cnt;
741 t = (struct tree_content*)f;
742 t->entry_count = 0;
743 t->delta_depth = 0;
744 return t;
747 static void release_tree_entry(struct tree_entry *e);
748 static void release_tree_content(struct tree_content *t)
750 struct avail_tree_content *f = (struct avail_tree_content*)t;
751 unsigned int hc = hc_entries(f->entry_capacity);
752 f->next_avail = avail_tree_table[hc];
753 avail_tree_table[hc] = f;
756 static void release_tree_content_recursive(struct tree_content *t)
758 unsigned int i;
759 for (i = 0; i < t->entry_count; i++)
760 release_tree_entry(t->entries[i]);
761 release_tree_content(t);
764 static struct tree_content *grow_tree_content(
765 struct tree_content *t,
766 int amt)
768 struct tree_content *r = new_tree_content(t->entry_count + amt);
769 r->entry_count = t->entry_count;
770 r->delta_depth = t->delta_depth;
771 memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
772 release_tree_content(t);
773 return r;
776 static struct tree_entry *new_tree_entry(void)
778 struct tree_entry *e;
780 if (!avail_tree_entry) {
781 unsigned int n = tree_entry_alloc;
782 total_allocd += n * sizeof(struct tree_entry);
783 avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
784 while (n-- > 1) {
785 *((void**)e) = e + 1;
786 e++;
788 *((void**)e) = NULL;
791 e = avail_tree_entry;
792 avail_tree_entry = *((void**)e);
793 return e;
796 static void release_tree_entry(struct tree_entry *e)
798 if (e->tree)
799 release_tree_content_recursive(e->tree);
800 *((void**)e) = avail_tree_entry;
801 avail_tree_entry = e;
804 static struct tree_content *dup_tree_content(struct tree_content *s)
806 struct tree_content *d;
807 struct tree_entry *a, *b;
808 unsigned int i;
810 if (!s)
811 return NULL;
812 d = new_tree_content(s->entry_count);
813 for (i = 0; i < s->entry_count; i++) {
814 a = s->entries[i];
815 b = new_tree_entry();
816 memcpy(b, a, sizeof(*a));
817 if (a->tree && is_null_sha1(b->versions[1].sha1))
818 b->tree = dup_tree_content(a->tree);
819 else
820 b->tree = NULL;
821 d->entries[i] = b;
823 d->entry_count = s->entry_count;
824 d->delta_depth = s->delta_depth;
826 return d;
829 static void start_packfile(void)
831 static char tmpfile[PATH_MAX];
832 struct packed_git *p;
833 struct pack_header hdr;
834 int pack_fd;
836 pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
837 "pack/tmp_pack_XXXXXX");
838 p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
839 strcpy(p->pack_name, tmpfile);
840 p->pack_fd = pack_fd;
842 hdr.hdr_signature = htonl(PACK_SIGNATURE);
843 hdr.hdr_version = htonl(2);
844 hdr.hdr_entries = 0;
845 write_or_die(p->pack_fd, &hdr, sizeof(hdr));
847 pack_data = p;
848 pack_size = sizeof(hdr);
849 object_count = 0;
851 all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
852 all_packs[pack_id] = p;
855 static int oecmp (const void *a_, const void *b_)
857 struct object_entry *a = *((struct object_entry**)a_);
858 struct object_entry *b = *((struct object_entry**)b_);
859 return hashcmp(a->sha1, b->sha1);
862 static char *create_index(void)
864 static char tmpfile[PATH_MAX];
865 git_SHA_CTX ctx;
866 struct sha1file *f;
867 struct object_entry **idx, **c, **last, *e;
868 struct object_entry_pool *o;
869 uint32_t array[256];
870 int i, idx_fd;
872 /* Build the sorted table of object IDs. */
873 idx = xmalloc(object_count * sizeof(struct object_entry*));
874 c = idx;
875 for (o = blocks; o; o = o->next_pool)
876 for (e = o->next_free; e-- != o->entries;)
877 if (pack_id == e->pack_id)
878 *c++ = e;
879 last = idx + object_count;
880 if (c != last)
881 die("internal consistency error creating the index");
882 qsort(idx, object_count, sizeof(struct object_entry*), oecmp);
884 /* Generate the fan-out array. */
885 c = idx;
886 for (i = 0; i < 256; i++) {
887 struct object_entry **next = c;
888 while (next < last) {
889 if ((*next)->sha1[0] != i)
890 break;
891 next++;
893 array[i] = htonl(next - idx);
894 c = next;
897 idx_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
898 "pack/tmp_idx_XXXXXX");
899 f = sha1fd(idx_fd, tmpfile);
900 sha1write(f, array, 256 * sizeof(int));
901 git_SHA1_Init(&ctx);
902 for (c = idx; c != last; c++) {
903 uint32_t offset = htonl((*c)->offset);
904 sha1write(f, &offset, 4);
905 sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
906 git_SHA1_Update(&ctx, (*c)->sha1, 20);
908 sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
909 sha1close(f, NULL, CSUM_FSYNC);
910 free(idx);
911 git_SHA1_Final(pack_data->sha1, &ctx);
912 return tmpfile;
915 static char *keep_pack(char *curr_index_name)
917 static char name[PATH_MAX];
918 static const char *keep_msg = "fast-import";
919 int keep_fd;
921 keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
922 if (keep_fd < 0)
923 die_errno("cannot create keep file");
924 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
925 if (close(keep_fd))
926 die_errno("failed to write keep file");
928 snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
929 get_object_directory(), sha1_to_hex(pack_data->sha1));
930 if (move_temp_to_file(pack_data->pack_name, name))
931 die("cannot store pack file");
933 snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
934 get_object_directory(), sha1_to_hex(pack_data->sha1));
935 if (move_temp_to_file(curr_index_name, name))
936 die("cannot store index file");
937 return name;
940 static void unkeep_all_packs(void)
942 static char name[PATH_MAX];
943 int k;
945 for (k = 0; k < pack_id; k++) {
946 struct packed_git *p = all_packs[k];
947 snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
948 get_object_directory(), sha1_to_hex(p->sha1));
949 unlink_or_warn(name);
953 static void end_packfile(void)
955 struct packed_git *old_p = pack_data, *new_p;
957 clear_delta_base_cache();
958 if (object_count) {
959 char *idx_name;
960 int i;
961 struct branch *b;
962 struct tag *t;
964 close_pack_windows(pack_data);
965 fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
966 pack_data->pack_name, object_count,
967 NULL, 0);
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);
973 if (!new_p)
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 */
979 if (pack_edges) {
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);
992 fflush(pack_edges);
995 pack_id++;
997 else {
998 close(old_p->pack_fd);
999 unlink_or_warn(old_p->pack_name);
1001 free(old_p);
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)
1011 end_packfile();
1012 start_packfile();
1015 static size_t encode_header(
1016 enum object_type type,
1017 size_t size,
1018 unsigned char *hdr)
1020 int n = 1;
1021 unsigned char c;
1023 if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
1024 die("bad type %d", type);
1026 c = (type << 4) | (size & 15);
1027 size >>= 4;
1028 while (size) {
1029 *hdr++ = c | 0x80;
1030 c = size & 0x7f;
1031 size >>= 7;
1032 n++;
1034 *hdr = c;
1035 return n;
1038 static int store_object(
1039 enum object_type type,
1040 struct strbuf *dat,
1041 struct last_object *last,
1042 unsigned char *sha1out,
1043 uintmax_t mark)
1045 void *out, *delta;
1046 struct object_entry *e;
1047 unsigned char hdr[96];
1048 unsigned char sha1[20];
1049 unsigned long hdrlen, deltalen;
1050 git_SHA_CTX c;
1051 z_stream s;
1053 hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
1054 (unsigned long)dat->len) + 1;
1055 git_SHA1_Init(&c);
1056 git_SHA1_Update(&c, hdr, hdrlen);
1057 git_SHA1_Update(&c, dat->buf, dat->len);
1058 git_SHA1_Final(sha1, &c);
1059 if (sha1out)
1060 hashcpy(sha1out, sha1);
1062 e = insert_object(sha1);
1063 if (mark)
1064 insert_mark(mark, e);
1065 if (e->offset) {
1066 duplicate_count_by_type[type]++;
1067 return 1;
1068 } else if (find_sha1_pack(sha1, packed_git)) {
1069 e->type = type;
1070 e->pack_id = MAX_PACK_ID;
1071 e->offset = 1; /* just not zero! */
1072 duplicate_count_by_type[type]++;
1073 return 1;
1076 if (last && last->data.buf && last->depth < max_depth) {
1077 delta = diff_delta(last->data.buf, last->data.len,
1078 dat->buf, dat->len,
1079 &deltalen, 0);
1080 if (delta && deltalen >= dat->len) {
1081 free(delta);
1082 delta = NULL;
1084 } else
1085 delta = NULL;
1087 memset(&s, 0, sizeof(s));
1088 deflateInit(&s, pack_compression_level);
1089 if (delta) {
1090 s.next_in = delta;
1091 s.avail_in = deltalen;
1092 } else {
1093 s.next_in = (void *)dat->buf;
1094 s.avail_in = dat->len;
1096 s.avail_out = deflateBound(&s, s.avail_in);
1097 s.next_out = out = xmalloc(s.avail_out);
1098 while (deflate(&s, Z_FINISH) == Z_OK)
1099 /* nothing */;
1100 deflateEnd(&s);
1102 /* Determine if we should auto-checkpoint. */
1103 if ((pack_size + 60 + s.total_out) > max_packsize
1104 || (pack_size + 60 + s.total_out) < pack_size) {
1106 /* This new object needs to *not* have the current pack_id. */
1107 e->pack_id = pack_id + 1;
1108 cycle_packfile();
1110 /* We cannot carry a delta into the new pack. */
1111 if (delta) {
1112 free(delta);
1113 delta = NULL;
1115 memset(&s, 0, sizeof(s));
1116 deflateInit(&s, pack_compression_level);
1117 s.next_in = (void *)dat->buf;
1118 s.avail_in = dat->len;
1119 s.avail_out = deflateBound(&s, s.avail_in);
1120 s.next_out = out = xrealloc(out, s.avail_out);
1121 while (deflate(&s, Z_FINISH) == Z_OK)
1122 /* nothing */;
1123 deflateEnd(&s);
1127 e->type = type;
1128 e->pack_id = pack_id;
1129 e->offset = pack_size;
1130 object_count++;
1131 object_count_by_type[type]++;
1133 if (delta) {
1134 unsigned long ofs = e->offset - last->offset;
1135 unsigned pos = sizeof(hdr) - 1;
1137 delta_count_by_type[type]++;
1138 e->depth = last->depth + 1;
1140 hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1141 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1142 pack_size += hdrlen;
1144 hdr[pos] = ofs & 127;
1145 while (ofs >>= 7)
1146 hdr[--pos] = 128 | (--ofs & 127);
1147 write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1148 pack_size += sizeof(hdr) - pos;
1149 } else {
1150 e->depth = 0;
1151 hdrlen = encode_header(type, dat->len, hdr);
1152 write_or_die(pack_data->pack_fd, hdr, hdrlen);
1153 pack_size += hdrlen;
1156 write_or_die(pack_data->pack_fd, out, s.total_out);
1157 pack_size += s.total_out;
1159 free(out);
1160 free(delta);
1161 if (last) {
1162 if (last->no_swap) {
1163 last->data = *dat;
1164 } else {
1165 strbuf_swap(&last->data, dat);
1167 last->offset = e->offset;
1168 last->depth = e->depth;
1170 return 0;
1173 /* All calls must be guarded by find_object() or find_mark() to
1174 * ensure the 'struct object_entry' passed was written by this
1175 * process instance. We unpack the entry by the offset, avoiding
1176 * the need for the corresponding .idx file. This unpacking rule
1177 * works because we only use OBJ_REF_DELTA within the packfiles
1178 * created by fast-import.
1180 * oe must not be NULL. Such an oe usually comes from giving
1181 * an unknown SHA-1 to find_object() or an undefined mark to
1182 * find_mark(). Callers must test for this condition and use
1183 * the standard read_sha1_file() when it happens.
1185 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1186 * find_mark(), where the mark was reloaded from an existing marks
1187 * file and is referencing an object that this fast-import process
1188 * instance did not write out to a packfile. Callers must test for
1189 * this condition and use read_sha1_file() instead.
1191 static void *gfi_unpack_entry(
1192 struct object_entry *oe,
1193 unsigned long *sizep)
1195 enum object_type type;
1196 struct packed_git *p = all_packs[oe->pack_id];
1197 if (p == pack_data && p->pack_size < (pack_size + 20)) {
1198 /* The object is stored in the packfile we are writing to
1199 * and we have modified it since the last time we scanned
1200 * back to read a previously written object. If an old
1201 * window covered [p->pack_size, p->pack_size + 20) its
1202 * data is stale and is not valid. Closing all windows
1203 * and updating the packfile length ensures we can read
1204 * the newly written data.
1206 close_pack_windows(p);
1208 /* We have to offer 20 bytes additional on the end of
1209 * the packfile as the core unpacker code assumes the
1210 * footer is present at the file end and must promise
1211 * at least 20 bytes within any window it maps. But
1212 * we don't actually create the footer here.
1214 p->pack_size = pack_size + 20;
1216 return unpack_entry(p, oe->offset, &type, sizep);
1219 static const char *get_mode(const char *str, uint16_t *modep)
1221 unsigned char c;
1222 uint16_t mode = 0;
1224 while ((c = *str++) != ' ') {
1225 if (c < '0' || c > '7')
1226 return NULL;
1227 mode = (mode << 3) + (c - '0');
1229 *modep = mode;
1230 return str;
1233 static void load_tree(struct tree_entry *root)
1235 unsigned char *sha1 = root->versions[1].sha1;
1236 struct object_entry *myoe;
1237 struct tree_content *t;
1238 unsigned long size;
1239 char *buf;
1240 const char *c;
1242 root->tree = t = new_tree_content(8);
1243 if (is_null_sha1(sha1))
1244 return;
1246 myoe = find_object(sha1);
1247 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1248 if (myoe->type != OBJ_TREE)
1249 die("Not a tree: %s", sha1_to_hex(sha1));
1250 t->delta_depth = myoe->depth;
1251 buf = gfi_unpack_entry(myoe, &size);
1252 if (!buf)
1253 die("Can't load tree %s", sha1_to_hex(sha1));
1254 } else {
1255 enum object_type type;
1256 buf = read_sha1_file(sha1, &type, &size);
1257 if (!buf || type != OBJ_TREE)
1258 die("Can't load tree %s", sha1_to_hex(sha1));
1261 c = buf;
1262 while (c != (buf + size)) {
1263 struct tree_entry *e = new_tree_entry();
1265 if (t->entry_count == t->entry_capacity)
1266 root->tree = t = grow_tree_content(t, t->entry_count);
1267 t->entries[t->entry_count++] = e;
1269 e->tree = NULL;
1270 c = get_mode(c, &e->versions[1].mode);
1271 if (!c)
1272 die("Corrupt mode in %s", sha1_to_hex(sha1));
1273 e->versions[0].mode = e->versions[1].mode;
1274 e->name = to_atom(c, strlen(c));
1275 c += e->name->str_len + 1;
1276 hashcpy(e->versions[0].sha1, (unsigned char *)c);
1277 hashcpy(e->versions[1].sha1, (unsigned char *)c);
1278 c += 20;
1280 free(buf);
1283 static int tecmp0 (const void *_a, const void *_b)
1285 struct tree_entry *a = *((struct tree_entry**)_a);
1286 struct tree_entry *b = *((struct tree_entry**)_b);
1287 return base_name_compare(
1288 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1289 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1292 static int tecmp1 (const void *_a, const void *_b)
1294 struct tree_entry *a = *((struct tree_entry**)_a);
1295 struct tree_entry *b = *((struct tree_entry**)_b);
1296 return base_name_compare(
1297 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1298 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1301 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1303 size_t maxlen = 0;
1304 unsigned int i;
1306 if (!v)
1307 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
1308 else
1309 qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1311 for (i = 0; i < t->entry_count; i++) {
1312 if (t->entries[i]->versions[v].mode)
1313 maxlen += t->entries[i]->name->str_len + 34;
1316 strbuf_reset(b);
1317 strbuf_grow(b, maxlen);
1318 for (i = 0; i < t->entry_count; i++) {
1319 struct tree_entry *e = t->entries[i];
1320 if (!e->versions[v].mode)
1321 continue;
1322 strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
1323 e->name->str_dat, '\0');
1324 strbuf_add(b, e->versions[v].sha1, 20);
1328 static void store_tree(struct tree_entry *root)
1330 struct tree_content *t = root->tree;
1331 unsigned int i, j, del;
1332 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1333 struct object_entry *le;
1335 if (!is_null_sha1(root->versions[1].sha1))
1336 return;
1338 for (i = 0; i < t->entry_count; i++) {
1339 if (t->entries[i]->tree)
1340 store_tree(t->entries[i]);
1343 le = find_object(root->versions[0].sha1);
1344 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1345 mktree(t, 0, &old_tree);
1346 lo.data = old_tree;
1347 lo.offset = le->offset;
1348 lo.depth = t->delta_depth;
1351 mktree(t, 1, &new_tree);
1352 store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1354 t->delta_depth = lo.depth;
1355 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1356 struct tree_entry *e = t->entries[i];
1357 if (e->versions[1].mode) {
1358 e->versions[0].mode = e->versions[1].mode;
1359 hashcpy(e->versions[0].sha1, e->versions[1].sha1);
1360 t->entries[j++] = e;
1361 } else {
1362 release_tree_entry(e);
1363 del++;
1366 t->entry_count -= del;
1369 static int tree_content_set(
1370 struct tree_entry *root,
1371 const char *p,
1372 const unsigned char *sha1,
1373 const uint16_t mode,
1374 struct tree_content *subtree)
1376 struct tree_content *t = root->tree;
1377 const char *slash1;
1378 unsigned int i, n;
1379 struct tree_entry *e;
1381 slash1 = strchr(p, '/');
1382 if (slash1)
1383 n = slash1 - p;
1384 else
1385 n = strlen(p);
1386 if (!n)
1387 die("Empty path component found in input");
1388 if (!slash1 && !S_ISDIR(mode) && subtree)
1389 die("Non-directories cannot have subtrees");
1391 for (i = 0; i < t->entry_count; i++) {
1392 e = t->entries[i];
1393 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1394 if (!slash1) {
1395 if (!S_ISDIR(mode)
1396 && e->versions[1].mode == mode
1397 && !hashcmp(e->versions[1].sha1, sha1))
1398 return 0;
1399 e->versions[1].mode = mode;
1400 hashcpy(e->versions[1].sha1, sha1);
1401 if (e->tree)
1402 release_tree_content_recursive(e->tree);
1403 e->tree = subtree;
1404 hashclr(root->versions[1].sha1);
1405 return 1;
1407 if (!S_ISDIR(e->versions[1].mode)) {
1408 e->tree = new_tree_content(8);
1409 e->versions[1].mode = S_IFDIR;
1411 if (!e->tree)
1412 load_tree(e);
1413 if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1414 hashclr(root->versions[1].sha1);
1415 return 1;
1417 return 0;
1421 if (t->entry_count == t->entry_capacity)
1422 root->tree = t = grow_tree_content(t, t->entry_count);
1423 e = new_tree_entry();
1424 e->name = to_atom(p, n);
1425 e->versions[0].mode = 0;
1426 hashclr(e->versions[0].sha1);
1427 t->entries[t->entry_count++] = e;
1428 if (slash1) {
1429 e->tree = new_tree_content(8);
1430 e->versions[1].mode = S_IFDIR;
1431 tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1432 } else {
1433 e->tree = subtree;
1434 e->versions[1].mode = mode;
1435 hashcpy(e->versions[1].sha1, sha1);
1437 hashclr(root->versions[1].sha1);
1438 return 1;
1441 static int tree_content_remove(
1442 struct tree_entry *root,
1443 const char *p,
1444 struct tree_entry *backup_leaf)
1446 struct tree_content *t = root->tree;
1447 const char *slash1;
1448 unsigned int i, n;
1449 struct tree_entry *e;
1451 slash1 = strchr(p, '/');
1452 if (slash1)
1453 n = slash1 - p;
1454 else
1455 n = strlen(p);
1457 for (i = 0; i < t->entry_count; i++) {
1458 e = t->entries[i];
1459 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1460 if (!slash1 || !S_ISDIR(e->versions[1].mode))
1461 goto del_entry;
1462 if (!e->tree)
1463 load_tree(e);
1464 if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1465 for (n = 0; n < e->tree->entry_count; n++) {
1466 if (e->tree->entries[n]->versions[1].mode) {
1467 hashclr(root->versions[1].sha1);
1468 return 1;
1471 backup_leaf = NULL;
1472 goto del_entry;
1474 return 0;
1477 return 0;
1479 del_entry:
1480 if (backup_leaf)
1481 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1482 else if (e->tree)
1483 release_tree_content_recursive(e->tree);
1484 e->tree = NULL;
1485 e->versions[1].mode = 0;
1486 hashclr(e->versions[1].sha1);
1487 hashclr(root->versions[1].sha1);
1488 return 1;
1491 static int tree_content_get(
1492 struct tree_entry *root,
1493 const char *p,
1494 struct tree_entry *leaf)
1496 struct tree_content *t = root->tree;
1497 const char *slash1;
1498 unsigned int i, n;
1499 struct tree_entry *e;
1501 slash1 = strchr(p, '/');
1502 if (slash1)
1503 n = slash1 - p;
1504 else
1505 n = strlen(p);
1507 for (i = 0; i < t->entry_count; i++) {
1508 e = t->entries[i];
1509 if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1510 if (!slash1) {
1511 memcpy(leaf, e, sizeof(*leaf));
1512 if (e->tree && is_null_sha1(e->versions[1].sha1))
1513 leaf->tree = dup_tree_content(e->tree);
1514 else
1515 leaf->tree = NULL;
1516 return 1;
1518 if (!S_ISDIR(e->versions[1].mode))
1519 return 0;
1520 if (!e->tree)
1521 load_tree(e);
1522 return tree_content_get(e, slash1 + 1, leaf);
1525 return 0;
1528 static int update_branch(struct branch *b)
1530 static const char *msg = "fast-import";
1531 struct ref_lock *lock;
1532 unsigned char old_sha1[20];
1534 if (is_null_sha1(b->sha1))
1535 return 0;
1536 if (read_ref(b->name, old_sha1))
1537 hashclr(old_sha1);
1538 lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1539 if (!lock)
1540 return error("Unable to lock %s", b->name);
1541 if (!force_update && !is_null_sha1(old_sha1)) {
1542 struct commit *old_cmit, *new_cmit;
1544 old_cmit = lookup_commit_reference_gently(old_sha1, 0);
1545 new_cmit = lookup_commit_reference_gently(b->sha1, 0);
1546 if (!old_cmit || !new_cmit) {
1547 unlock_ref(lock);
1548 return error("Branch %s is missing commits.", b->name);
1551 if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1552 unlock_ref(lock);
1553 warning("Not updating %s"
1554 " (new tip %s does not contain %s)",
1555 b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
1556 return -1;
1559 if (write_ref_sha1(lock, b->sha1, msg) < 0)
1560 return error("Unable to update %s", b->name);
1561 return 0;
1564 static void dump_branches(void)
1566 unsigned int i;
1567 struct branch *b;
1569 for (i = 0; i < branch_table_sz; i++) {
1570 for (b = branch_table[i]; b; b = b->table_next_branch)
1571 failure |= update_branch(b);
1575 static void dump_tags(void)
1577 static const char *msg = "fast-import";
1578 struct tag *t;
1579 struct ref_lock *lock;
1580 char ref_name[PATH_MAX];
1582 for (t = first_tag; t; t = t->next_tag) {
1583 sprintf(ref_name, "tags/%s", t->name);
1584 lock = lock_ref_sha1(ref_name, NULL);
1585 if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1586 failure |= error("Unable to update %s", ref_name);
1590 static void dump_marks_helper(FILE *f,
1591 uintmax_t base,
1592 struct mark_set *m)
1594 uintmax_t k;
1595 if (m->shift) {
1596 for (k = 0; k < 1024; k++) {
1597 if (m->data.sets[k])
1598 dump_marks_helper(f, (base + k) << m->shift,
1599 m->data.sets[k]);
1601 } else {
1602 for (k = 0; k < 1024; k++) {
1603 if (m->data.marked[k])
1604 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1605 sha1_to_hex(m->data.marked[k]->sha1));
1610 static void dump_marks(void)
1612 static struct lock_file mark_lock;
1613 int mark_fd;
1614 FILE *f;
1616 if (!export_marks_file)
1617 return;
1619 mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
1620 if (mark_fd < 0) {
1621 failure |= error("Unable to write marks file %s: %s",
1622 export_marks_file, strerror(errno));
1623 return;
1626 f = fdopen(mark_fd, "w");
1627 if (!f) {
1628 int saved_errno = errno;
1629 rollback_lock_file(&mark_lock);
1630 failure |= error("Unable to write marks file %s: %s",
1631 export_marks_file, strerror(saved_errno));
1632 return;
1636 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1637 * Assign -1 to the lock file descriptor so that commit_lock_file()
1638 * won't try to close() it.
1640 mark_lock.fd = -1;
1642 dump_marks_helper(f, 0, marks);
1643 if (ferror(f) || fclose(f)) {
1644 int saved_errno = errno;
1645 rollback_lock_file(&mark_lock);
1646 failure |= error("Unable to write marks file %s: %s",
1647 export_marks_file, strerror(saved_errno));
1648 return;
1651 if (commit_lock_file(&mark_lock)) {
1652 int saved_errno = errno;
1653 rollback_lock_file(&mark_lock);
1654 failure |= error("Unable to commit marks file %s: %s",
1655 export_marks_file, strerror(saved_errno));
1656 return;
1660 static void read_marks(void)
1662 char line[512];
1663 FILE *f = fopen(import_marks_file, "r");
1664 if (!f)
1665 die_errno("cannot read '%s'", import_marks_file);
1666 while (fgets(line, sizeof(line), f)) {
1667 uintmax_t mark;
1668 char *end;
1669 unsigned char sha1[20];
1670 struct object_entry *e;
1672 end = strchr(line, '\n');
1673 if (line[0] != ':' || !end)
1674 die("corrupt mark line: %s", line);
1675 *end = 0;
1676 mark = strtoumax(line + 1, &end, 10);
1677 if (!mark || end == line + 1
1678 || *end != ' ' || get_sha1(end + 1, sha1))
1679 die("corrupt mark line: %s", line);
1680 e = find_object(sha1);
1681 if (!e) {
1682 enum object_type type = sha1_object_info(sha1, NULL);
1683 if (type < 0)
1684 die("object not found: %s", sha1_to_hex(sha1));
1685 e = insert_object(sha1);
1686 e->type = type;
1687 e->pack_id = MAX_PACK_ID;
1688 e->offset = 1; /* just not zero! */
1690 insert_mark(mark, e);
1692 fclose(f);
1696 static int read_next_command(void)
1698 static int stdin_eof = 0;
1700 if (stdin_eof) {
1701 unread_command_buf = 0;
1702 return EOF;
1705 do {
1706 if (unread_command_buf) {
1707 unread_command_buf = 0;
1708 } else {
1709 struct recent_command *rc;
1711 strbuf_detach(&command_buf, NULL);
1712 stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
1713 if (stdin_eof)
1714 return EOF;
1716 if (!seen_data_command
1717 && prefixcmp(command_buf.buf, "feature ")
1718 && prefixcmp(command_buf.buf, "option ")) {
1719 parse_argv();
1722 rc = rc_free;
1723 if (rc)
1724 rc_free = rc->next;
1725 else {
1726 rc = cmd_hist.next;
1727 cmd_hist.next = rc->next;
1728 cmd_hist.next->prev = &cmd_hist;
1729 free(rc->buf);
1732 rc->buf = command_buf.buf;
1733 rc->prev = cmd_tail;
1734 rc->next = cmd_hist.prev;
1735 rc->prev->next = rc;
1736 cmd_tail = rc;
1738 } while (command_buf.buf[0] == '#');
1740 return 0;
1743 static void skip_optional_lf(void)
1745 int term_char = fgetc(stdin);
1746 if (term_char != '\n' && term_char != EOF)
1747 ungetc(term_char, stdin);
1750 static void parse_mark(void)
1752 if (!prefixcmp(command_buf.buf, "mark :")) {
1753 next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1754 read_next_command();
1756 else
1757 next_mark = 0;
1760 static void parse_data(struct strbuf *sb)
1762 strbuf_reset(sb);
1764 if (prefixcmp(command_buf.buf, "data "))
1765 die("Expected 'data n' command, found: %s", command_buf.buf);
1767 if (!prefixcmp(command_buf.buf + 5, "<<")) {
1768 char *term = xstrdup(command_buf.buf + 5 + 2);
1769 size_t term_len = command_buf.len - 5 - 2;
1771 strbuf_detach(&command_buf, NULL);
1772 for (;;) {
1773 if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1774 die("EOF in data (terminator '%s' not found)", term);
1775 if (term_len == command_buf.len
1776 && !strcmp(term, command_buf.buf))
1777 break;
1778 strbuf_addbuf(sb, &command_buf);
1779 strbuf_addch(sb, '\n');
1781 free(term);
1783 else {
1784 size_t n = 0, length;
1786 length = strtoul(command_buf.buf + 5, NULL, 10);
1788 while (n < length) {
1789 size_t s = strbuf_fread(sb, length - n, stdin);
1790 if (!s && feof(stdin))
1791 die("EOF in data (%lu bytes remaining)",
1792 (unsigned long)(length - n));
1793 n += s;
1797 skip_optional_lf();
1800 static int validate_raw_date(const char *src, char *result, int maxlen)
1802 const char *orig_src = src;
1803 char *endp;
1804 unsigned long num;
1806 errno = 0;
1808 num = strtoul(src, &endp, 10);
1809 /* NEEDSWORK: perhaps check for reasonable values? */
1810 if (errno || endp == src || *endp != ' ')
1811 return -1;
1813 src = endp + 1;
1814 if (*src != '-' && *src != '+')
1815 return -1;
1817 num = strtoul(src + 1, &endp, 10);
1818 if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
1819 1400 < num)
1820 return -1;
1822 strcpy(result, orig_src);
1823 return 0;
1826 static char *parse_ident(const char *buf)
1828 const char *gt;
1829 size_t name_len;
1830 char *ident;
1832 gt = strrchr(buf, '>');
1833 if (!gt)
1834 die("Missing > in ident string: %s", buf);
1835 gt++;
1836 if (*gt != ' ')
1837 die("Missing space after > in ident string: %s", buf);
1838 gt++;
1839 name_len = gt - buf;
1840 ident = xmalloc(name_len + 24);
1841 strncpy(ident, buf, name_len);
1843 switch (whenspec) {
1844 case WHENSPEC_RAW:
1845 if (validate_raw_date(gt, ident + name_len, 24) < 0)
1846 die("Invalid raw date \"%s\" in ident: %s", gt, buf);
1847 break;
1848 case WHENSPEC_RFC2822:
1849 if (parse_date(gt, ident + name_len, 24) < 0)
1850 die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
1851 break;
1852 case WHENSPEC_NOW:
1853 if (strcmp("now", gt))
1854 die("Date in ident must be 'now': %s", buf);
1855 datestamp(ident + name_len, 24);
1856 break;
1859 return ident;
1862 static void parse_new_blob(void)
1864 static struct strbuf buf = STRBUF_INIT;
1866 read_next_command();
1867 parse_mark();
1868 parse_data(&buf);
1869 store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1872 static void unload_one_branch(void)
1874 while (cur_active_branches
1875 && cur_active_branches >= max_active_branches) {
1876 uintmax_t min_commit = ULONG_MAX;
1877 struct branch *e, *l = NULL, *p = NULL;
1879 for (e = active_branches; e; e = e->active_next_branch) {
1880 if (e->last_commit < min_commit) {
1881 p = l;
1882 min_commit = e->last_commit;
1884 l = e;
1887 if (p) {
1888 e = p->active_next_branch;
1889 p->active_next_branch = e->active_next_branch;
1890 } else {
1891 e = active_branches;
1892 active_branches = e->active_next_branch;
1894 e->active = 0;
1895 e->active_next_branch = NULL;
1896 if (e->branch_tree.tree) {
1897 release_tree_content_recursive(e->branch_tree.tree);
1898 e->branch_tree.tree = NULL;
1900 cur_active_branches--;
1904 static void load_branch(struct branch *b)
1906 load_tree(&b->branch_tree);
1907 if (!b->active) {
1908 b->active = 1;
1909 b->active_next_branch = active_branches;
1910 active_branches = b;
1911 cur_active_branches++;
1912 branch_load_count++;
1916 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
1918 unsigned char fanout = 0;
1919 while ((num_notes >>= 8))
1920 fanout++;
1921 return fanout;
1924 static void construct_path_with_fanout(const char *hex_sha1,
1925 unsigned char fanout, char *path)
1927 unsigned int i = 0, j = 0;
1928 if (fanout >= 20)
1929 die("Too large fanout (%u)", fanout);
1930 while (fanout) {
1931 path[i++] = hex_sha1[j++];
1932 path[i++] = hex_sha1[j++];
1933 path[i++] = '/';
1934 fanout--;
1936 memcpy(path + i, hex_sha1 + j, 40 - j);
1937 path[i + 40 - j] = '\0';
1940 static uintmax_t do_change_note_fanout(
1941 struct tree_entry *orig_root, struct tree_entry *root,
1942 char *hex_sha1, unsigned int hex_sha1_len,
1943 char *fullpath, unsigned int fullpath_len,
1944 unsigned char fanout)
1946 struct tree_content *t = root->tree;
1947 struct tree_entry *e, leaf;
1948 unsigned int i, tmp_hex_sha1_len, tmp_fullpath_len;
1949 uintmax_t num_notes = 0;
1950 unsigned char sha1[20];
1951 char realpath[60];
1953 for (i = 0; t && i < t->entry_count; i++) {
1954 e = t->entries[i];
1955 tmp_hex_sha1_len = hex_sha1_len + e->name->str_len;
1956 tmp_fullpath_len = fullpath_len;
1959 * We're interested in EITHER existing note entries (entries
1960 * with exactly 40 hex chars in path, not including directory
1961 * separators), OR directory entries that may contain note
1962 * entries (with < 40 hex chars in path).
1963 * Also, each path component in a note entry must be a multiple
1964 * of 2 chars.
1966 if (!e->versions[1].mode ||
1967 tmp_hex_sha1_len > 40 ||
1968 e->name->str_len % 2)
1969 continue;
1971 /* This _may_ be a note entry, or a subdir containing notes */
1972 memcpy(hex_sha1 + hex_sha1_len, e->name->str_dat,
1973 e->name->str_len);
1974 if (tmp_fullpath_len)
1975 fullpath[tmp_fullpath_len++] = '/';
1976 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
1977 e->name->str_len);
1978 tmp_fullpath_len += e->name->str_len;
1979 fullpath[tmp_fullpath_len] = '\0';
1981 if (tmp_hex_sha1_len == 40 && !get_sha1_hex(hex_sha1, sha1)) {
1982 /* This is a note entry */
1983 construct_path_with_fanout(hex_sha1, fanout, realpath);
1984 if (!strcmp(fullpath, realpath)) {
1985 /* Note entry is in correct location */
1986 num_notes++;
1987 continue;
1990 /* Rename fullpath to realpath */
1991 if (!tree_content_remove(orig_root, fullpath, &leaf))
1992 die("Failed to remove path %s", fullpath);
1993 tree_content_set(orig_root, realpath,
1994 leaf.versions[1].sha1,
1995 leaf.versions[1].mode,
1996 leaf.tree);
1997 } else if (S_ISDIR(e->versions[1].mode)) {
1998 /* This is a subdir that may contain note entries */
1999 if (!e->tree)
2000 load_tree(e);
2001 num_notes += do_change_note_fanout(orig_root, e,
2002 hex_sha1, tmp_hex_sha1_len,
2003 fullpath, tmp_fullpath_len, fanout);
2006 /* The above may have reallocated the current tree_content */
2007 t = root->tree;
2009 return num_notes;
2012 static uintmax_t change_note_fanout(struct tree_entry *root,
2013 unsigned char fanout)
2015 char hex_sha1[40], path[60];
2016 return do_change_note_fanout(root, root, hex_sha1, 0, path, 0, fanout);
2019 static void file_change_m(struct branch *b)
2021 const char *p = command_buf.buf + 2;
2022 static struct strbuf uq = STRBUF_INIT;
2023 const char *endp;
2024 struct object_entry *oe = oe;
2025 unsigned char sha1[20];
2026 uint16_t mode, inline_data = 0;
2028 p = get_mode(p, &mode);
2029 if (!p)
2030 die("Corrupt mode: %s", command_buf.buf);
2031 switch (mode) {
2032 case 0644:
2033 case 0755:
2034 mode |= S_IFREG;
2035 case S_IFREG | 0644:
2036 case S_IFREG | 0755:
2037 case S_IFLNK:
2038 case S_IFGITLINK:
2039 /* ok */
2040 break;
2041 default:
2042 die("Corrupt mode: %s", command_buf.buf);
2045 if (*p == ':') {
2046 char *x;
2047 oe = find_mark(strtoumax(p + 1, &x, 10));
2048 hashcpy(sha1, oe->sha1);
2049 p = x;
2050 } else if (!prefixcmp(p, "inline")) {
2051 inline_data = 1;
2052 p += 6;
2053 } else {
2054 if (get_sha1_hex(p, sha1))
2055 die("Invalid SHA1: %s", command_buf.buf);
2056 oe = find_object(sha1);
2057 p += 40;
2059 if (*p++ != ' ')
2060 die("Missing space after SHA1: %s", command_buf.buf);
2062 strbuf_reset(&uq);
2063 if (!unquote_c_style(&uq, p, &endp)) {
2064 if (*endp)
2065 die("Garbage after path in: %s", command_buf.buf);
2066 p = uq.buf;
2069 if (S_ISGITLINK(mode)) {
2070 if (inline_data)
2071 die("Git links cannot be specified 'inline': %s",
2072 command_buf.buf);
2073 else if (oe) {
2074 if (oe->type != OBJ_COMMIT)
2075 die("Not a commit (actually a %s): %s",
2076 typename(oe->type), command_buf.buf);
2079 * Accept the sha1 without checking; it expected to be in
2080 * another repository.
2082 } else if (inline_data) {
2083 static struct strbuf buf = STRBUF_INIT;
2085 if (p != uq.buf) {
2086 strbuf_addstr(&uq, p);
2087 p = uq.buf;
2089 read_next_command();
2090 parse_data(&buf);
2091 store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
2092 } else if (oe) {
2093 if (oe->type != OBJ_BLOB)
2094 die("Not a blob (actually a %s): %s",
2095 typename(oe->type), command_buf.buf);
2096 } else {
2097 enum object_type type = sha1_object_info(sha1, NULL);
2098 if (type < 0)
2099 die("Blob not found: %s", command_buf.buf);
2100 if (type != OBJ_BLOB)
2101 die("Not a blob (actually a %s): %s",
2102 typename(type), command_buf.buf);
2105 tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
2108 static void file_change_d(struct branch *b)
2110 const char *p = command_buf.buf + 2;
2111 static struct strbuf uq = STRBUF_INIT;
2112 const char *endp;
2114 strbuf_reset(&uq);
2115 if (!unquote_c_style(&uq, p, &endp)) {
2116 if (*endp)
2117 die("Garbage after path in: %s", command_buf.buf);
2118 p = uq.buf;
2120 tree_content_remove(&b->branch_tree, p, NULL);
2123 static void file_change_cr(struct branch *b, int rename)
2125 const char *s, *d;
2126 static struct strbuf s_uq = STRBUF_INIT;
2127 static struct strbuf d_uq = STRBUF_INIT;
2128 const char *endp;
2129 struct tree_entry leaf;
2131 s = command_buf.buf + 2;
2132 strbuf_reset(&s_uq);
2133 if (!unquote_c_style(&s_uq, s, &endp)) {
2134 if (*endp != ' ')
2135 die("Missing space after source: %s", command_buf.buf);
2136 } else {
2137 endp = strchr(s, ' ');
2138 if (!endp)
2139 die("Missing space after source: %s", command_buf.buf);
2140 strbuf_add(&s_uq, s, endp - s);
2142 s = s_uq.buf;
2144 endp++;
2145 if (!*endp)
2146 die("Missing dest: %s", command_buf.buf);
2148 d = endp;
2149 strbuf_reset(&d_uq);
2150 if (!unquote_c_style(&d_uq, d, &endp)) {
2151 if (*endp)
2152 die("Garbage after dest in: %s", command_buf.buf);
2153 d = d_uq.buf;
2156 memset(&leaf, 0, sizeof(leaf));
2157 if (rename)
2158 tree_content_remove(&b->branch_tree, s, &leaf);
2159 else
2160 tree_content_get(&b->branch_tree, s, &leaf);
2161 if (!leaf.versions[1].mode)
2162 die("Path %s not in branch", s);
2163 tree_content_set(&b->branch_tree, d,
2164 leaf.versions[1].sha1,
2165 leaf.versions[1].mode,
2166 leaf.tree);
2169 static void note_change_n(struct branch *b, unsigned char old_fanout)
2171 const char *p = command_buf.buf + 2;
2172 static struct strbuf uq = STRBUF_INIT;
2173 struct object_entry *oe = oe;
2174 struct branch *s;
2175 unsigned char sha1[20], commit_sha1[20];
2176 char path[60];
2177 uint16_t inline_data = 0;
2178 unsigned char new_fanout;
2180 /* <dataref> or 'inline' */
2181 if (*p == ':') {
2182 char *x;
2183 oe = find_mark(strtoumax(p + 1, &x, 10));
2184 hashcpy(sha1, oe->sha1);
2185 p = x;
2186 } else if (!prefixcmp(p, "inline")) {
2187 inline_data = 1;
2188 p += 6;
2189 } else {
2190 if (get_sha1_hex(p, sha1))
2191 die("Invalid SHA1: %s", command_buf.buf);
2192 oe = find_object(sha1);
2193 p += 40;
2195 if (*p++ != ' ')
2196 die("Missing space after SHA1: %s", command_buf.buf);
2198 /* <committish> */
2199 s = lookup_branch(p);
2200 if (s) {
2201 hashcpy(commit_sha1, s->sha1);
2202 } else if (*p == ':') {
2203 uintmax_t commit_mark = strtoumax(p + 1, NULL, 10);
2204 struct object_entry *commit_oe = find_mark(commit_mark);
2205 if (commit_oe->type != OBJ_COMMIT)
2206 die("Mark :%" PRIuMAX " not a commit", commit_mark);
2207 hashcpy(commit_sha1, commit_oe->sha1);
2208 } else if (!get_sha1(p, commit_sha1)) {
2209 unsigned long size;
2210 char *buf = read_object_with_reference(commit_sha1,
2211 commit_type, &size, commit_sha1);
2212 if (!buf || size < 46)
2213 die("Not a valid commit: %s", p);
2214 free(buf);
2215 } else
2216 die("Invalid ref name or SHA1 expression: %s", p);
2218 if (inline_data) {
2219 static struct strbuf buf = STRBUF_INIT;
2221 if (p != uq.buf) {
2222 strbuf_addstr(&uq, p);
2223 p = uq.buf;
2225 read_next_command();
2226 parse_data(&buf);
2227 store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
2228 } else if (oe) {
2229 if (oe->type != OBJ_BLOB)
2230 die("Not a blob (actually a %s): %s",
2231 typename(oe->type), command_buf.buf);
2232 } else if (!is_null_sha1(sha1)) {
2233 enum object_type type = sha1_object_info(sha1, NULL);
2234 if (type < 0)
2235 die("Blob not found: %s", command_buf.buf);
2236 if (type != OBJ_BLOB)
2237 die("Not a blob (actually a %s): %s",
2238 typename(type), command_buf.buf);
2241 construct_path_with_fanout(sha1_to_hex(commit_sha1), old_fanout, path);
2242 if (tree_content_remove(&b->branch_tree, path, NULL))
2243 b->num_notes--;
2245 if (is_null_sha1(sha1))
2246 return; /* nothing to insert */
2248 b->num_notes++;
2249 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2250 construct_path_with_fanout(sha1_to_hex(commit_sha1), new_fanout, path);
2251 tree_content_set(&b->branch_tree, path, sha1, S_IFREG | 0644, NULL);
2254 static void file_change_deleteall(struct branch *b)
2256 release_tree_content_recursive(b->branch_tree.tree);
2257 hashclr(b->branch_tree.versions[0].sha1);
2258 hashclr(b->branch_tree.versions[1].sha1);
2259 load_tree(&b->branch_tree);
2260 b->num_notes = 0;
2263 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2265 if (!buf || size < 46)
2266 die("Not a valid commit: %s", sha1_to_hex(b->sha1));
2267 if (memcmp("tree ", buf, 5)
2268 || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
2269 die("The commit %s is corrupt", sha1_to_hex(b->sha1));
2270 hashcpy(b->branch_tree.versions[0].sha1,
2271 b->branch_tree.versions[1].sha1);
2274 static void parse_from_existing(struct branch *b)
2276 if (is_null_sha1(b->sha1)) {
2277 hashclr(b->branch_tree.versions[0].sha1);
2278 hashclr(b->branch_tree.versions[1].sha1);
2279 } else {
2280 unsigned long size;
2281 char *buf;
2283 buf = read_object_with_reference(b->sha1,
2284 commit_type, &size, b->sha1);
2285 parse_from_commit(b, buf, size);
2286 free(buf);
2290 static int parse_from(struct branch *b)
2292 const char *from;
2293 struct branch *s;
2295 if (prefixcmp(command_buf.buf, "from "))
2296 return 0;
2298 if (b->branch_tree.tree) {
2299 release_tree_content_recursive(b->branch_tree.tree);
2300 b->branch_tree.tree = NULL;
2303 from = strchr(command_buf.buf, ' ') + 1;
2304 s = lookup_branch(from);
2305 if (b == s)
2306 die("Can't create a branch from itself: %s", b->name);
2307 else if (s) {
2308 unsigned char *t = s->branch_tree.versions[1].sha1;
2309 hashcpy(b->sha1, s->sha1);
2310 hashcpy(b->branch_tree.versions[0].sha1, t);
2311 hashcpy(b->branch_tree.versions[1].sha1, t);
2312 } else if (*from == ':') {
2313 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2314 struct object_entry *oe = find_mark(idnum);
2315 if (oe->type != OBJ_COMMIT)
2316 die("Mark :%" PRIuMAX " not a commit", idnum);
2317 hashcpy(b->sha1, oe->sha1);
2318 if (oe->pack_id != MAX_PACK_ID) {
2319 unsigned long size;
2320 char *buf = gfi_unpack_entry(oe, &size);
2321 parse_from_commit(b, buf, size);
2322 free(buf);
2323 } else
2324 parse_from_existing(b);
2325 } else if (!get_sha1(from, b->sha1))
2326 parse_from_existing(b);
2327 else
2328 die("Invalid ref name or SHA1 expression: %s", from);
2330 read_next_command();
2331 return 1;
2334 static struct hash_list *parse_merge(unsigned int *count)
2336 struct hash_list *list = NULL, *n, *e = e;
2337 const char *from;
2338 struct branch *s;
2340 *count = 0;
2341 while (!prefixcmp(command_buf.buf, "merge ")) {
2342 from = strchr(command_buf.buf, ' ') + 1;
2343 n = xmalloc(sizeof(*n));
2344 s = lookup_branch(from);
2345 if (s)
2346 hashcpy(n->sha1, s->sha1);
2347 else if (*from == ':') {
2348 uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2349 struct object_entry *oe = find_mark(idnum);
2350 if (oe->type != OBJ_COMMIT)
2351 die("Mark :%" PRIuMAX " not a commit", idnum);
2352 hashcpy(n->sha1, oe->sha1);
2353 } else if (!get_sha1(from, n->sha1)) {
2354 unsigned long size;
2355 char *buf = read_object_with_reference(n->sha1,
2356 commit_type, &size, n->sha1);
2357 if (!buf || size < 46)
2358 die("Not a valid commit: %s", from);
2359 free(buf);
2360 } else
2361 die("Invalid ref name or SHA1 expression: %s", from);
2363 n->next = NULL;
2364 if (list)
2365 e->next = n;
2366 else
2367 list = n;
2368 e = n;
2369 (*count)++;
2370 read_next_command();
2372 return list;
2375 static void parse_new_commit(void)
2377 static struct strbuf msg = STRBUF_INIT;
2378 struct branch *b;
2379 char *sp;
2380 char *author = NULL;
2381 char *committer = NULL;
2382 struct hash_list *merge_list = NULL;
2383 unsigned int merge_count;
2384 unsigned char prev_fanout, new_fanout;
2386 /* Obtain the branch name from the rest of our command */
2387 sp = strchr(command_buf.buf, ' ') + 1;
2388 b = lookup_branch(sp);
2389 if (!b)
2390 b = new_branch(sp);
2392 read_next_command();
2393 parse_mark();
2394 if (!prefixcmp(command_buf.buf, "author ")) {
2395 author = parse_ident(command_buf.buf + 7);
2396 read_next_command();
2398 if (!prefixcmp(command_buf.buf, "committer ")) {
2399 committer = parse_ident(command_buf.buf + 10);
2400 read_next_command();
2402 if (!committer)
2403 die("Expected committer but didn't get one");
2404 parse_data(&msg);
2405 read_next_command();
2406 parse_from(b);
2407 merge_list = parse_merge(&merge_count);
2409 /* ensure the branch is active/loaded */
2410 if (!b->branch_tree.tree || !max_active_branches) {
2411 unload_one_branch();
2412 load_branch(b);
2415 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2417 /* file_change* */
2418 while (command_buf.len > 0) {
2419 if (!prefixcmp(command_buf.buf, "M "))
2420 file_change_m(b);
2421 else if (!prefixcmp(command_buf.buf, "D "))
2422 file_change_d(b);
2423 else if (!prefixcmp(command_buf.buf, "R "))
2424 file_change_cr(b, 1);
2425 else if (!prefixcmp(command_buf.buf, "C "))
2426 file_change_cr(b, 0);
2427 else if (!prefixcmp(command_buf.buf, "N "))
2428 note_change_n(b, prev_fanout);
2429 else if (!strcmp("deleteall", command_buf.buf))
2430 file_change_deleteall(b);
2431 else {
2432 unread_command_buf = 1;
2433 break;
2435 if (read_next_command() == EOF)
2436 break;
2439 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2440 if (new_fanout != prev_fanout)
2441 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2443 /* build the tree and the commit */
2444 store_tree(&b->branch_tree);
2445 hashcpy(b->branch_tree.versions[0].sha1,
2446 b->branch_tree.versions[1].sha1);
2448 strbuf_reset(&new_data);
2449 strbuf_addf(&new_data, "tree %s\n",
2450 sha1_to_hex(b->branch_tree.versions[1].sha1));
2451 if (!is_null_sha1(b->sha1))
2452 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2453 while (merge_list) {
2454 struct hash_list *next = merge_list->next;
2455 strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2456 free(merge_list);
2457 merge_list = next;
2459 strbuf_addf(&new_data,
2460 "author %s\n"
2461 "committer %s\n"
2462 "\n",
2463 author ? author : committer, committer);
2464 strbuf_addbuf(&new_data, &msg);
2465 free(author);
2466 free(committer);
2468 if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2469 b->pack_id = pack_id;
2470 b->last_commit = object_count_by_type[OBJ_COMMIT];
2473 static void parse_new_tag(void)
2475 static struct strbuf msg = STRBUF_INIT;
2476 char *sp;
2477 const char *from;
2478 char *tagger;
2479 struct branch *s;
2480 struct tag *t;
2481 uintmax_t from_mark = 0;
2482 unsigned char sha1[20];
2483 enum object_type type;
2485 /* Obtain the new tag name from the rest of our command */
2486 sp = strchr(command_buf.buf, ' ') + 1;
2487 t = pool_alloc(sizeof(struct tag));
2488 t->next_tag = NULL;
2489 t->name = pool_strdup(sp);
2490 if (last_tag)
2491 last_tag->next_tag = t;
2492 else
2493 first_tag = t;
2494 last_tag = t;
2495 read_next_command();
2497 /* from ... */
2498 if (prefixcmp(command_buf.buf, "from "))
2499 die("Expected from command, got %s", command_buf.buf);
2500 from = strchr(command_buf.buf, ' ') + 1;
2501 s = lookup_branch(from);
2502 if (s) {
2503 hashcpy(sha1, s->sha1);
2504 type = OBJ_COMMIT;
2505 } else if (*from == ':') {
2506 struct object_entry *oe;
2507 from_mark = strtoumax(from + 1, NULL, 10);
2508 oe = find_mark(from_mark);
2509 type = oe->type;
2510 hashcpy(sha1, oe->sha1);
2511 } else if (!get_sha1(from, sha1)) {
2512 unsigned long size;
2513 char *buf;
2515 buf = read_sha1_file(sha1, &type, &size);
2516 if (!buf || size < 46)
2517 die("Not a valid commit: %s", from);
2518 free(buf);
2519 } else
2520 die("Invalid ref name or SHA1 expression: %s", from);
2521 read_next_command();
2523 /* tagger ... */
2524 if (!prefixcmp(command_buf.buf, "tagger ")) {
2525 tagger = parse_ident(command_buf.buf + 7);
2526 read_next_command();
2527 } else
2528 tagger = NULL;
2530 /* tag payload/message */
2531 parse_data(&msg);
2533 /* build the tag object */
2534 strbuf_reset(&new_data);
2536 strbuf_addf(&new_data,
2537 "object %s\n"
2538 "type %s\n"
2539 "tag %s\n",
2540 sha1_to_hex(sha1), typename(type), t->name);
2541 if (tagger)
2542 strbuf_addf(&new_data,
2543 "tagger %s\n", tagger);
2544 strbuf_addch(&new_data, '\n');
2545 strbuf_addbuf(&new_data, &msg);
2546 free(tagger);
2548 if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2549 t->pack_id = MAX_PACK_ID;
2550 else
2551 t->pack_id = pack_id;
2554 static void parse_reset_branch(void)
2556 struct branch *b;
2557 char *sp;
2559 /* Obtain the branch name from the rest of our command */
2560 sp = strchr(command_buf.buf, ' ') + 1;
2561 b = lookup_branch(sp);
2562 if (b) {
2563 hashclr(b->sha1);
2564 hashclr(b->branch_tree.versions[0].sha1);
2565 hashclr(b->branch_tree.versions[1].sha1);
2566 if (b->branch_tree.tree) {
2567 release_tree_content_recursive(b->branch_tree.tree);
2568 b->branch_tree.tree = NULL;
2571 else
2572 b = new_branch(sp);
2573 read_next_command();
2574 parse_from(b);
2575 if (command_buf.len > 0)
2576 unread_command_buf = 1;
2579 static void parse_checkpoint(void)
2581 if (object_count) {
2582 cycle_packfile();
2583 dump_branches();
2584 dump_tags();
2585 dump_marks();
2587 skip_optional_lf();
2590 static void parse_progress(void)
2592 fwrite(command_buf.buf, 1, command_buf.len, stdout);
2593 fputc('\n', stdout);
2594 fflush(stdout);
2595 skip_optional_lf();
2598 static char* make_fast_import_path(const char *path)
2600 struct strbuf abs_path = STRBUF_INIT;
2602 if (!relative_marks_paths || is_absolute_path(path))
2603 return xstrdup(path);
2604 strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
2605 return strbuf_detach(&abs_path, NULL);
2608 static void option_import_marks(const char *marks, int from_stream)
2610 if (import_marks_file) {
2611 if (from_stream)
2612 die("Only one import-marks command allowed per stream");
2614 /* read previous mark file */
2615 if(!import_marks_file_from_stream)
2616 read_marks();
2619 import_marks_file = make_fast_import_path(marks);
2620 import_marks_file_from_stream = from_stream;
2623 static void option_date_format(const char *fmt)
2625 if (!strcmp(fmt, "raw"))
2626 whenspec = WHENSPEC_RAW;
2627 else if (!strcmp(fmt, "rfc2822"))
2628 whenspec = WHENSPEC_RFC2822;
2629 else if (!strcmp(fmt, "now"))
2630 whenspec = WHENSPEC_NOW;
2631 else
2632 die("unknown --date-format argument %s", fmt);
2635 static void option_max_pack_size(const char *packsize)
2637 max_packsize = strtoumax(packsize, NULL, 0) * 1024 * 1024;
2640 static void option_depth(const char *depth)
2642 max_depth = strtoul(depth, NULL, 0);
2643 if (max_depth > MAX_DEPTH)
2644 die("--depth cannot exceed %u", MAX_DEPTH);
2647 static void option_active_branches(const char *branches)
2649 max_active_branches = strtoul(branches, NULL, 0);
2652 static void option_export_marks(const char *marks)
2654 export_marks_file = make_fast_import_path(marks);
2657 static void option_export_pack_edges(const char *edges)
2659 if (pack_edges)
2660 fclose(pack_edges);
2661 pack_edges = fopen(edges, "a");
2662 if (!pack_edges)
2663 die_errno("Cannot open '%s'", edges);
2666 static int parse_one_option(const char *option)
2668 if (!prefixcmp(option, "max-pack-size=")) {
2669 option_max_pack_size(option + 14);
2670 } else if (!prefixcmp(option, "depth=")) {
2671 option_depth(option + 6);
2672 } else if (!prefixcmp(option, "active-branches=")) {
2673 option_active_branches(option + 16);
2674 } else if (!prefixcmp(option, "export-pack-edges=")) {
2675 option_export_pack_edges(option + 18);
2676 } else if (!prefixcmp(option, "quiet")) {
2677 show_stats = 0;
2678 } else if (!prefixcmp(option, "stats")) {
2679 show_stats = 1;
2680 } else {
2681 return 0;
2684 return 1;
2687 static int parse_one_feature(const char *feature, int from_stream)
2689 if (!prefixcmp(feature, "date-format=")) {
2690 option_date_format(feature + 12);
2691 } else if (!prefixcmp(feature, "import-marks=")) {
2692 option_import_marks(feature + 13, from_stream);
2693 } else if (!prefixcmp(feature, "export-marks=")) {
2694 option_export_marks(feature + 13);
2695 } else if (!prefixcmp(feature, "relative-marks")) {
2696 relative_marks_paths = 1;
2697 } else if (!prefixcmp(feature, "no-relative-marks")) {
2698 relative_marks_paths = 0;
2699 } else if (!prefixcmp(feature, "force")) {
2700 force_update = 1;
2701 } else {
2702 return 0;
2705 return 1;
2708 static void parse_feature(void)
2710 char *feature = command_buf.buf + 8;
2712 if (seen_data_command)
2713 die("Got feature command '%s' after data command", feature);
2715 if (parse_one_feature(feature, 1))
2716 return;
2718 die("This version of fast-import does not support feature %s.", feature);
2721 static void parse_option(void)
2723 char *option = command_buf.buf + 11;
2725 if (seen_data_command)
2726 die("Got option command '%s' after data command", option);
2728 if (parse_one_option(option))
2729 return;
2731 die("This version of fast-import does not support option: %s", option);
2734 static int git_pack_config(const char *k, const char *v, void *cb)
2736 if (!strcmp(k, "pack.depth")) {
2737 max_depth = git_config_int(k, v);
2738 if (max_depth > MAX_DEPTH)
2739 max_depth = MAX_DEPTH;
2740 return 0;
2742 if (!strcmp(k, "pack.compression")) {
2743 int level = git_config_int(k, v);
2744 if (level == -1)
2745 level = Z_DEFAULT_COMPRESSION;
2746 else if (level < 0 || level > Z_BEST_COMPRESSION)
2747 die("bad pack compression level %d", level);
2748 pack_compression_level = level;
2749 pack_compression_seen = 1;
2750 return 0;
2752 return git_default_config(k, v, cb);
2755 static const char fast_import_usage[] =
2756 "git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2758 static void parse_argv(void)
2760 unsigned int i;
2762 for (i = 1; i < global_argc; i++) {
2763 const char *a = global_argv[i];
2765 if (*a != '-' || !strcmp(a, "--"))
2766 break;
2768 if (parse_one_option(a + 2))
2769 continue;
2771 if (parse_one_feature(a + 2, 0))
2772 continue;
2774 die("unknown option %s", a);
2776 if (i != global_argc)
2777 usage(fast_import_usage);
2779 seen_data_command = 1;
2780 if (import_marks_file)
2781 read_marks();
2784 int main(int argc, const char **argv)
2786 unsigned int i;
2788 git_extract_argv0_path(argv[0]);
2790 if (argc == 2 && !strcmp(argv[1], "-h"))
2791 usage(fast_import_usage);
2793 setup_git_directory();
2794 git_config(git_pack_config, NULL);
2795 if (!pack_compression_seen && core_compression_seen)
2796 pack_compression_level = core_compression_level;
2798 alloc_objects(object_entry_alloc);
2799 strbuf_init(&command_buf, 0);
2800 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
2801 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
2802 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
2803 marks = pool_calloc(1, sizeof(struct mark_set));
2805 global_argc = argc;
2806 global_argv = argv;
2808 rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
2809 for (i = 0; i < (cmd_save - 1); i++)
2810 rc_free[i].next = &rc_free[i + 1];
2811 rc_free[cmd_save - 1].next = NULL;
2813 prepare_packed_git();
2814 start_packfile();
2815 set_die_routine(die_nicely);
2816 while (read_next_command() != EOF) {
2817 if (!strcmp("blob", command_buf.buf))
2818 parse_new_blob();
2819 else if (!prefixcmp(command_buf.buf, "commit "))
2820 parse_new_commit();
2821 else if (!prefixcmp(command_buf.buf, "tag "))
2822 parse_new_tag();
2823 else if (!prefixcmp(command_buf.buf, "reset "))
2824 parse_reset_branch();
2825 else if (!strcmp("checkpoint", command_buf.buf))
2826 parse_checkpoint();
2827 else if (!prefixcmp(command_buf.buf, "progress "))
2828 parse_progress();
2829 else if (!prefixcmp(command_buf.buf, "feature "))
2830 parse_feature();
2831 else if (!prefixcmp(command_buf.buf, "option git "))
2832 parse_option();
2833 else if (!prefixcmp(command_buf.buf, "option "))
2834 /* ignore non-git options*/;
2835 else
2836 die("Unsupported command: %s", command_buf.buf);
2839 /* argv hasn't been parsed yet, do so */
2840 if (!seen_data_command)
2841 parse_argv();
2843 end_packfile();
2845 dump_branches();
2846 dump_tags();
2847 unkeep_all_packs();
2848 dump_marks();
2850 if (pack_edges)
2851 fclose(pack_edges);
2853 if (show_stats) {
2854 uintmax_t total_count = 0, duplicate_count = 0;
2855 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
2856 total_count += object_count_by_type[i];
2857 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
2858 duplicate_count += duplicate_count_by_type[i];
2860 fprintf(stderr, "%s statistics:\n", argv[0]);
2861 fprintf(stderr, "---------------------------------------------------------------------\n");
2862 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
2863 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
2864 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]);
2865 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]);
2866 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]);
2867 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]);
2868 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
2869 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2870 fprintf(stderr, " atoms: %10u\n", atom_cnt);
2871 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2872 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024));
2873 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2874 fprintf(stderr, "---------------------------------------------------------------------\n");
2875 pack_report();
2876 fprintf(stderr, "---------------------------------------------------------------------\n");
2877 fprintf(stderr, "\n");
2880 return failure ? 1 : 0;