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 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
143 comment ::= '#' not_lf* lf;
144 not_lf ::= # Any byte that is not ASCII newline (LF);
156 #include "csum-file.h"
158 #include "exec_cmd.h"
161 #define PACK_ID_BITS 16
162 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
163 #define DEPTH_BITS 13
164 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
168 struct pack_idx_entry idx
;
169 struct object_entry
*next
;
170 uint32_t type
: TYPE_BITS
,
171 pack_id
: PACK_ID_BITS
,
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 */
186 struct object_entry
*marked
[1024];
187 struct mark_set
*sets
[1024];
197 unsigned no_swap
: 1;
202 struct mem_pool
*next_pool
;
205 uintmax_t space
[FLEX_ARRAY
]; /* more */
210 struct atom_str
*next_atom
;
211 unsigned short str_len
;
212 char str_dat
[FLEX_ARRAY
]; /* more */
218 struct tree_content
*tree
;
219 struct atom_str
*name
;
223 unsigned char sha1
[20];
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
;
243 struct branch
*table_next_branch
;
244 struct branch
*active_next_branch
;
246 struct tree_entry branch_tree
;
247 uintmax_t last_commit
;
250 unsigned pack_id
: PACK_ID_BITS
;
251 unsigned char sha1
[20];
256 struct tag
*next_tag
;
258 unsigned int pack_id
;
259 unsigned char sha1
[20];
264 struct hash_list
*next
;
265 unsigned char sha1
[20];
274 struct recent_command
276 struct recent_command
*prev
;
277 struct recent_command
*next
;
281 /* Configured limits on output */
282 static unsigned long max_depth
= 10;
283 static off_t max_packsize
;
284 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
285 static int force_update
;
286 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
287 static int pack_compression_seen
;
289 /* Stats and misc. counters */
290 static uintmax_t alloc_count
;
291 static uintmax_t marks_set_count
;
292 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
294 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
295 static unsigned long object_count
;
296 static unsigned long branch_count
;
297 static unsigned long branch_load_count
;
299 static FILE *pack_edges
;
300 static unsigned int show_stats
= 1;
301 static int global_argc
;
302 static const char **global_argv
;
305 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
306 static size_t total_allocd
;
307 static struct mem_pool
*mem_pool
;
309 /* Atom management */
310 static unsigned int atom_table_sz
= 4451;
311 static unsigned int atom_cnt
;
312 static struct atom_str
**atom_table
;
314 /* The .pack file being generated */
315 static unsigned int pack_id
;
316 static struct sha1file
*pack_file
;
317 static struct packed_git
*pack_data
;
318 static struct packed_git
**all_packs
;
319 static off_t pack_size
;
321 /* Table of objects we've written. */
322 static unsigned int object_entry_alloc
= 5000;
323 static struct object_entry_pool
*blocks
;
324 static struct object_entry
*object_table
[1 << 16];
325 static struct mark_set
*marks
;
326 static const char *export_marks_file
;
327 static const char *import_marks_file
;
328 static int import_marks_file_from_stream
;
329 static int relative_marks_paths
;
332 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
334 /* Tree management */
335 static unsigned int tree_entry_alloc
= 1000;
336 static void *avail_tree_entry
;
337 static unsigned int avail_tree_table_sz
= 100;
338 static struct avail_tree_content
**avail_tree_table
;
339 static struct strbuf old_tree
= STRBUF_INIT
;
340 static struct strbuf new_tree
= STRBUF_INIT
;
343 static unsigned long max_active_branches
= 5;
344 static unsigned long cur_active_branches
;
345 static unsigned long branch_table_sz
= 1039;
346 static struct branch
**branch_table
;
347 static struct branch
*active_branches
;
350 static struct tag
*first_tag
;
351 static struct tag
*last_tag
;
353 /* Input stream parsing */
354 static whenspec_type whenspec
= WHENSPEC_RAW
;
355 static struct strbuf command_buf
= STRBUF_INIT
;
356 static int unread_command_buf
;
357 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
358 static struct recent_command
*cmd_tail
= &cmd_hist
;
359 static struct recent_command
*rc_free
;
360 static unsigned int cmd_save
= 100;
361 static uintmax_t next_mark
;
362 static struct strbuf new_data
= STRBUF_INIT
;
363 static int seen_data_command
;
365 /* Signal handling */
366 static volatile sig_atomic_t checkpoint_requested
;
368 static void parse_argv(void);
370 static void write_branch_report(FILE *rpt
, struct branch
*b
)
372 fprintf(rpt
, "%s:\n", b
->name
);
374 fprintf(rpt
, " status :");
376 fputs(" active", rpt
);
377 if (b
->branch_tree
.tree
)
378 fputs(" loaded", rpt
);
379 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
380 fputs(" dirty", rpt
);
383 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
384 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
385 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
386 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
388 fputs(" last pack : ", rpt
);
389 if (b
->pack_id
< MAX_PACK_ID
)
390 fprintf(rpt
, "%u", b
->pack_id
);
396 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
398 static void write_crash_report(const char *err
)
400 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
401 FILE *rpt
= fopen(loc
, "w");
404 struct recent_command
*rc
;
407 error("can't write crash report %s: %s", loc
, strerror(errno
));
411 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
413 fprintf(rpt
, "fast-import crash report:\n");
414 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
415 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
416 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
419 fputs("fatal: ", rpt
);
424 fputs("Most Recent Commands Before Crash\n", rpt
);
425 fputs("---------------------------------\n", rpt
);
426 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
427 if (rc
->next
== &cmd_hist
)
436 fputs("Active Branch LRU\n", rpt
);
437 fputs("-----------------\n", rpt
);
438 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
440 max_active_branches
);
442 fputs(" pos clock name\n", rpt
);
443 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
444 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
445 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
446 ++lu
, b
->last_commit
, b
->name
);
449 fputs("Inactive Branches\n", rpt
);
450 fputs("-----------------\n", rpt
);
451 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
452 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
453 write_branch_report(rpt
, b
);
459 fputs("Annotated Tags\n", rpt
);
460 fputs("--------------\n", rpt
);
461 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
462 fputs(sha1_to_hex(tg
->sha1
), rpt
);
464 fputs(tg
->name
, rpt
);
470 fputs("Marks\n", rpt
);
471 fputs("-----\n", rpt
);
472 if (export_marks_file
)
473 fprintf(rpt
, " exported to %s\n", export_marks_file
);
475 dump_marks_helper(rpt
, 0, marks
);
478 fputs("-------------------\n", rpt
);
479 fputs("END OF CRASH REPORT\n", rpt
);
483 static void end_packfile(void);
484 static void unkeep_all_packs(void);
485 static void dump_marks(void);
487 static NORETURN
void die_nicely(const char *err
, va_list params
)
490 char message
[2 * PATH_MAX
];
492 vsnprintf(message
, sizeof(message
), err
, params
);
493 fputs("fatal: ", stderr
);
494 fputs(message
, stderr
);
499 write_crash_report(message
);
507 #ifndef SIGUSR1 /* Windows, for example */
509 static void set_checkpoint_signal(void)
515 static void checkpoint_signal(int signo
)
517 checkpoint_requested
= 1;
520 static void set_checkpoint_signal(void)
524 memset(&sa
, 0, sizeof(sa
));
525 sa
.sa_handler
= checkpoint_signal
;
526 sigemptyset(&sa
.sa_mask
);
527 sa
.sa_flags
= SA_RESTART
;
528 sigaction(SIGUSR1
, &sa
, NULL
);
533 static void alloc_objects(unsigned int cnt
)
535 struct object_entry_pool
*b
;
537 b
= xmalloc(sizeof(struct object_entry_pool
)
538 + cnt
* sizeof(struct object_entry
));
539 b
->next_pool
= blocks
;
540 b
->next_free
= b
->entries
;
541 b
->end
= b
->entries
+ cnt
;
546 static struct object_entry
*new_object(unsigned char *sha1
)
548 struct object_entry
*e
;
550 if (blocks
->next_free
== blocks
->end
)
551 alloc_objects(object_entry_alloc
);
553 e
= blocks
->next_free
++;
554 hashcpy(e
->idx
.sha1
, sha1
);
558 static struct object_entry
*find_object(unsigned char *sha1
)
560 unsigned int h
= sha1
[0] << 8 | sha1
[1];
561 struct object_entry
*e
;
562 for (e
= object_table
[h
]; e
; e
= e
->next
)
563 if (!hashcmp(sha1
, e
->idx
.sha1
))
568 static struct object_entry
*insert_object(unsigned char *sha1
)
570 unsigned int h
= sha1
[0] << 8 | sha1
[1];
571 struct object_entry
*e
= object_table
[h
];
572 struct object_entry
*p
= NULL
;
575 if (!hashcmp(sha1
, e
->idx
.sha1
))
581 e
= new_object(sha1
);
591 static unsigned int hc_str(const char *s
, size_t len
)
599 static void *pool_alloc(size_t len
)
604 /* round up to a 'uintmax_t' alignment */
605 if (len
& (sizeof(uintmax_t) - 1))
606 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
608 for (p
= mem_pool
; p
; p
= p
->next_pool
)
609 if ((p
->end
- p
->next_free
>= len
))
613 if (len
>= (mem_pool_alloc
/2)) {
617 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
618 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
619 p
->next_pool
= mem_pool
;
620 p
->next_free
= (char *) p
->space
;
621 p
->end
= p
->next_free
+ mem_pool_alloc
;
630 static void *pool_calloc(size_t count
, size_t size
)
632 size_t len
= count
* size
;
633 void *r
= pool_alloc(len
);
638 static char *pool_strdup(const char *s
)
640 char *r
= pool_alloc(strlen(s
) + 1);
645 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
647 struct mark_set
*s
= marks
;
648 while ((idnum
>> s
->shift
) >= 1024) {
649 s
= pool_calloc(1, sizeof(struct mark_set
));
650 s
->shift
= marks
->shift
+ 10;
651 s
->data
.sets
[0] = marks
;
655 uintmax_t i
= idnum
>> s
->shift
;
656 idnum
-= i
<< s
->shift
;
657 if (!s
->data
.sets
[i
]) {
658 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
659 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
663 if (!s
->data
.marked
[idnum
])
665 s
->data
.marked
[idnum
] = oe
;
668 static struct object_entry
*find_mark(uintmax_t idnum
)
670 uintmax_t orig_idnum
= idnum
;
671 struct mark_set
*s
= marks
;
672 struct object_entry
*oe
= NULL
;
673 if ((idnum
>> s
->shift
) < 1024) {
674 while (s
&& s
->shift
) {
675 uintmax_t i
= idnum
>> s
->shift
;
676 idnum
-= i
<< s
->shift
;
680 oe
= s
->data
.marked
[idnum
];
683 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
687 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
689 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
692 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
693 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
696 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
698 strncpy(c
->str_dat
, s
, len
);
700 c
->next_atom
= atom_table
[hc
];
706 static struct branch
*lookup_branch(const char *name
)
708 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
711 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
712 if (!strcmp(name
, b
->name
))
717 static struct branch
*new_branch(const char *name
)
719 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
720 struct branch
*b
= lookup_branch(name
);
723 die("Invalid attempt to create duplicate branch: %s", name
);
724 switch (check_ref_format(name
)) {
725 case 0: break; /* its valid */
726 case CHECK_REF_FORMAT_ONELEVEL
:
727 break; /* valid, but too few '/', allow anyway */
729 die("Branch name doesn't conform to GIT standards: %s", name
);
732 b
= pool_calloc(1, sizeof(struct branch
));
733 b
->name
= pool_strdup(name
);
734 b
->table_next_branch
= branch_table
[hc
];
735 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
736 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
739 b
->pack_id
= MAX_PACK_ID
;
740 branch_table
[hc
] = b
;
745 static unsigned int hc_entries(unsigned int cnt
)
747 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
748 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
751 static struct tree_content
*new_tree_content(unsigned int cnt
)
753 struct avail_tree_content
*f
, *l
= NULL
;
754 struct tree_content
*t
;
755 unsigned int hc
= hc_entries(cnt
);
757 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
758 if (f
->entry_capacity
>= cnt
)
763 l
->next_avail
= f
->next_avail
;
765 avail_tree_table
[hc
] = f
->next_avail
;
767 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
768 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
769 f
->entry_capacity
= cnt
;
772 t
= (struct tree_content
*)f
;
778 static void release_tree_entry(struct tree_entry
*e
);
779 static void release_tree_content(struct tree_content
*t
)
781 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
782 unsigned int hc
= hc_entries(f
->entry_capacity
);
783 f
->next_avail
= avail_tree_table
[hc
];
784 avail_tree_table
[hc
] = f
;
787 static void release_tree_content_recursive(struct tree_content
*t
)
790 for (i
= 0; i
< t
->entry_count
; i
++)
791 release_tree_entry(t
->entries
[i
]);
792 release_tree_content(t
);
795 static struct tree_content
*grow_tree_content(
796 struct tree_content
*t
,
799 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
800 r
->entry_count
= t
->entry_count
;
801 r
->delta_depth
= t
->delta_depth
;
802 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
803 release_tree_content(t
);
807 static struct tree_entry
*new_tree_entry(void)
809 struct tree_entry
*e
;
811 if (!avail_tree_entry
) {
812 unsigned int n
= tree_entry_alloc
;
813 total_allocd
+= n
* sizeof(struct tree_entry
);
814 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
816 *((void**)e
) = e
+ 1;
822 e
= avail_tree_entry
;
823 avail_tree_entry
= *((void**)e
);
827 static void release_tree_entry(struct tree_entry
*e
)
830 release_tree_content_recursive(e
->tree
);
831 *((void**)e
) = avail_tree_entry
;
832 avail_tree_entry
= e
;
835 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
837 struct tree_content
*d
;
838 struct tree_entry
*a
, *b
;
843 d
= new_tree_content(s
->entry_count
);
844 for (i
= 0; i
< s
->entry_count
; i
++) {
846 b
= new_tree_entry();
847 memcpy(b
, a
, sizeof(*a
));
848 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
849 b
->tree
= dup_tree_content(a
->tree
);
854 d
->entry_count
= s
->entry_count
;
855 d
->delta_depth
= s
->delta_depth
;
860 static void start_packfile(void)
862 static char tmpfile
[PATH_MAX
];
863 struct packed_git
*p
;
864 struct pack_header hdr
;
867 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
868 "pack/tmp_pack_XXXXXX");
869 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
870 strcpy(p
->pack_name
, tmpfile
);
871 p
->pack_fd
= pack_fd
;
872 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
874 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
875 hdr
.hdr_version
= htonl(2);
877 sha1write(pack_file
, &hdr
, sizeof(hdr
));
880 pack_size
= sizeof(hdr
);
883 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
884 all_packs
[pack_id
] = p
;
887 static const char *create_index(void)
890 struct pack_idx_entry
**idx
, **c
, **last
;
891 struct object_entry
*e
;
892 struct object_entry_pool
*o
;
894 /* Build the table of object IDs. */
895 idx
= xmalloc(object_count
* sizeof(*idx
));
897 for (o
= blocks
; o
; o
= o
->next_pool
)
898 for (e
= o
->next_free
; e
-- != o
->entries
;)
899 if (pack_id
== e
->pack_id
)
901 last
= idx
+ object_count
;
903 die("internal consistency error creating the index");
905 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
910 static char *keep_pack(const char *curr_index_name
)
912 static char name
[PATH_MAX
];
913 static const char *keep_msg
= "fast-import";
916 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
918 die_errno("cannot create keep file");
919 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
921 die_errno("failed to write keep file");
923 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
924 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
925 if (move_temp_to_file(pack_data
->pack_name
, name
))
926 die("cannot store pack file");
928 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
929 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
930 if (move_temp_to_file(curr_index_name
, name
))
931 die("cannot store index file");
932 free((void *)curr_index_name
);
936 static void unkeep_all_packs(void)
938 static char name
[PATH_MAX
];
941 for (k
= 0; k
< pack_id
; k
++) {
942 struct packed_git
*p
= all_packs
[k
];
943 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
944 get_object_directory(), sha1_to_hex(p
->sha1
));
945 unlink_or_warn(name
);
949 static void end_packfile(void)
951 struct packed_git
*old_p
= pack_data
, *new_p
;
953 clear_delta_base_cache();
955 unsigned char cur_pack_sha1
[20];
961 close_pack_windows(pack_data
);
962 sha1close(pack_file
, cur_pack_sha1
, 0);
963 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
964 pack_data
->pack_name
, object_count
,
965 cur_pack_sha1
, pack_size
);
966 close(pack_data
->pack_fd
);
967 idx_name
= keep_pack(create_index());
969 /* Register the packfile with core git's machinery. */
970 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
972 die("core git rejected index %s", idx_name
);
973 all_packs
[pack_id
] = new_p
;
974 install_packed_git(new_p
);
976 /* Print the boundary */
978 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
979 for (i
= 0; i
< branch_table_sz
; i
++) {
980 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
981 if (b
->pack_id
== pack_id
)
982 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
985 for (t
= first_tag
; t
; t
= t
->next_tag
) {
986 if (t
->pack_id
== pack_id
)
987 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
989 fputc('\n', pack_edges
);
996 close(old_p
->pack_fd
);
997 unlink_or_warn(old_p
->pack_name
);
1001 /* We can't carry a delta across packfiles. */
1002 strbuf_release(&last_blob
.data
);
1003 last_blob
.offset
= 0;
1004 last_blob
.depth
= 0;
1007 static void cycle_packfile(void)
1013 static int store_object(
1014 enum object_type type
,
1016 struct last_object
*last
,
1017 unsigned char *sha1out
,
1021 struct object_entry
*e
;
1022 unsigned char hdr
[96];
1023 unsigned char sha1
[20];
1024 unsigned long hdrlen
, deltalen
;
1028 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1029 (unsigned long)dat
->len
) + 1;
1031 git_SHA1_Update(&c
, hdr
, hdrlen
);
1032 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1033 git_SHA1_Final(sha1
, &c
);
1035 hashcpy(sha1out
, sha1
);
1037 e
= insert_object(sha1
);
1039 insert_mark(mark
, e
);
1040 if (e
->idx
.offset
) {
1041 duplicate_count_by_type
[type
]++;
1043 } else if (find_sha1_pack(sha1
, packed_git
)) {
1045 e
->pack_id
= MAX_PACK_ID
;
1046 e
->idx
.offset
= 1; /* just not zero! */
1047 duplicate_count_by_type
[type
]++;
1051 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1052 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1054 &deltalen
, dat
->len
- 20);
1058 memset(&s
, 0, sizeof(s
));
1059 deflateInit(&s
, pack_compression_level
);
1062 s
.avail_in
= deltalen
;
1064 s
.next_in
= (void *)dat
->buf
;
1065 s
.avail_in
= dat
->len
;
1067 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1068 s
.next_out
= out
= xmalloc(s
.avail_out
);
1069 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1073 /* Determine if we should auto-checkpoint. */
1074 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1075 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1077 /* This new object needs to *not* have the current pack_id. */
1078 e
->pack_id
= pack_id
+ 1;
1081 /* We cannot carry a delta into the new pack. */
1086 memset(&s
, 0, sizeof(s
));
1087 deflateInit(&s
, pack_compression_level
);
1088 s
.next_in
= (void *)dat
->buf
;
1089 s
.avail_in
= dat
->len
;
1090 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1091 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1092 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1099 e
->pack_id
= pack_id
;
1100 e
->idx
.offset
= pack_size
;
1102 object_count_by_type
[type
]++;
1104 crc32_begin(pack_file
);
1107 off_t ofs
= e
->idx
.offset
- last
->offset
;
1108 unsigned pos
= sizeof(hdr
) - 1;
1110 delta_count_by_type
[type
]++;
1111 e
->depth
= last
->depth
+ 1;
1113 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1114 sha1write(pack_file
, hdr
, hdrlen
);
1115 pack_size
+= hdrlen
;
1117 hdr
[pos
] = ofs
& 127;
1119 hdr
[--pos
] = 128 | (--ofs
& 127);
1120 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1121 pack_size
+= sizeof(hdr
) - pos
;
1124 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1125 sha1write(pack_file
, hdr
, hdrlen
);
1126 pack_size
+= hdrlen
;
1129 sha1write(pack_file
, out
, s
.total_out
);
1130 pack_size
+= s
.total_out
;
1132 e
->idx
.crc32
= crc32_end(pack_file
);
1137 if (last
->no_swap
) {
1140 strbuf_swap(&last
->data
, dat
);
1142 last
->offset
= e
->idx
.offset
;
1143 last
->depth
= e
->depth
;
1148 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1150 if (ftruncate(pack_data
->pack_fd
, to
)
1151 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1152 die_errno("cannot truncate pack to skip duplicate");
1155 /* yes this is a layering violation */
1156 pack_file
->total
= to
;
1157 pack_file
->offset
= 0;
1158 pack_file
->ctx
= *ctx
;
1161 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1163 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1164 unsigned char *in_buf
= xmalloc(in_sz
);
1165 unsigned char *out_buf
= xmalloc(out_sz
);
1166 struct object_entry
*e
;
1167 unsigned char sha1
[20];
1168 unsigned long hdrlen
;
1171 git_SHA_CTX pack_file_ctx
;
1175 /* Determine if we should auto-checkpoint. */
1176 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1177 || (pack_size
+ 60 + len
) < pack_size
)
1182 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1183 sha1flush(pack_file
);
1184 pack_file_ctx
= pack_file
->ctx
;
1186 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1187 if (out_sz
<= hdrlen
)
1188 die("impossibly large object header");
1191 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1193 crc32_begin(pack_file
);
1195 memset(&s
, 0, sizeof(s
));
1196 deflateInit(&s
, pack_compression_level
);
1198 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1199 if (out_sz
<= hdrlen
)
1200 die("impossibly large object header");
1202 s
.next_out
= out_buf
+ hdrlen
;
1203 s
.avail_out
= out_sz
- hdrlen
;
1205 while (status
!= Z_STREAM_END
) {
1206 if (0 < len
&& !s
.avail_in
) {
1207 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1208 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1209 if (!n
&& feof(stdin
))
1210 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1212 git_SHA1_Update(&c
, in_buf
, n
);
1218 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1220 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1221 size_t n
= s
.next_out
- out_buf
;
1222 sha1write(pack_file
, out_buf
, n
);
1224 s
.next_out
= out_buf
;
1225 s
.avail_out
= out_sz
;
1234 die("unexpected deflate failure: %d", status
);
1238 git_SHA1_Final(sha1
, &c
);
1241 hashcpy(sha1out
, sha1
);
1243 e
= insert_object(sha1
);
1246 insert_mark(mark
, e
);
1248 if (e
->idx
.offset
) {
1249 duplicate_count_by_type
[OBJ_BLOB
]++;
1250 truncate_pack(offset
, &pack_file_ctx
);
1252 } else if (find_sha1_pack(sha1
, packed_git
)) {
1254 e
->pack_id
= MAX_PACK_ID
;
1255 e
->idx
.offset
= 1; /* just not zero! */
1256 duplicate_count_by_type
[OBJ_BLOB
]++;
1257 truncate_pack(offset
, &pack_file_ctx
);
1262 e
->pack_id
= pack_id
;
1263 e
->idx
.offset
= offset
;
1264 e
->idx
.crc32
= crc32_end(pack_file
);
1266 object_count_by_type
[OBJ_BLOB
]++;
1273 /* All calls must be guarded by find_object() or find_mark() to
1274 * ensure the 'struct object_entry' passed was written by this
1275 * process instance. We unpack the entry by the offset, avoiding
1276 * the need for the corresponding .idx file. This unpacking rule
1277 * works because we only use OBJ_REF_DELTA within the packfiles
1278 * created by fast-import.
1280 * oe must not be NULL. Such an oe usually comes from giving
1281 * an unknown SHA-1 to find_object() or an undefined mark to
1282 * find_mark(). Callers must test for this condition and use
1283 * the standard read_sha1_file() when it happens.
1285 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1286 * find_mark(), where the mark was reloaded from an existing marks
1287 * file and is referencing an object that this fast-import process
1288 * instance did not write out to a packfile. Callers must test for
1289 * this condition and use read_sha1_file() instead.
1291 static void *gfi_unpack_entry(
1292 struct object_entry
*oe
,
1293 unsigned long *sizep
)
1295 enum object_type type
;
1296 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1297 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1298 /* The object is stored in the packfile we are writing to
1299 * and we have modified it since the last time we scanned
1300 * back to read a previously written object. If an old
1301 * window covered [p->pack_size, p->pack_size + 20) its
1302 * data is stale and is not valid. Closing all windows
1303 * and updating the packfile length ensures we can read
1304 * the newly written data.
1306 close_pack_windows(p
);
1307 sha1flush(pack_file
);
1309 /* We have to offer 20 bytes additional on the end of
1310 * the packfile as the core unpacker code assumes the
1311 * footer is present at the file end and must promise
1312 * at least 20 bytes within any window it maps. But
1313 * we don't actually create the footer here.
1315 p
->pack_size
= pack_size
+ 20;
1317 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1320 static const char *get_mode(const char *str
, uint16_t *modep
)
1325 while ((c
= *str
++) != ' ') {
1326 if (c
< '0' || c
> '7')
1328 mode
= (mode
<< 3) + (c
- '0');
1334 static void load_tree(struct tree_entry
*root
)
1336 unsigned char *sha1
= root
->versions
[1].sha1
;
1337 struct object_entry
*myoe
;
1338 struct tree_content
*t
;
1343 root
->tree
= t
= new_tree_content(8);
1344 if (is_null_sha1(sha1
))
1347 myoe
= find_object(sha1
);
1348 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1349 if (myoe
->type
!= OBJ_TREE
)
1350 die("Not a tree: %s", sha1_to_hex(sha1
));
1351 t
->delta_depth
= myoe
->depth
;
1352 buf
= gfi_unpack_entry(myoe
, &size
);
1354 die("Can't load tree %s", sha1_to_hex(sha1
));
1356 enum object_type type
;
1357 buf
= read_sha1_file(sha1
, &type
, &size
);
1358 if (!buf
|| type
!= OBJ_TREE
)
1359 die("Can't load tree %s", sha1_to_hex(sha1
));
1363 while (c
!= (buf
+ size
)) {
1364 struct tree_entry
*e
= new_tree_entry();
1366 if (t
->entry_count
== t
->entry_capacity
)
1367 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1368 t
->entries
[t
->entry_count
++] = e
;
1371 c
= get_mode(c
, &e
->versions
[1].mode
);
1373 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1374 e
->versions
[0].mode
= e
->versions
[1].mode
;
1375 e
->name
= to_atom(c
, strlen(c
));
1376 c
+= e
->name
->str_len
+ 1;
1377 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1378 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1384 static int tecmp0 (const void *_a
, const void *_b
)
1386 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1387 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1388 return base_name_compare(
1389 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1390 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1393 static int tecmp1 (const void *_a
, const void *_b
)
1395 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1396 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1397 return base_name_compare(
1398 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1399 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1402 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1408 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1410 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1412 for (i
= 0; i
< t
->entry_count
; i
++) {
1413 if (t
->entries
[i
]->versions
[v
].mode
)
1414 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1418 strbuf_grow(b
, maxlen
);
1419 for (i
= 0; i
< t
->entry_count
; i
++) {
1420 struct tree_entry
*e
= t
->entries
[i
];
1421 if (!e
->versions
[v
].mode
)
1423 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1424 e
->name
->str_dat
, '\0');
1425 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1429 static void store_tree(struct tree_entry
*root
)
1431 struct tree_content
*t
= root
->tree
;
1432 unsigned int i
, j
, del
;
1433 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1434 struct object_entry
*le
;
1436 if (!is_null_sha1(root
->versions
[1].sha1
))
1439 for (i
= 0; i
< t
->entry_count
; i
++) {
1440 if (t
->entries
[i
]->tree
)
1441 store_tree(t
->entries
[i
]);
1444 le
= find_object(root
->versions
[0].sha1
);
1445 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1446 mktree(t
, 0, &old_tree
);
1448 lo
.offset
= le
->idx
.offset
;
1449 lo
.depth
= t
->delta_depth
;
1452 mktree(t
, 1, &new_tree
);
1453 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1455 t
->delta_depth
= lo
.depth
;
1456 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1457 struct tree_entry
*e
= t
->entries
[i
];
1458 if (e
->versions
[1].mode
) {
1459 e
->versions
[0].mode
= e
->versions
[1].mode
;
1460 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1461 t
->entries
[j
++] = e
;
1463 release_tree_entry(e
);
1467 t
->entry_count
-= del
;
1470 static void tree_content_replace(
1471 struct tree_entry
*root
,
1472 const unsigned char *sha1
,
1473 const uint16_t mode
,
1474 struct tree_content
*newtree
)
1477 die("Root cannot be a non-directory");
1478 hashcpy(root
->versions
[1].sha1
, sha1
);
1480 release_tree_content_recursive(root
->tree
);
1481 root
->tree
= newtree
;
1484 static int tree_content_set(
1485 struct tree_entry
*root
,
1487 const unsigned char *sha1
,
1488 const uint16_t mode
,
1489 struct tree_content
*subtree
)
1491 struct tree_content
*t
;
1494 struct tree_entry
*e
;
1496 slash1
= strchr(p
, '/');
1502 die("Empty path component found in input");
1503 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1504 die("Non-directories cannot have subtrees");
1509 for (i
= 0; i
< t
->entry_count
; i
++) {
1511 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1514 && e
->versions
[1].mode
== mode
1515 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1517 e
->versions
[1].mode
= mode
;
1518 hashcpy(e
->versions
[1].sha1
, sha1
);
1520 release_tree_content_recursive(e
->tree
);
1522 hashclr(root
->versions
[1].sha1
);
1525 if (!S_ISDIR(e
->versions
[1].mode
)) {
1526 e
->tree
= new_tree_content(8);
1527 e
->versions
[1].mode
= S_IFDIR
;
1531 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1532 hashclr(root
->versions
[1].sha1
);
1539 if (t
->entry_count
== t
->entry_capacity
)
1540 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1541 e
= new_tree_entry();
1542 e
->name
= to_atom(p
, n
);
1543 e
->versions
[0].mode
= 0;
1544 hashclr(e
->versions
[0].sha1
);
1545 t
->entries
[t
->entry_count
++] = e
;
1547 e
->tree
= new_tree_content(8);
1548 e
->versions
[1].mode
= S_IFDIR
;
1549 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1552 e
->versions
[1].mode
= mode
;
1553 hashcpy(e
->versions
[1].sha1
, sha1
);
1555 hashclr(root
->versions
[1].sha1
);
1559 static int tree_content_remove(
1560 struct tree_entry
*root
,
1562 struct tree_entry
*backup_leaf
)
1564 struct tree_content
*t
;
1567 struct tree_entry
*e
;
1569 slash1
= strchr(p
, '/');
1578 for (i
= 0; i
< t
->entry_count
; i
++) {
1580 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1581 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1583 * If p names a file in some subdirectory, and a
1584 * file or symlink matching the name of the
1585 * parent directory of p exists, then p cannot
1586 * exist and need not be deleted.
1589 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1593 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1594 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1595 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1596 hashclr(root
->versions
[1].sha1
);
1610 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1612 release_tree_content_recursive(e
->tree
);
1614 e
->versions
[1].mode
= 0;
1615 hashclr(e
->versions
[1].sha1
);
1616 hashclr(root
->versions
[1].sha1
);
1620 static int tree_content_get(
1621 struct tree_entry
*root
,
1623 struct tree_entry
*leaf
)
1625 struct tree_content
*t
;
1628 struct tree_entry
*e
;
1630 slash1
= strchr(p
, '/');
1639 for (i
= 0; i
< t
->entry_count
; i
++) {
1641 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1643 memcpy(leaf
, e
, sizeof(*leaf
));
1644 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1645 leaf
->tree
= dup_tree_content(e
->tree
);
1650 if (!S_ISDIR(e
->versions
[1].mode
))
1654 return tree_content_get(e
, slash1
+ 1, leaf
);
1660 static int update_branch(struct branch
*b
)
1662 static const char *msg
= "fast-import";
1663 struct ref_lock
*lock
;
1664 unsigned char old_sha1
[20];
1666 if (is_null_sha1(b
->sha1
))
1668 if (read_ref(b
->name
, old_sha1
))
1670 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1672 return error("Unable to lock %s", b
->name
);
1673 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1674 struct commit
*old_cmit
, *new_cmit
;
1676 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1677 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1678 if (!old_cmit
|| !new_cmit
) {
1680 return error("Branch %s is missing commits.", b
->name
);
1683 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1685 warning("Not updating %s"
1686 " (new tip %s does not contain %s)",
1687 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1691 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1692 return error("Unable to update %s", b
->name
);
1696 static void dump_branches(void)
1701 for (i
= 0; i
< branch_table_sz
; i
++) {
1702 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1703 failure
|= update_branch(b
);
1707 static void dump_tags(void)
1709 static const char *msg
= "fast-import";
1711 struct ref_lock
*lock
;
1712 char ref_name
[PATH_MAX
];
1714 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1715 sprintf(ref_name
, "tags/%s", t
->name
);
1716 lock
= lock_ref_sha1(ref_name
, NULL
);
1717 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1718 failure
|= error("Unable to update %s", ref_name
);
1722 static void dump_marks_helper(FILE *f
,
1728 for (k
= 0; k
< 1024; k
++) {
1729 if (m
->data
.sets
[k
])
1730 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1734 for (k
= 0; k
< 1024; k
++) {
1735 if (m
->data
.marked
[k
])
1736 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1737 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1742 static void dump_marks(void)
1744 static struct lock_file mark_lock
;
1748 if (!export_marks_file
)
1751 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1753 failure
|= error("Unable to write marks file %s: %s",
1754 export_marks_file
, strerror(errno
));
1758 f
= fdopen(mark_fd
, "w");
1760 int saved_errno
= errno
;
1761 rollback_lock_file(&mark_lock
);
1762 failure
|= error("Unable to write marks file %s: %s",
1763 export_marks_file
, strerror(saved_errno
));
1768 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1769 * Assign -1 to the lock file descriptor so that commit_lock_file()
1770 * won't try to close() it.
1774 dump_marks_helper(f
, 0, marks
);
1775 if (ferror(f
) || fclose(f
)) {
1776 int saved_errno
= errno
;
1777 rollback_lock_file(&mark_lock
);
1778 failure
|= error("Unable to write marks file %s: %s",
1779 export_marks_file
, strerror(saved_errno
));
1783 if (commit_lock_file(&mark_lock
)) {
1784 int saved_errno
= errno
;
1785 rollback_lock_file(&mark_lock
);
1786 failure
|= error("Unable to commit marks file %s: %s",
1787 export_marks_file
, strerror(saved_errno
));
1792 static void read_marks(void)
1795 FILE *f
= fopen(import_marks_file
, "r");
1797 die_errno("cannot read '%s'", import_marks_file
);
1798 while (fgets(line
, sizeof(line
), f
)) {
1801 unsigned char sha1
[20];
1802 struct object_entry
*e
;
1804 end
= strchr(line
, '\n');
1805 if (line
[0] != ':' || !end
)
1806 die("corrupt mark line: %s", line
);
1808 mark
= strtoumax(line
+ 1, &end
, 10);
1809 if (!mark
|| end
== line
+ 1
1810 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1811 die("corrupt mark line: %s", line
);
1812 e
= find_object(sha1
);
1814 enum object_type type
= sha1_object_info(sha1
, NULL
);
1816 die("object not found: %s", sha1_to_hex(sha1
));
1817 e
= insert_object(sha1
);
1819 e
->pack_id
= MAX_PACK_ID
;
1820 e
->idx
.offset
= 1; /* just not zero! */
1822 insert_mark(mark
, e
);
1828 static int read_next_command(void)
1830 static int stdin_eof
= 0;
1833 unread_command_buf
= 0;
1838 if (unread_command_buf
) {
1839 unread_command_buf
= 0;
1841 struct recent_command
*rc
;
1843 strbuf_detach(&command_buf
, NULL
);
1844 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1848 if (!seen_data_command
1849 && prefixcmp(command_buf
.buf
, "feature ")
1850 && prefixcmp(command_buf
.buf
, "option ")) {
1859 cmd_hist
.next
= rc
->next
;
1860 cmd_hist
.next
->prev
= &cmd_hist
;
1864 rc
->buf
= command_buf
.buf
;
1865 rc
->prev
= cmd_tail
;
1866 rc
->next
= cmd_hist
.prev
;
1867 rc
->prev
->next
= rc
;
1870 } while (command_buf
.buf
[0] == '#');
1875 static void skip_optional_lf(void)
1877 int term_char
= fgetc(stdin
);
1878 if (term_char
!= '\n' && term_char
!= EOF
)
1879 ungetc(term_char
, stdin
);
1882 static void parse_mark(void)
1884 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1885 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1886 read_next_command();
1892 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1896 if (prefixcmp(command_buf
.buf
, "data "))
1897 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1899 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1900 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1901 size_t term_len
= command_buf
.len
- 5 - 2;
1903 strbuf_detach(&command_buf
, NULL
);
1905 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1906 die("EOF in data (terminator '%s' not found)", term
);
1907 if (term_len
== command_buf
.len
1908 && !strcmp(term
, command_buf
.buf
))
1910 strbuf_addbuf(sb
, &command_buf
);
1911 strbuf_addch(sb
, '\n');
1916 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1917 size_t n
= 0, length
= (size_t)len
;
1919 if (limit
&& limit
< len
) {
1924 die("data is too large to use in this context");
1926 while (n
< length
) {
1927 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1928 if (!s
&& feof(stdin
))
1929 die("EOF in data (%lu bytes remaining)",
1930 (unsigned long)(length
- n
));
1939 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1941 const char *orig_src
= src
;
1947 num
= strtoul(src
, &endp
, 10);
1948 /* NEEDSWORK: perhaps check for reasonable values? */
1949 if (errno
|| endp
== src
|| *endp
!= ' ')
1953 if (*src
!= '-' && *src
!= '+')
1956 num
= strtoul(src
+ 1, &endp
, 10);
1957 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1961 strcpy(result
, orig_src
);
1965 static char *parse_ident(const char *buf
)
1971 gt
= strrchr(buf
, '>');
1973 die("Missing > in ident string: %s", buf
);
1976 die("Missing space after > in ident string: %s", buf
);
1978 name_len
= gt
- buf
;
1979 ident
= xmalloc(name_len
+ 24);
1980 strncpy(ident
, buf
, name_len
);
1984 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1985 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1987 case WHENSPEC_RFC2822
:
1988 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1989 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1992 if (strcmp("now", gt
))
1993 die("Date in ident must be 'now': %s", buf
);
1994 datestamp(ident
+ name_len
, 24);
2001 static void parse_and_store_blob(
2002 struct last_object
*last
,
2003 unsigned char *sha1out
,
2006 static struct strbuf buf
= STRBUF_INIT
;
2009 if (parse_data(&buf
, big_file_threshold
, &len
))
2010 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2013 strbuf_release(&last
->data
);
2017 stream_blob(len
, sha1out
, mark
);
2022 static void parse_new_blob(void)
2024 read_next_command();
2026 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2029 static void unload_one_branch(void)
2031 while (cur_active_branches
2032 && cur_active_branches
>= max_active_branches
) {
2033 uintmax_t min_commit
= ULONG_MAX
;
2034 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2036 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2037 if (e
->last_commit
< min_commit
) {
2039 min_commit
= e
->last_commit
;
2045 e
= p
->active_next_branch
;
2046 p
->active_next_branch
= e
->active_next_branch
;
2048 e
= active_branches
;
2049 active_branches
= e
->active_next_branch
;
2052 e
->active_next_branch
= NULL
;
2053 if (e
->branch_tree
.tree
) {
2054 release_tree_content_recursive(e
->branch_tree
.tree
);
2055 e
->branch_tree
.tree
= NULL
;
2057 cur_active_branches
--;
2061 static void load_branch(struct branch
*b
)
2063 load_tree(&b
->branch_tree
);
2066 b
->active_next_branch
= active_branches
;
2067 active_branches
= b
;
2068 cur_active_branches
++;
2069 branch_load_count
++;
2073 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2075 unsigned char fanout
= 0;
2076 while ((num_notes
>>= 8))
2081 static void construct_path_with_fanout(const char *hex_sha1
,
2082 unsigned char fanout
, char *path
)
2084 unsigned int i
= 0, j
= 0;
2086 die("Too large fanout (%u)", fanout
);
2088 path
[i
++] = hex_sha1
[j
++];
2089 path
[i
++] = hex_sha1
[j
++];
2093 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2094 path
[i
+ 40 - j
] = '\0';
2097 static uintmax_t do_change_note_fanout(
2098 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2099 char *hex_sha1
, unsigned int hex_sha1_len
,
2100 char *fullpath
, unsigned int fullpath_len
,
2101 unsigned char fanout
)
2103 struct tree_content
*t
= root
->tree
;
2104 struct tree_entry
*e
, leaf
;
2105 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2106 uintmax_t num_notes
= 0;
2107 unsigned char sha1
[20];
2110 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2112 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2113 tmp_fullpath_len
= fullpath_len
;
2116 * We're interested in EITHER existing note entries (entries
2117 * with exactly 40 hex chars in path, not including directory
2118 * separators), OR directory entries that may contain note
2119 * entries (with < 40 hex chars in path).
2120 * Also, each path component in a note entry must be a multiple
2123 if (!e
->versions
[1].mode
||
2124 tmp_hex_sha1_len
> 40 ||
2125 e
->name
->str_len
% 2)
2128 /* This _may_ be a note entry, or a subdir containing notes */
2129 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2131 if (tmp_fullpath_len
)
2132 fullpath
[tmp_fullpath_len
++] = '/';
2133 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2135 tmp_fullpath_len
+= e
->name
->str_len
;
2136 fullpath
[tmp_fullpath_len
] = '\0';
2138 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2139 /* This is a note entry */
2140 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2141 if (!strcmp(fullpath
, realpath
)) {
2142 /* Note entry is in correct location */
2147 /* Rename fullpath to realpath */
2148 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2149 die("Failed to remove path %s", fullpath
);
2150 tree_content_set(orig_root
, realpath
,
2151 leaf
.versions
[1].sha1
,
2152 leaf
.versions
[1].mode
,
2154 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2155 /* This is a subdir that may contain note entries */
2158 num_notes
+= do_change_note_fanout(orig_root
, e
,
2159 hex_sha1
, tmp_hex_sha1_len
,
2160 fullpath
, tmp_fullpath_len
, fanout
);
2163 /* The above may have reallocated the current tree_content */
2169 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2170 unsigned char fanout
)
2172 char hex_sha1
[40], path
[60];
2173 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2176 static void file_change_m(struct branch
*b
)
2178 const char *p
= command_buf
.buf
+ 2;
2179 static struct strbuf uq
= STRBUF_INIT
;
2181 struct object_entry
*oe
= oe
;
2182 unsigned char sha1
[20];
2183 uint16_t mode
, inline_data
= 0;
2185 p
= get_mode(p
, &mode
);
2187 die("Corrupt mode: %s", command_buf
.buf
);
2192 case S_IFREG
| 0644:
2193 case S_IFREG
| 0755:
2200 die("Corrupt mode: %s", command_buf
.buf
);
2205 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2206 hashcpy(sha1
, oe
->idx
.sha1
);
2208 } else if (!prefixcmp(p
, "inline")) {
2212 if (get_sha1_hex(p
, sha1
))
2213 die("Invalid SHA1: %s", command_buf
.buf
);
2214 oe
= find_object(sha1
);
2218 die("Missing space after SHA1: %s", command_buf
.buf
);
2221 if (!unquote_c_style(&uq
, p
, &endp
)) {
2223 die("Garbage after path in: %s", command_buf
.buf
);
2227 if (S_ISGITLINK(mode
)) {
2229 die("Git links cannot be specified 'inline': %s",
2232 if (oe
->type
!= OBJ_COMMIT
)
2233 die("Not a commit (actually a %s): %s",
2234 typename(oe
->type
), command_buf
.buf
);
2237 * Accept the sha1 without checking; it expected to be in
2238 * another repository.
2240 } else if (inline_data
) {
2242 die("Directories cannot be specified 'inline': %s",
2245 strbuf_addstr(&uq
, p
);
2248 read_next_command();
2249 parse_and_store_blob(&last_blob
, sha1
, 0);
2251 enum object_type expected
= S_ISDIR(mode
) ?
2253 enum object_type type
= oe
? oe
->type
:
2254 sha1_object_info(sha1
, NULL
);
2256 die("%s not found: %s",
2257 S_ISDIR(mode
) ? "Tree" : "Blob",
2259 if (type
!= expected
)
2260 die("Not a %s (actually a %s): %s",
2261 typename(expected
), typename(type
),
2266 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2269 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2272 static void file_change_d(struct branch
*b
)
2274 const char *p
= command_buf
.buf
+ 2;
2275 static struct strbuf uq
= STRBUF_INIT
;
2279 if (!unquote_c_style(&uq
, p
, &endp
)) {
2281 die("Garbage after path in: %s", command_buf
.buf
);
2284 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2287 static void file_change_cr(struct branch
*b
, int rename
)
2290 static struct strbuf s_uq
= STRBUF_INIT
;
2291 static struct strbuf d_uq
= STRBUF_INIT
;
2293 struct tree_entry leaf
;
2295 s
= command_buf
.buf
+ 2;
2296 strbuf_reset(&s_uq
);
2297 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2299 die("Missing space after source: %s", command_buf
.buf
);
2301 endp
= strchr(s
, ' ');
2303 die("Missing space after source: %s", command_buf
.buf
);
2304 strbuf_add(&s_uq
, s
, endp
- s
);
2310 die("Missing dest: %s", command_buf
.buf
);
2313 strbuf_reset(&d_uq
);
2314 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2316 die("Garbage after dest in: %s", command_buf
.buf
);
2320 memset(&leaf
, 0, sizeof(leaf
));
2322 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2324 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2325 if (!leaf
.versions
[1].mode
)
2326 die("Path %s not in branch", s
);
2327 if (!*d
) { /* C "path/to/subdir" "" */
2328 tree_content_replace(&b
->branch_tree
,
2329 leaf
.versions
[1].sha1
,
2330 leaf
.versions
[1].mode
,
2334 tree_content_set(&b
->branch_tree
, d
,
2335 leaf
.versions
[1].sha1
,
2336 leaf
.versions
[1].mode
,
2340 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2342 const char *p
= command_buf
.buf
+ 2;
2343 static struct strbuf uq
= STRBUF_INIT
;
2344 struct object_entry
*oe
= oe
;
2346 unsigned char sha1
[20], commit_sha1
[20];
2348 uint16_t inline_data
= 0;
2349 unsigned char new_fanout
;
2351 /* <dataref> or 'inline' */
2354 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2355 hashcpy(sha1
, oe
->idx
.sha1
);
2357 } else if (!prefixcmp(p
, "inline")) {
2361 if (get_sha1_hex(p
, sha1
))
2362 die("Invalid SHA1: %s", command_buf
.buf
);
2363 oe
= find_object(sha1
);
2367 die("Missing space after SHA1: %s", command_buf
.buf
);
2370 s
= lookup_branch(p
);
2372 hashcpy(commit_sha1
, s
->sha1
);
2373 } else if (*p
== ':') {
2374 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2375 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2376 if (commit_oe
->type
!= OBJ_COMMIT
)
2377 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2378 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2379 } else if (!get_sha1(p
, commit_sha1
)) {
2381 char *buf
= read_object_with_reference(commit_sha1
,
2382 commit_type
, &size
, commit_sha1
);
2383 if (!buf
|| size
< 46)
2384 die("Not a valid commit: %s", p
);
2387 die("Invalid ref name or SHA1 expression: %s", p
);
2391 strbuf_addstr(&uq
, p
);
2394 read_next_command();
2395 parse_and_store_blob(&last_blob
, sha1
, 0);
2397 if (oe
->type
!= OBJ_BLOB
)
2398 die("Not a blob (actually a %s): %s",
2399 typename(oe
->type
), command_buf
.buf
);
2400 } else if (!is_null_sha1(sha1
)) {
2401 enum object_type type
= sha1_object_info(sha1
, NULL
);
2403 die("Blob not found: %s", command_buf
.buf
);
2404 if (type
!= OBJ_BLOB
)
2405 die("Not a blob (actually a %s): %s",
2406 typename(type
), command_buf
.buf
);
2409 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2410 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2413 if (is_null_sha1(sha1
))
2414 return; /* nothing to insert */
2417 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2418 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2419 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2422 static void file_change_deleteall(struct branch
*b
)
2424 release_tree_content_recursive(b
->branch_tree
.tree
);
2425 hashclr(b
->branch_tree
.versions
[0].sha1
);
2426 hashclr(b
->branch_tree
.versions
[1].sha1
);
2427 load_tree(&b
->branch_tree
);
2431 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2433 if (!buf
|| size
< 46)
2434 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2435 if (memcmp("tree ", buf
, 5)
2436 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2437 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2438 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2439 b
->branch_tree
.versions
[1].sha1
);
2442 static void parse_from_existing(struct branch
*b
)
2444 if (is_null_sha1(b
->sha1
)) {
2445 hashclr(b
->branch_tree
.versions
[0].sha1
);
2446 hashclr(b
->branch_tree
.versions
[1].sha1
);
2451 buf
= read_object_with_reference(b
->sha1
,
2452 commit_type
, &size
, b
->sha1
);
2453 parse_from_commit(b
, buf
, size
);
2458 static int parse_from(struct branch
*b
)
2463 if (prefixcmp(command_buf
.buf
, "from "))
2466 if (b
->branch_tree
.tree
) {
2467 release_tree_content_recursive(b
->branch_tree
.tree
);
2468 b
->branch_tree
.tree
= NULL
;
2471 from
= strchr(command_buf
.buf
, ' ') + 1;
2472 s
= lookup_branch(from
);
2474 die("Can't create a branch from itself: %s", b
->name
);
2476 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2477 hashcpy(b
->sha1
, s
->sha1
);
2478 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2479 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2480 } else if (*from
== ':') {
2481 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2482 struct object_entry
*oe
= find_mark(idnum
);
2483 if (oe
->type
!= OBJ_COMMIT
)
2484 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2485 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2486 if (oe
->pack_id
!= MAX_PACK_ID
) {
2488 char *buf
= gfi_unpack_entry(oe
, &size
);
2489 parse_from_commit(b
, buf
, size
);
2492 parse_from_existing(b
);
2493 } else if (!get_sha1(from
, b
->sha1
))
2494 parse_from_existing(b
);
2496 die("Invalid ref name or SHA1 expression: %s", from
);
2498 read_next_command();
2502 static struct hash_list
*parse_merge(unsigned int *count
)
2504 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2509 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2510 from
= strchr(command_buf
.buf
, ' ') + 1;
2511 n
= xmalloc(sizeof(*n
));
2512 s
= lookup_branch(from
);
2514 hashcpy(n
->sha1
, s
->sha1
);
2515 else if (*from
== ':') {
2516 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2517 struct object_entry
*oe
= find_mark(idnum
);
2518 if (oe
->type
!= OBJ_COMMIT
)
2519 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2520 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2521 } else if (!get_sha1(from
, n
->sha1
)) {
2523 char *buf
= read_object_with_reference(n
->sha1
,
2524 commit_type
, &size
, n
->sha1
);
2525 if (!buf
|| size
< 46)
2526 die("Not a valid commit: %s", from
);
2529 die("Invalid ref name or SHA1 expression: %s", from
);
2538 read_next_command();
2543 static void parse_new_commit(void)
2545 static struct strbuf msg
= STRBUF_INIT
;
2548 char *author
= NULL
;
2549 char *committer
= NULL
;
2550 struct hash_list
*merge_list
= NULL
;
2551 unsigned int merge_count
;
2552 unsigned char prev_fanout
, new_fanout
;
2554 /* Obtain the branch name from the rest of our command */
2555 sp
= strchr(command_buf
.buf
, ' ') + 1;
2556 b
= lookup_branch(sp
);
2560 read_next_command();
2562 if (!prefixcmp(command_buf
.buf
, "author ")) {
2563 author
= parse_ident(command_buf
.buf
+ 7);
2564 read_next_command();
2566 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2567 committer
= parse_ident(command_buf
.buf
+ 10);
2568 read_next_command();
2571 die("Expected committer but didn't get one");
2572 parse_data(&msg
, 0, NULL
);
2573 read_next_command();
2575 merge_list
= parse_merge(&merge_count
);
2577 /* ensure the branch is active/loaded */
2578 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2579 unload_one_branch();
2583 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2586 while (command_buf
.len
> 0) {
2587 if (!prefixcmp(command_buf
.buf
, "M "))
2589 else if (!prefixcmp(command_buf
.buf
, "D "))
2591 else if (!prefixcmp(command_buf
.buf
, "R "))
2592 file_change_cr(b
, 1);
2593 else if (!prefixcmp(command_buf
.buf
, "C "))
2594 file_change_cr(b
, 0);
2595 else if (!prefixcmp(command_buf
.buf
, "N "))
2596 note_change_n(b
, prev_fanout
);
2597 else if (!strcmp("deleteall", command_buf
.buf
))
2598 file_change_deleteall(b
);
2600 unread_command_buf
= 1;
2603 if (read_next_command() == EOF
)
2607 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2608 if (new_fanout
!= prev_fanout
)
2609 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2611 /* build the tree and the commit */
2612 store_tree(&b
->branch_tree
);
2613 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2614 b
->branch_tree
.versions
[1].sha1
);
2616 strbuf_reset(&new_data
);
2617 strbuf_addf(&new_data
, "tree %s\n",
2618 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2619 if (!is_null_sha1(b
->sha1
))
2620 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2621 while (merge_list
) {
2622 struct hash_list
*next
= merge_list
->next
;
2623 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2627 strbuf_addf(&new_data
,
2631 author
? author
: committer
, committer
);
2632 strbuf_addbuf(&new_data
, &msg
);
2636 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2637 b
->pack_id
= pack_id
;
2638 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2641 static void parse_new_tag(void)
2643 static struct strbuf msg
= STRBUF_INIT
;
2649 uintmax_t from_mark
= 0;
2650 unsigned char sha1
[20];
2651 enum object_type type
;
2653 /* Obtain the new tag name from the rest of our command */
2654 sp
= strchr(command_buf
.buf
, ' ') + 1;
2655 t
= pool_alloc(sizeof(struct tag
));
2657 t
->name
= pool_strdup(sp
);
2659 last_tag
->next_tag
= t
;
2663 read_next_command();
2666 if (prefixcmp(command_buf
.buf
, "from "))
2667 die("Expected from command, got %s", command_buf
.buf
);
2668 from
= strchr(command_buf
.buf
, ' ') + 1;
2669 s
= lookup_branch(from
);
2671 hashcpy(sha1
, s
->sha1
);
2673 } else if (*from
== ':') {
2674 struct object_entry
*oe
;
2675 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2676 oe
= find_mark(from_mark
);
2678 hashcpy(sha1
, oe
->idx
.sha1
);
2679 } else if (!get_sha1(from
, sha1
)) {
2683 buf
= read_sha1_file(sha1
, &type
, &size
);
2684 if (!buf
|| size
< 46)
2685 die("Not a valid commit: %s", from
);
2688 die("Invalid ref name or SHA1 expression: %s", from
);
2689 read_next_command();
2692 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2693 tagger
= parse_ident(command_buf
.buf
+ 7);
2694 read_next_command();
2698 /* tag payload/message */
2699 parse_data(&msg
, 0, NULL
);
2701 /* build the tag object */
2702 strbuf_reset(&new_data
);
2704 strbuf_addf(&new_data
,
2708 sha1_to_hex(sha1
), typename(type
), t
->name
);
2710 strbuf_addf(&new_data
,
2711 "tagger %s\n", tagger
);
2712 strbuf_addch(&new_data
, '\n');
2713 strbuf_addbuf(&new_data
, &msg
);
2716 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2717 t
->pack_id
= MAX_PACK_ID
;
2719 t
->pack_id
= pack_id
;
2722 static void parse_reset_branch(void)
2727 /* Obtain the branch name from the rest of our command */
2728 sp
= strchr(command_buf
.buf
, ' ') + 1;
2729 b
= lookup_branch(sp
);
2732 hashclr(b
->branch_tree
.versions
[0].sha1
);
2733 hashclr(b
->branch_tree
.versions
[1].sha1
);
2734 if (b
->branch_tree
.tree
) {
2735 release_tree_content_recursive(b
->branch_tree
.tree
);
2736 b
->branch_tree
.tree
= NULL
;
2741 read_next_command();
2743 if (command_buf
.len
> 0)
2744 unread_command_buf
= 1;
2747 static void checkpoint(void)
2749 checkpoint_requested
= 0;
2758 static void parse_checkpoint(void)
2760 checkpoint_requested
= 1;
2764 static void parse_progress(void)
2766 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2767 fputc('\n', stdout
);
2772 static char* make_fast_import_path(const char *path
)
2774 struct strbuf abs_path
= STRBUF_INIT
;
2776 if (!relative_marks_paths
|| is_absolute_path(path
))
2777 return xstrdup(path
);
2778 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2779 return strbuf_detach(&abs_path
, NULL
);
2782 static void option_import_marks(const char *marks
, int from_stream
)
2784 if (import_marks_file
) {
2786 die("Only one import-marks command allowed per stream");
2788 /* read previous mark file */
2789 if(!import_marks_file_from_stream
)
2793 import_marks_file
= make_fast_import_path(marks
);
2794 safe_create_leading_directories_const(import_marks_file
);
2795 import_marks_file_from_stream
= from_stream
;
2798 static void option_date_format(const char *fmt
)
2800 if (!strcmp(fmt
, "raw"))
2801 whenspec
= WHENSPEC_RAW
;
2802 else if (!strcmp(fmt
, "rfc2822"))
2803 whenspec
= WHENSPEC_RFC2822
;
2804 else if (!strcmp(fmt
, "now"))
2805 whenspec
= WHENSPEC_NOW
;
2807 die("unknown --date-format argument %s", fmt
);
2810 static void option_depth(const char *depth
)
2812 max_depth
= strtoul(depth
, NULL
, 0);
2813 if (max_depth
> MAX_DEPTH
)
2814 die("--depth cannot exceed %u", MAX_DEPTH
);
2817 static void option_active_branches(const char *branches
)
2819 max_active_branches
= strtoul(branches
, NULL
, 0);
2822 static void option_export_marks(const char *marks
)
2824 export_marks_file
= make_fast_import_path(marks
);
2825 safe_create_leading_directories_const(export_marks_file
);
2828 static void option_export_pack_edges(const char *edges
)
2832 pack_edges
= fopen(edges
, "a");
2834 die_errno("Cannot open '%s'", edges
);
2837 static int parse_one_option(const char *option
)
2839 if (!prefixcmp(option
, "max-pack-size=")) {
2841 if (!git_parse_ulong(option
+ 14, &v
))
2844 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2846 } else if (v
< 1024 * 1024) {
2847 warning("minimum max-pack-size is 1 MiB");
2851 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2853 if (!git_parse_ulong(option
+ 19, &v
))
2855 big_file_threshold
= v
;
2856 } else if (!prefixcmp(option
, "depth=")) {
2857 option_depth(option
+ 6);
2858 } else if (!prefixcmp(option
, "active-branches=")) {
2859 option_active_branches(option
+ 16);
2860 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2861 option_export_pack_edges(option
+ 18);
2862 } else if (!prefixcmp(option
, "quiet")) {
2864 } else if (!prefixcmp(option
, "stats")) {
2873 static int parse_one_feature(const char *feature
, int from_stream
)
2875 if (!prefixcmp(feature
, "date-format=")) {
2876 option_date_format(feature
+ 12);
2877 } else if (!prefixcmp(feature
, "import-marks=")) {
2878 option_import_marks(feature
+ 13, from_stream
);
2879 } else if (!prefixcmp(feature
, "export-marks=")) {
2880 option_export_marks(feature
+ 13);
2881 } else if (!prefixcmp(feature
, "relative-marks")) {
2882 relative_marks_paths
= 1;
2883 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2884 relative_marks_paths
= 0;
2885 } else if (!prefixcmp(feature
, "force")) {
2894 static void parse_feature(void)
2896 char *feature
= command_buf
.buf
+ 8;
2898 if (seen_data_command
)
2899 die("Got feature command '%s' after data command", feature
);
2901 if (parse_one_feature(feature
, 1))
2904 die("This version of fast-import does not support feature %s.", feature
);
2907 static void parse_option(void)
2909 char *option
= command_buf
.buf
+ 11;
2911 if (seen_data_command
)
2912 die("Got option command '%s' after data command", option
);
2914 if (parse_one_option(option
))
2917 die("This version of fast-import does not support option: %s", option
);
2920 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2922 if (!strcmp(k
, "pack.depth")) {
2923 max_depth
= git_config_int(k
, v
);
2924 if (max_depth
> MAX_DEPTH
)
2925 max_depth
= MAX_DEPTH
;
2928 if (!strcmp(k
, "pack.compression")) {
2929 int level
= git_config_int(k
, v
);
2931 level
= Z_DEFAULT_COMPRESSION
;
2932 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2933 die("bad pack compression level %d", level
);
2934 pack_compression_level
= level
;
2935 pack_compression_seen
= 1;
2938 if (!strcmp(k
, "pack.indexversion")) {
2939 pack_idx_default_version
= git_config_int(k
, v
);
2940 if (pack_idx_default_version
> 2)
2941 die("bad pack.indexversion=%"PRIu32
,
2942 pack_idx_default_version
);
2945 if (!strcmp(k
, "pack.packsizelimit")) {
2946 max_packsize
= git_config_ulong(k
, v
);
2949 if (!strcmp(k
, "core.bigfilethreshold")) {
2950 long n
= git_config_int(k
, v
);
2951 big_file_threshold
= 0 < n
? n
: 0;
2953 return git_default_config(k
, v
, cb
);
2956 static const char fast_import_usage
[] =
2957 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
2959 static void parse_argv(void)
2963 for (i
= 1; i
< global_argc
; i
++) {
2964 const char *a
= global_argv
[i
];
2966 if (*a
!= '-' || !strcmp(a
, "--"))
2969 if (parse_one_option(a
+ 2))
2972 if (parse_one_feature(a
+ 2, 0))
2975 die("unknown option %s", a
);
2977 if (i
!= global_argc
)
2978 usage(fast_import_usage
);
2980 seen_data_command
= 1;
2981 if (import_marks_file
)
2985 int main(int argc
, const char **argv
)
2989 git_extract_argv0_path(argv
[0]);
2991 if (argc
== 2 && !strcmp(argv
[1], "-h"))
2992 usage(fast_import_usage
);
2994 setup_git_directory();
2995 git_config(git_pack_config
, NULL
);
2996 if (!pack_compression_seen
&& core_compression_seen
)
2997 pack_compression_level
= core_compression_level
;
2999 alloc_objects(object_entry_alloc
);
3000 strbuf_init(&command_buf
, 0);
3001 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3002 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3003 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3004 marks
= pool_calloc(1, sizeof(struct mark_set
));
3009 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3010 for (i
= 0; i
< (cmd_save
- 1); i
++)
3011 rc_free
[i
].next
= &rc_free
[i
+ 1];
3012 rc_free
[cmd_save
- 1].next
= NULL
;
3014 prepare_packed_git();
3016 set_die_routine(die_nicely
);
3017 set_checkpoint_signal();
3018 while (read_next_command() != EOF
) {
3019 if (!strcmp("blob", command_buf
.buf
))
3021 else if (!prefixcmp(command_buf
.buf
, "commit "))
3023 else if (!prefixcmp(command_buf
.buf
, "tag "))
3025 else if (!prefixcmp(command_buf
.buf
, "reset "))
3026 parse_reset_branch();
3027 else if (!strcmp("checkpoint", command_buf
.buf
))
3029 else if (!prefixcmp(command_buf
.buf
, "progress "))
3031 else if (!prefixcmp(command_buf
.buf
, "feature "))
3033 else if (!prefixcmp(command_buf
.buf
, "option git "))
3035 else if (!prefixcmp(command_buf
.buf
, "option "))
3036 /* ignore non-git options*/;
3038 die("Unsupported command: %s", command_buf
.buf
);
3040 if (checkpoint_requested
)
3044 /* argv hasn't been parsed yet, do so */
3045 if (!seen_data_command
)
3059 uintmax_t total_count
= 0, duplicate_count
= 0;
3060 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3061 total_count
+= object_count_by_type
[i
];
3062 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3063 duplicate_count
+= duplicate_count_by_type
[i
];
3065 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3066 fprintf(stderr
, "---------------------------------------------------------------------\n");
3067 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3068 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3069 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
]);
3070 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
]);
3071 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
]);
3072 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
]);
3073 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3074 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3075 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3076 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3077 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3078 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3079 fprintf(stderr
, "---------------------------------------------------------------------\n");
3081 fprintf(stderr
, "---------------------------------------------------------------------\n");
3082 fprintf(stderr
, "\n");
3085 return failure
? 1 : 0;