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, get-mark, ls-tree, and cat-blob requests may
138 # appear anywhere in the input, except within a data command. Any
139 # form of the data command always escapes the related input from
140 # 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 get_mark ::= 'get-mark' sp idnum lf;
148 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
149 ls_tree ::= 'ls' sp (hexsha1 | idnum) sp path_str lf;
151 comment ::= '#' not_lf* lf;
152 not_lf ::= # Any byte that is not ASCII newline (LF);
157 #include "lockfile.h"
165 #include "csum-file.h"
167 #include "exec_cmd.h"
170 #define PACK_ID_BITS 16
171 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
172 #define DEPTH_BITS 13
173 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
176 * We abuse the setuid bit on directories to mean "do not delta".
178 #define NO_DELTA S_ISUID
180 struct object_entry
{
181 struct pack_idx_entry idx
;
182 struct object_entry
*next
;
183 uint32_t type
: TYPE_BITS
,
184 pack_id
: PACK_ID_BITS
,
188 struct object_entry_pool
{
189 struct object_entry_pool
*next_pool
;
190 struct object_entry
*next_free
;
191 struct object_entry
*end
;
192 struct object_entry entries
[FLEX_ARRAY
]; /* more */
197 struct object_entry
*marked
[1024];
198 struct mark_set
*sets
[1024];
207 unsigned no_swap
: 1;
211 struct mem_pool
*next_pool
;
214 uintmax_t space
[FLEX_ARRAY
]; /* more */
218 struct atom_str
*next_atom
;
219 unsigned short str_len
;
220 char str_dat
[FLEX_ARRAY
]; /* more */
225 struct tree_content
*tree
;
226 struct atom_str
*name
;
227 struct tree_entry_ms
{
229 unsigned char sha1
[20];
233 struct tree_content
{
234 unsigned int entry_capacity
; /* must match avail_tree_content */
235 unsigned int entry_count
;
236 unsigned int delta_depth
;
237 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
240 struct avail_tree_content
{
241 unsigned int entry_capacity
; /* must match tree_content */
242 struct avail_tree_content
*next_avail
;
246 struct branch
*table_next_branch
;
247 struct branch
*active_next_branch
;
249 struct tree_entry branch_tree
;
250 uintmax_t last_commit
;
254 unsigned pack_id
: PACK_ID_BITS
;
255 unsigned char sha1
[20];
259 struct tag
*next_tag
;
261 unsigned int pack_id
;
262 unsigned char sha1
[20];
266 struct hash_list
*next
;
267 unsigned char sha1
[20];
276 struct recent_command
{
277 struct recent_command
*prev
;
278 struct recent_command
*next
;
282 /* Configured limits on output */
283 static unsigned long max_depth
= 10;
284 static off_t max_packsize
;
285 static int force_update
;
286 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
287 static int pack_compression_seen
;
289 /* Stats and misc. counters */
290 static uintmax_t alloc_count
;
291 static uintmax_t marks_set_count
;
292 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
294 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
295 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
296 static unsigned long object_count
;
297 static unsigned long branch_count
;
298 static unsigned long branch_load_count
;
300 static FILE *pack_edges
;
301 static unsigned int show_stats
= 1;
302 static int global_argc
;
303 static char **global_argv
;
306 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
307 static size_t total_allocd
;
308 static struct mem_pool
*mem_pool
;
310 /* Atom management */
311 static unsigned int atom_table_sz
= 4451;
312 static unsigned int atom_cnt
;
313 static struct atom_str
**atom_table
;
315 /* The .pack file being generated */
316 static struct pack_idx_option pack_idx_opts
;
317 static unsigned int pack_id
;
318 static struct sha1file
*pack_file
;
319 static struct packed_git
*pack_data
;
320 static struct packed_git
**all_packs
;
321 static off_t pack_size
;
323 /* Table of objects we've written. */
324 static unsigned int object_entry_alloc
= 5000;
325 static struct object_entry_pool
*blocks
;
326 static struct object_entry
*object_table
[1 << 16];
327 static struct mark_set
*marks
;
328 static const char *export_marks_file
;
329 static const char *import_marks_file
;
330 static int import_marks_file_from_stream
;
331 static int import_marks_file_ignore_missing
;
332 static int relative_marks_paths
;
335 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
337 /* Tree management */
338 static unsigned int tree_entry_alloc
= 1000;
339 static void *avail_tree_entry
;
340 static unsigned int avail_tree_table_sz
= 100;
341 static struct avail_tree_content
**avail_tree_table
;
342 static struct strbuf old_tree
= STRBUF_INIT
;
343 static struct strbuf new_tree
= STRBUF_INIT
;
346 static unsigned long max_active_branches
= 5;
347 static unsigned long cur_active_branches
;
348 static unsigned long branch_table_sz
= 1039;
349 static struct branch
**branch_table
;
350 static struct branch
*active_branches
;
353 static struct tag
*first_tag
;
354 static struct tag
*last_tag
;
356 /* Input stream parsing */
357 static whenspec_type whenspec
= WHENSPEC_RAW
;
358 static struct strbuf command_buf
= STRBUF_INIT
;
359 static int unread_command_buf
;
360 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
361 static struct recent_command
*cmd_tail
= &cmd_hist
;
362 static struct recent_command
*rc_free
;
363 static unsigned int cmd_save
= 100;
364 static uintmax_t next_mark
;
365 static struct strbuf new_data
= STRBUF_INIT
;
366 static int seen_data_command
;
367 static int require_explicit_termination
;
369 /* Signal handling */
370 static volatile sig_atomic_t checkpoint_requested
;
372 /* Where to write output of cat-blob commands */
373 static int cat_blob_fd
= STDOUT_FILENO
;
375 static void parse_argv(void);
376 static void parse_get_mark(const char *p
);
377 static void parse_cat_blob(const char *p
);
378 static void parse_ls(const char *p
, struct branch
*b
);
380 static void write_branch_report(FILE *rpt
, struct branch
*b
)
382 fprintf(rpt
, "%s:\n", b
->name
);
384 fprintf(rpt
, " status :");
386 fputs(" active", rpt
);
387 if (b
->branch_tree
.tree
)
388 fputs(" loaded", rpt
);
389 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
390 fputs(" dirty", rpt
);
393 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
394 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
395 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
396 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
398 fputs(" last pack : ", rpt
);
399 if (b
->pack_id
< MAX_PACK_ID
)
400 fprintf(rpt
, "%u", b
->pack_id
);
406 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
408 static void write_crash_report(const char *err
)
410 char *loc
= git_pathdup("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
411 FILE *rpt
= fopen(loc
, "w");
414 struct recent_command
*rc
;
417 error("can't write crash report %s: %s", loc
, strerror(errno
));
422 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
424 fprintf(rpt
, "fast-import crash report:\n");
425 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
426 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
427 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_MODE(LOCAL
)));
430 fputs("fatal: ", rpt
);
435 fputs("Most Recent Commands Before Crash\n", rpt
);
436 fputs("---------------------------------\n", rpt
);
437 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
438 if (rc
->next
== &cmd_hist
)
447 fputs("Active Branch LRU\n", rpt
);
448 fputs("-----------------\n", rpt
);
449 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
451 max_active_branches
);
453 fputs(" pos clock name\n", rpt
);
454 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
455 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
456 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
457 ++lu
, b
->last_commit
, b
->name
);
460 fputs("Inactive Branches\n", rpt
);
461 fputs("-----------------\n", rpt
);
462 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
463 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
464 write_branch_report(rpt
, b
);
470 fputs("Annotated Tags\n", rpt
);
471 fputs("--------------\n", rpt
);
472 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
473 fputs(sha1_to_hex(tg
->sha1
), rpt
);
475 fputs(tg
->name
, rpt
);
481 fputs("Marks\n", rpt
);
482 fputs("-----\n", rpt
);
483 if (export_marks_file
)
484 fprintf(rpt
, " exported to %s\n", export_marks_file
);
486 dump_marks_helper(rpt
, 0, marks
);
489 fputs("-------------------\n", rpt
);
490 fputs("END OF CRASH REPORT\n", rpt
);
495 static void end_packfile(void);
496 static void unkeep_all_packs(void);
497 static void dump_marks(void);
499 static NORETURN
void die_nicely(const char *err
, va_list params
)
502 char message
[2 * PATH_MAX
];
504 vsnprintf(message
, sizeof(message
), err
, params
);
505 fputs("fatal: ", stderr
);
506 fputs(message
, stderr
);
511 write_crash_report(message
);
519 #ifndef SIGUSR1 /* Windows, for example */
521 static void set_checkpoint_signal(void)
527 static void checkpoint_signal(int signo
)
529 checkpoint_requested
= 1;
532 static void set_checkpoint_signal(void)
536 memset(&sa
, 0, sizeof(sa
));
537 sa
.sa_handler
= checkpoint_signal
;
538 sigemptyset(&sa
.sa_mask
);
539 sa
.sa_flags
= SA_RESTART
;
540 sigaction(SIGUSR1
, &sa
, NULL
);
545 static void alloc_objects(unsigned int cnt
)
547 struct object_entry_pool
*b
;
549 b
= xmalloc(sizeof(struct object_entry_pool
)
550 + cnt
* sizeof(struct object_entry
));
551 b
->next_pool
= blocks
;
552 b
->next_free
= b
->entries
;
553 b
->end
= b
->entries
+ cnt
;
558 static struct object_entry
*new_object(unsigned char *sha1
)
560 struct object_entry
*e
;
562 if (blocks
->next_free
== blocks
->end
)
563 alloc_objects(object_entry_alloc
);
565 e
= blocks
->next_free
++;
566 hashcpy(e
->idx
.sha1
, sha1
);
570 static struct object_entry
*find_object(unsigned char *sha1
)
572 unsigned int h
= sha1
[0] << 8 | sha1
[1];
573 struct object_entry
*e
;
574 for (e
= object_table
[h
]; e
; e
= e
->next
)
575 if (!hashcmp(sha1
, e
->idx
.sha1
))
580 static struct object_entry
*insert_object(unsigned char *sha1
)
582 unsigned int h
= sha1
[0] << 8 | sha1
[1];
583 struct object_entry
*e
= object_table
[h
];
586 if (!hashcmp(sha1
, e
->idx
.sha1
))
591 e
= new_object(sha1
);
592 e
->next
= object_table
[h
];
598 static unsigned int hc_str(const char *s
, size_t len
)
606 static void *pool_alloc(size_t len
)
611 /* round up to a 'uintmax_t' alignment */
612 if (len
& (sizeof(uintmax_t) - 1))
613 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
615 for (p
= mem_pool
; p
; p
= p
->next_pool
)
616 if ((p
->end
- p
->next_free
>= len
))
620 if (len
>= (mem_pool_alloc
/2)) {
624 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
625 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
626 p
->next_pool
= mem_pool
;
627 p
->next_free
= (char *) p
->space
;
628 p
->end
= p
->next_free
+ mem_pool_alloc
;
637 static void *pool_calloc(size_t count
, size_t size
)
639 size_t len
= count
* size
;
640 void *r
= pool_alloc(len
);
645 static char *pool_strdup(const char *s
)
647 char *r
= pool_alloc(strlen(s
) + 1);
652 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
654 struct mark_set
*s
= marks
;
655 while ((idnum
>> s
->shift
) >= 1024) {
656 s
= pool_calloc(1, sizeof(struct mark_set
));
657 s
->shift
= marks
->shift
+ 10;
658 s
->data
.sets
[0] = marks
;
662 uintmax_t i
= idnum
>> s
->shift
;
663 idnum
-= i
<< s
->shift
;
664 if (!s
->data
.sets
[i
]) {
665 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
666 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
670 if (!s
->data
.marked
[idnum
])
672 s
->data
.marked
[idnum
] = oe
;
675 static struct object_entry
*find_mark(uintmax_t idnum
)
677 uintmax_t orig_idnum
= idnum
;
678 struct mark_set
*s
= marks
;
679 struct object_entry
*oe
= NULL
;
680 if ((idnum
>> s
->shift
) < 1024) {
681 while (s
&& s
->shift
) {
682 uintmax_t i
= idnum
>> s
->shift
;
683 idnum
-= i
<< s
->shift
;
687 oe
= s
->data
.marked
[idnum
];
690 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
694 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
696 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
699 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
700 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
703 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
705 strncpy(c
->str_dat
, s
, len
);
707 c
->next_atom
= atom_table
[hc
];
713 static struct branch
*lookup_branch(const char *name
)
715 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
718 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
719 if (!strcmp(name
, b
->name
))
724 static struct branch
*new_branch(const char *name
)
726 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
727 struct branch
*b
= lookup_branch(name
);
730 die("Invalid attempt to create duplicate branch: %s", name
);
731 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
732 die("Branch name doesn't conform to GIT standards: %s", name
);
734 b
= pool_calloc(1, sizeof(struct branch
));
735 b
->name
= pool_strdup(name
);
736 b
->table_next_branch
= branch_table
[hc
];
737 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
738 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
741 b
->pack_id
= MAX_PACK_ID
;
742 branch_table
[hc
] = b
;
747 static unsigned int hc_entries(unsigned int cnt
)
749 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
750 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
753 static struct tree_content
*new_tree_content(unsigned int cnt
)
755 struct avail_tree_content
*f
, *l
= NULL
;
756 struct tree_content
*t
;
757 unsigned int hc
= hc_entries(cnt
);
759 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
760 if (f
->entry_capacity
>= cnt
)
765 l
->next_avail
= f
->next_avail
;
767 avail_tree_table
[hc
] = f
->next_avail
;
769 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
770 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
771 f
->entry_capacity
= cnt
;
774 t
= (struct tree_content
*)f
;
780 static void release_tree_entry(struct tree_entry
*e
);
781 static void release_tree_content(struct tree_content
*t
)
783 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
784 unsigned int hc
= hc_entries(f
->entry_capacity
);
785 f
->next_avail
= avail_tree_table
[hc
];
786 avail_tree_table
[hc
] = f
;
789 static void release_tree_content_recursive(struct tree_content
*t
)
792 for (i
= 0; i
< t
->entry_count
; i
++)
793 release_tree_entry(t
->entries
[i
]);
794 release_tree_content(t
);
797 static struct tree_content
*grow_tree_content(
798 struct tree_content
*t
,
801 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
802 r
->entry_count
= t
->entry_count
;
803 r
->delta_depth
= t
->delta_depth
;
804 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
805 release_tree_content(t
);
809 static struct tree_entry
*new_tree_entry(void)
811 struct tree_entry
*e
;
813 if (!avail_tree_entry
) {
814 unsigned int n
= tree_entry_alloc
;
815 total_allocd
+= n
* sizeof(struct tree_entry
);
816 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
818 *((void**)e
) = e
+ 1;
824 e
= avail_tree_entry
;
825 avail_tree_entry
= *((void**)e
);
829 static void release_tree_entry(struct tree_entry
*e
)
832 release_tree_content_recursive(e
->tree
);
833 *((void**)e
) = avail_tree_entry
;
834 avail_tree_entry
= e
;
837 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
839 struct tree_content
*d
;
840 struct tree_entry
*a
, *b
;
845 d
= new_tree_content(s
->entry_count
);
846 for (i
= 0; i
< s
->entry_count
; i
++) {
848 b
= new_tree_entry();
849 memcpy(b
, a
, sizeof(*a
));
850 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
851 b
->tree
= dup_tree_content(a
->tree
);
856 d
->entry_count
= s
->entry_count
;
857 d
->delta_depth
= s
->delta_depth
;
862 static void start_packfile(void)
864 static char tmp_file
[PATH_MAX
];
865 struct packed_git
*p
;
867 struct pack_header hdr
;
870 pack_fd
= odb_mkstemp(tmp_file
, sizeof(tmp_file
),
871 "pack/tmp_pack_XXXXXX");
872 namelen
= strlen(tmp_file
) + 2;
873 p
= xcalloc(1, sizeof(*p
) + namelen
);
874 xsnprintf(p
->pack_name
, namelen
, "%s", tmp_file
);
875 p
->pack_fd
= pack_fd
;
877 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
879 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
880 hdr
.hdr_version
= htonl(2);
882 sha1write(pack_file
, &hdr
, sizeof(hdr
));
885 pack_size
= sizeof(hdr
);
888 REALLOC_ARRAY(all_packs
, pack_id
+ 1);
889 all_packs
[pack_id
] = p
;
892 static const char *create_index(void)
895 struct pack_idx_entry
**idx
, **c
, **last
;
896 struct object_entry
*e
;
897 struct object_entry_pool
*o
;
899 /* Build the table of object IDs. */
900 idx
= xmalloc(object_count
* sizeof(*idx
));
902 for (o
= blocks
; o
; o
= o
->next_pool
)
903 for (e
= o
->next_free
; e
-- != o
->entries
;)
904 if (pack_id
== e
->pack_id
)
906 last
= idx
+ object_count
;
908 die("internal consistency error creating the index");
910 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
, pack_data
->sha1
);
915 static char *keep_pack(const char *curr_index_name
)
917 static char name
[PATH_MAX
];
918 static const char *keep_msg
= "fast-import";
921 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
923 die_errno("cannot create keep file");
924 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
926 die_errno("failed to write keep file");
928 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
929 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
930 if (finalize_object_file(pack_data
->pack_name
, name
))
931 die("cannot store pack file");
933 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
934 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
935 if (finalize_object_file(curr_index_name
, name
))
936 die("cannot store index file");
937 free((void *)curr_index_name
);
941 static void unkeep_all_packs(void)
943 static char name
[PATH_MAX
];
946 for (k
= 0; k
< pack_id
; k
++) {
947 struct packed_git
*p
= all_packs
[k
];
948 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
949 get_object_directory(), sha1_to_hex(p
->sha1
));
950 unlink_or_warn(name
);
954 static void end_packfile(void)
958 if (running
|| !pack_data
)
962 clear_delta_base_cache();
964 struct packed_git
*new_p
;
965 unsigned char cur_pack_sha1
[20];
971 close_pack_windows(pack_data
);
972 sha1close(pack_file
, cur_pack_sha1
, 0);
973 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
974 pack_data
->pack_name
, object_count
,
975 cur_pack_sha1
, pack_size
);
976 close(pack_data
->pack_fd
);
977 idx_name
= keep_pack(create_index());
979 /* Register the packfile with core git's machinery. */
980 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
982 die("core git rejected index %s", idx_name
);
983 all_packs
[pack_id
] = new_p
;
984 install_packed_git(new_p
);
986 /* Print the boundary */
988 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
989 for (i
= 0; i
< branch_table_sz
; i
++) {
990 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
991 if (b
->pack_id
== pack_id
)
992 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
995 for (t
= first_tag
; t
; t
= t
->next_tag
) {
996 if (t
->pack_id
== pack_id
)
997 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
999 fputc('\n', pack_edges
);
1006 close(pack_data
->pack_fd
);
1007 unlink_or_warn(pack_data
->pack_name
);
1013 /* We can't carry a delta across packfiles. */
1014 strbuf_release(&last_blob
.data
);
1015 last_blob
.offset
= 0;
1016 last_blob
.depth
= 0;
1019 static void cycle_packfile(void)
1025 static int store_object(
1026 enum object_type type
,
1028 struct last_object
*last
,
1029 unsigned char *sha1out
,
1033 struct object_entry
*e
;
1034 unsigned char hdr
[96];
1035 unsigned char sha1
[20];
1036 unsigned long hdrlen
, deltalen
;
1040 hdrlen
= xsnprintf((char *)hdr
, sizeof(hdr
), "%s %lu",
1041 typename(type
), (unsigned long)dat
->len
) + 1;
1043 git_SHA1_Update(&c
, hdr
, hdrlen
);
1044 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1045 git_SHA1_Final(sha1
, &c
);
1047 hashcpy(sha1out
, sha1
);
1049 e
= insert_object(sha1
);
1051 insert_mark(mark
, e
);
1052 if (e
->idx
.offset
) {
1053 duplicate_count_by_type
[type
]++;
1055 } else if (find_sha1_pack(sha1
, packed_git
)) {
1057 e
->pack_id
= MAX_PACK_ID
;
1058 e
->idx
.offset
= 1; /* just not zero! */
1059 duplicate_count_by_type
[type
]++;
1063 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1064 delta_count_attempts_by_type
[type
]++;
1065 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1067 &deltalen
, dat
->len
- 20);
1071 git_deflate_init(&s
, pack_compression_level
);
1074 s
.avail_in
= deltalen
;
1076 s
.next_in
= (void *)dat
->buf
;
1077 s
.avail_in
= dat
->len
;
1079 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1080 s
.next_out
= out
= xmalloc(s
.avail_out
);
1081 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1083 git_deflate_end(&s
);
1085 /* Determine if we should auto-checkpoint. */
1086 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1087 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1089 /* This new object needs to *not* have the current pack_id. */
1090 e
->pack_id
= pack_id
+ 1;
1093 /* We cannot carry a delta into the new pack. */
1098 git_deflate_init(&s
, pack_compression_level
);
1099 s
.next_in
= (void *)dat
->buf
;
1100 s
.avail_in
= dat
->len
;
1101 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1102 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1103 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1105 git_deflate_end(&s
);
1110 e
->pack_id
= pack_id
;
1111 e
->idx
.offset
= pack_size
;
1113 object_count_by_type
[type
]++;
1115 crc32_begin(pack_file
);
1118 off_t ofs
= e
->idx
.offset
- last
->offset
;
1119 unsigned pos
= sizeof(hdr
) - 1;
1121 delta_count_by_type
[type
]++;
1122 e
->depth
= last
->depth
+ 1;
1124 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1125 sha1write(pack_file
, hdr
, hdrlen
);
1126 pack_size
+= hdrlen
;
1128 hdr
[pos
] = ofs
& 127;
1130 hdr
[--pos
] = 128 | (--ofs
& 127);
1131 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1132 pack_size
+= sizeof(hdr
) - pos
;
1135 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1136 sha1write(pack_file
, hdr
, hdrlen
);
1137 pack_size
+= hdrlen
;
1140 sha1write(pack_file
, out
, s
.total_out
);
1141 pack_size
+= s
.total_out
;
1143 e
->idx
.crc32
= crc32_end(pack_file
);
1148 if (last
->no_swap
) {
1151 strbuf_swap(&last
->data
, dat
);
1153 last
->offset
= e
->idx
.offset
;
1154 last
->depth
= e
->depth
;
1159 static void truncate_pack(struct sha1file_checkpoint
*checkpoint
)
1161 if (sha1file_truncate(pack_file
, checkpoint
))
1162 die_errno("cannot truncate pack to skip duplicate");
1163 pack_size
= checkpoint
->offset
;
1166 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1168 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1169 unsigned char *in_buf
= xmalloc(in_sz
);
1170 unsigned char *out_buf
= xmalloc(out_sz
);
1171 struct object_entry
*e
;
1172 unsigned char sha1
[20];
1173 unsigned long hdrlen
;
1177 struct sha1file_checkpoint checkpoint
;
1180 /* Determine if we should auto-checkpoint. */
1181 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1182 || (pack_size
+ 60 + len
) < pack_size
)
1185 sha1file_checkpoint(pack_file
, &checkpoint
);
1186 offset
= checkpoint
.offset
;
1188 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1189 if (out_sz
<= hdrlen
)
1190 die("impossibly large object header");
1193 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1195 crc32_begin(pack_file
);
1197 git_deflate_init(&s
, pack_compression_level
);
1199 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1200 if (out_sz
<= hdrlen
)
1201 die("impossibly large object header");
1203 s
.next_out
= out_buf
+ hdrlen
;
1204 s
.avail_out
= out_sz
- hdrlen
;
1206 while (status
!= Z_STREAM_END
) {
1207 if (0 < len
&& !s
.avail_in
) {
1208 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1209 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1210 if (!n
&& feof(stdin
))
1211 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1213 git_SHA1_Update(&c
, in_buf
, n
);
1219 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1221 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1222 size_t n
= s
.next_out
- out_buf
;
1223 sha1write(pack_file
, out_buf
, n
);
1225 s
.next_out
= out_buf
;
1226 s
.avail_out
= out_sz
;
1235 die("unexpected deflate failure: %d", status
);
1238 git_deflate_end(&s
);
1239 git_SHA1_Final(sha1
, &c
);
1242 hashcpy(sha1out
, sha1
);
1244 e
= insert_object(sha1
);
1247 insert_mark(mark
, e
);
1249 if (e
->idx
.offset
) {
1250 duplicate_count_by_type
[OBJ_BLOB
]++;
1251 truncate_pack(&checkpoint
);
1253 } else if (find_sha1_pack(sha1
, packed_git
)) {
1255 e
->pack_id
= MAX_PACK_ID
;
1256 e
->idx
.offset
= 1; /* just not zero! */
1257 duplicate_count_by_type
[OBJ_BLOB
]++;
1258 truncate_pack(&checkpoint
);
1263 e
->pack_id
= pack_id
;
1264 e
->idx
.offset
= offset
;
1265 e
->idx
.crc32
= crc32_end(pack_file
);
1267 object_count_by_type
[OBJ_BLOB
]++;
1274 /* All calls must be guarded by find_object() or find_mark() to
1275 * ensure the 'struct object_entry' passed was written by this
1276 * process instance. We unpack the entry by the offset, avoiding
1277 * the need for the corresponding .idx file. This unpacking rule
1278 * works because we only use OBJ_REF_DELTA within the packfiles
1279 * created by fast-import.
1281 * oe must not be NULL. Such an oe usually comes from giving
1282 * an unknown SHA-1 to find_object() or an undefined mark to
1283 * find_mark(). Callers must test for this condition and use
1284 * the standard read_sha1_file() when it happens.
1286 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1287 * find_mark(), where the mark was reloaded from an existing marks
1288 * file and is referencing an object that this fast-import process
1289 * instance did not write out to a packfile. Callers must test for
1290 * this condition and use read_sha1_file() instead.
1292 static void *gfi_unpack_entry(
1293 struct object_entry
*oe
,
1294 unsigned long *sizep
)
1296 enum object_type type
;
1297 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1298 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1299 /* The object is stored in the packfile we are writing to
1300 * and we have modified it since the last time we scanned
1301 * back to read a previously written object. If an old
1302 * window covered [p->pack_size, p->pack_size + 20) its
1303 * data is stale and is not valid. Closing all windows
1304 * and updating the packfile length ensures we can read
1305 * the newly written data.
1307 close_pack_windows(p
);
1308 sha1flush(pack_file
);
1310 /* We have to offer 20 bytes additional on the end of
1311 * the packfile as the core unpacker code assumes the
1312 * footer is present at the file end and must promise
1313 * at least 20 bytes within any window it maps. But
1314 * we don't actually create the footer here.
1316 p
->pack_size
= pack_size
+ 20;
1318 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1321 static const char *get_mode(const char *str
, uint16_t *modep
)
1326 while ((c
= *str
++) != ' ') {
1327 if (c
< '0' || c
> '7')
1329 mode
= (mode
<< 3) + (c
- '0');
1335 static void load_tree(struct tree_entry
*root
)
1337 unsigned char *sha1
= root
->versions
[1].sha1
;
1338 struct object_entry
*myoe
;
1339 struct tree_content
*t
;
1344 root
->tree
= t
= new_tree_content(8);
1345 if (is_null_sha1(sha1
))
1348 myoe
= find_object(sha1
);
1349 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1350 if (myoe
->type
!= OBJ_TREE
)
1351 die("Not a tree: %s", sha1_to_hex(sha1
));
1352 t
->delta_depth
= myoe
->depth
;
1353 buf
= gfi_unpack_entry(myoe
, &size
);
1355 die("Can't load tree %s", sha1_to_hex(sha1
));
1357 enum object_type type
;
1358 buf
= read_sha1_file(sha1
, &type
, &size
);
1359 if (!buf
|| type
!= OBJ_TREE
)
1360 die("Can't load tree %s", sha1_to_hex(sha1
));
1364 while (c
!= (buf
+ size
)) {
1365 struct tree_entry
*e
= new_tree_entry();
1367 if (t
->entry_count
== t
->entry_capacity
)
1368 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1369 t
->entries
[t
->entry_count
++] = e
;
1372 c
= get_mode(c
, &e
->versions
[1].mode
);
1374 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1375 e
->versions
[0].mode
= e
->versions
[1].mode
;
1376 e
->name
= to_atom(c
, strlen(c
));
1377 c
+= e
->name
->str_len
+ 1;
1378 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1379 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1385 static int tecmp0 (const void *_a
, const void *_b
)
1387 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1388 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1389 return base_name_compare(
1390 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1391 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1394 static int tecmp1 (const void *_a
, const void *_b
)
1396 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1397 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1398 return base_name_compare(
1399 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1400 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1403 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1409 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1411 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1413 for (i
= 0; i
< t
->entry_count
; i
++) {
1414 if (t
->entries
[i
]->versions
[v
].mode
)
1415 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1419 strbuf_grow(b
, maxlen
);
1420 for (i
= 0; i
< t
->entry_count
; i
++) {
1421 struct tree_entry
*e
= t
->entries
[i
];
1422 if (!e
->versions
[v
].mode
)
1424 strbuf_addf(b
, "%o %s%c",
1425 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1426 e
->name
->str_dat
, '\0');
1427 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1431 static void store_tree(struct tree_entry
*root
)
1433 struct tree_content
*t
;
1434 unsigned int i
, j
, del
;
1435 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1436 struct object_entry
*le
= NULL
;
1438 if (!is_null_sha1(root
->versions
[1].sha1
))
1445 for (i
= 0; i
< t
->entry_count
; i
++) {
1446 if (t
->entries
[i
]->tree
)
1447 store_tree(t
->entries
[i
]);
1450 if (!(root
->versions
[0].mode
& NO_DELTA
))
1451 le
= find_object(root
->versions
[0].sha1
);
1452 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1453 mktree(t
, 0, &old_tree
);
1455 lo
.offset
= le
->idx
.offset
;
1456 lo
.depth
= t
->delta_depth
;
1459 mktree(t
, 1, &new_tree
);
1460 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1462 t
->delta_depth
= lo
.depth
;
1463 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1464 struct tree_entry
*e
= t
->entries
[i
];
1465 if (e
->versions
[1].mode
) {
1466 e
->versions
[0].mode
= e
->versions
[1].mode
;
1467 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1468 t
->entries
[j
++] = e
;
1470 release_tree_entry(e
);
1474 t
->entry_count
-= del
;
1477 static void tree_content_replace(
1478 struct tree_entry
*root
,
1479 const unsigned char *sha1
,
1480 const uint16_t mode
,
1481 struct tree_content
*newtree
)
1484 die("Root cannot be a non-directory");
1485 hashclr(root
->versions
[0].sha1
);
1486 hashcpy(root
->versions
[1].sha1
, sha1
);
1488 release_tree_content_recursive(root
->tree
);
1489 root
->tree
= newtree
;
1492 static int tree_content_set(
1493 struct tree_entry
*root
,
1495 const unsigned char *sha1
,
1496 const uint16_t mode
,
1497 struct tree_content
*subtree
)
1499 struct tree_content
*t
;
1502 struct tree_entry
*e
;
1504 slash1
= strchrnul(p
, '/');
1507 die("Empty path component found in input");
1508 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1509 die("Non-directories cannot have subtrees");
1514 for (i
= 0; i
< t
->entry_count
; i
++) {
1516 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1519 && e
->versions
[1].mode
== mode
1520 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1522 e
->versions
[1].mode
= mode
;
1523 hashcpy(e
->versions
[1].sha1
, sha1
);
1525 release_tree_content_recursive(e
->tree
);
1529 * We need to leave e->versions[0].sha1 alone
1530 * to avoid modifying the preimage tree used
1531 * when writing out the parent directory.
1532 * But after replacing the subdir with a
1533 * completely different one, it's not a good
1534 * delta base any more, and besides, we've
1535 * thrown away the tree entries needed to
1536 * make a delta against it.
1538 * So let's just explicitly disable deltas
1541 if (S_ISDIR(e
->versions
[0].mode
))
1542 e
->versions
[0].mode
|= NO_DELTA
;
1544 hashclr(root
->versions
[1].sha1
);
1547 if (!S_ISDIR(e
->versions
[1].mode
)) {
1548 e
->tree
= new_tree_content(8);
1549 e
->versions
[1].mode
= S_IFDIR
;
1553 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1554 hashclr(root
->versions
[1].sha1
);
1561 if (t
->entry_count
== t
->entry_capacity
)
1562 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1563 e
= new_tree_entry();
1564 e
->name
= to_atom(p
, n
);
1565 e
->versions
[0].mode
= 0;
1566 hashclr(e
->versions
[0].sha1
);
1567 t
->entries
[t
->entry_count
++] = e
;
1569 e
->tree
= new_tree_content(8);
1570 e
->versions
[1].mode
= S_IFDIR
;
1571 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1574 e
->versions
[1].mode
= mode
;
1575 hashcpy(e
->versions
[1].sha1
, sha1
);
1577 hashclr(root
->versions
[1].sha1
);
1581 static int tree_content_remove(
1582 struct tree_entry
*root
,
1584 struct tree_entry
*backup_leaf
,
1587 struct tree_content
*t
;
1590 struct tree_entry
*e
;
1592 slash1
= strchrnul(p
, '/');
1598 if (!*p
&& allow_root
) {
1604 for (i
= 0; i
< t
->entry_count
; i
++) {
1606 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1607 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1609 * If p names a file in some subdirectory, and a
1610 * file or symlink matching the name of the
1611 * parent directory of p exists, then p cannot
1612 * exist and need not be deleted.
1615 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1619 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1620 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1621 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1622 hashclr(root
->versions
[1].sha1
);
1636 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1638 release_tree_content_recursive(e
->tree
);
1640 e
->versions
[1].mode
= 0;
1641 hashclr(e
->versions
[1].sha1
);
1642 hashclr(root
->versions
[1].sha1
);
1646 static int tree_content_get(
1647 struct tree_entry
*root
,
1649 struct tree_entry
*leaf
,
1652 struct tree_content
*t
;
1655 struct tree_entry
*e
;
1657 slash1
= strchrnul(p
, '/');
1659 if (!n
&& !allow_root
)
1660 die("Empty path component found in input");
1671 for (i
= 0; i
< t
->entry_count
; i
++) {
1673 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1676 if (!S_ISDIR(e
->versions
[1].mode
))
1680 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1686 memcpy(leaf
, e
, sizeof(*leaf
));
1687 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1688 leaf
->tree
= dup_tree_content(e
->tree
);
1694 static int update_branch(struct branch
*b
)
1696 static const char *msg
= "fast-import";
1697 struct ref_transaction
*transaction
;
1698 unsigned char old_sha1
[20];
1699 struct strbuf err
= STRBUF_INIT
;
1701 if (is_null_sha1(b
->sha1
)) {
1703 delete_ref(b
->name
, NULL
, 0);
1706 if (read_ref(b
->name
, old_sha1
))
1708 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1709 struct commit
*old_cmit
, *new_cmit
;
1711 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1712 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1713 if (!old_cmit
|| !new_cmit
)
1714 return error("Branch %s is missing commits.", b
->name
);
1716 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1717 warning("Not updating %s"
1718 " (new tip %s does not contain %s)",
1719 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1723 transaction
= ref_transaction_begin(&err
);
1725 ref_transaction_update(transaction
, b
->name
, b
->sha1
, old_sha1
,
1727 ref_transaction_commit(transaction
, &err
)) {
1728 ref_transaction_free(transaction
);
1729 error("%s", err
.buf
);
1730 strbuf_release(&err
);
1733 ref_transaction_free(transaction
);
1734 strbuf_release(&err
);
1738 static void dump_branches(void)
1743 for (i
= 0; i
< branch_table_sz
; i
++) {
1744 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1745 failure
|= update_branch(b
);
1749 static void dump_tags(void)
1751 static const char *msg
= "fast-import";
1753 struct strbuf ref_name
= STRBUF_INIT
;
1754 struct strbuf err
= STRBUF_INIT
;
1755 struct ref_transaction
*transaction
;
1757 transaction
= ref_transaction_begin(&err
);
1759 failure
|= error("%s", err
.buf
);
1762 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1763 strbuf_reset(&ref_name
);
1764 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1766 if (ref_transaction_update(transaction
, ref_name
.buf
,
1767 t
->sha1
, NULL
, 0, msg
, &err
)) {
1768 failure
|= error("%s", err
.buf
);
1772 if (ref_transaction_commit(transaction
, &err
))
1773 failure
|= error("%s", err
.buf
);
1776 ref_transaction_free(transaction
);
1777 strbuf_release(&ref_name
);
1778 strbuf_release(&err
);
1781 static void dump_marks_helper(FILE *f
,
1787 for (k
= 0; k
< 1024; k
++) {
1788 if (m
->data
.sets
[k
])
1789 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1793 for (k
= 0; k
< 1024; k
++) {
1794 if (m
->data
.marked
[k
])
1795 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1796 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1801 static void dump_marks(void)
1803 static struct lock_file mark_lock
;
1806 if (!export_marks_file
)
1809 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1810 failure
|= error("Unable to write marks file %s: %s",
1811 export_marks_file
, strerror(errno
));
1815 f
= fdopen_lock_file(&mark_lock
, "w");
1817 int saved_errno
= errno
;
1818 rollback_lock_file(&mark_lock
);
1819 failure
|= error("Unable to write marks file %s: %s",
1820 export_marks_file
, strerror(saved_errno
));
1824 dump_marks_helper(f
, 0, marks
);
1825 if (commit_lock_file(&mark_lock
)) {
1826 failure
|= error("Unable to commit marks file %s: %s",
1827 export_marks_file
, strerror(errno
));
1832 static void read_marks(void)
1835 FILE *f
= fopen(import_marks_file
, "r");
1838 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1839 return; /* Marks file does not exist */
1841 die_errno("cannot read '%s'", import_marks_file
);
1842 while (fgets(line
, sizeof(line
), f
)) {
1845 unsigned char sha1
[20];
1846 struct object_entry
*e
;
1848 end
= strchr(line
, '\n');
1849 if (line
[0] != ':' || !end
)
1850 die("corrupt mark line: %s", line
);
1852 mark
= strtoumax(line
+ 1, &end
, 10);
1853 if (!mark
|| end
== line
+ 1
1854 || *end
!= ' ' || get_sha1_hex(end
+ 1, sha1
))
1855 die("corrupt mark line: %s", line
);
1856 e
= find_object(sha1
);
1858 enum object_type type
= sha1_object_info(sha1
, NULL
);
1860 die("object not found: %s", sha1_to_hex(sha1
));
1861 e
= insert_object(sha1
);
1863 e
->pack_id
= MAX_PACK_ID
;
1864 e
->idx
.offset
= 1; /* just not zero! */
1866 insert_mark(mark
, e
);
1872 static int read_next_command(void)
1874 static int stdin_eof
= 0;
1877 unread_command_buf
= 0;
1884 if (unread_command_buf
) {
1885 unread_command_buf
= 0;
1887 struct recent_command
*rc
;
1889 strbuf_detach(&command_buf
, NULL
);
1890 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1894 if (!seen_data_command
1895 && !starts_with(command_buf
.buf
, "feature ")
1896 && !starts_with(command_buf
.buf
, "option ")) {
1905 cmd_hist
.next
= rc
->next
;
1906 cmd_hist
.next
->prev
= &cmd_hist
;
1910 rc
->buf
= command_buf
.buf
;
1911 rc
->prev
= cmd_tail
;
1912 rc
->next
= cmd_hist
.prev
;
1913 rc
->prev
->next
= rc
;
1916 if (skip_prefix(command_buf
.buf
, "get-mark ", &p
)) {
1920 if (skip_prefix(command_buf
.buf
, "cat-blob ", &p
)) {
1924 if (command_buf
.buf
[0] == '#')
1930 static void skip_optional_lf(void)
1932 int term_char
= fgetc(stdin
);
1933 if (term_char
!= '\n' && term_char
!= EOF
)
1934 ungetc(term_char
, stdin
);
1937 static void parse_mark(void)
1940 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1941 next_mark
= strtoumax(v
, NULL
, 10);
1942 read_next_command();
1948 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1953 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1954 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1956 if (skip_prefix(data
, "<<", &data
)) {
1957 char *term
= xstrdup(data
);
1958 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1960 strbuf_detach(&command_buf
, NULL
);
1962 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1963 die("EOF in data (terminator '%s' not found)", term
);
1964 if (term_len
== command_buf
.len
1965 && !strcmp(term
, command_buf
.buf
))
1967 strbuf_addbuf(sb
, &command_buf
);
1968 strbuf_addch(sb
, '\n');
1973 uintmax_t len
= strtoumax(data
, NULL
, 10);
1974 size_t n
= 0, length
= (size_t)len
;
1976 if (limit
&& limit
< len
) {
1981 die("data is too large to use in this context");
1983 while (n
< length
) {
1984 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1985 if (!s
&& feof(stdin
))
1986 die("EOF in data (%lu bytes remaining)",
1987 (unsigned long)(length
- n
));
1996 static int validate_raw_date(const char *src
, struct strbuf
*result
)
1998 const char *orig_src
= src
;
2004 num
= strtoul(src
, &endp
, 10);
2005 /* NEEDSWORK: perhaps check for reasonable values? */
2006 if (errno
|| endp
== src
|| *endp
!= ' ')
2010 if (*src
!= '-' && *src
!= '+')
2013 num
= strtoul(src
+ 1, &endp
, 10);
2014 if (errno
|| endp
== src
+ 1 || *endp
|| 1400 < num
)
2017 strbuf_addstr(result
, orig_src
);
2021 static char *parse_ident(const char *buf
)
2025 struct strbuf ident
= STRBUF_INIT
;
2027 /* ensure there is a space delimiter even if there is no name */
2031 ltgt
= buf
+ strcspn(buf
, "<>");
2033 die("Missing < in ident string: %s", buf
);
2034 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
2035 die("Missing space before < in ident string: %s", buf
);
2036 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
2038 die("Missing > in ident string: %s", buf
);
2041 die("Missing space after > in ident string: %s", buf
);
2043 name_len
= ltgt
- buf
;
2044 strbuf_add(&ident
, buf
, name_len
);
2048 if (validate_raw_date(ltgt
, &ident
) < 0)
2049 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
2051 case WHENSPEC_RFC2822
:
2052 if (parse_date(ltgt
, &ident
) < 0)
2053 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
2056 if (strcmp("now", ltgt
))
2057 die("Date in ident must be 'now': %s", buf
);
2062 return strbuf_detach(&ident
, NULL
);
2065 static void parse_and_store_blob(
2066 struct last_object
*last
,
2067 unsigned char *sha1out
,
2070 static struct strbuf buf
= STRBUF_INIT
;
2073 if (parse_data(&buf
, big_file_threshold
, &len
))
2074 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2077 strbuf_release(&last
->data
);
2081 stream_blob(len
, sha1out
, mark
);
2086 static void parse_new_blob(void)
2088 read_next_command();
2090 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2093 static void unload_one_branch(void)
2095 while (cur_active_branches
2096 && cur_active_branches
>= max_active_branches
) {
2097 uintmax_t min_commit
= ULONG_MAX
;
2098 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2100 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2101 if (e
->last_commit
< min_commit
) {
2103 min_commit
= e
->last_commit
;
2109 e
= p
->active_next_branch
;
2110 p
->active_next_branch
= e
->active_next_branch
;
2112 e
= active_branches
;
2113 active_branches
= e
->active_next_branch
;
2116 e
->active_next_branch
= NULL
;
2117 if (e
->branch_tree
.tree
) {
2118 release_tree_content_recursive(e
->branch_tree
.tree
);
2119 e
->branch_tree
.tree
= NULL
;
2121 cur_active_branches
--;
2125 static void load_branch(struct branch
*b
)
2127 load_tree(&b
->branch_tree
);
2130 b
->active_next_branch
= active_branches
;
2131 active_branches
= b
;
2132 cur_active_branches
++;
2133 branch_load_count
++;
2137 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2139 unsigned char fanout
= 0;
2140 while ((num_notes
>>= 8))
2145 static void construct_path_with_fanout(const char *hex_sha1
,
2146 unsigned char fanout
, char *path
)
2148 unsigned int i
= 0, j
= 0;
2150 die("Too large fanout (%u)", fanout
);
2152 path
[i
++] = hex_sha1
[j
++];
2153 path
[i
++] = hex_sha1
[j
++];
2157 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2158 path
[i
+ 40 - j
] = '\0';
2161 static uintmax_t do_change_note_fanout(
2162 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2163 char *hex_sha1
, unsigned int hex_sha1_len
,
2164 char *fullpath
, unsigned int fullpath_len
,
2165 unsigned char fanout
)
2167 struct tree_content
*t
= root
->tree
;
2168 struct tree_entry
*e
, leaf
;
2169 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2170 uintmax_t num_notes
= 0;
2171 unsigned char sha1
[20];
2174 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2176 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2177 tmp_fullpath_len
= fullpath_len
;
2180 * We're interested in EITHER existing note entries (entries
2181 * with exactly 40 hex chars in path, not including directory
2182 * separators), OR directory entries that may contain note
2183 * entries (with < 40 hex chars in path).
2184 * Also, each path component in a note entry must be a multiple
2187 if (!e
->versions
[1].mode
||
2188 tmp_hex_sha1_len
> 40 ||
2189 e
->name
->str_len
% 2)
2192 /* This _may_ be a note entry, or a subdir containing notes */
2193 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2195 if (tmp_fullpath_len
)
2196 fullpath
[tmp_fullpath_len
++] = '/';
2197 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2199 tmp_fullpath_len
+= e
->name
->str_len
;
2200 fullpath
[tmp_fullpath_len
] = '\0';
2202 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2203 /* This is a note entry */
2204 if (fanout
== 0xff) {
2205 /* Counting mode, no rename */
2209 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2210 if (!strcmp(fullpath
, realpath
)) {
2211 /* Note entry is in correct location */
2216 /* Rename fullpath to realpath */
2217 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2218 die("Failed to remove path %s", fullpath
);
2219 tree_content_set(orig_root
, realpath
,
2220 leaf
.versions
[1].sha1
,
2221 leaf
.versions
[1].mode
,
2223 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2224 /* This is a subdir that may contain note entries */
2227 num_notes
+= do_change_note_fanout(orig_root
, e
,
2228 hex_sha1
, tmp_hex_sha1_len
,
2229 fullpath
, tmp_fullpath_len
, fanout
);
2232 /* The above may have reallocated the current tree_content */
2238 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2239 unsigned char fanout
)
2241 char hex_sha1
[40], path
[60];
2242 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2246 * Given a pointer into a string, parse a mark reference:
2248 * idnum ::= ':' bigint;
2250 * Return the first character after the value in *endptr.
2252 * Complain if the following character is not what is expected,
2253 * either a space or end of the string.
2255 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2261 mark
= strtoumax(p
, endptr
, 10);
2263 die("No value after ':' in mark: %s", command_buf
.buf
);
2268 * Parse the mark reference, and complain if this is not the end of
2271 static uintmax_t parse_mark_ref_eol(const char *p
)
2276 mark
= parse_mark_ref(p
, &end
);
2278 die("Garbage after mark: %s", command_buf
.buf
);
2283 * Parse the mark reference, demanding a trailing space. Return a
2284 * pointer to the space.
2286 static uintmax_t parse_mark_ref_space(const char **p
)
2291 mark
= parse_mark_ref(*p
, &end
);
2293 die("Missing space after mark: %s", command_buf
.buf
);
2298 static void file_change_m(const char *p
, struct branch
*b
)
2300 static struct strbuf uq
= STRBUF_INIT
;
2302 struct object_entry
*oe
;
2303 unsigned char sha1
[20];
2304 uint16_t mode
, inline_data
= 0;
2306 p
= get_mode(p
, &mode
);
2308 die("Corrupt mode: %s", command_buf
.buf
);
2313 case S_IFREG
| 0644:
2314 case S_IFREG
| 0755:
2321 die("Corrupt mode: %s", command_buf
.buf
);
2325 oe
= find_mark(parse_mark_ref_space(&p
));
2326 hashcpy(sha1
, oe
->idx
.sha1
);
2327 } else if (skip_prefix(p
, "inline ", &p
)) {
2329 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2331 if (get_sha1_hex(p
, sha1
))
2332 die("Invalid dataref: %s", command_buf
.buf
);
2333 oe
= find_object(sha1
);
2336 die("Missing space after SHA1: %s", command_buf
.buf
);
2340 if (!unquote_c_style(&uq
, p
, &endp
)) {
2342 die("Garbage after path in: %s", command_buf
.buf
);
2346 /* Git does not track empty, non-toplevel directories. */
2347 if (S_ISDIR(mode
) && !hashcmp(sha1
, EMPTY_TREE_SHA1_BIN
) && *p
) {
2348 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2352 if (S_ISGITLINK(mode
)) {
2354 die("Git links cannot be specified 'inline': %s",
2357 if (oe
->type
!= OBJ_COMMIT
)
2358 die("Not a commit (actually a %s): %s",
2359 typename(oe
->type
), command_buf
.buf
);
2362 * Accept the sha1 without checking; it expected to be in
2363 * another repository.
2365 } else if (inline_data
) {
2367 die("Directories cannot be specified 'inline': %s",
2370 strbuf_addstr(&uq
, p
);
2373 read_next_command();
2374 parse_and_store_blob(&last_blob
, sha1
, 0);
2376 enum object_type expected
= S_ISDIR(mode
) ?
2378 enum object_type type
= oe
? oe
->type
:
2379 sha1_object_info(sha1
, NULL
);
2381 die("%s not found: %s",
2382 S_ISDIR(mode
) ? "Tree" : "Blob",
2384 if (type
!= expected
)
2385 die("Not a %s (actually a %s): %s",
2386 typename(expected
), typename(type
),
2391 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2394 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2397 static void file_change_d(const char *p
, struct branch
*b
)
2399 static struct strbuf uq
= STRBUF_INIT
;
2403 if (!unquote_c_style(&uq
, p
, &endp
)) {
2405 die("Garbage after path in: %s", command_buf
.buf
);
2408 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2411 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2414 static struct strbuf s_uq
= STRBUF_INIT
;
2415 static struct strbuf d_uq
= STRBUF_INIT
;
2417 struct tree_entry leaf
;
2419 strbuf_reset(&s_uq
);
2420 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2422 die("Missing space after source: %s", command_buf
.buf
);
2424 endp
= strchr(s
, ' ');
2426 die("Missing space after source: %s", command_buf
.buf
);
2427 strbuf_add(&s_uq
, s
, endp
- s
);
2433 die("Missing dest: %s", command_buf
.buf
);
2436 strbuf_reset(&d_uq
);
2437 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2439 die("Garbage after dest in: %s", command_buf
.buf
);
2443 memset(&leaf
, 0, sizeof(leaf
));
2445 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2447 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2448 if (!leaf
.versions
[1].mode
)
2449 die("Path %s not in branch", s
);
2450 if (!*d
) { /* C "path/to/subdir" "" */
2451 tree_content_replace(&b
->branch_tree
,
2452 leaf
.versions
[1].sha1
,
2453 leaf
.versions
[1].mode
,
2457 tree_content_set(&b
->branch_tree
, d
,
2458 leaf
.versions
[1].sha1
,
2459 leaf
.versions
[1].mode
,
2463 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2465 static struct strbuf uq
= STRBUF_INIT
;
2466 struct object_entry
*oe
;
2468 unsigned char sha1
[20], commit_sha1
[20];
2470 uint16_t inline_data
= 0;
2471 unsigned char new_fanout
;
2474 * When loading a branch, we don't traverse its tree to count the real
2475 * number of notes (too expensive to do this for all non-note refs).
2476 * This means that recently loaded notes refs might incorrectly have
2477 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2479 * Fix this by traversing the tree and counting the number of notes
2480 * when b->num_notes == 0. If the notes tree is truly empty, the
2481 * calculation should not take long.
2483 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2484 /* Invoke change_note_fanout() in "counting mode". */
2485 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2486 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2489 /* Now parse the notemodify command. */
2490 /* <dataref> or 'inline' */
2492 oe
= find_mark(parse_mark_ref_space(&p
));
2493 hashcpy(sha1
, oe
->idx
.sha1
);
2494 } else if (skip_prefix(p
, "inline ", &p
)) {
2496 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2498 if (get_sha1_hex(p
, sha1
))
2499 die("Invalid dataref: %s", command_buf
.buf
);
2500 oe
= find_object(sha1
);
2503 die("Missing space after SHA1: %s", command_buf
.buf
);
2507 s
= lookup_branch(p
);
2509 if (is_null_sha1(s
->sha1
))
2510 die("Can't add a note on empty branch.");
2511 hashcpy(commit_sha1
, s
->sha1
);
2512 } else if (*p
== ':') {
2513 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2514 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2515 if (commit_oe
->type
!= OBJ_COMMIT
)
2516 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2517 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2518 } else if (!get_sha1(p
, commit_sha1
)) {
2520 char *buf
= read_object_with_reference(commit_sha1
,
2521 commit_type
, &size
, commit_sha1
);
2522 if (!buf
|| size
< 46)
2523 die("Not a valid commit: %s", p
);
2526 die("Invalid ref name or SHA1 expression: %s", p
);
2530 strbuf_addstr(&uq
, p
);
2533 read_next_command();
2534 parse_and_store_blob(&last_blob
, sha1
, 0);
2536 if (oe
->type
!= OBJ_BLOB
)
2537 die("Not a blob (actually a %s): %s",
2538 typename(oe
->type
), command_buf
.buf
);
2539 } else if (!is_null_sha1(sha1
)) {
2540 enum object_type type
= sha1_object_info(sha1
, NULL
);
2542 die("Blob not found: %s", command_buf
.buf
);
2543 if (type
!= OBJ_BLOB
)
2544 die("Not a blob (actually a %s): %s",
2545 typename(type
), command_buf
.buf
);
2548 construct_path_with_fanout(sha1_to_hex(commit_sha1
), *old_fanout
, path
);
2549 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2552 if (is_null_sha1(sha1
))
2553 return; /* nothing to insert */
2556 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2557 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2558 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2561 static void file_change_deleteall(struct branch
*b
)
2563 release_tree_content_recursive(b
->branch_tree
.tree
);
2564 hashclr(b
->branch_tree
.versions
[0].sha1
);
2565 hashclr(b
->branch_tree
.versions
[1].sha1
);
2566 load_tree(&b
->branch_tree
);
2570 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2572 if (!buf
|| size
< 46)
2573 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2574 if (memcmp("tree ", buf
, 5)
2575 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2576 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2577 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2578 b
->branch_tree
.versions
[1].sha1
);
2581 static void parse_from_existing(struct branch
*b
)
2583 if (is_null_sha1(b
->sha1
)) {
2584 hashclr(b
->branch_tree
.versions
[0].sha1
);
2585 hashclr(b
->branch_tree
.versions
[1].sha1
);
2590 buf
= read_object_with_reference(b
->sha1
,
2591 commit_type
, &size
, b
->sha1
);
2592 parse_from_commit(b
, buf
, size
);
2597 static int parse_from(struct branch
*b
)
2601 unsigned char sha1
[20];
2603 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2606 hashcpy(sha1
, b
->branch_tree
.versions
[1].sha1
);
2608 s
= lookup_branch(from
);
2610 die("Can't create a branch from itself: %s", b
->name
);
2612 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2613 hashcpy(b
->sha1
, s
->sha1
);
2614 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2615 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2616 } else if (*from
== ':') {
2617 uintmax_t idnum
= parse_mark_ref_eol(from
);
2618 struct object_entry
*oe
= find_mark(idnum
);
2619 if (oe
->type
!= OBJ_COMMIT
)
2620 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2621 if (hashcmp(b
->sha1
, oe
->idx
.sha1
)) {
2622 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2623 if (oe
->pack_id
!= MAX_PACK_ID
) {
2625 char *buf
= gfi_unpack_entry(oe
, &size
);
2626 parse_from_commit(b
, buf
, size
);
2629 parse_from_existing(b
);
2631 } else if (!get_sha1(from
, b
->sha1
)) {
2632 parse_from_existing(b
);
2633 if (is_null_sha1(b
->sha1
))
2637 die("Invalid ref name or SHA1 expression: %s", from
);
2639 if (b
->branch_tree
.tree
&& hashcmp(sha1
, b
->branch_tree
.versions
[1].sha1
)) {
2640 release_tree_content_recursive(b
->branch_tree
.tree
);
2641 b
->branch_tree
.tree
= NULL
;
2644 read_next_command();
2648 static struct hash_list
*parse_merge(unsigned int *count
)
2650 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2655 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2656 n
= xmalloc(sizeof(*n
));
2657 s
= lookup_branch(from
);
2659 hashcpy(n
->sha1
, s
->sha1
);
2660 else if (*from
== ':') {
2661 uintmax_t idnum
= parse_mark_ref_eol(from
);
2662 struct object_entry
*oe
= find_mark(idnum
);
2663 if (oe
->type
!= OBJ_COMMIT
)
2664 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2665 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2666 } else if (!get_sha1(from
, n
->sha1
)) {
2668 char *buf
= read_object_with_reference(n
->sha1
,
2669 commit_type
, &size
, n
->sha1
);
2670 if (!buf
|| size
< 46)
2671 die("Not a valid commit: %s", from
);
2674 die("Invalid ref name or SHA1 expression: %s", from
);
2681 read_next_command();
2686 static void parse_new_commit(const char *arg
)
2688 static struct strbuf msg
= STRBUF_INIT
;
2690 char *author
= NULL
;
2691 char *committer
= NULL
;
2692 struct hash_list
*merge_list
= NULL
;
2693 unsigned int merge_count
;
2694 unsigned char prev_fanout
, new_fanout
;
2697 b
= lookup_branch(arg
);
2699 b
= new_branch(arg
);
2701 read_next_command();
2703 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2704 author
= parse_ident(v
);
2705 read_next_command();
2707 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2708 committer
= parse_ident(v
);
2709 read_next_command();
2712 die("Expected committer but didn't get one");
2713 parse_data(&msg
, 0, NULL
);
2714 read_next_command();
2716 merge_list
= parse_merge(&merge_count
);
2718 /* ensure the branch is active/loaded */
2719 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2720 unload_one_branch();
2724 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2727 while (command_buf
.len
> 0) {
2728 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2729 file_change_m(v
, b
);
2730 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2731 file_change_d(v
, b
);
2732 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2733 file_change_cr(v
, b
, 1);
2734 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2735 file_change_cr(v
, b
, 0);
2736 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2737 note_change_n(v
, b
, &prev_fanout
);
2738 else if (!strcmp("deleteall", command_buf
.buf
))
2739 file_change_deleteall(b
);
2740 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2743 unread_command_buf
= 1;
2746 if (read_next_command() == EOF
)
2750 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2751 if (new_fanout
!= prev_fanout
)
2752 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2754 /* build the tree and the commit */
2755 store_tree(&b
->branch_tree
);
2756 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2757 b
->branch_tree
.versions
[1].sha1
);
2759 strbuf_reset(&new_data
);
2760 strbuf_addf(&new_data
, "tree %s\n",
2761 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2762 if (!is_null_sha1(b
->sha1
))
2763 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2764 while (merge_list
) {
2765 struct hash_list
*next
= merge_list
->next
;
2766 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2770 strbuf_addf(&new_data
,
2774 author
? author
: committer
, committer
);
2775 strbuf_addbuf(&new_data
, &msg
);
2779 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2780 b
->pack_id
= pack_id
;
2781 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2784 static void parse_new_tag(const char *arg
)
2786 static struct strbuf msg
= STRBUF_INIT
;
2791 uintmax_t from_mark
= 0;
2792 unsigned char sha1
[20];
2793 enum object_type type
;
2796 t
= pool_alloc(sizeof(struct tag
));
2797 memset(t
, 0, sizeof(struct tag
));
2798 t
->name
= pool_strdup(arg
);
2800 last_tag
->next_tag
= t
;
2804 read_next_command();
2807 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2808 die("Expected from command, got %s", command_buf
.buf
);
2809 s
= lookup_branch(from
);
2811 if (is_null_sha1(s
->sha1
))
2812 die("Can't tag an empty branch.");
2813 hashcpy(sha1
, s
->sha1
);
2815 } else if (*from
== ':') {
2816 struct object_entry
*oe
;
2817 from_mark
= parse_mark_ref_eol(from
);
2818 oe
= find_mark(from_mark
);
2820 hashcpy(sha1
, oe
->idx
.sha1
);
2821 } else if (!get_sha1(from
, sha1
)) {
2822 struct object_entry
*oe
= find_object(sha1
);
2824 type
= sha1_object_info(sha1
, NULL
);
2826 die("Not a valid object: %s", from
);
2830 die("Invalid ref name or SHA1 expression: %s", from
);
2831 read_next_command();
2834 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2835 tagger
= parse_ident(v
);
2836 read_next_command();
2840 /* tag payload/message */
2841 parse_data(&msg
, 0, NULL
);
2843 /* build the tag object */
2844 strbuf_reset(&new_data
);
2846 strbuf_addf(&new_data
,
2850 sha1_to_hex(sha1
), typename(type
), t
->name
);
2852 strbuf_addf(&new_data
,
2853 "tagger %s\n", tagger
);
2854 strbuf_addch(&new_data
, '\n');
2855 strbuf_addbuf(&new_data
, &msg
);
2858 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2859 t
->pack_id
= MAX_PACK_ID
;
2861 t
->pack_id
= pack_id
;
2864 static void parse_reset_branch(const char *arg
)
2868 b
= lookup_branch(arg
);
2871 hashclr(b
->branch_tree
.versions
[0].sha1
);
2872 hashclr(b
->branch_tree
.versions
[1].sha1
);
2873 if (b
->branch_tree
.tree
) {
2874 release_tree_content_recursive(b
->branch_tree
.tree
);
2875 b
->branch_tree
.tree
= NULL
;
2879 b
= new_branch(arg
);
2880 read_next_command();
2882 if (command_buf
.len
> 0)
2883 unread_command_buf
= 1;
2886 static void cat_blob_write(const char *buf
, unsigned long size
)
2888 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2889 die_errno("Write to frontend failed");
2892 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2894 struct strbuf line
= STRBUF_INIT
;
2896 enum object_type type
= 0;
2899 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2900 buf
= read_sha1_file(sha1
, &type
, &size
);
2903 buf
= gfi_unpack_entry(oe
, &size
);
2907 * Output based on batch_one_object() from cat-file.c.
2910 strbuf_reset(&line
);
2911 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2912 cat_blob_write(line
.buf
, line
.len
);
2913 strbuf_release(&line
);
2918 die("Can't read object %s", sha1_to_hex(sha1
));
2919 if (type
!= OBJ_BLOB
)
2920 die("Object %s is a %s but a blob was expected.",
2921 sha1_to_hex(sha1
), typename(type
));
2922 strbuf_reset(&line
);
2923 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2924 typename(type
), size
);
2925 cat_blob_write(line
.buf
, line
.len
);
2926 strbuf_release(&line
);
2927 cat_blob_write(buf
, size
);
2928 cat_blob_write("\n", 1);
2929 if (oe
&& oe
->pack_id
== pack_id
) {
2930 last_blob
.offset
= oe
->idx
.offset
;
2931 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2932 last_blob
.depth
= oe
->depth
;
2937 static void parse_get_mark(const char *p
)
2939 struct object_entry
*oe
= oe
;
2942 /* get-mark SP <object> LF */
2944 die("Not a mark: %s", p
);
2946 oe
= find_mark(parse_mark_ref_eol(p
));
2948 die("Unknown mark: %s", command_buf
.buf
);
2950 snprintf(output
, sizeof(output
), "%s\n", sha1_to_hex(oe
->idx
.sha1
));
2951 cat_blob_write(output
, 41);
2954 static void parse_cat_blob(const char *p
)
2956 struct object_entry
*oe
= oe
;
2957 unsigned char sha1
[20];
2959 /* cat-blob SP <object> LF */
2961 oe
= find_mark(parse_mark_ref_eol(p
));
2963 die("Unknown mark: %s", command_buf
.buf
);
2964 hashcpy(sha1
, oe
->idx
.sha1
);
2966 if (get_sha1_hex(p
, sha1
))
2967 die("Invalid dataref: %s", command_buf
.buf
);
2969 die("Garbage after SHA1: %s", command_buf
.buf
);
2970 oe
= find_object(sha1
);
2976 static struct object_entry
*dereference(struct object_entry
*oe
,
2977 unsigned char sha1
[20])
2982 enum object_type type
= sha1_object_info(sha1
, NULL
);
2984 die("object not found: %s", sha1_to_hex(sha1
));
2986 oe
= insert_object(sha1
);
2988 oe
->pack_id
= MAX_PACK_ID
;
2992 case OBJ_TREE
: /* easy case. */
2998 die("Not a tree-ish: %s", command_buf
.buf
);
3001 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
3002 buf
= gfi_unpack_entry(oe
, &size
);
3004 enum object_type unused
;
3005 buf
= read_sha1_file(sha1
, &unused
, &size
);
3008 die("Can't load object %s", sha1_to_hex(sha1
));
3010 /* Peel one layer. */
3013 if (size
< 40 + strlen("object ") ||
3014 get_sha1_hex(buf
+ strlen("object "), sha1
))
3015 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
3018 if (size
< 40 + strlen("tree ") ||
3019 get_sha1_hex(buf
+ strlen("tree "), sha1
))
3020 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
3024 return find_object(sha1
);
3027 static struct object_entry
*parse_treeish_dataref(const char **p
)
3029 unsigned char sha1
[20];
3030 struct object_entry
*e
;
3032 if (**p
== ':') { /* <mark> */
3033 e
= find_mark(parse_mark_ref_space(p
));
3035 die("Unknown mark: %s", command_buf
.buf
);
3036 hashcpy(sha1
, e
->idx
.sha1
);
3037 } else { /* <sha1> */
3038 if (get_sha1_hex(*p
, sha1
))
3039 die("Invalid dataref: %s", command_buf
.buf
);
3040 e
= find_object(sha1
);
3043 die("Missing space after tree-ish: %s", command_buf
.buf
);
3046 while (!e
|| e
->type
!= OBJ_TREE
)
3047 e
= dereference(e
, sha1
);
3051 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
3053 static struct strbuf line
= STRBUF_INIT
;
3055 /* See show_tree(). */
3057 S_ISGITLINK(mode
) ? commit_type
:
3058 S_ISDIR(mode
) ? tree_type
:
3062 /* missing SP path LF */
3063 strbuf_reset(&line
);
3064 strbuf_addstr(&line
, "missing ");
3065 quote_c_style(path
, &line
, NULL
, 0);
3066 strbuf_addch(&line
, '\n');
3068 /* mode SP type SP object_name TAB path LF */
3069 strbuf_reset(&line
);
3070 strbuf_addf(&line
, "%06o %s %s\t",
3071 mode
& ~NO_DELTA
, type
, sha1_to_hex(sha1
));
3072 quote_c_style(path
, &line
, NULL
, 0);
3073 strbuf_addch(&line
, '\n');
3075 cat_blob_write(line
.buf
, line
.len
);
3078 static void parse_ls(const char *p
, struct branch
*b
)
3080 struct tree_entry
*root
= NULL
;
3081 struct tree_entry leaf
= {NULL
};
3083 /* ls SP (<tree-ish> SP)? <path> */
3086 die("Not in a commit: %s", command_buf
.buf
);
3087 root
= &b
->branch_tree
;
3089 struct object_entry
*e
= parse_treeish_dataref(&p
);
3090 root
= new_tree_entry();
3091 hashcpy(root
->versions
[1].sha1
, e
->idx
.sha1
);
3092 if (!is_null_sha1(root
->versions
[1].sha1
))
3093 root
->versions
[1].mode
= S_IFDIR
;
3097 static struct strbuf uq
= STRBUF_INIT
;
3100 if (unquote_c_style(&uq
, p
, &endp
))
3101 die("Invalid path: %s", command_buf
.buf
);
3103 die("Garbage after path in: %s", command_buf
.buf
);
3106 tree_content_get(root
, p
, &leaf
, 1);
3108 * A directory in preparation would have a sha1 of zero
3109 * until it is saved. Save, for simplicity.
3111 if (S_ISDIR(leaf
.versions
[1].mode
))
3114 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].sha1
, p
);
3116 release_tree_content_recursive(leaf
.tree
);
3117 if (!b
|| root
!= &b
->branch_tree
)
3118 release_tree_entry(root
);
3121 static void checkpoint(void)
3123 checkpoint_requested
= 0;
3132 static void parse_checkpoint(void)
3134 checkpoint_requested
= 1;
3138 static void parse_progress(void)
3140 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3141 fputc('\n', stdout
);
3146 static char* make_fast_import_path(const char *path
)
3148 if (!relative_marks_paths
|| is_absolute_path(path
))
3149 return xstrdup(path
);
3150 return xstrdup(git_path("info/fast-import/%s", path
));
3153 static void option_import_marks(const char *marks
,
3154 int from_stream
, int ignore_missing
)
3156 if (import_marks_file
) {
3158 die("Only one import-marks command allowed per stream");
3160 /* read previous mark file */
3161 if(!import_marks_file_from_stream
)
3165 import_marks_file
= make_fast_import_path(marks
);
3166 safe_create_leading_directories_const(import_marks_file
);
3167 import_marks_file_from_stream
= from_stream
;
3168 import_marks_file_ignore_missing
= ignore_missing
;
3171 static void option_date_format(const char *fmt
)
3173 if (!strcmp(fmt
, "raw"))
3174 whenspec
= WHENSPEC_RAW
;
3175 else if (!strcmp(fmt
, "rfc2822"))
3176 whenspec
= WHENSPEC_RFC2822
;
3177 else if (!strcmp(fmt
, "now"))
3178 whenspec
= WHENSPEC_NOW
;
3180 die("unknown --date-format argument %s", fmt
);
3183 static unsigned long ulong_arg(const char *option
, const char *arg
)
3186 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3187 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3188 die("%s: argument must be a non-negative integer", option
);
3192 static void option_depth(const char *depth
)
3194 max_depth
= ulong_arg("--depth", depth
);
3195 if (max_depth
> MAX_DEPTH
)
3196 die("--depth cannot exceed %u", MAX_DEPTH
);
3199 static void option_active_branches(const char *branches
)
3201 max_active_branches
= ulong_arg("--active-branches", branches
);
3204 static void option_export_marks(const char *marks
)
3206 export_marks_file
= make_fast_import_path(marks
);
3207 safe_create_leading_directories_const(export_marks_file
);
3210 static void option_cat_blob_fd(const char *fd
)
3212 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3213 if (n
> (unsigned long) INT_MAX
)
3214 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3215 cat_blob_fd
= (int) n
;
3218 static void option_export_pack_edges(const char *edges
)
3222 pack_edges
= fopen(edges
, "a");
3224 die_errno("Cannot open '%s'", edges
);
3227 static int parse_one_option(const char *option
)
3229 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3231 if (!git_parse_ulong(option
, &v
))
3234 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3236 } else if (v
< 1024 * 1024) {
3237 warning("minimum max-pack-size is 1 MiB");
3241 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3243 if (!git_parse_ulong(option
, &v
))
3245 big_file_threshold
= v
;
3246 } else if (skip_prefix(option
, "depth=", &option
)) {
3247 option_depth(option
);
3248 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3249 option_active_branches(option
);
3250 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3251 option_export_pack_edges(option
);
3252 } else if (starts_with(option
, "quiet")) {
3254 } else if (starts_with(option
, "stats")) {
3263 static int parse_one_feature(const char *feature
, int from_stream
)
3267 if (skip_prefix(feature
, "date-format=", &arg
)) {
3268 option_date_format(arg
);
3269 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3270 option_import_marks(arg
, from_stream
, 0);
3271 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3272 option_import_marks(arg
, from_stream
, 1);
3273 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3274 option_export_marks(arg
);
3275 } else if (!strcmp(feature
, "get-mark")) {
3276 ; /* Don't die - this feature is supported */
3277 } else if (!strcmp(feature
, "cat-blob")) {
3278 ; /* Don't die - this feature is supported */
3279 } else if (!strcmp(feature
, "relative-marks")) {
3280 relative_marks_paths
= 1;
3281 } else if (!strcmp(feature
, "no-relative-marks")) {
3282 relative_marks_paths
= 0;
3283 } else if (!strcmp(feature
, "done")) {
3284 require_explicit_termination
= 1;
3285 } else if (!strcmp(feature
, "force")) {
3287 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3288 ; /* do nothing; we have the feature */
3296 static void parse_feature(const char *feature
)
3298 if (seen_data_command
)
3299 die("Got feature command '%s' after data command", feature
);
3301 if (parse_one_feature(feature
, 1))
3304 die("This version of fast-import does not support feature %s.", feature
);
3307 static void parse_option(const char *option
)
3309 if (seen_data_command
)
3310 die("Got option command '%s' after data command", option
);
3312 if (parse_one_option(option
))
3315 die("This version of fast-import does not support option: %s", option
);
3318 static void git_pack_config(void)
3320 int indexversion_value
;
3321 unsigned long packsizelimit_value
;
3323 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3324 if (max_depth
> MAX_DEPTH
)
3325 max_depth
= MAX_DEPTH
;
3327 if (!git_config_get_int("pack.compression", &pack_compression_level
)) {
3328 if (pack_compression_level
== -1)
3329 pack_compression_level
= Z_DEFAULT_COMPRESSION
;
3330 else if (pack_compression_level
< 0 ||
3331 pack_compression_level
> Z_BEST_COMPRESSION
)
3332 git_die_config("pack.compression",
3333 "bad pack compression level %d", pack_compression_level
);
3334 pack_compression_seen
= 1;
3336 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3337 pack_idx_opts
.version
= indexversion_value
;
3338 if (pack_idx_opts
.version
> 2)
3339 git_die_config("pack.indexversion",
3340 "bad pack.indexversion=%"PRIu32
, pack_idx_opts
.version
);
3342 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3343 max_packsize
= packsizelimit_value
;
3345 git_config(git_default_config
, NULL
);
3348 static const char fast_import_usage
[] =
3349 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3351 static void parse_argv(void)
3355 for (i
= 1; i
< global_argc
; i
++) {
3356 const char *a
= global_argv
[i
];
3358 if (*a
!= '-' || !strcmp(a
, "--"))
3361 if (!skip_prefix(a
, "--", &a
))
3362 die("unknown option %s", a
);
3364 if (parse_one_option(a
))
3367 if (parse_one_feature(a
, 0))
3370 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3371 option_cat_blob_fd(a
);
3375 die("unknown option --%s", a
);
3377 if (i
!= global_argc
)
3378 usage(fast_import_usage
);
3380 seen_data_command
= 1;
3381 if (import_marks_file
)
3385 int main(int argc
, char **argv
)
3389 git_extract_argv0_path(argv
[0]);
3391 git_setup_gettext();
3393 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3394 usage(fast_import_usage
);
3396 setup_git_directory();
3397 reset_pack_idx_option(&pack_idx_opts
);
3399 if (!pack_compression_seen
&& core_compression_seen
)
3400 pack_compression_level
= core_compression_level
;
3402 alloc_objects(object_entry_alloc
);
3403 strbuf_init(&command_buf
, 0);
3404 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3405 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3406 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3407 marks
= pool_calloc(1, sizeof(struct mark_set
));
3412 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3413 for (i
= 0; i
< (cmd_save
- 1); i
++)
3414 rc_free
[i
].next
= &rc_free
[i
+ 1];
3415 rc_free
[cmd_save
- 1].next
= NULL
;
3417 prepare_packed_git();
3419 set_die_routine(die_nicely
);
3420 set_checkpoint_signal();
3421 while (read_next_command() != EOF
) {
3423 if (!strcmp("blob", command_buf
.buf
))
3425 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3427 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3428 parse_new_commit(v
);
3429 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3431 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3432 parse_reset_branch(v
);
3433 else if (!strcmp("checkpoint", command_buf
.buf
))
3435 else if (!strcmp("done", command_buf
.buf
))
3437 else if (starts_with(command_buf
.buf
, "progress "))
3439 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3441 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3443 else if (starts_with(command_buf
.buf
, "option "))
3444 /* ignore non-git options*/;
3446 die("Unsupported command: %s", command_buf
.buf
);
3448 if (checkpoint_requested
)
3452 /* argv hasn't been parsed yet, do so */
3453 if (!seen_data_command
)
3456 if (require_explicit_termination
&& feof(stdin
))
3457 die("stream ends early");
3470 uintmax_t total_count
= 0, duplicate_count
= 0;
3471 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3472 total_count
+= object_count_by_type
[i
];
3473 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3474 duplicate_count
+= duplicate_count_by_type
[i
];
3476 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3477 fprintf(stderr
, "---------------------------------------------------------------------\n");
3478 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3479 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3480 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
]);
3481 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
]);
3482 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
]);
3483 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
]);
3484 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3485 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3486 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3487 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3488 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3489 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3490 fprintf(stderr
, "---------------------------------------------------------------------\n");
3492 fprintf(stderr
, "---------------------------------------------------------------------\n");
3493 fprintf(stderr
, "\n");
3496 return failure
? 1 : 0;