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 commit-ish lf)?
26 ('merge' sp commit-ish 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 commit-ish lf;
47 note_inm ::= 'N' sp 'inline' sp commit-ish lf
50 new_tag ::= 'tag' sp tag_str lf
51 'from' sp commit-ish lf
52 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
56 reset_branch ::= 'reset' sp ref_str lf
57 ('from' sp commit-ish 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 commit-ish ::= (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
;
252 unsigned pack_id
: PACK_ID_BITS
;
253 unsigned char sha1
[20];
257 struct tag
*next_tag
;
259 unsigned int pack_id
;
260 unsigned char sha1
[20];
264 struct hash_list
*next
;
265 unsigned char sha1
[20];
274 struct recent_command
{
275 struct recent_command
*prev
;
276 struct recent_command
*next
;
280 /* Configured limits on output */
281 static unsigned long max_depth
= 10;
282 static off_t max_packsize
;
283 static int force_update
;
284 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
285 static int pack_compression_seen
;
287 /* Stats and misc. counters */
288 static uintmax_t alloc_count
;
289 static uintmax_t marks_set_count
;
290 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
291 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
292 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
294 static unsigned long object_count
;
295 static unsigned long branch_count
;
296 static unsigned long branch_load_count
;
298 static FILE *pack_edges
;
299 static unsigned int show_stats
= 1;
300 static int global_argc
;
301 static char **global_argv
;
304 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
305 static size_t total_allocd
;
306 static struct mem_pool
*mem_pool
;
308 /* Atom management */
309 static unsigned int atom_table_sz
= 4451;
310 static unsigned int atom_cnt
;
311 static struct atom_str
**atom_table
;
313 /* The .pack file being generated */
314 static struct pack_idx_option pack_idx_opts
;
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 import_marks_file_ignore_missing
;
330 static int relative_marks_paths
;
333 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
335 /* Tree management */
336 static unsigned int tree_entry_alloc
= 1000;
337 static void *avail_tree_entry
;
338 static unsigned int avail_tree_table_sz
= 100;
339 static struct avail_tree_content
**avail_tree_table
;
340 static struct strbuf old_tree
= STRBUF_INIT
;
341 static struct strbuf new_tree
= STRBUF_INIT
;
344 static unsigned long max_active_branches
= 5;
345 static unsigned long cur_active_branches
;
346 static unsigned long branch_table_sz
= 1039;
347 static struct branch
**branch_table
;
348 static struct branch
*active_branches
;
351 static struct tag
*first_tag
;
352 static struct tag
*last_tag
;
354 /* Input stream parsing */
355 static whenspec_type whenspec
= WHENSPEC_RAW
;
356 static struct strbuf command_buf
= STRBUF_INIT
;
357 static int unread_command_buf
;
358 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
359 static struct recent_command
*cmd_tail
= &cmd_hist
;
360 static struct recent_command
*rc_free
;
361 static unsigned int cmd_save
= 100;
362 static uintmax_t next_mark
;
363 static struct strbuf new_data
= STRBUF_INIT
;
364 static int seen_data_command
;
365 static int require_explicit_termination
;
367 /* Signal handling */
368 static volatile sig_atomic_t checkpoint_requested
;
370 /* Where to write output of cat-blob commands */
371 static int cat_blob_fd
= STDOUT_FILENO
;
373 static void parse_argv(void);
374 static void parse_cat_blob(const char *p
);
375 static void parse_ls(const char *p
, struct branch
*b
);
377 static void write_branch_report(FILE *rpt
, struct branch
*b
)
379 fprintf(rpt
, "%s:\n", b
->name
);
381 fprintf(rpt
, " status :");
383 fputs(" active", rpt
);
384 if (b
->branch_tree
.tree
)
385 fputs(" loaded", rpt
);
386 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
387 fputs(" dirty", rpt
);
390 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
391 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
392 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
393 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
395 fputs(" last pack : ", rpt
);
396 if (b
->pack_id
< MAX_PACK_ID
)
397 fprintf(rpt
, "%u", b
->pack_id
);
403 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
405 static void write_crash_report(const char *err
)
407 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
408 FILE *rpt
= fopen(loc
, "w");
411 struct recent_command
*rc
;
414 error("can't write crash report %s: %s", loc
, strerror(errno
));
418 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
420 fprintf(rpt
, "fast-import crash report:\n");
421 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
422 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
423 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
426 fputs("fatal: ", rpt
);
431 fputs("Most Recent Commands Before Crash\n", rpt
);
432 fputs("---------------------------------\n", rpt
);
433 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
434 if (rc
->next
== &cmd_hist
)
443 fputs("Active Branch LRU\n", rpt
);
444 fputs("-----------------\n", rpt
);
445 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
447 max_active_branches
);
449 fputs(" pos clock name\n", rpt
);
450 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
451 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
452 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
453 ++lu
, b
->last_commit
, b
->name
);
456 fputs("Inactive Branches\n", rpt
);
457 fputs("-----------------\n", rpt
);
458 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
459 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
460 write_branch_report(rpt
, b
);
466 fputs("Annotated Tags\n", rpt
);
467 fputs("--------------\n", rpt
);
468 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
469 fputs(sha1_to_hex(tg
->sha1
), rpt
);
471 fputs(tg
->name
, rpt
);
477 fputs("Marks\n", rpt
);
478 fputs("-----\n", rpt
);
479 if (export_marks_file
)
480 fprintf(rpt
, " exported to %s\n", export_marks_file
);
482 dump_marks_helper(rpt
, 0, marks
);
485 fputs("-------------------\n", rpt
);
486 fputs("END OF CRASH REPORT\n", rpt
);
490 static void end_packfile(void);
491 static void unkeep_all_packs(void);
492 static void dump_marks(void);
494 static NORETURN
void die_nicely(const char *err
, va_list params
)
497 char message
[2 * PATH_MAX
];
499 vsnprintf(message
, sizeof(message
), err
, params
);
500 fputs("fatal: ", stderr
);
501 fputs(message
, stderr
);
506 write_crash_report(message
);
514 #ifndef SIGUSR1 /* Windows, for example */
516 static void set_checkpoint_signal(void)
522 static void checkpoint_signal(int signo
)
524 checkpoint_requested
= 1;
527 static void set_checkpoint_signal(void)
531 memset(&sa
, 0, sizeof(sa
));
532 sa
.sa_handler
= checkpoint_signal
;
533 sigemptyset(&sa
.sa_mask
);
534 sa
.sa_flags
= SA_RESTART
;
535 sigaction(SIGUSR1
, &sa
, NULL
);
540 static void alloc_objects(unsigned int cnt
)
542 struct object_entry_pool
*b
;
544 b
= xmalloc(sizeof(struct object_entry_pool
)
545 + cnt
* sizeof(struct object_entry
));
546 b
->next_pool
= blocks
;
547 b
->next_free
= b
->entries
;
548 b
->end
= b
->entries
+ cnt
;
553 static struct object_entry
*new_object(unsigned char *sha1
)
555 struct object_entry
*e
;
557 if (blocks
->next_free
== blocks
->end
)
558 alloc_objects(object_entry_alloc
);
560 e
= blocks
->next_free
++;
561 hashcpy(e
->idx
.sha1
, sha1
);
565 static struct object_entry
*find_object(unsigned char *sha1
)
567 unsigned int h
= sha1
[0] << 8 | sha1
[1];
568 struct object_entry
*e
;
569 for (e
= object_table
[h
]; e
; e
= e
->next
)
570 if (!hashcmp(sha1
, e
->idx
.sha1
))
575 static struct object_entry
*insert_object(unsigned char *sha1
)
577 unsigned int h
= sha1
[0] << 8 | sha1
[1];
578 struct object_entry
*e
= object_table
[h
];
581 if (!hashcmp(sha1
, e
->idx
.sha1
))
586 e
= new_object(sha1
);
587 e
->next
= object_table
[h
];
593 static unsigned int hc_str(const char *s
, size_t len
)
601 static void *pool_alloc(size_t len
)
606 /* round up to a 'uintmax_t' alignment */
607 if (len
& (sizeof(uintmax_t) - 1))
608 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
610 for (p
= mem_pool
; p
; p
= p
->next_pool
)
611 if ((p
->end
- p
->next_free
>= len
))
615 if (len
>= (mem_pool_alloc
/2)) {
619 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
620 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
621 p
->next_pool
= mem_pool
;
622 p
->next_free
= (char *) p
->space
;
623 p
->end
= p
->next_free
+ mem_pool_alloc
;
632 static void *pool_calloc(size_t count
, size_t size
)
634 size_t len
= count
* size
;
635 void *r
= pool_alloc(len
);
640 static char *pool_strdup(const char *s
)
642 char *r
= pool_alloc(strlen(s
) + 1);
647 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
649 struct mark_set
*s
= marks
;
650 while ((idnum
>> s
->shift
) >= 1024) {
651 s
= pool_calloc(1, sizeof(struct mark_set
));
652 s
->shift
= marks
->shift
+ 10;
653 s
->data
.sets
[0] = marks
;
657 uintmax_t i
= idnum
>> s
->shift
;
658 idnum
-= i
<< s
->shift
;
659 if (!s
->data
.sets
[i
]) {
660 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
661 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
665 if (!s
->data
.marked
[idnum
])
667 s
->data
.marked
[idnum
] = oe
;
670 static struct object_entry
*find_mark(uintmax_t idnum
)
672 uintmax_t orig_idnum
= idnum
;
673 struct mark_set
*s
= marks
;
674 struct object_entry
*oe
= NULL
;
675 if ((idnum
>> s
->shift
) < 1024) {
676 while (s
&& s
->shift
) {
677 uintmax_t i
= idnum
>> s
->shift
;
678 idnum
-= i
<< s
->shift
;
682 oe
= s
->data
.marked
[idnum
];
685 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
689 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
691 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
694 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
695 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
698 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
700 strncpy(c
->str_dat
, s
, len
);
702 c
->next_atom
= atom_table
[hc
];
708 static struct branch
*lookup_branch(const char *name
)
710 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
713 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
714 if (!strcmp(name
, b
->name
))
719 static struct branch
*new_branch(const char *name
)
721 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
722 struct branch
*b
= lookup_branch(name
);
725 die("Invalid attempt to create duplicate branch: %s", name
);
726 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
727 die("Branch name doesn't conform to GIT standards: %s", name
);
729 b
= pool_calloc(1, sizeof(struct branch
));
730 b
->name
= pool_strdup(name
);
731 b
->table_next_branch
= branch_table
[hc
];
732 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
733 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
736 b
->pack_id
= MAX_PACK_ID
;
737 branch_table
[hc
] = b
;
742 static unsigned int hc_entries(unsigned int cnt
)
744 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
745 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
748 static struct tree_content
*new_tree_content(unsigned int cnt
)
750 struct avail_tree_content
*f
, *l
= NULL
;
751 struct tree_content
*t
;
752 unsigned int hc
= hc_entries(cnt
);
754 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
755 if (f
->entry_capacity
>= cnt
)
760 l
->next_avail
= f
->next_avail
;
762 avail_tree_table
[hc
] = f
->next_avail
;
764 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
765 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
766 f
->entry_capacity
= cnt
;
769 t
= (struct tree_content
*)f
;
775 static void release_tree_entry(struct tree_entry
*e
);
776 static void release_tree_content(struct tree_content
*t
)
778 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
779 unsigned int hc
= hc_entries(f
->entry_capacity
);
780 f
->next_avail
= avail_tree_table
[hc
];
781 avail_tree_table
[hc
] = f
;
784 static void release_tree_content_recursive(struct tree_content
*t
)
787 for (i
= 0; i
< t
->entry_count
; i
++)
788 release_tree_entry(t
->entries
[i
]);
789 release_tree_content(t
);
792 static struct tree_content
*grow_tree_content(
793 struct tree_content
*t
,
796 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
797 r
->entry_count
= t
->entry_count
;
798 r
->delta_depth
= t
->delta_depth
;
799 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
800 release_tree_content(t
);
804 static struct tree_entry
*new_tree_entry(void)
806 struct tree_entry
*e
;
808 if (!avail_tree_entry
) {
809 unsigned int n
= tree_entry_alloc
;
810 total_allocd
+= n
* sizeof(struct tree_entry
);
811 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
813 *((void**)e
) = e
+ 1;
819 e
= avail_tree_entry
;
820 avail_tree_entry
= *((void**)e
);
824 static void release_tree_entry(struct tree_entry
*e
)
827 release_tree_content_recursive(e
->tree
);
828 *((void**)e
) = avail_tree_entry
;
829 avail_tree_entry
= e
;
832 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
834 struct tree_content
*d
;
835 struct tree_entry
*a
, *b
;
840 d
= new_tree_content(s
->entry_count
);
841 for (i
= 0; i
< s
->entry_count
; i
++) {
843 b
= new_tree_entry();
844 memcpy(b
, a
, sizeof(*a
));
845 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
846 b
->tree
= dup_tree_content(a
->tree
);
851 d
->entry_count
= s
->entry_count
;
852 d
->delta_depth
= s
->delta_depth
;
857 static void start_packfile(void)
859 static char tmp_file
[PATH_MAX
];
860 struct packed_git
*p
;
861 struct pack_header hdr
;
864 pack_fd
= odb_mkstemp(tmp_file
, sizeof(tmp_file
),
865 "pack/tmp_pack_XXXXXX");
866 p
= xcalloc(1, sizeof(*p
) + strlen(tmp_file
) + 2);
867 strcpy(p
->pack_name
, tmp_file
);
868 p
->pack_fd
= pack_fd
;
870 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
872 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
873 hdr
.hdr_version
= htonl(2);
875 sha1write(pack_file
, &hdr
, sizeof(hdr
));
878 pack_size
= sizeof(hdr
);
881 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
882 all_packs
[pack_id
] = p
;
885 static const char *create_index(void)
888 struct pack_idx_entry
**idx
, **c
, **last
;
889 struct object_entry
*e
;
890 struct object_entry_pool
*o
;
892 /* Build the table of object IDs. */
893 idx
= xmalloc(object_count
* sizeof(*idx
));
895 for (o
= blocks
; o
; o
= o
->next_pool
)
896 for (e
= o
->next_free
; e
-- != o
->entries
;)
897 if (pack_id
== e
->pack_id
)
899 last
= idx
+ object_count
;
901 die("internal consistency error creating the index");
903 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
, pack_data
->sha1
);
908 static char *keep_pack(const char *curr_index_name
)
910 static char name
[PATH_MAX
];
911 static const char *keep_msg
= "fast-import";
914 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
916 die_errno("cannot create keep file");
917 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
919 die_errno("failed to write keep file");
921 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
922 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
923 if (move_temp_to_file(pack_data
->pack_name
, name
))
924 die("cannot store pack file");
926 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
927 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
928 if (move_temp_to_file(curr_index_name
, name
))
929 die("cannot store index file");
930 free((void *)curr_index_name
);
934 static void unkeep_all_packs(void)
936 static char name
[PATH_MAX
];
939 for (k
= 0; k
< pack_id
; k
++) {
940 struct packed_git
*p
= all_packs
[k
];
941 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
942 get_object_directory(), sha1_to_hex(p
->sha1
));
943 unlink_or_warn(name
);
947 static void end_packfile(void)
949 struct packed_git
*old_p
= pack_data
, *new_p
;
951 clear_delta_base_cache();
953 unsigned char cur_pack_sha1
[20];
959 close_pack_windows(pack_data
);
960 sha1close(pack_file
, cur_pack_sha1
, 0);
961 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
962 pack_data
->pack_name
, object_count
,
963 cur_pack_sha1
, pack_size
);
964 close(pack_data
->pack_fd
);
965 idx_name
= keep_pack(create_index());
967 /* Register the packfile with core git's machinery. */
968 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
970 die("core git rejected index %s", idx_name
);
971 all_packs
[pack_id
] = new_p
;
972 install_packed_git(new_p
);
974 /* Print the boundary */
976 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
977 for (i
= 0; i
< branch_table_sz
; i
++) {
978 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
979 if (b
->pack_id
== pack_id
)
980 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
983 for (t
= first_tag
; t
; t
= t
->next_tag
) {
984 if (t
->pack_id
== pack_id
)
985 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
987 fputc('\n', pack_edges
);
994 close(old_p
->pack_fd
);
995 unlink_or_warn(old_p
->pack_name
);
999 /* We can't carry a delta across packfiles. */
1000 strbuf_release(&last_blob
.data
);
1001 last_blob
.offset
= 0;
1002 last_blob
.depth
= 0;
1005 static void cycle_packfile(void)
1011 static int store_object(
1012 enum object_type type
,
1014 struct last_object
*last
,
1015 unsigned char *sha1out
,
1019 struct object_entry
*e
;
1020 unsigned char hdr
[96];
1021 unsigned char sha1
[20];
1022 unsigned long hdrlen
, deltalen
;
1026 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1027 (unsigned long)dat
->len
) + 1;
1029 git_SHA1_Update(&c
, hdr
, hdrlen
);
1030 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1031 git_SHA1_Final(sha1
, &c
);
1033 hashcpy(sha1out
, sha1
);
1035 e
= insert_object(sha1
);
1037 insert_mark(mark
, e
);
1038 if (e
->idx
.offset
) {
1039 duplicate_count_by_type
[type
]++;
1041 } else if (find_sha1_pack(sha1
, packed_git
)) {
1043 e
->pack_id
= MAX_PACK_ID
;
1044 e
->idx
.offset
= 1; /* just not zero! */
1045 duplicate_count_by_type
[type
]++;
1049 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1050 delta_count_attempts_by_type
[type
]++;
1051 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1053 &deltalen
, dat
->len
- 20);
1057 memset(&s
, 0, sizeof(s
));
1058 git_deflate_init(&s
, pack_compression_level
);
1061 s
.avail_in
= deltalen
;
1063 s
.next_in
= (void *)dat
->buf
;
1064 s
.avail_in
= dat
->len
;
1066 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1067 s
.next_out
= out
= xmalloc(s
.avail_out
);
1068 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1070 git_deflate_end(&s
);
1072 /* Determine if we should auto-checkpoint. */
1073 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1074 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1076 /* This new object needs to *not* have the current pack_id. */
1077 e
->pack_id
= pack_id
+ 1;
1080 /* We cannot carry a delta into the new pack. */
1085 memset(&s
, 0, sizeof(s
));
1086 git_deflate_init(&s
, pack_compression_level
);
1087 s
.next_in
= (void *)dat
->buf
;
1088 s
.avail_in
= dat
->len
;
1089 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1090 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1091 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1093 git_deflate_end(&s
);
1098 e
->pack_id
= pack_id
;
1099 e
->idx
.offset
= pack_size
;
1101 object_count_by_type
[type
]++;
1103 crc32_begin(pack_file
);
1106 off_t ofs
= e
->idx
.offset
- last
->offset
;
1107 unsigned pos
= sizeof(hdr
) - 1;
1109 delta_count_by_type
[type
]++;
1110 e
->depth
= last
->depth
+ 1;
1112 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1113 sha1write(pack_file
, hdr
, hdrlen
);
1114 pack_size
+= hdrlen
;
1116 hdr
[pos
] = ofs
& 127;
1118 hdr
[--pos
] = 128 | (--ofs
& 127);
1119 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1120 pack_size
+= sizeof(hdr
) - pos
;
1123 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1124 sha1write(pack_file
, hdr
, hdrlen
);
1125 pack_size
+= hdrlen
;
1128 sha1write(pack_file
, out
, s
.total_out
);
1129 pack_size
+= s
.total_out
;
1131 e
->idx
.crc32
= crc32_end(pack_file
);
1136 if (last
->no_swap
) {
1139 strbuf_swap(&last
->data
, dat
);
1141 last
->offset
= e
->idx
.offset
;
1142 last
->depth
= e
->depth
;
1147 static void truncate_pack(struct sha1file_checkpoint
*checkpoint
)
1149 if (sha1file_truncate(pack_file
, checkpoint
))
1150 die_errno("cannot truncate pack to skip duplicate");
1151 pack_size
= checkpoint
->offset
;
1154 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1156 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1157 unsigned char *in_buf
= xmalloc(in_sz
);
1158 unsigned char *out_buf
= xmalloc(out_sz
);
1159 struct object_entry
*e
;
1160 unsigned char sha1
[20];
1161 unsigned long hdrlen
;
1165 struct sha1file_checkpoint checkpoint
;
1168 /* Determine if we should auto-checkpoint. */
1169 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1170 || (pack_size
+ 60 + len
) < pack_size
)
1173 sha1file_checkpoint(pack_file
, &checkpoint
);
1174 offset
= checkpoint
.offset
;
1176 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1177 if (out_sz
<= hdrlen
)
1178 die("impossibly large object header");
1181 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1183 crc32_begin(pack_file
);
1185 memset(&s
, 0, sizeof(s
));
1186 git_deflate_init(&s
, pack_compression_level
);
1188 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1189 if (out_sz
<= hdrlen
)
1190 die("impossibly large object header");
1192 s
.next_out
= out_buf
+ hdrlen
;
1193 s
.avail_out
= out_sz
- hdrlen
;
1195 while (status
!= Z_STREAM_END
) {
1196 if (0 < len
&& !s
.avail_in
) {
1197 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1198 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1199 if (!n
&& feof(stdin
))
1200 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1202 git_SHA1_Update(&c
, in_buf
, n
);
1208 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1210 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1211 size_t n
= s
.next_out
- out_buf
;
1212 sha1write(pack_file
, out_buf
, n
);
1214 s
.next_out
= out_buf
;
1215 s
.avail_out
= out_sz
;
1224 die("unexpected deflate failure: %d", status
);
1227 git_deflate_end(&s
);
1228 git_SHA1_Final(sha1
, &c
);
1231 hashcpy(sha1out
, sha1
);
1233 e
= insert_object(sha1
);
1236 insert_mark(mark
, e
);
1238 if (e
->idx
.offset
) {
1239 duplicate_count_by_type
[OBJ_BLOB
]++;
1240 truncate_pack(&checkpoint
);
1242 } else if (find_sha1_pack(sha1
, packed_git
)) {
1244 e
->pack_id
= MAX_PACK_ID
;
1245 e
->idx
.offset
= 1; /* just not zero! */
1246 duplicate_count_by_type
[OBJ_BLOB
]++;
1247 truncate_pack(&checkpoint
);
1252 e
->pack_id
= pack_id
;
1253 e
->idx
.offset
= offset
;
1254 e
->idx
.crc32
= crc32_end(pack_file
);
1256 object_count_by_type
[OBJ_BLOB
]++;
1263 /* All calls must be guarded by find_object() or find_mark() to
1264 * ensure the 'struct object_entry' passed was written by this
1265 * process instance. We unpack the entry by the offset, avoiding
1266 * the need for the corresponding .idx file. This unpacking rule
1267 * works because we only use OBJ_REF_DELTA within the packfiles
1268 * created by fast-import.
1270 * oe must not be NULL. Such an oe usually comes from giving
1271 * an unknown SHA-1 to find_object() or an undefined mark to
1272 * find_mark(). Callers must test for this condition and use
1273 * the standard read_sha1_file() when it happens.
1275 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1276 * find_mark(), where the mark was reloaded from an existing marks
1277 * file and is referencing an object that this fast-import process
1278 * instance did not write out to a packfile. Callers must test for
1279 * this condition and use read_sha1_file() instead.
1281 static void *gfi_unpack_entry(
1282 struct object_entry
*oe
,
1283 unsigned long *sizep
)
1285 enum object_type type
;
1286 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1287 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1288 /* The object is stored in the packfile we are writing to
1289 * and we have modified it since the last time we scanned
1290 * back to read a previously written object. If an old
1291 * window covered [p->pack_size, p->pack_size + 20) its
1292 * data is stale and is not valid. Closing all windows
1293 * and updating the packfile length ensures we can read
1294 * the newly written data.
1296 close_pack_windows(p
);
1297 sha1flush(pack_file
);
1299 /* We have to offer 20 bytes additional on the end of
1300 * the packfile as the core unpacker code assumes the
1301 * footer is present at the file end and must promise
1302 * at least 20 bytes within any window it maps. But
1303 * we don't actually create the footer here.
1305 p
->pack_size
= pack_size
+ 20;
1307 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1310 static const char *get_mode(const char *str
, uint16_t *modep
)
1315 while ((c
= *str
++) != ' ') {
1316 if (c
< '0' || c
> '7')
1318 mode
= (mode
<< 3) + (c
- '0');
1324 static void load_tree(struct tree_entry
*root
)
1326 unsigned char *sha1
= root
->versions
[1].sha1
;
1327 struct object_entry
*myoe
;
1328 struct tree_content
*t
;
1333 root
->tree
= t
= new_tree_content(8);
1334 if (is_null_sha1(sha1
))
1337 myoe
= find_object(sha1
);
1338 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1339 if (myoe
->type
!= OBJ_TREE
)
1340 die("Not a tree: %s", sha1_to_hex(sha1
));
1341 t
->delta_depth
= myoe
->depth
;
1342 buf
= gfi_unpack_entry(myoe
, &size
);
1344 die("Can't load tree %s", sha1_to_hex(sha1
));
1346 enum object_type type
;
1347 buf
= read_sha1_file(sha1
, &type
, &size
);
1348 if (!buf
|| type
!= OBJ_TREE
)
1349 die("Can't load tree %s", sha1_to_hex(sha1
));
1353 while (c
!= (buf
+ size
)) {
1354 struct tree_entry
*e
= new_tree_entry();
1356 if (t
->entry_count
== t
->entry_capacity
)
1357 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1358 t
->entries
[t
->entry_count
++] = e
;
1361 c
= get_mode(c
, &e
->versions
[1].mode
);
1363 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1364 e
->versions
[0].mode
= e
->versions
[1].mode
;
1365 e
->name
= to_atom(c
, strlen(c
));
1366 c
+= e
->name
->str_len
+ 1;
1367 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1368 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1374 static int tecmp0 (const void *_a
, const void *_b
)
1376 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1377 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1378 return base_name_compare(
1379 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1380 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1383 static int tecmp1 (const void *_a
, const void *_b
)
1385 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1386 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1387 return base_name_compare(
1388 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1389 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1392 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1398 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1400 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1402 for (i
= 0; i
< t
->entry_count
; i
++) {
1403 if (t
->entries
[i
]->versions
[v
].mode
)
1404 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1408 strbuf_grow(b
, maxlen
);
1409 for (i
= 0; i
< t
->entry_count
; i
++) {
1410 struct tree_entry
*e
= t
->entries
[i
];
1411 if (!e
->versions
[v
].mode
)
1413 strbuf_addf(b
, "%o %s%c",
1414 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1415 e
->name
->str_dat
, '\0');
1416 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1420 static void store_tree(struct tree_entry
*root
)
1422 struct tree_content
*t
;
1423 unsigned int i
, j
, del
;
1424 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1425 struct object_entry
*le
= NULL
;
1427 if (!is_null_sha1(root
->versions
[1].sha1
))
1434 for (i
= 0; i
< t
->entry_count
; i
++) {
1435 if (t
->entries
[i
]->tree
)
1436 store_tree(t
->entries
[i
]);
1439 if (!(root
->versions
[0].mode
& NO_DELTA
))
1440 le
= find_object(root
->versions
[0].sha1
);
1441 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1442 mktree(t
, 0, &old_tree
);
1444 lo
.offset
= le
->idx
.offset
;
1445 lo
.depth
= t
->delta_depth
;
1448 mktree(t
, 1, &new_tree
);
1449 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1451 t
->delta_depth
= lo
.depth
;
1452 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1453 struct tree_entry
*e
= t
->entries
[i
];
1454 if (e
->versions
[1].mode
) {
1455 e
->versions
[0].mode
= e
->versions
[1].mode
;
1456 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1457 t
->entries
[j
++] = e
;
1459 release_tree_entry(e
);
1463 t
->entry_count
-= del
;
1466 static void tree_content_replace(
1467 struct tree_entry
*root
,
1468 const unsigned char *sha1
,
1469 const uint16_t mode
,
1470 struct tree_content
*newtree
)
1473 die("Root cannot be a non-directory");
1474 hashclr(root
->versions
[0].sha1
);
1475 hashcpy(root
->versions
[1].sha1
, sha1
);
1477 release_tree_content_recursive(root
->tree
);
1478 root
->tree
= newtree
;
1481 static int tree_content_set(
1482 struct tree_entry
*root
,
1484 const unsigned char *sha1
,
1485 const uint16_t mode
,
1486 struct tree_content
*subtree
)
1488 struct tree_content
*t
;
1491 struct tree_entry
*e
;
1493 slash1
= strchrnul(p
, '/');
1496 die("Empty path component found in input");
1497 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1498 die("Non-directories cannot have subtrees");
1503 for (i
= 0; i
< t
->entry_count
; i
++) {
1505 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1508 && e
->versions
[1].mode
== mode
1509 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1511 e
->versions
[1].mode
= mode
;
1512 hashcpy(e
->versions
[1].sha1
, sha1
);
1514 release_tree_content_recursive(e
->tree
);
1518 * We need to leave e->versions[0].sha1 alone
1519 * to avoid modifying the preimage tree used
1520 * when writing out the parent directory.
1521 * But after replacing the subdir with a
1522 * completely different one, it's not a good
1523 * delta base any more, and besides, we've
1524 * thrown away the tree entries needed to
1525 * make a delta against it.
1527 * So let's just explicitly disable deltas
1530 if (S_ISDIR(e
->versions
[0].mode
))
1531 e
->versions
[0].mode
|= NO_DELTA
;
1533 hashclr(root
->versions
[1].sha1
);
1536 if (!S_ISDIR(e
->versions
[1].mode
)) {
1537 e
->tree
= new_tree_content(8);
1538 e
->versions
[1].mode
= S_IFDIR
;
1542 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1543 hashclr(root
->versions
[1].sha1
);
1550 if (t
->entry_count
== t
->entry_capacity
)
1551 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1552 e
= new_tree_entry();
1553 e
->name
= to_atom(p
, n
);
1554 e
->versions
[0].mode
= 0;
1555 hashclr(e
->versions
[0].sha1
);
1556 t
->entries
[t
->entry_count
++] = e
;
1558 e
->tree
= new_tree_content(8);
1559 e
->versions
[1].mode
= S_IFDIR
;
1560 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1563 e
->versions
[1].mode
= mode
;
1564 hashcpy(e
->versions
[1].sha1
, sha1
);
1566 hashclr(root
->versions
[1].sha1
);
1570 static int tree_content_remove(
1571 struct tree_entry
*root
,
1573 struct tree_entry
*backup_leaf
,
1576 struct tree_content
*t
;
1579 struct tree_entry
*e
;
1581 slash1
= strchrnul(p
, '/');
1587 if (!*p
&& allow_root
) {
1593 for (i
= 0; i
< t
->entry_count
; i
++) {
1595 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1596 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1598 * If p names a file in some subdirectory, and a
1599 * file or symlink matching the name of the
1600 * parent directory of p exists, then p cannot
1601 * exist and need not be deleted.
1604 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1608 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1609 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1610 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1611 hashclr(root
->versions
[1].sha1
);
1625 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1627 release_tree_content_recursive(e
->tree
);
1629 e
->versions
[1].mode
= 0;
1630 hashclr(e
->versions
[1].sha1
);
1631 hashclr(root
->versions
[1].sha1
);
1635 static int tree_content_get(
1636 struct tree_entry
*root
,
1638 struct tree_entry
*leaf
,
1641 struct tree_content
*t
;
1644 struct tree_entry
*e
;
1646 slash1
= strchrnul(p
, '/');
1648 if (!n
&& !allow_root
)
1649 die("Empty path component found in input");
1660 for (i
= 0; i
< t
->entry_count
; i
++) {
1662 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1665 if (!S_ISDIR(e
->versions
[1].mode
))
1669 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1675 memcpy(leaf
, e
, sizeof(*leaf
));
1676 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1677 leaf
->tree
= dup_tree_content(e
->tree
);
1683 static int update_branch(struct branch
*b
)
1685 static const char *msg
= "fast-import";
1686 struct ref_lock
*lock
;
1687 unsigned char old_sha1
[20];
1689 if (read_ref(b
->name
, old_sha1
))
1691 if (is_null_sha1(b
->sha1
)) {
1693 delete_ref(b
->name
, old_sha1
, 0);
1696 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0, NULL
);
1698 return error("Unable to lock %s", b
->name
);
1699 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1700 struct commit
*old_cmit
, *new_cmit
;
1702 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1703 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1704 if (!old_cmit
|| !new_cmit
) {
1706 return error("Branch %s is missing commits.", b
->name
);
1709 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1711 warning("Not updating %s"
1712 " (new tip %s does not contain %s)",
1713 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1717 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1718 return error("Unable to update %s", b
->name
);
1722 static void dump_branches(void)
1727 for (i
= 0; i
< branch_table_sz
; i
++) {
1728 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1729 failure
|= update_branch(b
);
1733 static void dump_tags(void)
1735 static const char *msg
= "fast-import";
1737 struct ref_lock
*lock
;
1738 char ref_name
[PATH_MAX
];
1740 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1741 sprintf(ref_name
, "tags/%s", t
->name
);
1742 lock
= lock_ref_sha1(ref_name
, NULL
);
1743 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1744 failure
|= error("Unable to update %s", ref_name
);
1748 static void dump_marks_helper(FILE *f
,
1754 for (k
= 0; k
< 1024; k
++) {
1755 if (m
->data
.sets
[k
])
1756 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1760 for (k
= 0; k
< 1024; k
++) {
1761 if (m
->data
.marked
[k
])
1762 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1763 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1768 static void dump_marks(void)
1770 static struct lock_file mark_lock
;
1774 if (!export_marks_file
)
1777 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1779 failure
|= error("Unable to write marks file %s: %s",
1780 export_marks_file
, strerror(errno
));
1784 f
= fdopen(mark_fd
, "w");
1786 int saved_errno
= errno
;
1787 rollback_lock_file(&mark_lock
);
1788 failure
|= error("Unable to write marks file %s: %s",
1789 export_marks_file
, strerror(saved_errno
));
1794 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1795 * Assign -1 to the lock file descriptor so that commit_lock_file()
1796 * won't try to close() it.
1800 dump_marks_helper(f
, 0, marks
);
1801 if (ferror(f
) || fclose(f
)) {
1802 int saved_errno
= errno
;
1803 rollback_lock_file(&mark_lock
);
1804 failure
|= error("Unable to write marks file %s: %s",
1805 export_marks_file
, strerror(saved_errno
));
1809 if (commit_lock_file(&mark_lock
)) {
1810 int saved_errno
= errno
;
1811 rollback_lock_file(&mark_lock
);
1812 failure
|= error("Unable to commit marks file %s: %s",
1813 export_marks_file
, strerror(saved_errno
));
1818 static void read_marks(void)
1821 FILE *f
= fopen(import_marks_file
, "r");
1824 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1825 return; /* Marks file does not exist */
1827 die_errno("cannot read '%s'", import_marks_file
);
1828 while (fgets(line
, sizeof(line
), f
)) {
1831 unsigned char sha1
[20];
1832 struct object_entry
*e
;
1834 end
= strchr(line
, '\n');
1835 if (line
[0] != ':' || !end
)
1836 die("corrupt mark line: %s", line
);
1838 mark
= strtoumax(line
+ 1, &end
, 10);
1839 if (!mark
|| end
== line
+ 1
1840 || *end
!= ' ' || get_sha1_hex(end
+ 1, sha1
))
1841 die("corrupt mark line: %s", line
);
1842 e
= find_object(sha1
);
1844 enum object_type type
= sha1_object_info(sha1
, NULL
);
1846 die("object not found: %s", sha1_to_hex(sha1
));
1847 e
= insert_object(sha1
);
1849 e
->pack_id
= MAX_PACK_ID
;
1850 e
->idx
.offset
= 1; /* just not zero! */
1852 insert_mark(mark
, e
);
1858 static int read_next_command(void)
1860 static int stdin_eof
= 0;
1863 unread_command_buf
= 0;
1870 if (unread_command_buf
) {
1871 unread_command_buf
= 0;
1873 struct recent_command
*rc
;
1875 strbuf_detach(&command_buf
, NULL
);
1876 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1880 if (!seen_data_command
1881 && !starts_with(command_buf
.buf
, "feature ")
1882 && !starts_with(command_buf
.buf
, "option ")) {
1891 cmd_hist
.next
= rc
->next
;
1892 cmd_hist
.next
->prev
= &cmd_hist
;
1896 rc
->buf
= command_buf
.buf
;
1897 rc
->prev
= cmd_tail
;
1898 rc
->next
= cmd_hist
.prev
;
1899 rc
->prev
->next
= rc
;
1902 if (skip_prefix(command_buf
.buf
, "cat-blob ", &p
)) {
1906 if (command_buf
.buf
[0] == '#')
1912 static void skip_optional_lf(void)
1914 int term_char
= fgetc(stdin
);
1915 if (term_char
!= '\n' && term_char
!= EOF
)
1916 ungetc(term_char
, stdin
);
1919 static void parse_mark(void)
1922 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1923 next_mark
= strtoumax(v
, NULL
, 10);
1924 read_next_command();
1930 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1935 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1936 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1938 if (skip_prefix(data
, "<<", &data
)) {
1939 char *term
= xstrdup(data
);
1940 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1942 strbuf_detach(&command_buf
, NULL
);
1944 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1945 die("EOF in data (terminator '%s' not found)", term
);
1946 if (term_len
== command_buf
.len
1947 && !strcmp(term
, command_buf
.buf
))
1949 strbuf_addbuf(sb
, &command_buf
);
1950 strbuf_addch(sb
, '\n');
1955 uintmax_t len
= strtoumax(data
, NULL
, 10);
1956 size_t n
= 0, length
= (size_t)len
;
1958 if (limit
&& limit
< len
) {
1963 die("data is too large to use in this context");
1965 while (n
< length
) {
1966 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1967 if (!s
&& feof(stdin
))
1968 die("EOF in data (%lu bytes remaining)",
1969 (unsigned long)(length
- n
));
1978 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1980 const char *orig_src
= src
;
1986 num
= strtoul(src
, &endp
, 10);
1987 /* NEEDSWORK: perhaps check for reasonable values? */
1988 if (errno
|| endp
== src
|| *endp
!= ' ')
1992 if (*src
!= '-' && *src
!= '+')
1995 num
= strtoul(src
+ 1, &endp
, 10);
1996 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
2000 strcpy(result
, orig_src
);
2004 static char *parse_ident(const char *buf
)
2010 /* ensure there is a space delimiter even if there is no name */
2014 ltgt
= buf
+ strcspn(buf
, "<>");
2016 die("Missing < in ident string: %s", buf
);
2017 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
2018 die("Missing space before < in ident string: %s", buf
);
2019 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
2021 die("Missing > in ident string: %s", buf
);
2024 die("Missing space after > in ident string: %s", buf
);
2026 name_len
= ltgt
- buf
;
2027 ident
= xmalloc(name_len
+ 24);
2028 strncpy(ident
, buf
, name_len
);
2032 if (validate_raw_date(ltgt
, ident
+ name_len
, 24) < 0)
2033 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
2035 case WHENSPEC_RFC2822
:
2036 if (parse_date(ltgt
, ident
+ name_len
, 24) < 0)
2037 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
2040 if (strcmp("now", ltgt
))
2041 die("Date in ident must be 'now': %s", buf
);
2042 datestamp(ident
+ name_len
, 24);
2049 static void parse_and_store_blob(
2050 struct last_object
*last
,
2051 unsigned char *sha1out
,
2054 static struct strbuf buf
= STRBUF_INIT
;
2057 if (parse_data(&buf
, big_file_threshold
, &len
))
2058 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2061 strbuf_release(&last
->data
);
2065 stream_blob(len
, sha1out
, mark
);
2070 static void parse_new_blob(void)
2072 read_next_command();
2074 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2077 static void unload_one_branch(void)
2079 while (cur_active_branches
2080 && cur_active_branches
>= max_active_branches
) {
2081 uintmax_t min_commit
= ULONG_MAX
;
2082 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2084 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2085 if (e
->last_commit
< min_commit
) {
2087 min_commit
= e
->last_commit
;
2093 e
= p
->active_next_branch
;
2094 p
->active_next_branch
= e
->active_next_branch
;
2096 e
= active_branches
;
2097 active_branches
= e
->active_next_branch
;
2100 e
->active_next_branch
= NULL
;
2101 if (e
->branch_tree
.tree
) {
2102 release_tree_content_recursive(e
->branch_tree
.tree
);
2103 e
->branch_tree
.tree
= NULL
;
2105 cur_active_branches
--;
2109 static void load_branch(struct branch
*b
)
2111 load_tree(&b
->branch_tree
);
2114 b
->active_next_branch
= active_branches
;
2115 active_branches
= b
;
2116 cur_active_branches
++;
2117 branch_load_count
++;
2121 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2123 unsigned char fanout
= 0;
2124 while ((num_notes
>>= 8))
2129 static void construct_path_with_fanout(const char *hex_sha1
,
2130 unsigned char fanout
, char *path
)
2132 unsigned int i
= 0, j
= 0;
2134 die("Too large fanout (%u)", fanout
);
2136 path
[i
++] = hex_sha1
[j
++];
2137 path
[i
++] = hex_sha1
[j
++];
2141 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2142 path
[i
+ 40 - j
] = '\0';
2145 static uintmax_t do_change_note_fanout(
2146 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2147 char *hex_sha1
, unsigned int hex_sha1_len
,
2148 char *fullpath
, unsigned int fullpath_len
,
2149 unsigned char fanout
)
2151 struct tree_content
*t
= root
->tree
;
2152 struct tree_entry
*e
, leaf
;
2153 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2154 uintmax_t num_notes
= 0;
2155 unsigned char sha1
[20];
2158 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2160 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2161 tmp_fullpath_len
= fullpath_len
;
2164 * We're interested in EITHER existing note entries (entries
2165 * with exactly 40 hex chars in path, not including directory
2166 * separators), OR directory entries that may contain note
2167 * entries (with < 40 hex chars in path).
2168 * Also, each path component in a note entry must be a multiple
2171 if (!e
->versions
[1].mode
||
2172 tmp_hex_sha1_len
> 40 ||
2173 e
->name
->str_len
% 2)
2176 /* This _may_ be a note entry, or a subdir containing notes */
2177 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2179 if (tmp_fullpath_len
)
2180 fullpath
[tmp_fullpath_len
++] = '/';
2181 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2183 tmp_fullpath_len
+= e
->name
->str_len
;
2184 fullpath
[tmp_fullpath_len
] = '\0';
2186 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2187 /* This is a note entry */
2188 if (fanout
== 0xff) {
2189 /* Counting mode, no rename */
2193 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2194 if (!strcmp(fullpath
, realpath
)) {
2195 /* Note entry is in correct location */
2200 /* Rename fullpath to realpath */
2201 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2202 die("Failed to remove path %s", fullpath
);
2203 tree_content_set(orig_root
, realpath
,
2204 leaf
.versions
[1].sha1
,
2205 leaf
.versions
[1].mode
,
2207 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2208 /* This is a subdir that may contain note entries */
2211 num_notes
+= do_change_note_fanout(orig_root
, e
,
2212 hex_sha1
, tmp_hex_sha1_len
,
2213 fullpath
, tmp_fullpath_len
, fanout
);
2216 /* The above may have reallocated the current tree_content */
2222 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2223 unsigned char fanout
)
2225 char hex_sha1
[40], path
[60];
2226 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2230 * Given a pointer into a string, parse a mark reference:
2232 * idnum ::= ':' bigint;
2234 * Return the first character after the value in *endptr.
2236 * Complain if the following character is not what is expected,
2237 * either a space or end of the string.
2239 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2245 mark
= strtoumax(p
, endptr
, 10);
2247 die("No value after ':' in mark: %s", command_buf
.buf
);
2252 * Parse the mark reference, and complain if this is not the end of
2255 static uintmax_t parse_mark_ref_eol(const char *p
)
2260 mark
= parse_mark_ref(p
, &end
);
2262 die("Garbage after mark: %s", command_buf
.buf
);
2267 * Parse the mark reference, demanding a trailing space. Return a
2268 * pointer to the space.
2270 static uintmax_t parse_mark_ref_space(const char **p
)
2275 mark
= parse_mark_ref(*p
, &end
);
2277 die("Missing space after mark: %s", command_buf
.buf
);
2282 static void file_change_m(const char *p
, struct branch
*b
)
2284 static struct strbuf uq
= STRBUF_INIT
;
2286 struct object_entry
*oe
;
2287 unsigned char sha1
[20];
2288 uint16_t mode
, inline_data
= 0;
2290 p
= get_mode(p
, &mode
);
2292 die("Corrupt mode: %s", command_buf
.buf
);
2297 case S_IFREG
| 0644:
2298 case S_IFREG
| 0755:
2305 die("Corrupt mode: %s", command_buf
.buf
);
2309 oe
= find_mark(parse_mark_ref_space(&p
));
2310 hashcpy(sha1
, oe
->idx
.sha1
);
2311 } else if (skip_prefix(p
, "inline ", &p
)) {
2313 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2315 if (get_sha1_hex(p
, sha1
))
2316 die("Invalid dataref: %s", command_buf
.buf
);
2317 oe
= find_object(sha1
);
2320 die("Missing space after SHA1: %s", command_buf
.buf
);
2324 if (!unquote_c_style(&uq
, p
, &endp
)) {
2326 die("Garbage after path in: %s", command_buf
.buf
);
2330 /* Git does not track empty, non-toplevel directories. */
2331 if (S_ISDIR(mode
) && !hashcmp(sha1
, EMPTY_TREE_SHA1_BIN
) && *p
) {
2332 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2336 if (S_ISGITLINK(mode
)) {
2338 die("Git links cannot be specified 'inline': %s",
2341 if (oe
->type
!= OBJ_COMMIT
)
2342 die("Not a commit (actually a %s): %s",
2343 typename(oe
->type
), command_buf
.buf
);
2346 * Accept the sha1 without checking; it expected to be in
2347 * another repository.
2349 } else if (inline_data
) {
2351 die("Directories cannot be specified 'inline': %s",
2354 strbuf_addstr(&uq
, p
);
2357 read_next_command();
2358 parse_and_store_blob(&last_blob
, sha1
, 0);
2360 enum object_type expected
= S_ISDIR(mode
) ?
2362 enum object_type type
= oe
? oe
->type
:
2363 sha1_object_info(sha1
, NULL
);
2365 die("%s not found: %s",
2366 S_ISDIR(mode
) ? "Tree" : "Blob",
2368 if (type
!= expected
)
2369 die("Not a %s (actually a %s): %s",
2370 typename(expected
), typename(type
),
2375 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2378 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2381 static void file_change_d(const char *p
, struct branch
*b
)
2383 static struct strbuf uq
= STRBUF_INIT
;
2387 if (!unquote_c_style(&uq
, p
, &endp
)) {
2389 die("Garbage after path in: %s", command_buf
.buf
);
2392 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2395 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2398 static struct strbuf s_uq
= STRBUF_INIT
;
2399 static struct strbuf d_uq
= STRBUF_INIT
;
2401 struct tree_entry leaf
;
2403 strbuf_reset(&s_uq
);
2404 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2406 die("Missing space after source: %s", command_buf
.buf
);
2408 endp
= strchr(s
, ' ');
2410 die("Missing space after source: %s", command_buf
.buf
);
2411 strbuf_add(&s_uq
, s
, endp
- s
);
2417 die("Missing dest: %s", command_buf
.buf
);
2420 strbuf_reset(&d_uq
);
2421 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2423 die("Garbage after dest in: %s", command_buf
.buf
);
2427 memset(&leaf
, 0, sizeof(leaf
));
2429 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2431 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2432 if (!leaf
.versions
[1].mode
)
2433 die("Path %s not in branch", s
);
2434 if (!*d
) { /* C "path/to/subdir" "" */
2435 tree_content_replace(&b
->branch_tree
,
2436 leaf
.versions
[1].sha1
,
2437 leaf
.versions
[1].mode
,
2441 tree_content_set(&b
->branch_tree
, d
,
2442 leaf
.versions
[1].sha1
,
2443 leaf
.versions
[1].mode
,
2447 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2449 static struct strbuf uq
= STRBUF_INIT
;
2450 struct object_entry
*oe
;
2452 unsigned char sha1
[20], commit_sha1
[20];
2454 uint16_t inline_data
= 0;
2455 unsigned char new_fanout
;
2458 * When loading a branch, we don't traverse its tree to count the real
2459 * number of notes (too expensive to do this for all non-note refs).
2460 * This means that recently loaded notes refs might incorrectly have
2461 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2463 * Fix this by traversing the tree and counting the number of notes
2464 * when b->num_notes == 0. If the notes tree is truly empty, the
2465 * calculation should not take long.
2467 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2468 /* Invoke change_note_fanout() in "counting mode". */
2469 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2470 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2473 /* Now parse the notemodify command. */
2474 /* <dataref> or 'inline' */
2476 oe
= find_mark(parse_mark_ref_space(&p
));
2477 hashcpy(sha1
, oe
->idx
.sha1
);
2478 } else if (skip_prefix(p
, "inline ", &p
)) {
2480 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2482 if (get_sha1_hex(p
, sha1
))
2483 die("Invalid dataref: %s", command_buf
.buf
);
2484 oe
= find_object(sha1
);
2487 die("Missing space after SHA1: %s", command_buf
.buf
);
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
, 0))
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 (!skip_prefix(command_buf
.buf
, "from ", &from
))
2589 if (b
->branch_tree
.tree
) {
2590 release_tree_content_recursive(b
->branch_tree
.tree
);
2591 b
->branch_tree
.tree
= NULL
;
2594 s
= lookup_branch(from
);
2596 die("Can't create a branch from itself: %s", b
->name
);
2598 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2599 hashcpy(b
->sha1
, s
->sha1
);
2600 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2601 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2602 } else if (*from
== ':') {
2603 uintmax_t idnum
= parse_mark_ref_eol(from
);
2604 struct object_entry
*oe
= find_mark(idnum
);
2605 if (oe
->type
!= OBJ_COMMIT
)
2606 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2607 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2608 if (oe
->pack_id
!= MAX_PACK_ID
) {
2610 char *buf
= gfi_unpack_entry(oe
, &size
);
2611 parse_from_commit(b
, buf
, size
);
2614 parse_from_existing(b
);
2615 } else if (!get_sha1(from
, b
->sha1
)) {
2616 parse_from_existing(b
);
2617 if (is_null_sha1(b
->sha1
))
2621 die("Invalid ref name or SHA1 expression: %s", from
);
2623 read_next_command();
2627 static struct hash_list
*parse_merge(unsigned int *count
)
2629 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2634 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2635 n
= xmalloc(sizeof(*n
));
2636 s
= lookup_branch(from
);
2638 hashcpy(n
->sha1
, s
->sha1
);
2639 else if (*from
== ':') {
2640 uintmax_t idnum
= parse_mark_ref_eol(from
);
2641 struct object_entry
*oe
= find_mark(idnum
);
2642 if (oe
->type
!= OBJ_COMMIT
)
2643 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2644 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2645 } else if (!get_sha1(from
, n
->sha1
)) {
2647 char *buf
= read_object_with_reference(n
->sha1
,
2648 commit_type
, &size
, n
->sha1
);
2649 if (!buf
|| size
< 46)
2650 die("Not a valid commit: %s", from
);
2653 die("Invalid ref name or SHA1 expression: %s", from
);
2660 read_next_command();
2665 static void parse_new_commit(const char *arg
)
2667 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
;
2676 b
= lookup_branch(arg
);
2678 b
= new_branch(arg
);
2680 read_next_command();
2682 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2683 author
= parse_ident(v
);
2684 read_next_command();
2686 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2687 committer
= parse_ident(v
);
2688 read_next_command();
2691 die("Expected committer but didn't get one");
2692 parse_data(&msg
, 0, NULL
);
2693 read_next_command();
2695 merge_list
= parse_merge(&merge_count
);
2697 /* ensure the branch is active/loaded */
2698 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2699 unload_one_branch();
2703 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2706 while (command_buf
.len
> 0) {
2707 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2708 file_change_m(v
, b
);
2709 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2710 file_change_d(v
, b
);
2711 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2712 file_change_cr(v
, b
, 1);
2713 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2714 file_change_cr(v
, b
, 0);
2715 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2716 note_change_n(v
, b
, &prev_fanout
);
2717 else if (!strcmp("deleteall", command_buf
.buf
))
2718 file_change_deleteall(b
);
2719 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2722 unread_command_buf
= 1;
2725 if (read_next_command() == EOF
)
2729 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2730 if (new_fanout
!= prev_fanout
)
2731 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2733 /* build the tree and the commit */
2734 store_tree(&b
->branch_tree
);
2735 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2736 b
->branch_tree
.versions
[1].sha1
);
2738 strbuf_reset(&new_data
);
2739 strbuf_addf(&new_data
, "tree %s\n",
2740 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2741 if (!is_null_sha1(b
->sha1
))
2742 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2743 while (merge_list
) {
2744 struct hash_list
*next
= merge_list
->next
;
2745 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2749 strbuf_addf(&new_data
,
2753 author
? author
: committer
, committer
);
2754 strbuf_addbuf(&new_data
, &msg
);
2758 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2759 b
->pack_id
= pack_id
;
2760 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2763 static void parse_new_tag(const char *arg
)
2765 static struct strbuf msg
= STRBUF_INIT
;
2770 uintmax_t from_mark
= 0;
2771 unsigned char sha1
[20];
2772 enum object_type type
;
2775 t
= pool_alloc(sizeof(struct tag
));
2776 memset(t
, 0, sizeof(struct tag
));
2777 t
->name
= pool_strdup(arg
);
2779 last_tag
->next_tag
= t
;
2783 read_next_command();
2786 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2787 die("Expected from command, got %s", command_buf
.buf
);
2788 s
= lookup_branch(from
);
2790 if (is_null_sha1(s
->sha1
))
2791 die("Can't tag an empty branch.");
2792 hashcpy(sha1
, s
->sha1
);
2794 } else if (*from
== ':') {
2795 struct object_entry
*oe
;
2796 from_mark
= parse_mark_ref_eol(from
);
2797 oe
= find_mark(from_mark
);
2799 hashcpy(sha1
, oe
->idx
.sha1
);
2800 } else if (!get_sha1(from
, sha1
)) {
2801 struct object_entry
*oe
= find_object(sha1
);
2803 type
= sha1_object_info(sha1
, NULL
);
2805 die("Not a valid object: %s", from
);
2809 die("Invalid ref name or SHA1 expression: %s", from
);
2810 read_next_command();
2813 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2814 tagger
= parse_ident(v
);
2815 read_next_command();
2819 /* tag payload/message */
2820 parse_data(&msg
, 0, NULL
);
2822 /* build the tag object */
2823 strbuf_reset(&new_data
);
2825 strbuf_addf(&new_data
,
2829 sha1_to_hex(sha1
), typename(type
), t
->name
);
2831 strbuf_addf(&new_data
,
2832 "tagger %s\n", tagger
);
2833 strbuf_addch(&new_data
, '\n');
2834 strbuf_addbuf(&new_data
, &msg
);
2837 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2838 t
->pack_id
= MAX_PACK_ID
;
2840 t
->pack_id
= pack_id
;
2843 static void parse_reset_branch(const char *arg
)
2847 b
= lookup_branch(arg
);
2850 hashclr(b
->branch_tree
.versions
[0].sha1
);
2851 hashclr(b
->branch_tree
.versions
[1].sha1
);
2852 if (b
->branch_tree
.tree
) {
2853 release_tree_content_recursive(b
->branch_tree
.tree
);
2854 b
->branch_tree
.tree
= NULL
;
2858 b
= new_branch(arg
);
2859 read_next_command();
2861 if (command_buf
.len
> 0)
2862 unread_command_buf
= 1;
2865 static void cat_blob_write(const char *buf
, unsigned long size
)
2867 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2868 die_errno("Write to frontend failed");
2871 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2873 struct strbuf line
= STRBUF_INIT
;
2875 enum object_type type
= 0;
2878 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2879 buf
= read_sha1_file(sha1
, &type
, &size
);
2882 buf
= gfi_unpack_entry(oe
, &size
);
2886 * Output based on batch_one_object() from cat-file.c.
2889 strbuf_reset(&line
);
2890 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2891 cat_blob_write(line
.buf
, line
.len
);
2892 strbuf_release(&line
);
2897 die("Can't read object %s", sha1_to_hex(sha1
));
2898 if (type
!= OBJ_BLOB
)
2899 die("Object %s is a %s but a blob was expected.",
2900 sha1_to_hex(sha1
), typename(type
));
2901 strbuf_reset(&line
);
2902 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2903 typename(type
), size
);
2904 cat_blob_write(line
.buf
, line
.len
);
2905 strbuf_release(&line
);
2906 cat_blob_write(buf
, size
);
2907 cat_blob_write("\n", 1);
2908 if (oe
&& oe
->pack_id
== pack_id
) {
2909 last_blob
.offset
= oe
->idx
.offset
;
2910 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2911 last_blob
.depth
= oe
->depth
;
2916 static void parse_cat_blob(const char *p
)
2918 struct object_entry
*oe
= oe
;
2919 unsigned char sha1
[20];
2921 /* cat-blob SP <object> LF */
2923 oe
= find_mark(parse_mark_ref_eol(p
));
2925 die("Unknown mark: %s", command_buf
.buf
);
2926 hashcpy(sha1
, oe
->idx
.sha1
);
2928 if (get_sha1_hex(p
, sha1
))
2929 die("Invalid dataref: %s", command_buf
.buf
);
2931 die("Garbage after SHA1: %s", command_buf
.buf
);
2932 oe
= find_object(sha1
);
2938 static struct object_entry
*dereference(struct object_entry
*oe
,
2939 unsigned char sha1
[20])
2944 enum object_type type
= sha1_object_info(sha1
, NULL
);
2946 die("object not found: %s", sha1_to_hex(sha1
));
2948 oe
= insert_object(sha1
);
2950 oe
->pack_id
= MAX_PACK_ID
;
2954 case OBJ_TREE
: /* easy case. */
2960 die("Not a tree-ish: %s", command_buf
.buf
);
2963 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
2964 buf
= gfi_unpack_entry(oe
, &size
);
2966 enum object_type unused
;
2967 buf
= read_sha1_file(sha1
, &unused
, &size
);
2970 die("Can't load object %s", sha1_to_hex(sha1
));
2972 /* Peel one layer. */
2975 if (size
< 40 + strlen("object ") ||
2976 get_sha1_hex(buf
+ strlen("object "), sha1
))
2977 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
2980 if (size
< 40 + strlen("tree ") ||
2981 get_sha1_hex(buf
+ strlen("tree "), sha1
))
2982 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
2986 return find_object(sha1
);
2989 static struct object_entry
*parse_treeish_dataref(const char **p
)
2991 unsigned char sha1
[20];
2992 struct object_entry
*e
;
2994 if (**p
== ':') { /* <mark> */
2995 e
= find_mark(parse_mark_ref_space(p
));
2997 die("Unknown mark: %s", command_buf
.buf
);
2998 hashcpy(sha1
, e
->idx
.sha1
);
2999 } else { /* <sha1> */
3000 if (get_sha1_hex(*p
, sha1
))
3001 die("Invalid dataref: %s", command_buf
.buf
);
3002 e
= find_object(sha1
);
3005 die("Missing space after tree-ish: %s", command_buf
.buf
);
3008 while (!e
|| e
->type
!= OBJ_TREE
)
3009 e
= dereference(e
, sha1
);
3013 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
3015 static struct strbuf line
= STRBUF_INIT
;
3017 /* See show_tree(). */
3019 S_ISGITLINK(mode
) ? commit_type
:
3020 S_ISDIR(mode
) ? tree_type
:
3024 /* missing SP path LF */
3025 strbuf_reset(&line
);
3026 strbuf_addstr(&line
, "missing ");
3027 quote_c_style(path
, &line
, NULL
, 0);
3028 strbuf_addch(&line
, '\n');
3030 /* mode SP type SP object_name TAB path LF */
3031 strbuf_reset(&line
);
3032 strbuf_addf(&line
, "%06o %s %s\t",
3033 mode
& ~NO_DELTA
, type
, sha1_to_hex(sha1
));
3034 quote_c_style(path
, &line
, NULL
, 0);
3035 strbuf_addch(&line
, '\n');
3037 cat_blob_write(line
.buf
, line
.len
);
3040 static void parse_ls(const char *p
, struct branch
*b
)
3042 struct tree_entry
*root
= NULL
;
3043 struct tree_entry leaf
= {NULL
};
3045 /* ls SP (<tree-ish> SP)? <path> */
3048 die("Not in a commit: %s", command_buf
.buf
);
3049 root
= &b
->branch_tree
;
3051 struct object_entry
*e
= parse_treeish_dataref(&p
);
3052 root
= new_tree_entry();
3053 hashcpy(root
->versions
[1].sha1
, e
->idx
.sha1
);
3054 if (!is_null_sha1(root
->versions
[1].sha1
))
3055 root
->versions
[1].mode
= S_IFDIR
;
3059 static struct strbuf uq
= STRBUF_INIT
;
3062 if (unquote_c_style(&uq
, p
, &endp
))
3063 die("Invalid path: %s", command_buf
.buf
);
3065 die("Garbage after path in: %s", command_buf
.buf
);
3068 tree_content_get(root
, p
, &leaf
, 1);
3070 * A directory in preparation would have a sha1 of zero
3071 * until it is saved. Save, for simplicity.
3073 if (S_ISDIR(leaf
.versions
[1].mode
))
3076 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].sha1
, p
);
3078 release_tree_content_recursive(leaf
.tree
);
3079 if (!b
|| root
!= &b
->branch_tree
)
3080 release_tree_entry(root
);
3083 static void checkpoint(void)
3085 checkpoint_requested
= 0;
3094 static void parse_checkpoint(void)
3096 checkpoint_requested
= 1;
3100 static void parse_progress(void)
3102 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3103 fputc('\n', stdout
);
3108 static char* make_fast_import_path(const char *path
)
3110 struct strbuf abs_path
= STRBUF_INIT
;
3112 if (!relative_marks_paths
|| is_absolute_path(path
))
3113 return xstrdup(path
);
3114 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
3115 return strbuf_detach(&abs_path
, NULL
);
3118 static void option_import_marks(const char *marks
,
3119 int from_stream
, int ignore_missing
)
3121 if (import_marks_file
) {
3123 die("Only one import-marks command allowed per stream");
3125 /* read previous mark file */
3126 if(!import_marks_file_from_stream
)
3130 import_marks_file
= make_fast_import_path(marks
);
3131 safe_create_leading_directories_const(import_marks_file
);
3132 import_marks_file_from_stream
= from_stream
;
3133 import_marks_file_ignore_missing
= ignore_missing
;
3136 static void option_date_format(const char *fmt
)
3138 if (!strcmp(fmt
, "raw"))
3139 whenspec
= WHENSPEC_RAW
;
3140 else if (!strcmp(fmt
, "rfc2822"))
3141 whenspec
= WHENSPEC_RFC2822
;
3142 else if (!strcmp(fmt
, "now"))
3143 whenspec
= WHENSPEC_NOW
;
3145 die("unknown --date-format argument %s", fmt
);
3148 static unsigned long ulong_arg(const char *option
, const char *arg
)
3151 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3152 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3153 die("%s: argument must be a non-negative integer", option
);
3157 static void option_depth(const char *depth
)
3159 max_depth
= ulong_arg("--depth", depth
);
3160 if (max_depth
> MAX_DEPTH
)
3161 die("--depth cannot exceed %u", MAX_DEPTH
);
3164 static void option_active_branches(const char *branches
)
3166 max_active_branches
= ulong_arg("--active-branches", branches
);
3169 static void option_export_marks(const char *marks
)
3171 export_marks_file
= make_fast_import_path(marks
);
3172 safe_create_leading_directories_const(export_marks_file
);
3175 static void option_cat_blob_fd(const char *fd
)
3177 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3178 if (n
> (unsigned long) INT_MAX
)
3179 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3180 cat_blob_fd
= (int) n
;
3183 static void option_export_pack_edges(const char *edges
)
3187 pack_edges
= fopen(edges
, "a");
3189 die_errno("Cannot open '%s'", edges
);
3192 static int parse_one_option(const char *option
)
3194 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3196 if (!git_parse_ulong(option
, &v
))
3199 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3201 } else if (v
< 1024 * 1024) {
3202 warning("minimum max-pack-size is 1 MiB");
3206 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3208 if (!git_parse_ulong(option
, &v
))
3210 big_file_threshold
= v
;
3211 } else if (skip_prefix(option
, "depth=", &option
)) {
3212 option_depth(option
);
3213 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3214 option_active_branches(option
);
3215 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3216 option_export_pack_edges(option
);
3217 } else if (starts_with(option
, "quiet")) {
3219 } else if (starts_with(option
, "stats")) {
3228 static int parse_one_feature(const char *feature
, int from_stream
)
3232 if (skip_prefix(feature
, "date-format=", &arg
)) {
3233 option_date_format(arg
);
3234 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3235 option_import_marks(arg
, from_stream
, 0);
3236 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3237 option_import_marks(arg
, from_stream
, 1);
3238 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3239 option_export_marks(arg
);
3240 } else if (!strcmp(feature
, "cat-blob")) {
3241 ; /* Don't die - this feature is supported */
3242 } else if (!strcmp(feature
, "relative-marks")) {
3243 relative_marks_paths
= 1;
3244 } else if (!strcmp(feature
, "no-relative-marks")) {
3245 relative_marks_paths
= 0;
3246 } else if (!strcmp(feature
, "done")) {
3247 require_explicit_termination
= 1;
3248 } else if (!strcmp(feature
, "force")) {
3250 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3251 ; /* do nothing; we have the feature */
3259 static void parse_feature(const char *feature
)
3261 if (seen_data_command
)
3262 die("Got feature command '%s' after data command", feature
);
3264 if (parse_one_feature(feature
, 1))
3267 die("This version of fast-import does not support feature %s.", feature
);
3270 static void parse_option(const char *option
)
3272 if (seen_data_command
)
3273 die("Got option command '%s' after data command", option
);
3275 if (parse_one_option(option
))
3278 die("This version of fast-import does not support option: %s", option
);
3281 static int git_pack_config(const char *k
, const char *v
, void *cb
)
3283 if (!strcmp(k
, "pack.depth")) {
3284 max_depth
= git_config_int(k
, v
);
3285 if (max_depth
> MAX_DEPTH
)
3286 max_depth
= MAX_DEPTH
;
3289 if (!strcmp(k
, "pack.compression")) {
3290 int level
= git_config_int(k
, v
);
3292 level
= Z_DEFAULT_COMPRESSION
;
3293 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
3294 die("bad pack compression level %d", level
);
3295 pack_compression_level
= level
;
3296 pack_compression_seen
= 1;
3299 if (!strcmp(k
, "pack.indexversion")) {
3300 pack_idx_opts
.version
= git_config_int(k
, v
);
3301 if (pack_idx_opts
.version
> 2)
3302 die("bad pack.indexversion=%"PRIu32
,
3303 pack_idx_opts
.version
);
3306 if (!strcmp(k
, "pack.packsizelimit")) {
3307 max_packsize
= git_config_ulong(k
, v
);
3310 return git_default_config(k
, v
, cb
);
3313 static const char fast_import_usage
[] =
3314 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3316 static void parse_argv(void)
3320 for (i
= 1; i
< global_argc
; i
++) {
3321 const char *a
= global_argv
[i
];
3323 if (*a
!= '-' || !strcmp(a
, "--"))
3326 if (!skip_prefix(a
, "--", &a
))
3327 die("unknown option %s", a
);
3329 if (parse_one_option(a
))
3332 if (parse_one_feature(a
, 0))
3335 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3336 option_cat_blob_fd(a
);
3340 die("unknown option --%s", a
);
3342 if (i
!= global_argc
)
3343 usage(fast_import_usage
);
3345 seen_data_command
= 1;
3346 if (import_marks_file
)
3350 int main(int argc
, char **argv
)
3354 git_extract_argv0_path(argv
[0]);
3356 git_setup_gettext();
3358 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3359 usage(fast_import_usage
);
3361 setup_git_directory();
3362 reset_pack_idx_option(&pack_idx_opts
);
3363 git_config(git_pack_config
, NULL
);
3364 if (!pack_compression_seen
&& core_compression_seen
)
3365 pack_compression_level
= core_compression_level
;
3367 alloc_objects(object_entry_alloc
);
3368 strbuf_init(&command_buf
, 0);
3369 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3370 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3371 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3372 marks
= pool_calloc(1, sizeof(struct mark_set
));
3377 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3378 for (i
= 0; i
< (cmd_save
- 1); i
++)
3379 rc_free
[i
].next
= &rc_free
[i
+ 1];
3380 rc_free
[cmd_save
- 1].next
= NULL
;
3382 prepare_packed_git();
3384 set_die_routine(die_nicely
);
3385 set_checkpoint_signal();
3386 while (read_next_command() != EOF
) {
3388 if (!strcmp("blob", command_buf
.buf
))
3390 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3392 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3393 parse_new_commit(v
);
3394 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3396 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3397 parse_reset_branch(v
);
3398 else if (!strcmp("checkpoint", command_buf
.buf
))
3400 else if (!strcmp("done", command_buf
.buf
))
3402 else if (starts_with(command_buf
.buf
, "progress "))
3404 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3406 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3408 else if (starts_with(command_buf
.buf
, "option "))
3409 /* ignore non-git options*/;
3411 die("Unsupported command: %s", command_buf
.buf
);
3413 if (checkpoint_requested
)
3417 /* argv hasn't been parsed yet, do so */
3418 if (!seen_data_command
)
3421 if (require_explicit_termination
&& feof(stdin
))
3422 die("stream ends early");
3435 uintmax_t total_count
= 0, duplicate_count
= 0;
3436 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3437 total_count
+= object_count_by_type
[i
];
3438 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3439 duplicate_count
+= duplicate_count_by_type
[i
];
3441 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3442 fprintf(stderr
, "---------------------------------------------------------------------\n");
3443 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3444 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3445 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
]);
3446 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
]);
3447 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
]);
3448 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
]);
3449 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3450 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3451 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3452 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3453 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3454 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3455 fprintf(stderr
, "---------------------------------------------------------------------\n");
3457 fprintf(stderr
, "---------------------------------------------------------------------\n");
3458 fprintf(stderr
, "\n");
3461 return failure
? 1 : 0;