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 ls ::= 'ls' sp '"' quoted(path) '"' lf;
33 file_change ::= file_clr
39 file_clr ::= 'deleteall' lf;
40 file_del ::= 'D' sp path_str lf;
41 file_rnm ::= 'R' sp path_str sp path_str lf;
42 file_cpy ::= 'C' sp path_str sp path_str lf;
43 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
44 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
46 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
47 note_inm ::= 'N' sp 'inline' sp committish lf
50 new_tag ::= 'tag' sp tag_str lf
51 'from' sp committish lf
52 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
56 reset_branch ::= 'reset' sp ref_str lf
57 ('from' sp committish lf)?
60 checkpoint ::= 'checkpoint' lf
63 progress ::= 'progress' sp not_lf* lf
66 # note: the first idnum in a stream should be 1 and subsequent
67 # idnums should not have gaps between values as this will cause
68 # the stream parser to reserve space for the gapped values. An
69 # idnum can be updated in the future to a new object by issuing
70 # a new mark directive with the old idnum.
72 mark ::= 'mark' sp idnum lf;
73 data ::= (delimited_data | exact_data)
76 # note: delim may be any string but must not contain lf.
77 # data_line may contain any data but must not be exactly
79 delimited_data ::= 'data' sp '<<' delim lf
83 # note: declen indicates the length of binary_data in bytes.
84 # declen does not include the lf preceding the binary data.
86 exact_data ::= 'data' sp declen lf
89 # note: quoted strings are C-style quoting supporting \c for
90 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
91 # is the signed byte value in octal. Note that the only
92 # characters which must actually be escaped to protect the
93 # stream formatting is: \, " and LF. Otherwise these values
96 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
98 sha1exp_str ::= sha1exp;
100 path_str ::= path | '"' quoted(path) '"' ;
101 mode ::= '100644' | '644'
106 declen ::= # unsigned 32 bit value, ascii base10 notation;
107 bigint ::= # unsigned integer value, ascii base10 notation;
108 binary_data ::= # file content, not interpreted;
110 when ::= raw_when | rfc2822_when;
111 raw_when ::= ts sp tz;
112 rfc2822_when ::= # Valid RFC 2822 date and time;
114 sp ::= # ASCII space character;
115 lf ::= # ASCII newline (LF) character;
117 # note: a colon (':') must precede the numerical value assigned to
118 # an idnum. This is to distinguish it from a ref or tag name as
119 # GIT does not permit ':' in ref or tag strings.
121 idnum ::= ':' bigint;
122 path ::= # GIT style file path, e.g. "a/b/c";
123 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
124 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
125 sha1exp ::= # Any valid GIT SHA1 expression;
126 hexsha1 ::= # SHA1 in hexadecimal format;
128 # note: name and email are UTF8 strings, however name must not
129 # contain '<' or lf and email must not contain any of the
130 # following: '<', '>', lf.
132 name ::= # valid GIT author/committer name;
133 email ::= # valid GIT author/committer email;
134 ts ::= # time since the epoch in seconds, ascii base10 notation;
135 tz ::= # GIT style timezone;
137 # note: comments, ls and cat requests may appear anywhere
138 # in the input, except within a data command. Any form
139 # of the data command always escapes the related input
140 # from comment processing.
142 # In case it is not clear, the '#' that starts the comment
143 # must be the first character on that line (an lf
147 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
148 ls_tree ::= 'ls' sp (hexsha1 | idnum) sp path_str lf;
150 comment ::= '#' not_lf* lf;
151 not_lf ::= # Any byte that is not ASCII newline (LF);
163 #include "csum-file.h"
165 #include "exec_cmd.h"
168 #define PACK_ID_BITS 16
169 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
170 #define DEPTH_BITS 13
171 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
174 * We abuse the setuid bit on directories to mean "do not delta".
176 #define NO_DELTA S_ISUID
178 struct object_entry
{
179 struct pack_idx_entry idx
;
180 struct object_entry
*next
;
181 uint32_t type
: TYPE_BITS
,
182 pack_id
: PACK_ID_BITS
,
186 struct object_entry_pool
{
187 struct object_entry_pool
*next_pool
;
188 struct object_entry
*next_free
;
189 struct object_entry
*end
;
190 struct object_entry entries
[FLEX_ARRAY
]; /* more */
195 struct object_entry
*marked
[1024];
196 struct mark_set
*sets
[1024];
205 unsigned no_swap
: 1;
209 struct mem_pool
*next_pool
;
212 uintmax_t space
[FLEX_ARRAY
]; /* more */
216 struct atom_str
*next_atom
;
217 unsigned short str_len
;
218 char str_dat
[FLEX_ARRAY
]; /* more */
223 struct tree_content
*tree
;
224 struct atom_str
*name
;
225 struct tree_entry_ms
{
227 unsigned char sha1
[20];
231 struct tree_content
{
232 unsigned int entry_capacity
; /* must match avail_tree_content */
233 unsigned int entry_count
;
234 unsigned int delta_depth
;
235 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
238 struct avail_tree_content
{
239 unsigned int entry_capacity
; /* must match tree_content */
240 struct avail_tree_content
*next_avail
;
244 struct branch
*table_next_branch
;
245 struct branch
*active_next_branch
;
247 struct tree_entry branch_tree
;
248 uintmax_t last_commit
;
251 unsigned pack_id
: PACK_ID_BITS
;
252 unsigned char sha1
[20];
256 struct tag
*next_tag
;
258 unsigned int pack_id
;
259 unsigned char sha1
[20];
263 struct hash_list
*next
;
264 unsigned char sha1
[20];
273 struct recent_command
{
274 struct recent_command
*prev
;
275 struct recent_command
*next
;
279 /* Configured limits on output */
280 static unsigned long max_depth
= 10;
281 static off_t max_packsize
;
282 static int force_update
;
283 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
284 static int pack_compression_seen
;
286 /* Stats and misc. counters */
287 static uintmax_t alloc_count
;
288 static uintmax_t marks_set_count
;
289 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
290 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
291 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
292 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
293 static unsigned long object_count
;
294 static unsigned long branch_count
;
295 static unsigned long branch_load_count
;
297 static FILE *pack_edges
;
298 static unsigned int show_stats
= 1;
299 static int global_argc
;
300 static const char **global_argv
;
303 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
304 static size_t total_allocd
;
305 static struct mem_pool
*mem_pool
;
307 /* Atom management */
308 static unsigned int atom_table_sz
= 4451;
309 static unsigned int atom_cnt
;
310 static struct atom_str
**atom_table
;
312 /* The .pack file being generated */
313 static struct pack_idx_option pack_idx_opts
;
314 static unsigned int pack_id
;
315 static struct sha1file
*pack_file
;
316 static struct packed_git
*pack_data
;
317 static struct packed_git
**all_packs
;
318 static off_t pack_size
;
320 /* Table of objects we've written. */
321 static unsigned int object_entry_alloc
= 5000;
322 static struct object_entry_pool
*blocks
;
323 static struct object_entry
*object_table
[1 << 16];
324 static struct mark_set
*marks
;
325 static const char *export_marks_file
;
326 static const char *import_marks_file
;
327 static int import_marks_file_from_stream
;
328 static int import_marks_file_ignore_missing
;
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
;
364 static int require_explicit_termination
;
366 /* Signal handling */
367 static volatile sig_atomic_t checkpoint_requested
;
369 /* Where to write output of cat-blob commands */
370 static int cat_blob_fd
= STDOUT_FILENO
;
372 static void parse_argv(void);
373 static void parse_cat_blob(void);
374 static void parse_ls(struct branch
*b
);
376 static void write_branch_report(FILE *rpt
, struct branch
*b
)
378 fprintf(rpt
, "%s:\n", b
->name
);
380 fprintf(rpt
, " status :");
382 fputs(" active", rpt
);
383 if (b
->branch_tree
.tree
)
384 fputs(" loaded", rpt
);
385 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
386 fputs(" dirty", rpt
);
389 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
390 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
391 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
392 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
394 fputs(" last pack : ", rpt
);
395 if (b
->pack_id
< MAX_PACK_ID
)
396 fprintf(rpt
, "%u", b
->pack_id
);
402 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
404 static void write_crash_report(const char *err
)
406 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
407 FILE *rpt
= fopen(loc
, "w");
410 struct recent_command
*rc
;
413 error("can't write crash report %s: %s", loc
, strerror(errno
));
417 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
419 fprintf(rpt
, "fast-import crash report:\n");
420 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
421 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
422 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
425 fputs("fatal: ", rpt
);
430 fputs("Most Recent Commands Before Crash\n", rpt
);
431 fputs("---------------------------------\n", rpt
);
432 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
433 if (rc
->next
== &cmd_hist
)
442 fputs("Active Branch LRU\n", rpt
);
443 fputs("-----------------\n", rpt
);
444 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
446 max_active_branches
);
448 fputs(" pos clock name\n", rpt
);
449 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
450 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
451 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
452 ++lu
, b
->last_commit
, b
->name
);
455 fputs("Inactive Branches\n", rpt
);
456 fputs("-----------------\n", rpt
);
457 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
458 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
459 write_branch_report(rpt
, b
);
465 fputs("Annotated Tags\n", rpt
);
466 fputs("--------------\n", rpt
);
467 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
468 fputs(sha1_to_hex(tg
->sha1
), rpt
);
470 fputs(tg
->name
, rpt
);
476 fputs("Marks\n", rpt
);
477 fputs("-----\n", rpt
);
478 if (export_marks_file
)
479 fprintf(rpt
, " exported to %s\n", export_marks_file
);
481 dump_marks_helper(rpt
, 0, marks
);
484 fputs("-------------------\n", rpt
);
485 fputs("END OF CRASH REPORT\n", rpt
);
489 static void end_packfile(void);
490 static void unkeep_all_packs(void);
491 static void dump_marks(void);
493 static NORETURN
void die_nicely(const char *err
, va_list params
)
496 char message
[2 * PATH_MAX
];
498 vsnprintf(message
, sizeof(message
), err
, params
);
499 fputs("fatal: ", stderr
);
500 fputs(message
, stderr
);
505 write_crash_report(message
);
513 #ifndef SIGUSR1 /* Windows, for example */
515 static void set_checkpoint_signal(void)
521 static void checkpoint_signal(int signo
)
523 checkpoint_requested
= 1;
526 static void set_checkpoint_signal(void)
530 memset(&sa
, 0, sizeof(sa
));
531 sa
.sa_handler
= checkpoint_signal
;
532 sigemptyset(&sa
.sa_mask
);
533 sa
.sa_flags
= SA_RESTART
;
534 sigaction(SIGUSR1
, &sa
, NULL
);
539 static void alloc_objects(unsigned int cnt
)
541 struct object_entry_pool
*b
;
543 b
= xmalloc(sizeof(struct object_entry_pool
)
544 + cnt
* sizeof(struct object_entry
));
545 b
->next_pool
= blocks
;
546 b
->next_free
= b
->entries
;
547 b
->end
= b
->entries
+ cnt
;
552 static struct object_entry
*new_object(unsigned char *sha1
)
554 struct object_entry
*e
;
556 if (blocks
->next_free
== blocks
->end
)
557 alloc_objects(object_entry_alloc
);
559 e
= blocks
->next_free
++;
560 hashcpy(e
->idx
.sha1
, sha1
);
564 static struct object_entry
*find_object(unsigned char *sha1
)
566 unsigned int h
= sha1
[0] << 8 | sha1
[1];
567 struct object_entry
*e
;
568 for (e
= object_table
[h
]; e
; e
= e
->next
)
569 if (!hashcmp(sha1
, e
->idx
.sha1
))
574 static struct object_entry
*insert_object(unsigned char *sha1
)
576 unsigned int h
= sha1
[0] << 8 | sha1
[1];
577 struct object_entry
*e
= object_table
[h
];
580 if (!hashcmp(sha1
, e
->idx
.sha1
))
585 e
= new_object(sha1
);
586 e
->next
= object_table
[h
];
592 static unsigned int hc_str(const char *s
, size_t len
)
600 static void *pool_alloc(size_t len
)
605 /* round up to a 'uintmax_t' alignment */
606 if (len
& (sizeof(uintmax_t) - 1))
607 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
609 for (p
= mem_pool
; p
; p
= p
->next_pool
)
610 if ((p
->end
- p
->next_free
>= len
))
614 if (len
>= (mem_pool_alloc
/2)) {
618 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
619 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
620 p
->next_pool
= mem_pool
;
621 p
->next_free
= (char *) p
->space
;
622 p
->end
= p
->next_free
+ mem_pool_alloc
;
631 static void *pool_calloc(size_t count
, size_t size
)
633 size_t len
= count
* size
;
634 void *r
= pool_alloc(len
);
639 static char *pool_strdup(const char *s
)
641 char *r
= pool_alloc(strlen(s
) + 1);
646 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
648 struct mark_set
*s
= marks
;
649 while ((idnum
>> s
->shift
) >= 1024) {
650 s
= pool_calloc(1, sizeof(struct mark_set
));
651 s
->shift
= marks
->shift
+ 10;
652 s
->data
.sets
[0] = marks
;
656 uintmax_t i
= idnum
>> s
->shift
;
657 idnum
-= i
<< s
->shift
;
658 if (!s
->data
.sets
[i
]) {
659 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
660 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
664 if (!s
->data
.marked
[idnum
])
666 s
->data
.marked
[idnum
] = oe
;
669 static struct object_entry
*find_mark(uintmax_t idnum
)
671 uintmax_t orig_idnum
= idnum
;
672 struct mark_set
*s
= marks
;
673 struct object_entry
*oe
= NULL
;
674 if ((idnum
>> s
->shift
) < 1024) {
675 while (s
&& s
->shift
) {
676 uintmax_t i
= idnum
>> s
->shift
;
677 idnum
-= i
<< s
->shift
;
681 oe
= s
->data
.marked
[idnum
];
684 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
688 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
690 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
693 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
694 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
697 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
699 strncpy(c
->str_dat
, s
, len
);
701 c
->next_atom
= atom_table
[hc
];
707 static struct branch
*lookup_branch(const char *name
)
709 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
712 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
713 if (!strcmp(name
, b
->name
))
718 static struct branch
*new_branch(const char *name
)
720 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
721 struct branch
*b
= lookup_branch(name
);
724 die("Invalid attempt to create duplicate branch: %s", name
);
725 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
726 die("Branch name doesn't conform to GIT standards: %s", name
);
728 b
= pool_calloc(1, sizeof(struct branch
));
729 b
->name
= pool_strdup(name
);
730 b
->table_next_branch
= branch_table
[hc
];
731 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
732 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
735 b
->pack_id
= MAX_PACK_ID
;
736 branch_table
[hc
] = b
;
741 static unsigned int hc_entries(unsigned int cnt
)
743 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
744 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
747 static struct tree_content
*new_tree_content(unsigned int cnt
)
749 struct avail_tree_content
*f
, *l
= NULL
;
750 struct tree_content
*t
;
751 unsigned int hc
= hc_entries(cnt
);
753 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
754 if (f
->entry_capacity
>= cnt
)
759 l
->next_avail
= f
->next_avail
;
761 avail_tree_table
[hc
] = f
->next_avail
;
763 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
764 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
765 f
->entry_capacity
= cnt
;
768 t
= (struct tree_content
*)f
;
774 static void release_tree_entry(struct tree_entry
*e
);
775 static void release_tree_content(struct tree_content
*t
)
777 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
778 unsigned int hc
= hc_entries(f
->entry_capacity
);
779 f
->next_avail
= avail_tree_table
[hc
];
780 avail_tree_table
[hc
] = f
;
783 static void release_tree_content_recursive(struct tree_content
*t
)
786 for (i
= 0; i
< t
->entry_count
; i
++)
787 release_tree_entry(t
->entries
[i
]);
788 release_tree_content(t
);
791 static struct tree_content
*grow_tree_content(
792 struct tree_content
*t
,
795 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
796 r
->entry_count
= t
->entry_count
;
797 r
->delta_depth
= t
->delta_depth
;
798 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
799 release_tree_content(t
);
803 static struct tree_entry
*new_tree_entry(void)
805 struct tree_entry
*e
;
807 if (!avail_tree_entry
) {
808 unsigned int n
= tree_entry_alloc
;
809 total_allocd
+= n
* sizeof(struct tree_entry
);
810 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
812 *((void**)e
) = e
+ 1;
818 e
= avail_tree_entry
;
819 avail_tree_entry
= *((void**)e
);
823 static void release_tree_entry(struct tree_entry
*e
)
826 release_tree_content_recursive(e
->tree
);
827 *((void**)e
) = avail_tree_entry
;
828 avail_tree_entry
= e
;
831 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
833 struct tree_content
*d
;
834 struct tree_entry
*a
, *b
;
839 d
= new_tree_content(s
->entry_count
);
840 for (i
= 0; i
< s
->entry_count
; i
++) {
842 b
= new_tree_entry();
843 memcpy(b
, a
, sizeof(*a
));
844 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
845 b
->tree
= dup_tree_content(a
->tree
);
850 d
->entry_count
= s
->entry_count
;
851 d
->delta_depth
= s
->delta_depth
;
856 static void start_packfile(void)
858 static char tmp_file
[PATH_MAX
];
859 struct packed_git
*p
;
860 struct pack_header hdr
;
863 pack_fd
= odb_mkstemp(tmp_file
, sizeof(tmp_file
),
864 "pack/tmp_pack_XXXXXX");
865 p
= xcalloc(1, sizeof(*p
) + strlen(tmp_file
) + 2);
866 strcpy(p
->pack_name
, tmp_file
);
867 p
->pack_fd
= pack_fd
;
869 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
871 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
872 hdr
.hdr_version
= htonl(2);
874 sha1write(pack_file
, &hdr
, sizeof(hdr
));
877 pack_size
= sizeof(hdr
);
880 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
881 all_packs
[pack_id
] = p
;
884 static const char *create_index(void)
887 struct pack_idx_entry
**idx
, **c
, **last
;
888 struct object_entry
*e
;
889 struct object_entry_pool
*o
;
891 /* Build the table of object IDs. */
892 idx
= xmalloc(object_count
* sizeof(*idx
));
894 for (o
= blocks
; o
; o
= o
->next_pool
)
895 for (e
= o
->next_free
; e
-- != o
->entries
;)
896 if (pack_id
== e
->pack_id
)
898 last
= idx
+ object_count
;
900 die("internal consistency error creating the index");
902 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
, pack_data
->sha1
);
907 static char *keep_pack(const char *curr_index_name
)
909 static char name
[PATH_MAX
];
910 static const char *keep_msg
= "fast-import";
913 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
915 die_errno("cannot create keep file");
916 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
918 die_errno("failed to write keep file");
920 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
921 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
922 if (move_temp_to_file(pack_data
->pack_name
, name
))
923 die("cannot store pack file");
925 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
926 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
927 if (move_temp_to_file(curr_index_name
, name
))
928 die("cannot store index file");
929 free((void *)curr_index_name
);
933 static void unkeep_all_packs(void)
935 static char name
[PATH_MAX
];
938 for (k
= 0; k
< pack_id
; k
++) {
939 struct packed_git
*p
= all_packs
[k
];
940 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
941 get_object_directory(), sha1_to_hex(p
->sha1
));
942 unlink_or_warn(name
);
946 static void end_packfile(void)
948 struct packed_git
*old_p
= pack_data
, *new_p
;
950 clear_delta_base_cache();
952 unsigned char cur_pack_sha1
[20];
958 close_pack_windows(pack_data
);
959 sha1close(pack_file
, cur_pack_sha1
, 0);
960 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
961 pack_data
->pack_name
, object_count
,
962 cur_pack_sha1
, pack_size
);
963 close(pack_data
->pack_fd
);
964 idx_name
= keep_pack(create_index());
966 /* Register the packfile with core git's machinery. */
967 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
969 die("core git rejected index %s", idx_name
);
970 all_packs
[pack_id
] = new_p
;
971 install_packed_git(new_p
);
973 /* Print the boundary */
975 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
976 for (i
= 0; i
< branch_table_sz
; i
++) {
977 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
978 if (b
->pack_id
== pack_id
)
979 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
982 for (t
= first_tag
; t
; t
= t
->next_tag
) {
983 if (t
->pack_id
== pack_id
)
984 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
986 fputc('\n', pack_edges
);
993 close(old_p
->pack_fd
);
994 unlink_or_warn(old_p
->pack_name
);
998 /* We can't carry a delta across packfiles. */
999 strbuf_release(&last_blob
.data
);
1000 last_blob
.offset
= 0;
1001 last_blob
.depth
= 0;
1004 static void cycle_packfile(void)
1010 static int store_object(
1011 enum object_type type
,
1013 struct last_object
*last
,
1014 unsigned char *sha1out
,
1018 struct object_entry
*e
;
1019 unsigned char hdr
[96];
1020 unsigned char sha1
[20];
1021 unsigned long hdrlen
, deltalen
;
1025 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1026 (unsigned long)dat
->len
) + 1;
1028 git_SHA1_Update(&c
, hdr
, hdrlen
);
1029 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1030 git_SHA1_Final(sha1
, &c
);
1032 hashcpy(sha1out
, sha1
);
1034 e
= insert_object(sha1
);
1036 insert_mark(mark
, e
);
1037 if (e
->idx
.offset
) {
1038 duplicate_count_by_type
[type
]++;
1040 } else if (find_sha1_pack(sha1
, packed_git
)) {
1042 e
->pack_id
= MAX_PACK_ID
;
1043 e
->idx
.offset
= 1; /* just not zero! */
1044 duplicate_count_by_type
[type
]++;
1048 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1049 delta_count_attempts_by_type
[type
]++;
1050 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1052 &deltalen
, dat
->len
- 20);
1056 memset(&s
, 0, sizeof(s
));
1057 git_deflate_init(&s
, pack_compression_level
);
1060 s
.avail_in
= deltalen
;
1062 s
.next_in
= (void *)dat
->buf
;
1063 s
.avail_in
= dat
->len
;
1065 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1066 s
.next_out
= out
= xmalloc(s
.avail_out
);
1067 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1069 git_deflate_end(&s
);
1071 /* Determine if we should auto-checkpoint. */
1072 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1073 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1075 /* This new object needs to *not* have the current pack_id. */
1076 e
->pack_id
= pack_id
+ 1;
1079 /* We cannot carry a delta into the new pack. */
1084 memset(&s
, 0, sizeof(s
));
1085 git_deflate_init(&s
, pack_compression_level
);
1086 s
.next_in
= (void *)dat
->buf
;
1087 s
.avail_in
= dat
->len
;
1088 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1089 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1090 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1092 git_deflate_end(&s
);
1097 e
->pack_id
= pack_id
;
1098 e
->idx
.offset
= pack_size
;
1100 object_count_by_type
[type
]++;
1102 crc32_begin(pack_file
);
1105 off_t ofs
= e
->idx
.offset
- last
->offset
;
1106 unsigned pos
= sizeof(hdr
) - 1;
1108 delta_count_by_type
[type
]++;
1109 e
->depth
= last
->depth
+ 1;
1111 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1112 sha1write(pack_file
, hdr
, hdrlen
);
1113 pack_size
+= hdrlen
;
1115 hdr
[pos
] = ofs
& 127;
1117 hdr
[--pos
] = 128 | (--ofs
& 127);
1118 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1119 pack_size
+= sizeof(hdr
) - pos
;
1122 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1123 sha1write(pack_file
, hdr
, hdrlen
);
1124 pack_size
+= hdrlen
;
1127 sha1write(pack_file
, out
, s
.total_out
);
1128 pack_size
+= s
.total_out
;
1130 e
->idx
.crc32
= crc32_end(pack_file
);
1135 if (last
->no_swap
) {
1138 strbuf_swap(&last
->data
, dat
);
1140 last
->offset
= e
->idx
.offset
;
1141 last
->depth
= e
->depth
;
1146 static void truncate_pack(struct sha1file_checkpoint
*checkpoint
)
1148 if (sha1file_truncate(pack_file
, checkpoint
))
1149 die_errno("cannot truncate pack to skip duplicate");
1150 pack_size
= checkpoint
->offset
;
1153 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1155 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1156 unsigned char *in_buf
= xmalloc(in_sz
);
1157 unsigned char *out_buf
= xmalloc(out_sz
);
1158 struct object_entry
*e
;
1159 unsigned char sha1
[20];
1160 unsigned long hdrlen
;
1164 struct sha1file_checkpoint checkpoint
;
1167 /* Determine if we should auto-checkpoint. */
1168 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1169 || (pack_size
+ 60 + len
) < pack_size
)
1172 sha1file_checkpoint(pack_file
, &checkpoint
);
1173 offset
= checkpoint
.offset
;
1175 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1176 if (out_sz
<= hdrlen
)
1177 die("impossibly large object header");
1180 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1182 crc32_begin(pack_file
);
1184 memset(&s
, 0, sizeof(s
));
1185 git_deflate_init(&s
, pack_compression_level
);
1187 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1188 if (out_sz
<= hdrlen
)
1189 die("impossibly large object header");
1191 s
.next_out
= out_buf
+ hdrlen
;
1192 s
.avail_out
= out_sz
- hdrlen
;
1194 while (status
!= Z_STREAM_END
) {
1195 if (0 < len
&& !s
.avail_in
) {
1196 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1197 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1198 if (!n
&& feof(stdin
))
1199 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1201 git_SHA1_Update(&c
, in_buf
, n
);
1207 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1209 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1210 size_t n
= s
.next_out
- out_buf
;
1211 sha1write(pack_file
, out_buf
, n
);
1213 s
.next_out
= out_buf
;
1214 s
.avail_out
= out_sz
;
1223 die("unexpected deflate failure: %d", status
);
1226 git_deflate_end(&s
);
1227 git_SHA1_Final(sha1
, &c
);
1230 hashcpy(sha1out
, sha1
);
1232 e
= insert_object(sha1
);
1235 insert_mark(mark
, e
);
1237 if (e
->idx
.offset
) {
1238 duplicate_count_by_type
[OBJ_BLOB
]++;
1239 truncate_pack(&checkpoint
);
1241 } else if (find_sha1_pack(sha1
, packed_git
)) {
1243 e
->pack_id
= MAX_PACK_ID
;
1244 e
->idx
.offset
= 1; /* just not zero! */
1245 duplicate_count_by_type
[OBJ_BLOB
]++;
1246 truncate_pack(&checkpoint
);
1251 e
->pack_id
= pack_id
;
1252 e
->idx
.offset
= offset
;
1253 e
->idx
.crc32
= crc32_end(pack_file
);
1255 object_count_by_type
[OBJ_BLOB
]++;
1262 /* All calls must be guarded by find_object() or find_mark() to
1263 * ensure the 'struct object_entry' passed was written by this
1264 * process instance. We unpack the entry by the offset, avoiding
1265 * the need for the corresponding .idx file. This unpacking rule
1266 * works because we only use OBJ_REF_DELTA within the packfiles
1267 * created by fast-import.
1269 * oe must not be NULL. Such an oe usually comes from giving
1270 * an unknown SHA-1 to find_object() or an undefined mark to
1271 * find_mark(). Callers must test for this condition and use
1272 * the standard read_sha1_file() when it happens.
1274 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1275 * find_mark(), where the mark was reloaded from an existing marks
1276 * file and is referencing an object that this fast-import process
1277 * instance did not write out to a packfile. Callers must test for
1278 * this condition and use read_sha1_file() instead.
1280 static void *gfi_unpack_entry(
1281 struct object_entry
*oe
,
1282 unsigned long *sizep
)
1284 enum object_type type
;
1285 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1286 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1287 /* The object is stored in the packfile we are writing to
1288 * and we have modified it since the last time we scanned
1289 * back to read a previously written object. If an old
1290 * window covered [p->pack_size, p->pack_size + 20) its
1291 * data is stale and is not valid. Closing all windows
1292 * and updating the packfile length ensures we can read
1293 * the newly written data.
1295 close_pack_windows(p
);
1296 sha1flush(pack_file
);
1298 /* We have to offer 20 bytes additional on the end of
1299 * the packfile as the core unpacker code assumes the
1300 * footer is present at the file end and must promise
1301 * at least 20 bytes within any window it maps. But
1302 * we don't actually create the footer here.
1304 p
->pack_size
= pack_size
+ 20;
1306 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1309 static const char *get_mode(const char *str
, uint16_t *modep
)
1314 while ((c
= *str
++) != ' ') {
1315 if (c
< '0' || c
> '7')
1317 mode
= (mode
<< 3) + (c
- '0');
1323 static void load_tree(struct tree_entry
*root
)
1325 unsigned char *sha1
= root
->versions
[1].sha1
;
1326 struct object_entry
*myoe
;
1327 struct tree_content
*t
;
1332 root
->tree
= t
= new_tree_content(8);
1333 if (is_null_sha1(sha1
))
1336 myoe
= find_object(sha1
);
1337 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1338 if (myoe
->type
!= OBJ_TREE
)
1339 die("Not a tree: %s", sha1_to_hex(sha1
));
1340 t
->delta_depth
= myoe
->depth
;
1341 buf
= gfi_unpack_entry(myoe
, &size
);
1343 die("Can't load tree %s", sha1_to_hex(sha1
));
1345 enum object_type type
;
1346 buf
= read_sha1_file(sha1
, &type
, &size
);
1347 if (!buf
|| type
!= OBJ_TREE
)
1348 die("Can't load tree %s", sha1_to_hex(sha1
));
1352 while (c
!= (buf
+ size
)) {
1353 struct tree_entry
*e
= new_tree_entry();
1355 if (t
->entry_count
== t
->entry_capacity
)
1356 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1357 t
->entries
[t
->entry_count
++] = e
;
1360 c
= get_mode(c
, &e
->versions
[1].mode
);
1362 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1363 e
->versions
[0].mode
= e
->versions
[1].mode
;
1364 e
->name
= to_atom(c
, strlen(c
));
1365 c
+= e
->name
->str_len
+ 1;
1366 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1367 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1373 static int tecmp0 (const void *_a
, const void *_b
)
1375 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1376 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1377 return base_name_compare(
1378 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1379 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1382 static int tecmp1 (const void *_a
, const void *_b
)
1384 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1385 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1386 return base_name_compare(
1387 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1388 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1391 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1397 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1399 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1401 for (i
= 0; i
< t
->entry_count
; i
++) {
1402 if (t
->entries
[i
]->versions
[v
].mode
)
1403 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1407 strbuf_grow(b
, maxlen
);
1408 for (i
= 0; i
< t
->entry_count
; i
++) {
1409 struct tree_entry
*e
= t
->entries
[i
];
1410 if (!e
->versions
[v
].mode
)
1412 strbuf_addf(b
, "%o %s%c",
1413 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1414 e
->name
->str_dat
, '\0');
1415 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1419 static void store_tree(struct tree_entry
*root
)
1421 struct tree_content
*t
= root
->tree
;
1422 unsigned int i
, j
, del
;
1423 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1424 struct object_entry
*le
= NULL
;
1426 if (!is_null_sha1(root
->versions
[1].sha1
))
1429 for (i
= 0; i
< t
->entry_count
; i
++) {
1430 if (t
->entries
[i
]->tree
)
1431 store_tree(t
->entries
[i
]);
1434 if (!(root
->versions
[0].mode
& NO_DELTA
))
1435 le
= find_object(root
->versions
[0].sha1
);
1436 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1437 mktree(t
, 0, &old_tree
);
1439 lo
.offset
= le
->idx
.offset
;
1440 lo
.depth
= t
->delta_depth
;
1443 mktree(t
, 1, &new_tree
);
1444 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1446 t
->delta_depth
= lo
.depth
;
1447 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1448 struct tree_entry
*e
= t
->entries
[i
];
1449 if (e
->versions
[1].mode
) {
1450 e
->versions
[0].mode
= e
->versions
[1].mode
;
1451 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1452 t
->entries
[j
++] = e
;
1454 release_tree_entry(e
);
1458 t
->entry_count
-= del
;
1461 static void tree_content_replace(
1462 struct tree_entry
*root
,
1463 const unsigned char *sha1
,
1464 const uint16_t mode
,
1465 struct tree_content
*newtree
)
1468 die("Root cannot be a non-directory");
1469 hashclr(root
->versions
[0].sha1
);
1470 hashcpy(root
->versions
[1].sha1
, sha1
);
1472 release_tree_content_recursive(root
->tree
);
1473 root
->tree
= newtree
;
1476 static int tree_content_set(
1477 struct tree_entry
*root
,
1479 const unsigned char *sha1
,
1480 const uint16_t mode
,
1481 struct tree_content
*subtree
)
1483 struct tree_content
*t
;
1486 struct tree_entry
*e
;
1488 slash1
= strchr(p
, '/');
1494 die("Empty path component found in input");
1495 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1496 die("Non-directories cannot have subtrees");
1501 for (i
= 0; i
< t
->entry_count
; i
++) {
1503 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1506 && e
->versions
[1].mode
== mode
1507 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1509 e
->versions
[1].mode
= mode
;
1510 hashcpy(e
->versions
[1].sha1
, sha1
);
1512 release_tree_content_recursive(e
->tree
);
1516 * We need to leave e->versions[0].sha1 alone
1517 * to avoid modifying the preimage tree used
1518 * when writing out the parent directory.
1519 * But after replacing the subdir with a
1520 * completely different one, it's not a good
1521 * delta base any more, and besides, we've
1522 * thrown away the tree entries needed to
1523 * make a delta against it.
1525 * So let's just explicitly disable deltas
1528 if (S_ISDIR(e
->versions
[0].mode
))
1529 e
->versions
[0].mode
|= NO_DELTA
;
1531 hashclr(root
->versions
[1].sha1
);
1534 if (!S_ISDIR(e
->versions
[1].mode
)) {
1535 e
->tree
= new_tree_content(8);
1536 e
->versions
[1].mode
= S_IFDIR
;
1540 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1541 hashclr(root
->versions
[1].sha1
);
1548 if (t
->entry_count
== t
->entry_capacity
)
1549 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1550 e
= new_tree_entry();
1551 e
->name
= to_atom(p
, n
);
1552 e
->versions
[0].mode
= 0;
1553 hashclr(e
->versions
[0].sha1
);
1554 t
->entries
[t
->entry_count
++] = e
;
1556 e
->tree
= new_tree_content(8);
1557 e
->versions
[1].mode
= S_IFDIR
;
1558 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1561 e
->versions
[1].mode
= mode
;
1562 hashcpy(e
->versions
[1].sha1
, sha1
);
1564 hashclr(root
->versions
[1].sha1
);
1568 static int tree_content_remove(
1569 struct tree_entry
*root
,
1571 struct tree_entry
*backup_leaf
)
1573 struct tree_content
*t
;
1576 struct tree_entry
*e
;
1578 slash1
= strchr(p
, '/');
1587 for (i
= 0; i
< t
->entry_count
; i
++) {
1589 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1590 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1592 * If p names a file in some subdirectory, and a
1593 * file or symlink matching the name of the
1594 * parent directory of p exists, then p cannot
1595 * exist and need not be deleted.
1598 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1602 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1603 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1604 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1605 hashclr(root
->versions
[1].sha1
);
1619 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1621 release_tree_content_recursive(e
->tree
);
1623 e
->versions
[1].mode
= 0;
1624 hashclr(e
->versions
[1].sha1
);
1625 hashclr(root
->versions
[1].sha1
);
1629 static int tree_content_get(
1630 struct tree_entry
*root
,
1632 struct tree_entry
*leaf
,
1635 struct tree_content
*t
;
1638 struct tree_entry
*e
;
1640 slash1
= strchr(p
, '/');
1645 if (!n
&& !allow_root
)
1646 die("Empty path component found in input");
1657 for (i
= 0; i
< t
->entry_count
; i
++) {
1659 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1662 if (!S_ISDIR(e
->versions
[1].mode
))
1666 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1672 memcpy(leaf
, e
, sizeof(*leaf
));
1673 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1674 leaf
->tree
= dup_tree_content(e
->tree
);
1680 static int update_branch(struct branch
*b
)
1682 static const char *msg
= "fast-import";
1683 struct ref_lock
*lock
;
1684 unsigned char old_sha1
[20];
1686 if (is_null_sha1(b
->sha1
))
1688 if (read_ref(b
->name
, old_sha1
))
1690 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1692 return error("Unable to lock %s", b
->name
);
1693 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1694 struct commit
*old_cmit
, *new_cmit
;
1696 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1697 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1698 if (!old_cmit
|| !new_cmit
) {
1700 return error("Branch %s is missing commits.", b
->name
);
1703 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1705 warning("Not updating %s"
1706 " (new tip %s does not contain %s)",
1707 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1711 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1712 return error("Unable to update %s", b
->name
);
1716 static void dump_branches(void)
1721 for (i
= 0; i
< branch_table_sz
; i
++) {
1722 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1723 failure
|= update_branch(b
);
1727 static void dump_tags(void)
1729 static const char *msg
= "fast-import";
1731 struct ref_lock
*lock
;
1732 char ref_name
[PATH_MAX
];
1734 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1735 sprintf(ref_name
, "tags/%s", t
->name
);
1736 lock
= lock_ref_sha1(ref_name
, NULL
);
1737 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1738 failure
|= error("Unable to update %s", ref_name
);
1742 static void dump_marks_helper(FILE *f
,
1748 for (k
= 0; k
< 1024; k
++) {
1749 if (m
->data
.sets
[k
])
1750 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1754 for (k
= 0; k
< 1024; k
++) {
1755 if (m
->data
.marked
[k
])
1756 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1757 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1762 static void dump_marks(void)
1764 static struct lock_file mark_lock
;
1768 if (!export_marks_file
)
1771 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1773 failure
|= error("Unable to write marks file %s: %s",
1774 export_marks_file
, strerror(errno
));
1778 f
= fdopen(mark_fd
, "w");
1780 int saved_errno
= errno
;
1781 rollback_lock_file(&mark_lock
);
1782 failure
|= error("Unable to write marks file %s: %s",
1783 export_marks_file
, strerror(saved_errno
));
1788 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1789 * Assign -1 to the lock file descriptor so that commit_lock_file()
1790 * won't try to close() it.
1794 dump_marks_helper(f
, 0, marks
);
1795 if (ferror(f
) || fclose(f
)) {
1796 int saved_errno
= errno
;
1797 rollback_lock_file(&mark_lock
);
1798 failure
|= error("Unable to write marks file %s: %s",
1799 export_marks_file
, strerror(saved_errno
));
1803 if (commit_lock_file(&mark_lock
)) {
1804 int saved_errno
= errno
;
1805 rollback_lock_file(&mark_lock
);
1806 failure
|= error("Unable to commit marks file %s: %s",
1807 export_marks_file
, strerror(saved_errno
));
1812 static void read_marks(void)
1815 FILE *f
= fopen(import_marks_file
, "r");
1818 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1819 return; /* Marks file does not exist */
1821 die_errno("cannot read '%s'", import_marks_file
);
1822 while (fgets(line
, sizeof(line
), f
)) {
1825 unsigned char sha1
[20];
1826 struct object_entry
*e
;
1828 end
= strchr(line
, '\n');
1829 if (line
[0] != ':' || !end
)
1830 die("corrupt mark line: %s", line
);
1832 mark
= strtoumax(line
+ 1, &end
, 10);
1833 if (!mark
|| end
== line
+ 1
1834 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1835 die("corrupt mark line: %s", line
);
1836 e
= find_object(sha1
);
1838 enum object_type type
= sha1_object_info(sha1
, NULL
);
1840 die("object not found: %s", sha1_to_hex(sha1
));
1841 e
= insert_object(sha1
);
1843 e
->pack_id
= MAX_PACK_ID
;
1844 e
->idx
.offset
= 1; /* just not zero! */
1846 insert_mark(mark
, e
);
1852 static int read_next_command(void)
1854 static int stdin_eof
= 0;
1857 unread_command_buf
= 0;
1862 if (unread_command_buf
) {
1863 unread_command_buf
= 0;
1865 struct recent_command
*rc
;
1867 strbuf_detach(&command_buf
, NULL
);
1868 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1872 if (!seen_data_command
1873 && prefixcmp(command_buf
.buf
, "feature ")
1874 && prefixcmp(command_buf
.buf
, "option ")) {
1883 cmd_hist
.next
= rc
->next
;
1884 cmd_hist
.next
->prev
= &cmd_hist
;
1888 rc
->buf
= command_buf
.buf
;
1889 rc
->prev
= cmd_tail
;
1890 rc
->next
= cmd_hist
.prev
;
1891 rc
->prev
->next
= rc
;
1894 if (!prefixcmp(command_buf
.buf
, "cat-blob ")) {
1898 if (command_buf
.buf
[0] == '#')
1904 static void skip_optional_lf(void)
1906 int term_char
= fgetc(stdin
);
1907 if (term_char
!= '\n' && term_char
!= EOF
)
1908 ungetc(term_char
, stdin
);
1911 static void parse_mark(void)
1913 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1914 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1915 read_next_command();
1921 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1925 if (prefixcmp(command_buf
.buf
, "data "))
1926 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1928 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1929 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1930 size_t term_len
= command_buf
.len
- 5 - 2;
1932 strbuf_detach(&command_buf
, NULL
);
1934 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1935 die("EOF in data (terminator '%s' not found)", term
);
1936 if (term_len
== command_buf
.len
1937 && !strcmp(term
, command_buf
.buf
))
1939 strbuf_addbuf(sb
, &command_buf
);
1940 strbuf_addch(sb
, '\n');
1945 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1946 size_t n
= 0, length
= (size_t)len
;
1948 if (limit
&& limit
< len
) {
1953 die("data is too large to use in this context");
1955 while (n
< length
) {
1956 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1957 if (!s
&& feof(stdin
))
1958 die("EOF in data (%lu bytes remaining)",
1959 (unsigned long)(length
- n
));
1968 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1970 const char *orig_src
= src
;
1976 num
= strtoul(src
, &endp
, 10);
1977 /* NEEDSWORK: perhaps check for reasonable values? */
1978 if (errno
|| endp
== src
|| *endp
!= ' ')
1982 if (*src
!= '-' && *src
!= '+')
1985 num
= strtoul(src
+ 1, &endp
, 10);
1986 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1990 strcpy(result
, orig_src
);
1994 static char *parse_ident(const char *buf
)
2000 /* ensure there is a space delimiter even if there is no name */
2004 ltgt
= buf
+ strcspn(buf
, "<>");
2006 die("Missing < in ident string: %s", buf
);
2007 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
2008 die("Missing space before < in ident string: %s", buf
);
2009 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
2011 die("Missing > in ident string: %s", buf
);
2014 die("Missing space after > in ident string: %s", buf
);
2016 name_len
= ltgt
- buf
;
2017 ident
= xmalloc(name_len
+ 24);
2018 strncpy(ident
, buf
, name_len
);
2022 if (validate_raw_date(ltgt
, ident
+ name_len
, 24) < 0)
2023 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
2025 case WHENSPEC_RFC2822
:
2026 if (parse_date(ltgt
, ident
+ name_len
, 24) < 0)
2027 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
2030 if (strcmp("now", ltgt
))
2031 die("Date in ident must be 'now': %s", buf
);
2032 datestamp(ident
+ name_len
, 24);
2039 static void parse_and_store_blob(
2040 struct last_object
*last
,
2041 unsigned char *sha1out
,
2044 static struct strbuf buf
= STRBUF_INIT
;
2047 if (parse_data(&buf
, big_file_threshold
, &len
))
2048 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2051 strbuf_release(&last
->data
);
2055 stream_blob(len
, sha1out
, mark
);
2060 static void parse_new_blob(void)
2062 read_next_command();
2064 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2067 static void unload_one_branch(void)
2069 while (cur_active_branches
2070 && cur_active_branches
>= max_active_branches
) {
2071 uintmax_t min_commit
= ULONG_MAX
;
2072 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2074 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2075 if (e
->last_commit
< min_commit
) {
2077 min_commit
= e
->last_commit
;
2083 e
= p
->active_next_branch
;
2084 p
->active_next_branch
= e
->active_next_branch
;
2086 e
= active_branches
;
2087 active_branches
= e
->active_next_branch
;
2090 e
->active_next_branch
= NULL
;
2091 if (e
->branch_tree
.tree
) {
2092 release_tree_content_recursive(e
->branch_tree
.tree
);
2093 e
->branch_tree
.tree
= NULL
;
2095 cur_active_branches
--;
2099 static void load_branch(struct branch
*b
)
2101 load_tree(&b
->branch_tree
);
2104 b
->active_next_branch
= active_branches
;
2105 active_branches
= b
;
2106 cur_active_branches
++;
2107 branch_load_count
++;
2111 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2113 unsigned char fanout
= 0;
2114 while ((num_notes
>>= 8))
2119 static void construct_path_with_fanout(const char *hex_sha1
,
2120 unsigned char fanout
, char *path
)
2122 unsigned int i
= 0, j
= 0;
2124 die("Too large fanout (%u)", fanout
);
2126 path
[i
++] = hex_sha1
[j
++];
2127 path
[i
++] = hex_sha1
[j
++];
2131 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2132 path
[i
+ 40 - j
] = '\0';
2135 static uintmax_t do_change_note_fanout(
2136 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2137 char *hex_sha1
, unsigned int hex_sha1_len
,
2138 char *fullpath
, unsigned int fullpath_len
,
2139 unsigned char fanout
)
2141 struct tree_content
*t
= root
->tree
;
2142 struct tree_entry
*e
, leaf
;
2143 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2144 uintmax_t num_notes
= 0;
2145 unsigned char sha1
[20];
2148 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2150 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2151 tmp_fullpath_len
= fullpath_len
;
2154 * We're interested in EITHER existing note entries (entries
2155 * with exactly 40 hex chars in path, not including directory
2156 * separators), OR directory entries that may contain note
2157 * entries (with < 40 hex chars in path).
2158 * Also, each path component in a note entry must be a multiple
2161 if (!e
->versions
[1].mode
||
2162 tmp_hex_sha1_len
> 40 ||
2163 e
->name
->str_len
% 2)
2166 /* This _may_ be a note entry, or a subdir containing notes */
2167 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2169 if (tmp_fullpath_len
)
2170 fullpath
[tmp_fullpath_len
++] = '/';
2171 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2173 tmp_fullpath_len
+= e
->name
->str_len
;
2174 fullpath
[tmp_fullpath_len
] = '\0';
2176 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2177 /* This is a note entry */
2178 if (fanout
== 0xff) {
2179 /* Counting mode, no rename */
2183 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2184 if (!strcmp(fullpath
, realpath
)) {
2185 /* Note entry is in correct location */
2190 /* Rename fullpath to realpath */
2191 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2192 die("Failed to remove path %s", fullpath
);
2193 tree_content_set(orig_root
, realpath
,
2194 leaf
.versions
[1].sha1
,
2195 leaf
.versions
[1].mode
,
2197 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2198 /* This is a subdir that may contain note entries */
2201 num_notes
+= do_change_note_fanout(orig_root
, e
,
2202 hex_sha1
, tmp_hex_sha1_len
,
2203 fullpath
, tmp_fullpath_len
, fanout
);
2206 /* The above may have reallocated the current tree_content */
2212 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2213 unsigned char fanout
)
2215 char hex_sha1
[40], path
[60];
2216 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2220 * Given a pointer into a string, parse a mark reference:
2222 * idnum ::= ':' bigint;
2224 * Return the first character after the value in *endptr.
2226 * Complain if the following character is not what is expected,
2227 * either a space or end of the string.
2229 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2235 mark
= strtoumax(p
, endptr
, 10);
2237 die("No value after ':' in mark: %s", command_buf
.buf
);
2242 * Parse the mark reference, and complain if this is not the end of
2245 static uintmax_t parse_mark_ref_eol(const char *p
)
2250 mark
= parse_mark_ref(p
, &end
);
2252 die("Garbage after mark: %s", command_buf
.buf
);
2257 * Parse the mark reference, demanding a trailing space. Return a
2258 * pointer to the space.
2260 static uintmax_t parse_mark_ref_space(const char **p
)
2265 mark
= parse_mark_ref(*p
, &end
);
2267 die("Missing space after mark: %s", command_buf
.buf
);
2272 static void file_change_m(struct branch
*b
)
2274 const char *p
= command_buf
.buf
+ 2;
2275 static struct strbuf uq
= STRBUF_INIT
;
2277 struct object_entry
*oe
;
2278 unsigned char sha1
[20];
2279 uint16_t mode
, inline_data
= 0;
2281 p
= get_mode(p
, &mode
);
2283 die("Corrupt mode: %s", command_buf
.buf
);
2288 case S_IFREG
| 0644:
2289 case S_IFREG
| 0755:
2296 die("Corrupt mode: %s", command_buf
.buf
);
2300 oe
= find_mark(parse_mark_ref_space(&p
));
2301 hashcpy(sha1
, oe
->idx
.sha1
);
2302 } else if (!prefixcmp(p
, "inline ")) {
2304 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2305 p
+= strlen("inline"); /* advance to space */
2307 if (get_sha1_hex(p
, sha1
))
2308 die("Invalid dataref: %s", command_buf
.buf
);
2309 oe
= find_object(sha1
);
2312 die("Missing space after SHA1: %s", command_buf
.buf
);
2315 p
++; /* skip space */
2318 if (!unquote_c_style(&uq
, p
, &endp
)) {
2320 die("Garbage after path in: %s", command_buf
.buf
);
2324 /* Git does not track empty, non-toplevel directories. */
2325 if (S_ISDIR(mode
) && !memcmp(sha1
, EMPTY_TREE_SHA1_BIN
, 20) && *p
) {
2326 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2330 if (S_ISGITLINK(mode
)) {
2332 die("Git links cannot be specified 'inline': %s",
2335 if (oe
->type
!= OBJ_COMMIT
)
2336 die("Not a commit (actually a %s): %s",
2337 typename(oe
->type
), command_buf
.buf
);
2340 * Accept the sha1 without checking; it expected to be in
2341 * another repository.
2343 } else if (inline_data
) {
2345 die("Directories cannot be specified 'inline': %s",
2348 strbuf_addstr(&uq
, p
);
2351 read_next_command();
2352 parse_and_store_blob(&last_blob
, sha1
, 0);
2354 enum object_type expected
= S_ISDIR(mode
) ?
2356 enum object_type type
= oe
? oe
->type
:
2357 sha1_object_info(sha1
, NULL
);
2359 die("%s not found: %s",
2360 S_ISDIR(mode
) ? "Tree" : "Blob",
2362 if (type
!= expected
)
2363 die("Not a %s (actually a %s): %s",
2364 typename(expected
), typename(type
),
2369 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2372 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2375 static void file_change_d(struct branch
*b
)
2377 const char *p
= command_buf
.buf
+ 2;
2378 static struct strbuf uq
= STRBUF_INIT
;
2382 if (!unquote_c_style(&uq
, p
, &endp
)) {
2384 die("Garbage after path in: %s", command_buf
.buf
);
2387 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2390 static void file_change_cr(struct branch
*b
, int rename
)
2393 static struct strbuf s_uq
= STRBUF_INIT
;
2394 static struct strbuf d_uq
= STRBUF_INIT
;
2396 struct tree_entry leaf
;
2398 s
= command_buf
.buf
+ 2;
2399 strbuf_reset(&s_uq
);
2400 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2402 die("Missing space after source: %s", command_buf
.buf
);
2404 endp
= strchr(s
, ' ');
2406 die("Missing space after source: %s", command_buf
.buf
);
2407 strbuf_add(&s_uq
, s
, endp
- s
);
2413 die("Missing dest: %s", command_buf
.buf
);
2416 strbuf_reset(&d_uq
);
2417 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2419 die("Garbage after dest in: %s", command_buf
.buf
);
2423 memset(&leaf
, 0, sizeof(leaf
));
2425 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2427 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2428 if (!leaf
.versions
[1].mode
)
2429 die("Path %s not in branch", s
);
2430 if (!*d
) { /* C "path/to/subdir" "" */
2431 tree_content_replace(&b
->branch_tree
,
2432 leaf
.versions
[1].sha1
,
2433 leaf
.versions
[1].mode
,
2437 tree_content_set(&b
->branch_tree
, d
,
2438 leaf
.versions
[1].sha1
,
2439 leaf
.versions
[1].mode
,
2443 static void note_change_n(struct branch
*b
, unsigned char *old_fanout
)
2445 const char *p
= command_buf
.buf
+ 2;
2446 static struct strbuf uq
= STRBUF_INIT
;
2447 struct object_entry
*oe
;
2449 unsigned char sha1
[20], commit_sha1
[20];
2451 uint16_t inline_data
= 0;
2452 unsigned char new_fanout
;
2455 * When loading a branch, we don't traverse its tree to count the real
2456 * number of notes (too expensive to do this for all non-note refs).
2457 * This means that recently loaded notes refs might incorrectly have
2458 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2460 * Fix this by traversing the tree and counting the number of notes
2461 * when b->num_notes == 0. If the notes tree is truly empty, the
2462 * calculation should not take long.
2464 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2465 /* Invoke change_note_fanout() in "counting mode". */
2466 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2467 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2470 /* Now parse the notemodify command. */
2471 /* <dataref> or 'inline' */
2473 oe
= find_mark(parse_mark_ref_space(&p
));
2474 hashcpy(sha1
, oe
->idx
.sha1
);
2475 } else if (!prefixcmp(p
, "inline ")) {
2477 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2478 p
+= strlen("inline"); /* advance to space */
2480 if (get_sha1_hex(p
, sha1
))
2481 die("Invalid dataref: %s", command_buf
.buf
);
2482 oe
= find_object(sha1
);
2485 die("Missing space after SHA1: %s", command_buf
.buf
);
2488 p
++; /* skip space */
2491 s
= lookup_branch(p
);
2493 if (is_null_sha1(s
->sha1
))
2494 die("Can't add a note on empty branch.");
2495 hashcpy(commit_sha1
, s
->sha1
);
2496 } else if (*p
== ':') {
2497 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2498 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2499 if (commit_oe
->type
!= OBJ_COMMIT
)
2500 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2501 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2502 } else if (!get_sha1(p
, commit_sha1
)) {
2504 char *buf
= read_object_with_reference(commit_sha1
,
2505 commit_type
, &size
, commit_sha1
);
2506 if (!buf
|| size
< 46)
2507 die("Not a valid commit: %s", p
);
2510 die("Invalid ref name or SHA1 expression: %s", p
);
2514 strbuf_addstr(&uq
, p
);
2517 read_next_command();
2518 parse_and_store_blob(&last_blob
, sha1
, 0);
2520 if (oe
->type
!= OBJ_BLOB
)
2521 die("Not a blob (actually a %s): %s",
2522 typename(oe
->type
), command_buf
.buf
);
2523 } else if (!is_null_sha1(sha1
)) {
2524 enum object_type type
= sha1_object_info(sha1
, NULL
);
2526 die("Blob not found: %s", command_buf
.buf
);
2527 if (type
!= OBJ_BLOB
)
2528 die("Not a blob (actually a %s): %s",
2529 typename(type
), command_buf
.buf
);
2532 construct_path_with_fanout(sha1_to_hex(commit_sha1
), *old_fanout
, path
);
2533 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2536 if (is_null_sha1(sha1
))
2537 return; /* nothing to insert */
2540 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2541 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2542 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2545 static void file_change_deleteall(struct branch
*b
)
2547 release_tree_content_recursive(b
->branch_tree
.tree
);
2548 hashclr(b
->branch_tree
.versions
[0].sha1
);
2549 hashclr(b
->branch_tree
.versions
[1].sha1
);
2550 load_tree(&b
->branch_tree
);
2554 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2556 if (!buf
|| size
< 46)
2557 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2558 if (memcmp("tree ", buf
, 5)
2559 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2560 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2561 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2562 b
->branch_tree
.versions
[1].sha1
);
2565 static void parse_from_existing(struct branch
*b
)
2567 if (is_null_sha1(b
->sha1
)) {
2568 hashclr(b
->branch_tree
.versions
[0].sha1
);
2569 hashclr(b
->branch_tree
.versions
[1].sha1
);
2574 buf
= read_object_with_reference(b
->sha1
,
2575 commit_type
, &size
, b
->sha1
);
2576 parse_from_commit(b
, buf
, size
);
2581 static int parse_from(struct branch
*b
)
2586 if (prefixcmp(command_buf
.buf
, "from "))
2589 if (b
->branch_tree
.tree
) {
2590 release_tree_content_recursive(b
->branch_tree
.tree
);
2591 b
->branch_tree
.tree
= NULL
;
2594 from
= strchr(command_buf
.buf
, ' ') + 1;
2595 s
= lookup_branch(from
);
2597 die("Can't create a branch from itself: %s", b
->name
);
2599 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2600 hashcpy(b
->sha1
, s
->sha1
);
2601 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2602 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2603 } else if (*from
== ':') {
2604 uintmax_t idnum
= parse_mark_ref_eol(from
);
2605 struct object_entry
*oe
= find_mark(idnum
);
2606 if (oe
->type
!= OBJ_COMMIT
)
2607 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2608 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2609 if (oe
->pack_id
!= MAX_PACK_ID
) {
2611 char *buf
= gfi_unpack_entry(oe
, &size
);
2612 parse_from_commit(b
, buf
, size
);
2615 parse_from_existing(b
);
2616 } else if (!get_sha1(from
, b
->sha1
))
2617 parse_from_existing(b
);
2619 die("Invalid ref name or SHA1 expression: %s", from
);
2621 read_next_command();
2625 static struct hash_list
*parse_merge(unsigned int *count
)
2627 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2632 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2633 from
= strchr(command_buf
.buf
, ' ') + 1;
2634 n
= xmalloc(sizeof(*n
));
2635 s
= lookup_branch(from
);
2637 hashcpy(n
->sha1
, s
->sha1
);
2638 else if (*from
== ':') {
2639 uintmax_t idnum
= parse_mark_ref_eol(from
);
2640 struct object_entry
*oe
= find_mark(idnum
);
2641 if (oe
->type
!= OBJ_COMMIT
)
2642 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2643 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2644 } else if (!get_sha1(from
, n
->sha1
)) {
2646 char *buf
= read_object_with_reference(n
->sha1
,
2647 commit_type
, &size
, n
->sha1
);
2648 if (!buf
|| size
< 46)
2649 die("Not a valid commit: %s", from
);
2652 die("Invalid ref name or SHA1 expression: %s", from
);
2659 read_next_command();
2664 static void parse_new_commit(void)
2666 static struct strbuf msg
= STRBUF_INIT
;
2669 char *author
= NULL
;
2670 char *committer
= NULL
;
2671 struct hash_list
*merge_list
= NULL
;
2672 unsigned int merge_count
;
2673 unsigned char prev_fanout
, new_fanout
;
2675 /* Obtain the branch name from the rest of our command */
2676 sp
= strchr(command_buf
.buf
, ' ') + 1;
2677 b
= lookup_branch(sp
);
2681 read_next_command();
2683 if (!prefixcmp(command_buf
.buf
, "author ")) {
2684 author
= parse_ident(command_buf
.buf
+ 7);
2685 read_next_command();
2687 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2688 committer
= parse_ident(command_buf
.buf
+ 10);
2689 read_next_command();
2692 die("Expected committer but didn't get one");
2693 parse_data(&msg
, 0, NULL
);
2694 read_next_command();
2696 merge_list
= parse_merge(&merge_count
);
2698 /* ensure the branch is active/loaded */
2699 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2700 unload_one_branch();
2704 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2707 while (command_buf
.len
> 0) {
2708 if (!prefixcmp(command_buf
.buf
, "M "))
2710 else if (!prefixcmp(command_buf
.buf
, "D "))
2712 else if (!prefixcmp(command_buf
.buf
, "R "))
2713 file_change_cr(b
, 1);
2714 else if (!prefixcmp(command_buf
.buf
, "C "))
2715 file_change_cr(b
, 0);
2716 else if (!prefixcmp(command_buf
.buf
, "N "))
2717 note_change_n(b
, &prev_fanout
);
2718 else if (!strcmp("deleteall", command_buf
.buf
))
2719 file_change_deleteall(b
);
2720 else if (!prefixcmp(command_buf
.buf
, "ls "))
2723 unread_command_buf
= 1;
2726 if (read_next_command() == EOF
)
2730 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2731 if (new_fanout
!= prev_fanout
)
2732 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2734 /* build the tree and the commit */
2735 store_tree(&b
->branch_tree
);
2736 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2737 b
->branch_tree
.versions
[1].sha1
);
2739 strbuf_reset(&new_data
);
2740 strbuf_addf(&new_data
, "tree %s\n",
2741 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2742 if (!is_null_sha1(b
->sha1
))
2743 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2744 while (merge_list
) {
2745 struct hash_list
*next
= merge_list
->next
;
2746 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2750 strbuf_addf(&new_data
,
2754 author
? author
: committer
, committer
);
2755 strbuf_addbuf(&new_data
, &msg
);
2759 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2760 b
->pack_id
= pack_id
;
2761 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2764 static void parse_new_tag(void)
2766 static struct strbuf msg
= STRBUF_INIT
;
2772 uintmax_t from_mark
= 0;
2773 unsigned char sha1
[20];
2774 enum object_type type
;
2776 /* Obtain the new tag name from the rest of our command */
2777 sp
= strchr(command_buf
.buf
, ' ') + 1;
2778 t
= pool_alloc(sizeof(struct tag
));
2779 memset(t
, 0, sizeof(struct tag
));
2780 t
->name
= pool_strdup(sp
);
2782 last_tag
->next_tag
= t
;
2786 read_next_command();
2789 if (prefixcmp(command_buf
.buf
, "from "))
2790 die("Expected from command, got %s", command_buf
.buf
);
2791 from
= strchr(command_buf
.buf
, ' ') + 1;
2792 s
= lookup_branch(from
);
2794 if (is_null_sha1(s
->sha1
))
2795 die("Can't tag an empty branch.");
2796 hashcpy(sha1
, s
->sha1
);
2798 } else if (*from
== ':') {
2799 struct object_entry
*oe
;
2800 from_mark
= parse_mark_ref_eol(from
);
2801 oe
= find_mark(from_mark
);
2803 hashcpy(sha1
, oe
->idx
.sha1
);
2804 } else if (!get_sha1(from
, sha1
)) {
2805 struct object_entry
*oe
= find_object(sha1
);
2807 type
= sha1_object_info(sha1
, NULL
);
2809 die("Not a valid object: %s", from
);
2813 die("Invalid ref name or SHA1 expression: %s", from
);
2814 read_next_command();
2817 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2818 tagger
= parse_ident(command_buf
.buf
+ 7);
2819 read_next_command();
2823 /* tag payload/message */
2824 parse_data(&msg
, 0, NULL
);
2826 /* build the tag object */
2827 strbuf_reset(&new_data
);
2829 strbuf_addf(&new_data
,
2833 sha1_to_hex(sha1
), typename(type
), t
->name
);
2835 strbuf_addf(&new_data
,
2836 "tagger %s\n", tagger
);
2837 strbuf_addch(&new_data
, '\n');
2838 strbuf_addbuf(&new_data
, &msg
);
2841 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2842 t
->pack_id
= MAX_PACK_ID
;
2844 t
->pack_id
= pack_id
;
2847 static void parse_reset_branch(void)
2852 /* Obtain the branch name from the rest of our command */
2853 sp
= strchr(command_buf
.buf
, ' ') + 1;
2854 b
= lookup_branch(sp
);
2857 hashclr(b
->branch_tree
.versions
[0].sha1
);
2858 hashclr(b
->branch_tree
.versions
[1].sha1
);
2859 if (b
->branch_tree
.tree
) {
2860 release_tree_content_recursive(b
->branch_tree
.tree
);
2861 b
->branch_tree
.tree
= NULL
;
2866 read_next_command();
2868 if (command_buf
.len
> 0)
2869 unread_command_buf
= 1;
2872 static void cat_blob_write(const char *buf
, unsigned long size
)
2874 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2875 die_errno("Write to frontend failed");
2878 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2880 struct strbuf line
= STRBUF_INIT
;
2882 enum object_type type
= 0;
2885 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2886 buf
= read_sha1_file(sha1
, &type
, &size
);
2889 buf
= gfi_unpack_entry(oe
, &size
);
2893 * Output based on batch_one_object() from cat-file.c.
2896 strbuf_reset(&line
);
2897 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2898 cat_blob_write(line
.buf
, line
.len
);
2899 strbuf_release(&line
);
2904 die("Can't read object %s", sha1_to_hex(sha1
));
2905 if (type
!= OBJ_BLOB
)
2906 die("Object %s is a %s but a blob was expected.",
2907 sha1_to_hex(sha1
), typename(type
));
2908 strbuf_reset(&line
);
2909 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2910 typename(type
), size
);
2911 cat_blob_write(line
.buf
, line
.len
);
2912 strbuf_release(&line
);
2913 cat_blob_write(buf
, size
);
2914 cat_blob_write("\n", 1);
2915 if (oe
&& oe
->pack_id
== pack_id
) {
2916 last_blob
.offset
= oe
->idx
.offset
;
2917 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2918 last_blob
.depth
= oe
->depth
;
2923 static void parse_cat_blob(void)
2926 struct object_entry
*oe
= oe
;
2927 unsigned char sha1
[20];
2929 /* cat-blob SP <object> LF */
2930 p
= command_buf
.buf
+ strlen("cat-blob ");
2932 oe
= find_mark(parse_mark_ref_eol(p
));
2934 die("Unknown mark: %s", command_buf
.buf
);
2935 hashcpy(sha1
, oe
->idx
.sha1
);
2937 if (get_sha1_hex(p
, sha1
))
2938 die("Invalid dataref: %s", command_buf
.buf
);
2940 die("Garbage after SHA1: %s", command_buf
.buf
);
2941 oe
= find_object(sha1
);
2947 static struct object_entry
*dereference(struct object_entry
*oe
,
2948 unsigned char sha1
[20])
2953 enum object_type type
= sha1_object_info(sha1
, NULL
);
2955 die("object not found: %s", sha1_to_hex(sha1
));
2957 oe
= insert_object(sha1
);
2959 oe
->pack_id
= MAX_PACK_ID
;
2963 case OBJ_TREE
: /* easy case. */
2969 die("Not a treeish: %s", command_buf
.buf
);
2972 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
2973 buf
= gfi_unpack_entry(oe
, &size
);
2975 enum object_type unused
;
2976 buf
= read_sha1_file(sha1
, &unused
, &size
);
2979 die("Can't load object %s", sha1_to_hex(sha1
));
2981 /* Peel one layer. */
2984 if (size
< 40 + strlen("object ") ||
2985 get_sha1_hex(buf
+ strlen("object "), sha1
))
2986 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
2989 if (size
< 40 + strlen("tree ") ||
2990 get_sha1_hex(buf
+ strlen("tree "), sha1
))
2991 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
2995 return find_object(sha1
);
2998 static struct object_entry
*parse_treeish_dataref(const char **p
)
3000 unsigned char sha1
[20];
3001 struct object_entry
*e
;
3003 if (**p
== ':') { /* <mark> */
3004 e
= find_mark(parse_mark_ref_space(p
));
3006 die("Unknown mark: %s", command_buf
.buf
);
3007 hashcpy(sha1
, e
->idx
.sha1
);
3008 } else { /* <sha1> */
3009 if (get_sha1_hex(*p
, sha1
))
3010 die("Invalid dataref: %s", command_buf
.buf
);
3011 e
= find_object(sha1
);
3015 while (!e
|| e
->type
!= OBJ_TREE
)
3016 e
= dereference(e
, sha1
);
3020 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
3022 static struct strbuf line
= STRBUF_INIT
;
3024 /* See show_tree(). */
3026 S_ISGITLINK(mode
) ? commit_type
:
3027 S_ISDIR(mode
) ? tree_type
:
3031 /* missing SP path LF */
3032 strbuf_reset(&line
);
3033 strbuf_addstr(&line
, "missing ");
3034 quote_c_style(path
, &line
, NULL
, 0);
3035 strbuf_addch(&line
, '\n');
3037 /* mode SP type SP object_name TAB path LF */
3038 strbuf_reset(&line
);
3039 strbuf_addf(&line
, "%06o %s %s\t",
3040 mode
& ~NO_DELTA
, type
, sha1_to_hex(sha1
));
3041 quote_c_style(path
, &line
, NULL
, 0);
3042 strbuf_addch(&line
, '\n');
3044 cat_blob_write(line
.buf
, line
.len
);
3047 static void parse_ls(struct branch
*b
)
3050 struct tree_entry
*root
= NULL
;
3051 struct tree_entry leaf
= {NULL
};
3053 /* ls SP (<treeish> SP)? <path> */
3054 p
= command_buf
.buf
+ strlen("ls ");
3057 die("Not in a commit: %s", command_buf
.buf
);
3058 root
= &b
->branch_tree
;
3060 struct object_entry
*e
= parse_treeish_dataref(&p
);
3061 root
= new_tree_entry();
3062 hashcpy(root
->versions
[1].sha1
, e
->idx
.sha1
);
3063 if (!is_null_sha1(root
->versions
[1].sha1
))
3064 root
->versions
[1].mode
= S_IFDIR
;
3067 die("Missing space after tree-ish: %s", command_buf
.buf
);
3070 static struct strbuf uq
= STRBUF_INIT
;
3073 if (unquote_c_style(&uq
, p
, &endp
))
3074 die("Invalid path: %s", command_buf
.buf
);
3076 die("Garbage after path in: %s", command_buf
.buf
);
3079 tree_content_get(root
, p
, &leaf
, 1);
3081 * A directory in preparation would have a sha1 of zero
3082 * until it is saved. Save, for simplicity.
3084 if (S_ISDIR(leaf
.versions
[1].mode
))
3087 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].sha1
, p
);
3089 release_tree_content_recursive(leaf
.tree
);
3090 if (!b
|| root
!= &b
->branch_tree
)
3091 release_tree_entry(root
);
3094 static void checkpoint(void)
3096 checkpoint_requested
= 0;
3105 static void parse_checkpoint(void)
3107 checkpoint_requested
= 1;
3111 static void parse_progress(void)
3113 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3114 fputc('\n', stdout
);
3119 static char* make_fast_import_path(const char *path
)
3121 struct strbuf abs_path
= STRBUF_INIT
;
3123 if (!relative_marks_paths
|| is_absolute_path(path
))
3124 return xstrdup(path
);
3125 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
3126 return strbuf_detach(&abs_path
, NULL
);
3129 static void option_import_marks(const char *marks
,
3130 int from_stream
, int ignore_missing
)
3132 if (import_marks_file
) {
3134 die("Only one import-marks command allowed per stream");
3136 /* read previous mark file */
3137 if(!import_marks_file_from_stream
)
3141 import_marks_file
= make_fast_import_path(marks
);
3142 safe_create_leading_directories_const(import_marks_file
);
3143 import_marks_file_from_stream
= from_stream
;
3144 import_marks_file_ignore_missing
= ignore_missing
;
3147 static void option_date_format(const char *fmt
)
3149 if (!strcmp(fmt
, "raw"))
3150 whenspec
= WHENSPEC_RAW
;
3151 else if (!strcmp(fmt
, "rfc2822"))
3152 whenspec
= WHENSPEC_RFC2822
;
3153 else if (!strcmp(fmt
, "now"))
3154 whenspec
= WHENSPEC_NOW
;
3156 die("unknown --date-format argument %s", fmt
);
3159 static unsigned long ulong_arg(const char *option
, const char *arg
)
3162 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3163 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3164 die("%s: argument must be a non-negative integer", option
);
3168 static void option_depth(const char *depth
)
3170 max_depth
= ulong_arg("--depth", depth
);
3171 if (max_depth
> MAX_DEPTH
)
3172 die("--depth cannot exceed %u", MAX_DEPTH
);
3175 static void option_active_branches(const char *branches
)
3177 max_active_branches
= ulong_arg("--active-branches", branches
);
3180 static void option_export_marks(const char *marks
)
3182 export_marks_file
= make_fast_import_path(marks
);
3183 safe_create_leading_directories_const(export_marks_file
);
3186 static void option_cat_blob_fd(const char *fd
)
3188 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3189 if (n
> (unsigned long) INT_MAX
)
3190 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3191 cat_blob_fd
= (int) n
;
3194 static void option_export_pack_edges(const char *edges
)
3198 pack_edges
= fopen(edges
, "a");
3200 die_errno("Cannot open '%s'", edges
);
3203 static int parse_one_option(const char *option
)
3205 if (!prefixcmp(option
, "max-pack-size=")) {
3207 if (!git_parse_ulong(option
+ 14, &v
))
3210 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3212 } else if (v
< 1024 * 1024) {
3213 warning("minimum max-pack-size is 1 MiB");
3217 } else if (!prefixcmp(option
, "big-file-threshold=")) {
3219 if (!git_parse_ulong(option
+ 19, &v
))
3221 big_file_threshold
= v
;
3222 } else if (!prefixcmp(option
, "depth=")) {
3223 option_depth(option
+ 6);
3224 } else if (!prefixcmp(option
, "active-branches=")) {
3225 option_active_branches(option
+ 16);
3226 } else if (!prefixcmp(option
, "export-pack-edges=")) {
3227 option_export_pack_edges(option
+ 18);
3228 } else if (!prefixcmp(option
, "quiet")) {
3230 } else if (!prefixcmp(option
, "stats")) {
3239 static int parse_one_feature(const char *feature
, int from_stream
)
3241 if (!prefixcmp(feature
, "date-format=")) {
3242 option_date_format(feature
+ 12);
3243 } else if (!prefixcmp(feature
, "import-marks=")) {
3244 option_import_marks(feature
+ 13, from_stream
, 0);
3245 } else if (!prefixcmp(feature
, "import-marks-if-exists=")) {
3246 option_import_marks(feature
+ strlen("import-marks-if-exists="),
3248 } else if (!prefixcmp(feature
, "export-marks=")) {
3249 option_export_marks(feature
+ 13);
3250 } else if (!strcmp(feature
, "cat-blob")) {
3251 ; /* Don't die - this feature is supported */
3252 } else if (!strcmp(feature
, "relative-marks")) {
3253 relative_marks_paths
= 1;
3254 } else if (!strcmp(feature
, "no-relative-marks")) {
3255 relative_marks_paths
= 0;
3256 } else if (!strcmp(feature
, "done")) {
3257 require_explicit_termination
= 1;
3258 } else if (!strcmp(feature
, "force")) {
3260 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3261 ; /* do nothing; we have the feature */
3269 static void parse_feature(void)
3271 char *feature
= command_buf
.buf
+ 8;
3273 if (seen_data_command
)
3274 die("Got feature command '%s' after data command", feature
);
3276 if (parse_one_feature(feature
, 1))
3279 die("This version of fast-import does not support feature %s.", feature
);
3282 static void parse_option(void)
3284 char *option
= command_buf
.buf
+ 11;
3286 if (seen_data_command
)
3287 die("Got option command '%s' after data command", option
);
3289 if (parse_one_option(option
))
3292 die("This version of fast-import does not support option: %s", option
);
3295 static int git_pack_config(const char *k
, const char *v
, void *cb
)
3297 if (!strcmp(k
, "pack.depth")) {
3298 max_depth
= git_config_int(k
, v
);
3299 if (max_depth
> MAX_DEPTH
)
3300 max_depth
= MAX_DEPTH
;
3303 if (!strcmp(k
, "pack.compression")) {
3304 int level
= git_config_int(k
, v
);
3306 level
= Z_DEFAULT_COMPRESSION
;
3307 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
3308 die("bad pack compression level %d", level
);
3309 pack_compression_level
= level
;
3310 pack_compression_seen
= 1;
3313 if (!strcmp(k
, "pack.indexversion")) {
3314 pack_idx_opts
.version
= git_config_int(k
, v
);
3315 if (pack_idx_opts
.version
> 2)
3316 die("bad pack.indexversion=%"PRIu32
,
3317 pack_idx_opts
.version
);
3320 if (!strcmp(k
, "pack.packsizelimit")) {
3321 max_packsize
= git_config_ulong(k
, v
);
3324 return git_default_config(k
, v
, cb
);
3327 static const char fast_import_usage
[] =
3328 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3330 static void parse_argv(void)
3334 for (i
= 1; i
< global_argc
; i
++) {
3335 const char *a
= global_argv
[i
];
3337 if (*a
!= '-' || !strcmp(a
, "--"))
3340 if (parse_one_option(a
+ 2))
3343 if (parse_one_feature(a
+ 2, 0))
3346 if (!prefixcmp(a
+ 2, "cat-blob-fd=")) {
3347 option_cat_blob_fd(a
+ 2 + strlen("cat-blob-fd="));
3351 die("unknown option %s", a
);
3353 if (i
!= global_argc
)
3354 usage(fast_import_usage
);
3356 seen_data_command
= 1;
3357 if (import_marks_file
)
3361 int main(int argc
, const char **argv
)
3365 git_extract_argv0_path(argv
[0]);
3367 git_setup_gettext();
3369 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3370 usage(fast_import_usage
);
3372 setup_git_directory();
3373 reset_pack_idx_option(&pack_idx_opts
);
3374 git_config(git_pack_config
, NULL
);
3375 if (!pack_compression_seen
&& core_compression_seen
)
3376 pack_compression_level
= core_compression_level
;
3378 alloc_objects(object_entry_alloc
);
3379 strbuf_init(&command_buf
, 0);
3380 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3381 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3382 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3383 marks
= pool_calloc(1, sizeof(struct mark_set
));
3388 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3389 for (i
= 0; i
< (cmd_save
- 1); i
++)
3390 rc_free
[i
].next
= &rc_free
[i
+ 1];
3391 rc_free
[cmd_save
- 1].next
= NULL
;
3393 prepare_packed_git();
3395 set_die_routine(die_nicely
);
3396 set_checkpoint_signal();
3397 while (read_next_command() != EOF
) {
3398 if (!strcmp("blob", command_buf
.buf
))
3400 else if (!prefixcmp(command_buf
.buf
, "ls "))
3402 else if (!prefixcmp(command_buf
.buf
, "commit "))
3404 else if (!prefixcmp(command_buf
.buf
, "tag "))
3406 else if (!prefixcmp(command_buf
.buf
, "reset "))
3407 parse_reset_branch();
3408 else if (!strcmp("checkpoint", command_buf
.buf
))
3410 else if (!strcmp("done", command_buf
.buf
))
3412 else if (!prefixcmp(command_buf
.buf
, "progress "))
3414 else if (!prefixcmp(command_buf
.buf
, "feature "))
3416 else if (!prefixcmp(command_buf
.buf
, "option git "))
3418 else if (!prefixcmp(command_buf
.buf
, "option "))
3419 /* ignore non-git options*/;
3421 die("Unsupported command: %s", command_buf
.buf
);
3423 if (checkpoint_requested
)
3427 /* argv hasn't been parsed yet, do so */
3428 if (!seen_data_command
)
3431 if (require_explicit_termination
&& feof(stdin
))
3432 die("stream ends early");
3445 uintmax_t total_count
= 0, duplicate_count
= 0;
3446 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3447 total_count
+= object_count_by_type
[i
];
3448 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3449 duplicate_count
+= duplicate_count_by_type
[i
];
3451 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3452 fprintf(stderr
, "---------------------------------------------------------------------\n");
3453 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3454 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3455 fprintf(stderr
, " blobs : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas of %10" PRIuMAX
" attempts)\n", object_count_by_type
[OBJ_BLOB
], duplicate_count_by_type
[OBJ_BLOB
], delta_count_by_type
[OBJ_BLOB
], delta_count_attempts_by_type
[OBJ_BLOB
]);
3456 fprintf(stderr
, " trees : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas of %10" PRIuMAX
" attempts)\n", object_count_by_type
[OBJ_TREE
], duplicate_count_by_type
[OBJ_TREE
], delta_count_by_type
[OBJ_TREE
], delta_count_attempts_by_type
[OBJ_TREE
]);
3457 fprintf(stderr
, " commits: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas of %10" PRIuMAX
" attempts)\n", object_count_by_type
[OBJ_COMMIT
], duplicate_count_by_type
[OBJ_COMMIT
], delta_count_by_type
[OBJ_COMMIT
], delta_count_attempts_by_type
[OBJ_COMMIT
]);
3458 fprintf(stderr
, " tags : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas of %10" PRIuMAX
" attempts)\n", object_count_by_type
[OBJ_TAG
], duplicate_count_by_type
[OBJ_TAG
], delta_count_by_type
[OBJ_TAG
], delta_count_attempts_by_type
[OBJ_TAG
]);
3459 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3460 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3461 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3462 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3463 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3464 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3465 fprintf(stderr
, "---------------------------------------------------------------------\n");
3467 fprintf(stderr
, "---------------------------------------------------------------------\n");
3468 fprintf(stderr
, "\n");
3471 return failure
? 1 : 0;