2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
31 ls ::= 'ls' sp '"' quoted(path) '"' lf;
33 file_change ::= file_clr
39 file_clr ::= 'deleteall' lf;
40 file_del ::= 'D' sp path_str lf;
41 file_rnm ::= 'R' sp path_str sp path_str lf;
42 file_cpy ::= 'C' sp path_str sp path_str lf;
43 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
44 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
46 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
47 note_inm ::= 'N' sp 'inline' sp committish lf
50 new_tag ::= 'tag' sp tag_str lf
51 'from' sp committish lf
52 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
56 reset_branch ::= 'reset' sp ref_str lf
57 ('from' sp committish lf)?
60 checkpoint ::= 'checkpoint' lf
63 progress ::= 'progress' sp not_lf* lf
66 # note: the first idnum in a stream should be 1 and subsequent
67 # idnums should not have gaps between values as this will cause
68 # the stream parser to reserve space for the gapped values. An
69 # idnum can be updated in the future to a new object by issuing
70 # a new mark directive with the old idnum.
72 mark ::= 'mark' sp idnum lf;
73 data ::= (delimited_data | exact_data)
76 # note: delim may be any string but must not contain lf.
77 # data_line may contain any data but must not be exactly
79 delimited_data ::= 'data' sp '<<' delim lf
83 # note: declen indicates the length of binary_data in bytes.
84 # declen does not include the lf preceding the binary data.
86 exact_data ::= 'data' sp declen lf
89 # note: quoted strings are C-style quoting supporting \c for
90 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
91 # is the signed byte value in octal. Note that the only
92 # characters which must actually be escaped to protect the
93 # stream formatting is: \, " and LF. Otherwise these values
96 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
98 sha1exp_str ::= sha1exp;
100 path_str ::= path | '"' quoted(path) '"' ;
101 mode ::= '100644' | '644'
106 declen ::= # unsigned 32 bit value, ascii base10 notation;
107 bigint ::= # unsigned integer value, ascii base10 notation;
108 binary_data ::= # file content, not interpreted;
110 when ::= raw_when | rfc2822_when;
111 raw_when ::= ts sp tz;
112 rfc2822_when ::= # Valid RFC 2822 date and time;
114 sp ::= # ASCII space character;
115 lf ::= # ASCII newline (LF) character;
117 # note: a colon (':') must precede the numerical value assigned to
118 # an idnum. This is to distinguish it from a ref or tag name as
119 # GIT does not permit ':' in ref or tag strings.
121 idnum ::= ':' bigint;
122 path ::= # GIT style file path, e.g. "a/b/c";
123 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
124 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
125 sha1exp ::= # Any valid GIT SHA1 expression;
126 hexsha1 ::= # SHA1 in hexadecimal format;
128 # note: name and email are UTF8 strings, however name must not
129 # contain '<' or lf and email must not contain any of the
130 # following: '<', '>', lf.
132 name ::= # valid GIT author/committer name;
133 email ::= # valid GIT author/committer email;
134 ts ::= # time since the epoch in seconds, ascii base10 notation;
135 tz ::= # GIT style timezone;
137 # note: comments, ls and cat requests may appear anywhere
138 # in the input, except within a data command. Any form
139 # of the data command always escapes the related input
140 # from comment processing.
142 # In case it is not clear, the '#' that starts the comment
143 # must be the first character on that line (an lf
147 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
148 ls_tree ::= 'ls' sp (hexsha1 | idnum) sp path_str lf;
150 comment ::= '#' not_lf* lf;
151 not_lf ::= # Any byte that is not ASCII newline (LF);
163 #include "csum-file.h"
165 #include "exec_cmd.h"
168 #define PACK_ID_BITS 16
169 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
170 #define DEPTH_BITS 13
171 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
174 * We abuse the setuid bit on directories to mean "do not delta".
176 #define NO_DELTA S_ISUID
178 struct object_entry
{
179 struct pack_idx_entry idx
;
180 struct object_entry
*next
;
181 uint32_t type
: TYPE_BITS
,
182 pack_id
: PACK_ID_BITS
,
186 struct object_entry_pool
{
187 struct object_entry_pool
*next_pool
;
188 struct object_entry
*next_free
;
189 struct object_entry
*end
;
190 struct object_entry entries
[FLEX_ARRAY
]; /* more */
195 struct object_entry
*marked
[1024];
196 struct mark_set
*sets
[1024];
205 unsigned no_swap
: 1;
209 struct mem_pool
*next_pool
;
212 uintmax_t space
[FLEX_ARRAY
]; /* more */
216 struct atom_str
*next_atom
;
217 unsigned short str_len
;
218 char str_dat
[FLEX_ARRAY
]; /* more */
223 struct tree_content
*tree
;
224 struct atom_str
*name
;
225 struct tree_entry_ms
{
227 unsigned char sha1
[20];
231 struct tree_content
{
232 unsigned int entry_capacity
; /* must match avail_tree_content */
233 unsigned int entry_count
;
234 unsigned int delta_depth
;
235 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
238 struct avail_tree_content
{
239 unsigned int entry_capacity
; /* must match tree_content */
240 struct avail_tree_content
*next_avail
;
244 struct branch
*table_next_branch
;
245 struct branch
*active_next_branch
;
247 struct tree_entry branch_tree
;
248 uintmax_t last_commit
;
251 unsigned pack_id
: PACK_ID_BITS
;
252 unsigned char sha1
[20];
256 struct tag
*next_tag
;
258 unsigned int pack_id
;
259 unsigned char sha1
[20];
263 struct hash_list
*next
;
264 unsigned char sha1
[20];
273 struct recent_command
{
274 struct recent_command
*prev
;
275 struct recent_command
*next
;
279 /* Configured limits on output */
280 static unsigned long max_depth
= 10;
281 static off_t max_packsize
;
282 static int force_update
;
283 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
284 static int pack_compression_seen
;
286 /* Stats and misc. counters */
287 static uintmax_t alloc_count
;
288 static uintmax_t marks_set_count
;
289 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
290 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
291 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
292 static unsigned long object_count
;
293 static unsigned long branch_count
;
294 static unsigned long branch_load_count
;
296 static FILE *pack_edges
;
297 static unsigned int show_stats
= 1;
298 static int global_argc
;
299 static const char **global_argv
;
302 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
303 static size_t total_allocd
;
304 static struct mem_pool
*mem_pool
;
306 /* Atom management */
307 static unsigned int atom_table_sz
= 4451;
308 static unsigned int atom_cnt
;
309 static struct atom_str
**atom_table
;
311 /* The .pack file being generated */
312 static unsigned int pack_id
;
313 static struct sha1file
*pack_file
;
314 static struct packed_git
*pack_data
;
315 static struct packed_git
**all_packs
;
316 static off_t pack_size
;
318 /* Table of objects we've written. */
319 static unsigned int object_entry_alloc
= 5000;
320 static struct object_entry_pool
*blocks
;
321 static struct object_entry
*object_table
[1 << 16];
322 static struct mark_set
*marks
;
323 static const char *export_marks_file
;
324 static const char *import_marks_file
;
325 static int import_marks_file_from_stream
;
326 static int import_marks_file_ignore_missing
;
327 static int relative_marks_paths
;
330 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
332 /* Tree management */
333 static unsigned int tree_entry_alloc
= 1000;
334 static void *avail_tree_entry
;
335 static unsigned int avail_tree_table_sz
= 100;
336 static struct avail_tree_content
**avail_tree_table
;
337 static struct strbuf old_tree
= STRBUF_INIT
;
338 static struct strbuf new_tree
= STRBUF_INIT
;
341 static unsigned long max_active_branches
= 5;
342 static unsigned long cur_active_branches
;
343 static unsigned long branch_table_sz
= 1039;
344 static struct branch
**branch_table
;
345 static struct branch
*active_branches
;
348 static struct tag
*first_tag
;
349 static struct tag
*last_tag
;
351 /* Input stream parsing */
352 static whenspec_type whenspec
= WHENSPEC_RAW
;
353 static struct strbuf command_buf
= STRBUF_INIT
;
354 static int unread_command_buf
;
355 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
356 static struct recent_command
*cmd_tail
= &cmd_hist
;
357 static struct recent_command
*rc_free
;
358 static unsigned int cmd_save
= 100;
359 static uintmax_t next_mark
;
360 static struct strbuf new_data
= STRBUF_INIT
;
361 static int seen_data_command
;
363 /* Signal handling */
364 static volatile sig_atomic_t checkpoint_requested
;
366 /* Where to write output of cat-blob commands */
367 static int cat_blob_fd
= STDOUT_FILENO
;
369 static void parse_argv(void);
370 static void parse_cat_blob(void);
371 static void parse_ls(struct branch
*b
);
373 static void write_branch_report(FILE *rpt
, struct branch
*b
)
375 fprintf(rpt
, "%s:\n", b
->name
);
377 fprintf(rpt
, " status :");
379 fputs(" active", rpt
);
380 if (b
->branch_tree
.tree
)
381 fputs(" loaded", rpt
);
382 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
383 fputs(" dirty", rpt
);
386 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
387 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
388 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
389 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
391 fputs(" last pack : ", rpt
);
392 if (b
->pack_id
< MAX_PACK_ID
)
393 fprintf(rpt
, "%u", b
->pack_id
);
399 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
401 static void write_crash_report(const char *err
)
403 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
404 FILE *rpt
= fopen(loc
, "w");
407 struct recent_command
*rc
;
410 error("can't write crash report %s: %s", loc
, strerror(errno
));
414 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
416 fprintf(rpt
, "fast-import crash report:\n");
417 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
418 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
419 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
422 fputs("fatal: ", rpt
);
427 fputs("Most Recent Commands Before Crash\n", rpt
);
428 fputs("---------------------------------\n", rpt
);
429 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
430 if (rc
->next
== &cmd_hist
)
439 fputs("Active Branch LRU\n", rpt
);
440 fputs("-----------------\n", rpt
);
441 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
443 max_active_branches
);
445 fputs(" pos clock name\n", rpt
);
446 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
447 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
448 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
449 ++lu
, b
->last_commit
, b
->name
);
452 fputs("Inactive Branches\n", rpt
);
453 fputs("-----------------\n", rpt
);
454 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
455 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
456 write_branch_report(rpt
, b
);
462 fputs("Annotated Tags\n", rpt
);
463 fputs("--------------\n", rpt
);
464 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
465 fputs(sha1_to_hex(tg
->sha1
), rpt
);
467 fputs(tg
->name
, rpt
);
473 fputs("Marks\n", rpt
);
474 fputs("-----\n", rpt
);
475 if (export_marks_file
)
476 fprintf(rpt
, " exported to %s\n", export_marks_file
);
478 dump_marks_helper(rpt
, 0, marks
);
481 fputs("-------------------\n", rpt
);
482 fputs("END OF CRASH REPORT\n", rpt
);
486 static void end_packfile(void);
487 static void unkeep_all_packs(void);
488 static void dump_marks(void);
490 static NORETURN
void die_nicely(const char *err
, va_list params
)
493 char message
[2 * PATH_MAX
];
495 vsnprintf(message
, sizeof(message
), err
, params
);
496 fputs("fatal: ", stderr
);
497 fputs(message
, stderr
);
502 write_crash_report(message
);
510 #ifndef SIGUSR1 /* Windows, for example */
512 static void set_checkpoint_signal(void)
518 static void checkpoint_signal(int signo
)
520 checkpoint_requested
= 1;
523 static void set_checkpoint_signal(void)
527 memset(&sa
, 0, sizeof(sa
));
528 sa
.sa_handler
= checkpoint_signal
;
529 sigemptyset(&sa
.sa_mask
);
530 sa
.sa_flags
= SA_RESTART
;
531 sigaction(SIGUSR1
, &sa
, NULL
);
536 static void alloc_objects(unsigned int cnt
)
538 struct object_entry_pool
*b
;
540 b
= xmalloc(sizeof(struct object_entry_pool
)
541 + cnt
* sizeof(struct object_entry
));
542 b
->next_pool
= blocks
;
543 b
->next_free
= b
->entries
;
544 b
->end
= b
->entries
+ cnt
;
549 static struct object_entry
*new_object(unsigned char *sha1
)
551 struct object_entry
*e
;
553 if (blocks
->next_free
== blocks
->end
)
554 alloc_objects(object_entry_alloc
);
556 e
= blocks
->next_free
++;
557 hashcpy(e
->idx
.sha1
, sha1
);
561 static struct object_entry
*find_object(unsigned char *sha1
)
563 unsigned int h
= sha1
[0] << 8 | sha1
[1];
564 struct object_entry
*e
;
565 for (e
= object_table
[h
]; e
; e
= e
->next
)
566 if (!hashcmp(sha1
, e
->idx
.sha1
))
571 static struct object_entry
*insert_object(unsigned char *sha1
)
573 unsigned int h
= sha1
[0] << 8 | sha1
[1];
574 struct object_entry
*e
= object_table
[h
];
577 if (!hashcmp(sha1
, e
->idx
.sha1
))
582 e
= new_object(sha1
);
583 e
->next
= object_table
[h
];
589 static unsigned int hc_str(const char *s
, size_t len
)
597 static void *pool_alloc(size_t len
)
602 /* round up to a 'uintmax_t' alignment */
603 if (len
& (sizeof(uintmax_t) - 1))
604 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
606 for (p
= mem_pool
; p
; p
= p
->next_pool
)
607 if ((p
->end
- p
->next_free
>= len
))
611 if (len
>= (mem_pool_alloc
/2)) {
615 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
616 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
617 p
->next_pool
= mem_pool
;
618 p
->next_free
= (char *) p
->space
;
619 p
->end
= p
->next_free
+ mem_pool_alloc
;
628 static void *pool_calloc(size_t count
, size_t size
)
630 size_t len
= count
* size
;
631 void *r
= pool_alloc(len
);
636 static char *pool_strdup(const char *s
)
638 char *r
= pool_alloc(strlen(s
) + 1);
643 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
645 struct mark_set
*s
= marks
;
646 while ((idnum
>> s
->shift
) >= 1024) {
647 s
= pool_calloc(1, sizeof(struct mark_set
));
648 s
->shift
= marks
->shift
+ 10;
649 s
->data
.sets
[0] = marks
;
653 uintmax_t i
= idnum
>> s
->shift
;
654 idnum
-= i
<< s
->shift
;
655 if (!s
->data
.sets
[i
]) {
656 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
657 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
661 if (!s
->data
.marked
[idnum
])
663 s
->data
.marked
[idnum
] = oe
;
666 static struct object_entry
*find_mark(uintmax_t idnum
)
668 uintmax_t orig_idnum
= idnum
;
669 struct mark_set
*s
= marks
;
670 struct object_entry
*oe
= NULL
;
671 if ((idnum
>> s
->shift
) < 1024) {
672 while (s
&& s
->shift
) {
673 uintmax_t i
= idnum
>> s
->shift
;
674 idnum
-= i
<< s
->shift
;
678 oe
= s
->data
.marked
[idnum
];
681 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
685 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
687 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
690 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
691 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
694 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
696 strncpy(c
->str_dat
, s
, len
);
698 c
->next_atom
= atom_table
[hc
];
704 static struct branch
*lookup_branch(const char *name
)
706 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
709 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
710 if (!strcmp(name
, b
->name
))
715 static struct branch
*new_branch(const char *name
)
717 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
718 struct branch
*b
= lookup_branch(name
);
721 die("Invalid attempt to create duplicate branch: %s", name
);
722 switch (check_ref_format(name
)) {
723 case 0: break; /* its valid */
724 case CHECK_REF_FORMAT_ONELEVEL
:
725 break; /* valid, but too few '/', allow anyway */
727 die("Branch name doesn't conform to GIT standards: %s", name
);
730 b
= pool_calloc(1, sizeof(struct branch
));
731 b
->name
= pool_strdup(name
);
732 b
->table_next_branch
= branch_table
[hc
];
733 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
734 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
737 b
->pack_id
= MAX_PACK_ID
;
738 branch_table
[hc
] = b
;
743 static unsigned int hc_entries(unsigned int cnt
)
745 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
746 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
749 static struct tree_content
*new_tree_content(unsigned int cnt
)
751 struct avail_tree_content
*f
, *l
= NULL
;
752 struct tree_content
*t
;
753 unsigned int hc
= hc_entries(cnt
);
755 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
756 if (f
->entry_capacity
>= cnt
)
761 l
->next_avail
= f
->next_avail
;
763 avail_tree_table
[hc
] = f
->next_avail
;
765 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
766 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
767 f
->entry_capacity
= cnt
;
770 t
= (struct tree_content
*)f
;
776 static void release_tree_entry(struct tree_entry
*e
);
777 static void release_tree_content(struct tree_content
*t
)
779 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
780 unsigned int hc
= hc_entries(f
->entry_capacity
);
781 f
->next_avail
= avail_tree_table
[hc
];
782 avail_tree_table
[hc
] = f
;
785 static void release_tree_content_recursive(struct tree_content
*t
)
788 for (i
= 0; i
< t
->entry_count
; i
++)
789 release_tree_entry(t
->entries
[i
]);
790 release_tree_content(t
);
793 static struct tree_content
*grow_tree_content(
794 struct tree_content
*t
,
797 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
798 r
->entry_count
= t
->entry_count
;
799 r
->delta_depth
= t
->delta_depth
;
800 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
801 release_tree_content(t
);
805 static struct tree_entry
*new_tree_entry(void)
807 struct tree_entry
*e
;
809 if (!avail_tree_entry
) {
810 unsigned int n
= tree_entry_alloc
;
811 total_allocd
+= n
* sizeof(struct tree_entry
);
812 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
814 *((void**)e
) = e
+ 1;
820 e
= avail_tree_entry
;
821 avail_tree_entry
= *((void**)e
);
825 static void release_tree_entry(struct tree_entry
*e
)
828 release_tree_content_recursive(e
->tree
);
829 *((void**)e
) = avail_tree_entry
;
830 avail_tree_entry
= e
;
833 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
835 struct tree_content
*d
;
836 struct tree_entry
*a
, *b
;
841 d
= new_tree_content(s
->entry_count
);
842 for (i
= 0; i
< s
->entry_count
; i
++) {
844 b
= new_tree_entry();
845 memcpy(b
, a
, sizeof(*a
));
846 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
847 b
->tree
= dup_tree_content(a
->tree
);
852 d
->entry_count
= s
->entry_count
;
853 d
->delta_depth
= s
->delta_depth
;
858 static void start_packfile(void)
860 static char tmpfile
[PATH_MAX
];
861 struct packed_git
*p
;
862 struct pack_header hdr
;
865 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
866 "pack/tmp_pack_XXXXXX");
867 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
868 strcpy(p
->pack_name
, tmpfile
);
869 p
->pack_fd
= pack_fd
;
871 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
873 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
874 hdr
.hdr_version
= htonl(2);
876 sha1write(pack_file
, &hdr
, sizeof(hdr
));
879 pack_size
= sizeof(hdr
);
882 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
883 all_packs
[pack_id
] = p
;
886 static const char *create_index(void)
889 struct pack_idx_entry
**idx
, **c
, **last
;
890 struct object_entry
*e
;
891 struct object_entry_pool
*o
;
893 /* Build the table of object IDs. */
894 idx
= xmalloc(object_count
* sizeof(*idx
));
896 for (o
= blocks
; o
; o
= o
->next_pool
)
897 for (e
= o
->next_free
; e
-- != o
->entries
;)
898 if (pack_id
== e
->pack_id
)
900 last
= idx
+ object_count
;
902 die("internal consistency error creating the index");
904 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
909 static char *keep_pack(const char *curr_index_name
)
911 static char name
[PATH_MAX
];
912 static const char *keep_msg
= "fast-import";
915 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
917 die_errno("cannot create keep file");
918 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
920 die_errno("failed to write keep file");
922 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
923 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
924 if (move_temp_to_file(pack_data
->pack_name
, name
))
925 die("cannot store pack file");
927 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
928 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
929 if (move_temp_to_file(curr_index_name
, name
))
930 die("cannot store index file");
931 free((void *)curr_index_name
);
935 static void unkeep_all_packs(void)
937 static char name
[PATH_MAX
];
940 for (k
= 0; k
< pack_id
; k
++) {
941 struct packed_git
*p
= all_packs
[k
];
942 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
943 get_object_directory(), sha1_to_hex(p
->sha1
));
944 unlink_or_warn(name
);
948 static void end_packfile(void)
950 struct packed_git
*old_p
= pack_data
, *new_p
;
952 clear_delta_base_cache();
954 unsigned char cur_pack_sha1
[20];
960 close_pack_windows(pack_data
);
961 sha1close(pack_file
, cur_pack_sha1
, 0);
962 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
963 pack_data
->pack_name
, object_count
,
964 cur_pack_sha1
, pack_size
);
965 close(pack_data
->pack_fd
);
966 idx_name
= keep_pack(create_index());
968 /* Register the packfile with core git's machinery. */
969 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
971 die("core git rejected index %s", idx_name
);
972 all_packs
[pack_id
] = new_p
;
973 install_packed_git(new_p
);
975 /* Print the boundary */
977 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
978 for (i
= 0; i
< branch_table_sz
; i
++) {
979 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
980 if (b
->pack_id
== pack_id
)
981 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
984 for (t
= first_tag
; t
; t
= t
->next_tag
) {
985 if (t
->pack_id
== pack_id
)
986 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
988 fputc('\n', pack_edges
);
995 close(old_p
->pack_fd
);
996 unlink_or_warn(old_p
->pack_name
);
1000 /* We can't carry a delta across packfiles. */
1001 strbuf_release(&last_blob
.data
);
1002 last_blob
.offset
= 0;
1003 last_blob
.depth
= 0;
1006 static void cycle_packfile(void)
1012 static int store_object(
1013 enum object_type type
,
1015 struct last_object
*last
,
1016 unsigned char *sha1out
,
1020 struct object_entry
*e
;
1021 unsigned char hdr
[96];
1022 unsigned char sha1
[20];
1023 unsigned long hdrlen
, deltalen
;
1027 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1028 (unsigned long)dat
->len
) + 1;
1030 git_SHA1_Update(&c
, hdr
, hdrlen
);
1031 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1032 git_SHA1_Final(sha1
, &c
);
1034 hashcpy(sha1out
, sha1
);
1036 e
= insert_object(sha1
);
1038 insert_mark(mark
, e
);
1039 if (e
->idx
.offset
) {
1040 duplicate_count_by_type
[type
]++;
1042 } else if (find_sha1_pack(sha1
, packed_git
)) {
1044 e
->pack_id
= MAX_PACK_ID
;
1045 e
->idx
.offset
= 1; /* just not zero! */
1046 duplicate_count_by_type
[type
]++;
1050 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1051 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1053 &deltalen
, dat
->len
- 20);
1057 memset(&s
, 0, sizeof(s
));
1058 deflateInit(&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
= deflateBound(&s
, s
.avail_in
);
1067 s
.next_out
= out
= xmalloc(s
.avail_out
);
1068 while (deflate(&s
, Z_FINISH
) == Z_OK
)
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 deflateInit(&s
, pack_compression_level
);
1087 s
.next_in
= (void *)dat
->buf
;
1088 s
.avail_in
= dat
->len
;
1089 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1090 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1091 while (deflate(&s
, Z_FINISH
) == Z_OK
)
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(off_t to
, git_SHA_CTX
*ctx
)
1149 if (ftruncate(pack_data
->pack_fd
, to
)
1150 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1151 die_errno("cannot truncate pack to skip duplicate");
1154 /* yes this is a layering violation */
1155 pack_file
->total
= to
;
1156 pack_file
->offset
= 0;
1157 pack_file
->ctx
= *ctx
;
1160 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1162 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1163 unsigned char *in_buf
= xmalloc(in_sz
);
1164 unsigned char *out_buf
= xmalloc(out_sz
);
1165 struct object_entry
*e
;
1166 unsigned char sha1
[20];
1167 unsigned long hdrlen
;
1170 git_SHA_CTX pack_file_ctx
;
1174 /* Determine if we should auto-checkpoint. */
1175 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1176 || (pack_size
+ 60 + len
) < pack_size
)
1181 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1182 sha1flush(pack_file
);
1183 pack_file_ctx
= pack_file
->ctx
;
1185 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1186 if (out_sz
<= hdrlen
)
1187 die("impossibly large object header");
1190 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1192 crc32_begin(pack_file
);
1194 memset(&s
, 0, sizeof(s
));
1195 deflateInit(&s
, pack_compression_level
);
1197 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1198 if (out_sz
<= hdrlen
)
1199 die("impossibly large object header");
1201 s
.next_out
= out_buf
+ hdrlen
;
1202 s
.avail_out
= out_sz
- hdrlen
;
1204 while (status
!= Z_STREAM_END
) {
1205 if (0 < len
&& !s
.avail_in
) {
1206 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1207 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1208 if (!n
&& feof(stdin
))
1209 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1211 git_SHA1_Update(&c
, in_buf
, n
);
1217 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1219 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1220 size_t n
= s
.next_out
- out_buf
;
1221 sha1write(pack_file
, out_buf
, n
);
1223 s
.next_out
= out_buf
;
1224 s
.avail_out
= out_sz
;
1233 die("unexpected deflate failure: %d", status
);
1237 git_SHA1_Final(sha1
, &c
);
1240 hashcpy(sha1out
, sha1
);
1242 e
= insert_object(sha1
);
1245 insert_mark(mark
, e
);
1247 if (e
->idx
.offset
) {
1248 duplicate_count_by_type
[OBJ_BLOB
]++;
1249 truncate_pack(offset
, &pack_file_ctx
);
1251 } else if (find_sha1_pack(sha1
, packed_git
)) {
1253 e
->pack_id
= MAX_PACK_ID
;
1254 e
->idx
.offset
= 1; /* just not zero! */
1255 duplicate_count_by_type
[OBJ_BLOB
]++;
1256 truncate_pack(offset
, &pack_file_ctx
);
1261 e
->pack_id
= pack_id
;
1262 e
->idx
.offset
= offset
;
1263 e
->idx
.crc32
= crc32_end(pack_file
);
1265 object_count_by_type
[OBJ_BLOB
]++;
1272 /* All calls must be guarded by find_object() or find_mark() to
1273 * ensure the 'struct object_entry' passed was written by this
1274 * process instance. We unpack the entry by the offset, avoiding
1275 * the need for the corresponding .idx file. This unpacking rule
1276 * works because we only use OBJ_REF_DELTA within the packfiles
1277 * created by fast-import.
1279 * oe must not be NULL. Such an oe usually comes from giving
1280 * an unknown SHA-1 to find_object() or an undefined mark to
1281 * find_mark(). Callers must test for this condition and use
1282 * the standard read_sha1_file() when it happens.
1284 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1285 * find_mark(), where the mark was reloaded from an existing marks
1286 * file and is referencing an object that this fast-import process
1287 * instance did not write out to a packfile. Callers must test for
1288 * this condition and use read_sha1_file() instead.
1290 static void *gfi_unpack_entry(
1291 struct object_entry
*oe
,
1292 unsigned long *sizep
)
1294 enum object_type type
;
1295 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1296 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1297 /* The object is stored in the packfile we are writing to
1298 * and we have modified it since the last time we scanned
1299 * back to read a previously written object. If an old
1300 * window covered [p->pack_size, p->pack_size + 20) its
1301 * data is stale and is not valid. Closing all windows
1302 * and updating the packfile length ensures we can read
1303 * the newly written data.
1305 close_pack_windows(p
);
1306 sha1flush(pack_file
);
1308 /* We have to offer 20 bytes additional on the end of
1309 * the packfile as the core unpacker code assumes the
1310 * footer is present at the file end and must promise
1311 * at least 20 bytes within any window it maps. But
1312 * we don't actually create the footer here.
1314 p
->pack_size
= pack_size
+ 20;
1316 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1319 static const char *get_mode(const char *str
, uint16_t *modep
)
1324 while ((c
= *str
++) != ' ') {
1325 if (c
< '0' || c
> '7')
1327 mode
= (mode
<< 3) + (c
- '0');
1333 static void load_tree(struct tree_entry
*root
)
1335 unsigned char *sha1
= root
->versions
[1].sha1
;
1336 struct object_entry
*myoe
;
1337 struct tree_content
*t
;
1342 root
->tree
= t
= new_tree_content(8);
1343 if (is_null_sha1(sha1
))
1346 myoe
= find_object(sha1
);
1347 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1348 if (myoe
->type
!= OBJ_TREE
)
1349 die("Not a tree: %s", sha1_to_hex(sha1
));
1350 t
->delta_depth
= myoe
->depth
;
1351 buf
= gfi_unpack_entry(myoe
, &size
);
1353 die("Can't load tree %s", sha1_to_hex(sha1
));
1355 enum object_type type
;
1356 buf
= read_sha1_file(sha1
, &type
, &size
);
1357 if (!buf
|| type
!= OBJ_TREE
)
1358 die("Can't load tree %s", sha1_to_hex(sha1
));
1362 while (c
!= (buf
+ size
)) {
1363 struct tree_entry
*e
= new_tree_entry();
1365 if (t
->entry_count
== t
->entry_capacity
)
1366 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1367 t
->entries
[t
->entry_count
++] = e
;
1370 c
= get_mode(c
, &e
->versions
[1].mode
);
1372 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1373 e
->versions
[0].mode
= e
->versions
[1].mode
;
1374 e
->name
= to_atom(c
, strlen(c
));
1375 c
+= e
->name
->str_len
+ 1;
1376 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1377 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1383 static int tecmp0 (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
[0].mode
,
1389 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1392 static int tecmp1 (const void *_a
, const void *_b
)
1394 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1395 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1396 return base_name_compare(
1397 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1398 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1401 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1407 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1409 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1411 for (i
= 0; i
< t
->entry_count
; i
++) {
1412 if (t
->entries
[i
]->versions
[v
].mode
)
1413 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1417 strbuf_grow(b
, maxlen
);
1418 for (i
= 0; i
< t
->entry_count
; i
++) {
1419 struct tree_entry
*e
= t
->entries
[i
];
1420 if (!e
->versions
[v
].mode
)
1422 strbuf_addf(b
, "%o %s%c",
1423 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1424 e
->name
->str_dat
, '\0');
1425 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1429 static void store_tree(struct tree_entry
*root
)
1431 struct tree_content
*t
= root
->tree
;
1432 unsigned int i
, j
, del
;
1433 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1434 struct object_entry
*le
= NULL
;
1436 if (!is_null_sha1(root
->versions
[1].sha1
))
1439 for (i
= 0; i
< t
->entry_count
; i
++) {
1440 if (t
->entries
[i
]->tree
)
1441 store_tree(t
->entries
[i
]);
1444 if (!(root
->versions
[0].mode
& NO_DELTA
))
1445 le
= find_object(root
->versions
[0].sha1
);
1446 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1447 mktree(t
, 0, &old_tree
);
1449 lo
.offset
= le
->idx
.offset
;
1450 lo
.depth
= t
->delta_depth
;
1453 mktree(t
, 1, &new_tree
);
1454 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1456 t
->delta_depth
= lo
.depth
;
1457 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1458 struct tree_entry
*e
= t
->entries
[i
];
1459 if (e
->versions
[1].mode
) {
1460 e
->versions
[0].mode
= e
->versions
[1].mode
;
1461 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1462 t
->entries
[j
++] = e
;
1464 release_tree_entry(e
);
1468 t
->entry_count
-= del
;
1471 static void tree_content_replace(
1472 struct tree_entry
*root
,
1473 const unsigned char *sha1
,
1474 const uint16_t mode
,
1475 struct tree_content
*newtree
)
1478 die("Root cannot be a non-directory");
1479 hashclr(root
->versions
[0].sha1
);
1480 hashcpy(root
->versions
[1].sha1
, sha1
);
1482 release_tree_content_recursive(root
->tree
);
1483 root
->tree
= newtree
;
1486 static int tree_content_set(
1487 struct tree_entry
*root
,
1489 const unsigned char *sha1
,
1490 const uint16_t mode
,
1491 struct tree_content
*subtree
)
1493 struct tree_content
*t
;
1496 struct tree_entry
*e
;
1498 slash1
= strchr(p
, '/');
1504 die("Empty path component found in input");
1505 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1506 die("Non-directories cannot have subtrees");
1511 for (i
= 0; i
< t
->entry_count
; i
++) {
1513 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1516 && e
->versions
[1].mode
== mode
1517 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1519 e
->versions
[1].mode
= mode
;
1520 hashcpy(e
->versions
[1].sha1
, sha1
);
1522 release_tree_content_recursive(e
->tree
);
1526 * We need to leave e->versions[0].sha1 alone
1527 * to avoid modifying the preimage tree used
1528 * when writing out the parent directory.
1529 * But after replacing the subdir with a
1530 * completely different one, it's not a good
1531 * delta base any more, and besides, we've
1532 * thrown away the tree entries needed to
1533 * make a delta against it.
1535 * So let's just explicitly disable deltas
1538 if (S_ISDIR(e
->versions
[0].mode
))
1539 e
->versions
[0].mode
|= NO_DELTA
;
1541 hashclr(root
->versions
[1].sha1
);
1544 if (!S_ISDIR(e
->versions
[1].mode
)) {
1545 e
->tree
= new_tree_content(8);
1546 e
->versions
[1].mode
= S_IFDIR
;
1550 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1551 hashclr(root
->versions
[1].sha1
);
1558 if (t
->entry_count
== t
->entry_capacity
)
1559 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1560 e
= new_tree_entry();
1561 e
->name
= to_atom(p
, n
);
1562 e
->versions
[0].mode
= 0;
1563 hashclr(e
->versions
[0].sha1
);
1564 t
->entries
[t
->entry_count
++] = e
;
1566 e
->tree
= new_tree_content(8);
1567 e
->versions
[1].mode
= S_IFDIR
;
1568 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1571 e
->versions
[1].mode
= mode
;
1572 hashcpy(e
->versions
[1].sha1
, sha1
);
1574 hashclr(root
->versions
[1].sha1
);
1578 static int tree_content_remove(
1579 struct tree_entry
*root
,
1581 struct tree_entry
*backup_leaf
)
1583 struct tree_content
*t
;
1586 struct tree_entry
*e
;
1588 slash1
= strchr(p
, '/');
1597 for (i
= 0; i
< t
->entry_count
; i
++) {
1599 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1600 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1602 * If p names a file in some subdirectory, and a
1603 * file or symlink matching the name of the
1604 * parent directory of p exists, then p cannot
1605 * exist and need not be deleted.
1608 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1612 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1613 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1614 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1615 hashclr(root
->versions
[1].sha1
);
1629 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1631 release_tree_content_recursive(e
->tree
);
1633 e
->versions
[1].mode
= 0;
1634 hashclr(e
->versions
[1].sha1
);
1635 hashclr(root
->versions
[1].sha1
);
1639 static int tree_content_get(
1640 struct tree_entry
*root
,
1642 struct tree_entry
*leaf
)
1644 struct tree_content
*t
;
1647 struct tree_entry
*e
;
1649 slash1
= strchr(p
, '/');
1658 for (i
= 0; i
< t
->entry_count
; i
++) {
1660 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1662 memcpy(leaf
, e
, sizeof(*leaf
));
1663 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1664 leaf
->tree
= dup_tree_content(e
->tree
);
1669 if (!S_ISDIR(e
->versions
[1].mode
))
1673 return tree_content_get(e
, slash1
+ 1, leaf
);
1679 static int update_branch(struct branch
*b
)
1681 static const char *msg
= "fast-import";
1682 struct ref_lock
*lock
;
1683 unsigned char old_sha1
[20];
1685 if (is_null_sha1(b
->sha1
))
1687 if (read_ref(b
->name
, old_sha1
))
1689 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1691 return error("Unable to lock %s", b
->name
);
1692 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1693 struct commit
*old_cmit
, *new_cmit
;
1695 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1696 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1697 if (!old_cmit
|| !new_cmit
) {
1699 return error("Branch %s is missing commits.", b
->name
);
1702 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1704 warning("Not updating %s"
1705 " (new tip %s does not contain %s)",
1706 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1710 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1711 return error("Unable to update %s", b
->name
);
1715 static void dump_branches(void)
1720 for (i
= 0; i
< branch_table_sz
; i
++) {
1721 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1722 failure
|= update_branch(b
);
1726 static void dump_tags(void)
1728 static const char *msg
= "fast-import";
1730 struct ref_lock
*lock
;
1731 char ref_name
[PATH_MAX
];
1733 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1734 sprintf(ref_name
, "tags/%s", t
->name
);
1735 lock
= lock_ref_sha1(ref_name
, NULL
);
1736 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1737 failure
|= error("Unable to update %s", ref_name
);
1741 static void dump_marks_helper(FILE *f
,
1747 for (k
= 0; k
< 1024; k
++) {
1748 if (m
->data
.sets
[k
])
1749 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1753 for (k
= 0; k
< 1024; k
++) {
1754 if (m
->data
.marked
[k
])
1755 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1756 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1761 static void dump_marks(void)
1763 static struct lock_file mark_lock
;
1767 if (!export_marks_file
)
1770 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1772 failure
|= error("Unable to write marks file %s: %s",
1773 export_marks_file
, strerror(errno
));
1777 f
= fdopen(mark_fd
, "w");
1779 int saved_errno
= errno
;
1780 rollback_lock_file(&mark_lock
);
1781 failure
|= error("Unable to write marks file %s: %s",
1782 export_marks_file
, strerror(saved_errno
));
1787 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1788 * Assign -1 to the lock file descriptor so that commit_lock_file()
1789 * won't try to close() it.
1793 dump_marks_helper(f
, 0, marks
);
1794 if (ferror(f
) || fclose(f
)) {
1795 int saved_errno
= errno
;
1796 rollback_lock_file(&mark_lock
);
1797 failure
|= error("Unable to write marks file %s: %s",
1798 export_marks_file
, strerror(saved_errno
));
1802 if (commit_lock_file(&mark_lock
)) {
1803 int saved_errno
= errno
;
1804 rollback_lock_file(&mark_lock
);
1805 failure
|= error("Unable to commit marks file %s: %s",
1806 export_marks_file
, strerror(saved_errno
));
1811 static void read_marks(void)
1814 FILE *f
= fopen(import_marks_file
, "r");
1817 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1818 return; /* Marks file does not exist */
1820 die_errno("cannot read '%s'", import_marks_file
);
1821 while (fgets(line
, sizeof(line
), f
)) {
1824 unsigned char sha1
[20];
1825 struct object_entry
*e
;
1827 end
= strchr(line
, '\n');
1828 if (line
[0] != ':' || !end
)
1829 die("corrupt mark line: %s", line
);
1831 mark
= strtoumax(line
+ 1, &end
, 10);
1832 if (!mark
|| end
== line
+ 1
1833 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1834 die("corrupt mark line: %s", line
);
1835 e
= find_object(sha1
);
1837 enum object_type type
= sha1_object_info(sha1
, NULL
);
1839 die("object not found: %s", sha1_to_hex(sha1
));
1840 e
= insert_object(sha1
);
1842 e
->pack_id
= MAX_PACK_ID
;
1843 e
->idx
.offset
= 1; /* just not zero! */
1845 insert_mark(mark
, e
);
1851 static int read_next_command(void)
1853 static int stdin_eof
= 0;
1856 unread_command_buf
= 0;
1861 if (unread_command_buf
) {
1862 unread_command_buf
= 0;
1864 struct recent_command
*rc
;
1866 strbuf_detach(&command_buf
, NULL
);
1867 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1871 if (!seen_data_command
1872 && prefixcmp(command_buf
.buf
, "feature ")
1873 && prefixcmp(command_buf
.buf
, "option ")) {
1882 cmd_hist
.next
= rc
->next
;
1883 cmd_hist
.next
->prev
= &cmd_hist
;
1887 rc
->buf
= command_buf
.buf
;
1888 rc
->prev
= cmd_tail
;
1889 rc
->next
= cmd_hist
.prev
;
1890 rc
->prev
->next
= rc
;
1893 if (!prefixcmp(command_buf
.buf
, "cat-blob ")) {
1897 if (command_buf
.buf
[0] == '#')
1903 static void skip_optional_lf(void)
1905 int term_char
= fgetc(stdin
);
1906 if (term_char
!= '\n' && term_char
!= EOF
)
1907 ungetc(term_char
, stdin
);
1910 static void parse_mark(void)
1912 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1913 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1914 read_next_command();
1920 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1924 if (prefixcmp(command_buf
.buf
, "data "))
1925 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1927 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1928 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1929 size_t term_len
= command_buf
.len
- 5 - 2;
1931 strbuf_detach(&command_buf
, NULL
);
1933 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1934 die("EOF in data (terminator '%s' not found)", term
);
1935 if (term_len
== command_buf
.len
1936 && !strcmp(term
, command_buf
.buf
))
1938 strbuf_addbuf(sb
, &command_buf
);
1939 strbuf_addch(sb
, '\n');
1944 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1945 size_t n
= 0, length
= (size_t)len
;
1947 if (limit
&& limit
< len
) {
1952 die("data is too large to use in this context");
1954 while (n
< length
) {
1955 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1956 if (!s
&& feof(stdin
))
1957 die("EOF in data (%lu bytes remaining)",
1958 (unsigned long)(length
- n
));
1967 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1969 const char *orig_src
= src
;
1975 num
= strtoul(src
, &endp
, 10);
1976 /* NEEDSWORK: perhaps check for reasonable values? */
1977 if (errno
|| endp
== src
|| *endp
!= ' ')
1981 if (*src
!= '-' && *src
!= '+')
1984 num
= strtoul(src
+ 1, &endp
, 10);
1985 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1989 strcpy(result
, orig_src
);
1993 static char *parse_ident(const char *buf
)
1999 gt
= strrchr(buf
, '>');
2001 die("Missing > in ident string: %s", buf
);
2004 die("Missing space after > in ident string: %s", buf
);
2006 name_len
= gt
- buf
;
2007 ident
= xmalloc(name_len
+ 24);
2008 strncpy(ident
, buf
, name_len
);
2012 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
2013 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
2015 case WHENSPEC_RFC2822
:
2016 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
2017 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
2020 if (strcmp("now", gt
))
2021 die("Date in ident must be 'now': %s", buf
);
2022 datestamp(ident
+ name_len
, 24);
2029 static void parse_and_store_blob(
2030 struct last_object
*last
,
2031 unsigned char *sha1out
,
2034 static struct strbuf buf
= STRBUF_INIT
;
2037 if (parse_data(&buf
, big_file_threshold
, &len
))
2038 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2041 strbuf_release(&last
->data
);
2045 stream_blob(len
, sha1out
, mark
);
2050 static void parse_new_blob(void)
2052 read_next_command();
2054 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2057 static void unload_one_branch(void)
2059 while (cur_active_branches
2060 && cur_active_branches
>= max_active_branches
) {
2061 uintmax_t min_commit
= ULONG_MAX
;
2062 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2064 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2065 if (e
->last_commit
< min_commit
) {
2067 min_commit
= e
->last_commit
;
2073 e
= p
->active_next_branch
;
2074 p
->active_next_branch
= e
->active_next_branch
;
2076 e
= active_branches
;
2077 active_branches
= e
->active_next_branch
;
2080 e
->active_next_branch
= NULL
;
2081 if (e
->branch_tree
.tree
) {
2082 release_tree_content_recursive(e
->branch_tree
.tree
);
2083 e
->branch_tree
.tree
= NULL
;
2085 cur_active_branches
--;
2089 static void load_branch(struct branch
*b
)
2091 load_tree(&b
->branch_tree
);
2094 b
->active_next_branch
= active_branches
;
2095 active_branches
= b
;
2096 cur_active_branches
++;
2097 branch_load_count
++;
2101 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2103 unsigned char fanout
= 0;
2104 while ((num_notes
>>= 8))
2109 static void construct_path_with_fanout(const char *hex_sha1
,
2110 unsigned char fanout
, char *path
)
2112 unsigned int i
= 0, j
= 0;
2114 die("Too large fanout (%u)", fanout
);
2116 path
[i
++] = hex_sha1
[j
++];
2117 path
[i
++] = hex_sha1
[j
++];
2121 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2122 path
[i
+ 40 - j
] = '\0';
2125 static uintmax_t do_change_note_fanout(
2126 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2127 char *hex_sha1
, unsigned int hex_sha1_len
,
2128 char *fullpath
, unsigned int fullpath_len
,
2129 unsigned char fanout
)
2131 struct tree_content
*t
= root
->tree
;
2132 struct tree_entry
*e
, leaf
;
2133 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2134 uintmax_t num_notes
= 0;
2135 unsigned char sha1
[20];
2138 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2140 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2141 tmp_fullpath_len
= fullpath_len
;
2144 * We're interested in EITHER existing note entries (entries
2145 * with exactly 40 hex chars in path, not including directory
2146 * separators), OR directory entries that may contain note
2147 * entries (with < 40 hex chars in path).
2148 * Also, each path component in a note entry must be a multiple
2151 if (!e
->versions
[1].mode
||
2152 tmp_hex_sha1_len
> 40 ||
2153 e
->name
->str_len
% 2)
2156 /* This _may_ be a note entry, or a subdir containing notes */
2157 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2159 if (tmp_fullpath_len
)
2160 fullpath
[tmp_fullpath_len
++] = '/';
2161 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2163 tmp_fullpath_len
+= e
->name
->str_len
;
2164 fullpath
[tmp_fullpath_len
] = '\0';
2166 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2167 /* This is a note entry */
2168 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2169 if (!strcmp(fullpath
, realpath
)) {
2170 /* Note entry is in correct location */
2175 /* Rename fullpath to realpath */
2176 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2177 die("Failed to remove path %s", fullpath
);
2178 tree_content_set(orig_root
, realpath
,
2179 leaf
.versions
[1].sha1
,
2180 leaf
.versions
[1].mode
,
2182 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2183 /* This is a subdir that may contain note entries */
2186 num_notes
+= do_change_note_fanout(orig_root
, e
,
2187 hex_sha1
, tmp_hex_sha1_len
,
2188 fullpath
, tmp_fullpath_len
, fanout
);
2191 /* The above may have reallocated the current tree_content */
2197 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2198 unsigned char fanout
)
2200 char hex_sha1
[40], path
[60];
2201 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2204 static void file_change_m(struct branch
*b
)
2206 const char *p
= command_buf
.buf
+ 2;
2207 static struct strbuf uq
= STRBUF_INIT
;
2209 struct object_entry
*oe
= oe
;
2210 unsigned char sha1
[20];
2211 uint16_t mode
, inline_data
= 0;
2213 p
= get_mode(p
, &mode
);
2215 die("Corrupt mode: %s", command_buf
.buf
);
2220 case S_IFREG
| 0644:
2221 case S_IFREG
| 0755:
2228 die("Corrupt mode: %s", command_buf
.buf
);
2233 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2234 hashcpy(sha1
, oe
->idx
.sha1
);
2236 } else if (!prefixcmp(p
, "inline")) {
2240 if (get_sha1_hex(p
, sha1
))
2241 die("Invalid SHA1: %s", command_buf
.buf
);
2242 oe
= find_object(sha1
);
2246 die("Missing space after SHA1: %s", command_buf
.buf
);
2249 if (!unquote_c_style(&uq
, p
, &endp
)) {
2251 die("Garbage after path in: %s", command_buf
.buf
);
2255 /* Git does not track empty, non-toplevel directories. */
2256 if (S_ISDIR(mode
) && !memcmp(sha1
, EMPTY_TREE_SHA1_BIN
, 20) && *p
) {
2257 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2261 if (S_ISGITLINK(mode
)) {
2263 die("Git links cannot be specified 'inline': %s",
2266 if (oe
->type
!= OBJ_COMMIT
)
2267 die("Not a commit (actually a %s): %s",
2268 typename(oe
->type
), command_buf
.buf
);
2271 * Accept the sha1 without checking; it expected to be in
2272 * another repository.
2274 } else if (inline_data
) {
2276 die("Directories cannot be specified 'inline': %s",
2279 strbuf_addstr(&uq
, p
);
2282 read_next_command();
2283 parse_and_store_blob(&last_blob
, sha1
, 0);
2285 enum object_type expected
= S_ISDIR(mode
) ?
2287 enum object_type type
= oe
? oe
->type
:
2288 sha1_object_info(sha1
, NULL
);
2290 die("%s not found: %s",
2291 S_ISDIR(mode
) ? "Tree" : "Blob",
2293 if (type
!= expected
)
2294 die("Not a %s (actually a %s): %s",
2295 typename(expected
), typename(type
),
2300 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2303 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2306 static void file_change_d(struct branch
*b
)
2308 const char *p
= command_buf
.buf
+ 2;
2309 static struct strbuf uq
= STRBUF_INIT
;
2313 if (!unquote_c_style(&uq
, p
, &endp
)) {
2315 die("Garbage after path in: %s", command_buf
.buf
);
2318 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2321 static void file_change_cr(struct branch
*b
, int rename
)
2324 static struct strbuf s_uq
= STRBUF_INIT
;
2325 static struct strbuf d_uq
= STRBUF_INIT
;
2327 struct tree_entry leaf
;
2329 s
= command_buf
.buf
+ 2;
2330 strbuf_reset(&s_uq
);
2331 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2333 die("Missing space after source: %s", command_buf
.buf
);
2335 endp
= strchr(s
, ' ');
2337 die("Missing space after source: %s", command_buf
.buf
);
2338 strbuf_add(&s_uq
, s
, endp
- s
);
2344 die("Missing dest: %s", command_buf
.buf
);
2347 strbuf_reset(&d_uq
);
2348 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2350 die("Garbage after dest in: %s", command_buf
.buf
);
2354 memset(&leaf
, 0, sizeof(leaf
));
2356 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2358 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2359 if (!leaf
.versions
[1].mode
)
2360 die("Path %s not in branch", s
);
2361 if (!*d
) { /* C "path/to/subdir" "" */
2362 tree_content_replace(&b
->branch_tree
,
2363 leaf
.versions
[1].sha1
,
2364 leaf
.versions
[1].mode
,
2368 tree_content_set(&b
->branch_tree
, d
,
2369 leaf
.versions
[1].sha1
,
2370 leaf
.versions
[1].mode
,
2374 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2376 const char *p
= command_buf
.buf
+ 2;
2377 static struct strbuf uq
= STRBUF_INIT
;
2378 struct object_entry
*oe
= oe
;
2380 unsigned char sha1
[20], commit_sha1
[20];
2382 uint16_t inline_data
= 0;
2383 unsigned char new_fanout
;
2385 /* <dataref> or 'inline' */
2388 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2389 hashcpy(sha1
, oe
->idx
.sha1
);
2391 } else if (!prefixcmp(p
, "inline")) {
2395 if (get_sha1_hex(p
, sha1
))
2396 die("Invalid SHA1: %s", command_buf
.buf
);
2397 oe
= find_object(sha1
);
2401 die("Missing space after SHA1: %s", command_buf
.buf
);
2404 s
= lookup_branch(p
);
2406 hashcpy(commit_sha1
, s
->sha1
);
2407 } else if (*p
== ':') {
2408 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2409 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2410 if (commit_oe
->type
!= OBJ_COMMIT
)
2411 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2412 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2413 } else if (!get_sha1(p
, commit_sha1
)) {
2415 char *buf
= read_object_with_reference(commit_sha1
,
2416 commit_type
, &size
, commit_sha1
);
2417 if (!buf
|| size
< 46)
2418 die("Not a valid commit: %s", p
);
2421 die("Invalid ref name or SHA1 expression: %s", p
);
2425 strbuf_addstr(&uq
, p
);
2428 read_next_command();
2429 parse_and_store_blob(&last_blob
, sha1
, 0);
2431 if (oe
->type
!= OBJ_BLOB
)
2432 die("Not a blob (actually a %s): %s",
2433 typename(oe
->type
), command_buf
.buf
);
2434 } else if (!is_null_sha1(sha1
)) {
2435 enum object_type type
= sha1_object_info(sha1
, NULL
);
2437 die("Blob not found: %s", command_buf
.buf
);
2438 if (type
!= OBJ_BLOB
)
2439 die("Not a blob (actually a %s): %s",
2440 typename(type
), command_buf
.buf
);
2443 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2444 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2447 if (is_null_sha1(sha1
))
2448 return; /* nothing to insert */
2451 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2452 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2453 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2456 static void file_change_deleteall(struct branch
*b
)
2458 release_tree_content_recursive(b
->branch_tree
.tree
);
2459 hashclr(b
->branch_tree
.versions
[0].sha1
);
2460 hashclr(b
->branch_tree
.versions
[1].sha1
);
2461 load_tree(&b
->branch_tree
);
2465 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2467 if (!buf
|| size
< 46)
2468 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2469 if (memcmp("tree ", buf
, 5)
2470 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2471 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2472 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2473 b
->branch_tree
.versions
[1].sha1
);
2476 static void parse_from_existing(struct branch
*b
)
2478 if (is_null_sha1(b
->sha1
)) {
2479 hashclr(b
->branch_tree
.versions
[0].sha1
);
2480 hashclr(b
->branch_tree
.versions
[1].sha1
);
2485 buf
= read_object_with_reference(b
->sha1
,
2486 commit_type
, &size
, b
->sha1
);
2487 parse_from_commit(b
, buf
, size
);
2492 static int parse_from(struct branch
*b
)
2497 if (prefixcmp(command_buf
.buf
, "from "))
2500 if (b
->branch_tree
.tree
) {
2501 release_tree_content_recursive(b
->branch_tree
.tree
);
2502 b
->branch_tree
.tree
= NULL
;
2505 from
= strchr(command_buf
.buf
, ' ') + 1;
2506 s
= lookup_branch(from
);
2508 die("Can't create a branch from itself: %s", b
->name
);
2510 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2511 hashcpy(b
->sha1
, s
->sha1
);
2512 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2513 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2514 } else if (*from
== ':') {
2515 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2516 struct object_entry
*oe
= find_mark(idnum
);
2517 if (oe
->type
!= OBJ_COMMIT
)
2518 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2519 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2520 if (oe
->pack_id
!= MAX_PACK_ID
) {
2522 char *buf
= gfi_unpack_entry(oe
, &size
);
2523 parse_from_commit(b
, buf
, size
);
2526 parse_from_existing(b
);
2527 } else if (!get_sha1(from
, b
->sha1
))
2528 parse_from_existing(b
);
2530 die("Invalid ref name or SHA1 expression: %s", from
);
2532 read_next_command();
2536 static struct hash_list
*parse_merge(unsigned int *count
)
2538 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2543 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2544 from
= strchr(command_buf
.buf
, ' ') + 1;
2545 n
= xmalloc(sizeof(*n
));
2546 s
= lookup_branch(from
);
2548 hashcpy(n
->sha1
, s
->sha1
);
2549 else if (*from
== ':') {
2550 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2551 struct object_entry
*oe
= find_mark(idnum
);
2552 if (oe
->type
!= OBJ_COMMIT
)
2553 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2554 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2555 } else if (!get_sha1(from
, n
->sha1
)) {
2557 char *buf
= read_object_with_reference(n
->sha1
,
2558 commit_type
, &size
, n
->sha1
);
2559 if (!buf
|| size
< 46)
2560 die("Not a valid commit: %s", from
);
2563 die("Invalid ref name or SHA1 expression: %s", from
);
2572 read_next_command();
2577 static void parse_new_commit(void)
2579 static struct strbuf msg
= STRBUF_INIT
;
2582 char *author
= NULL
;
2583 char *committer
= NULL
;
2584 struct hash_list
*merge_list
= NULL
;
2585 unsigned int merge_count
;
2586 unsigned char prev_fanout
, new_fanout
;
2588 /* Obtain the branch name from the rest of our command */
2589 sp
= strchr(command_buf
.buf
, ' ') + 1;
2590 b
= lookup_branch(sp
);
2594 read_next_command();
2596 if (!prefixcmp(command_buf
.buf
, "author ")) {
2597 author
= parse_ident(command_buf
.buf
+ 7);
2598 read_next_command();
2600 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2601 committer
= parse_ident(command_buf
.buf
+ 10);
2602 read_next_command();
2605 die("Expected committer but didn't get one");
2606 parse_data(&msg
, 0, NULL
);
2607 read_next_command();
2609 merge_list
= parse_merge(&merge_count
);
2611 /* ensure the branch is active/loaded */
2612 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2613 unload_one_branch();
2617 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2620 while (command_buf
.len
> 0) {
2621 if (!prefixcmp(command_buf
.buf
, "M "))
2623 else if (!prefixcmp(command_buf
.buf
, "D "))
2625 else if (!prefixcmp(command_buf
.buf
, "R "))
2626 file_change_cr(b
, 1);
2627 else if (!prefixcmp(command_buf
.buf
, "C "))
2628 file_change_cr(b
, 0);
2629 else if (!prefixcmp(command_buf
.buf
, "N "))
2630 note_change_n(b
, prev_fanout
);
2631 else if (!strcmp("deleteall", command_buf
.buf
))
2632 file_change_deleteall(b
);
2633 else if (!prefixcmp(command_buf
.buf
, "ls "))
2636 unread_command_buf
= 1;
2639 if (read_next_command() == EOF
)
2643 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2644 if (new_fanout
!= prev_fanout
)
2645 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2647 /* build the tree and the commit */
2648 store_tree(&b
->branch_tree
);
2649 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2650 b
->branch_tree
.versions
[1].sha1
);
2652 strbuf_reset(&new_data
);
2653 strbuf_addf(&new_data
, "tree %s\n",
2654 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2655 if (!is_null_sha1(b
->sha1
))
2656 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2657 while (merge_list
) {
2658 struct hash_list
*next
= merge_list
->next
;
2659 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2663 strbuf_addf(&new_data
,
2667 author
? author
: committer
, committer
);
2668 strbuf_addbuf(&new_data
, &msg
);
2672 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2673 b
->pack_id
= pack_id
;
2674 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2677 static void parse_new_tag(void)
2679 static struct strbuf msg
= STRBUF_INIT
;
2685 uintmax_t from_mark
= 0;
2686 unsigned char sha1
[20];
2687 enum object_type type
;
2689 /* Obtain the new tag name from the rest of our command */
2690 sp
= strchr(command_buf
.buf
, ' ') + 1;
2691 t
= pool_alloc(sizeof(struct tag
));
2693 t
->name
= pool_strdup(sp
);
2695 last_tag
->next_tag
= t
;
2699 read_next_command();
2702 if (prefixcmp(command_buf
.buf
, "from "))
2703 die("Expected from command, got %s", command_buf
.buf
);
2704 from
= strchr(command_buf
.buf
, ' ') + 1;
2705 s
= lookup_branch(from
);
2707 hashcpy(sha1
, s
->sha1
);
2709 } else if (*from
== ':') {
2710 struct object_entry
*oe
;
2711 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2712 oe
= find_mark(from_mark
);
2714 hashcpy(sha1
, oe
->idx
.sha1
);
2715 } else if (!get_sha1(from
, sha1
)) {
2719 buf
= read_sha1_file(sha1
, &type
, &size
);
2720 if (!buf
|| size
< 46)
2721 die("Not a valid commit: %s", from
);
2724 die("Invalid ref name or SHA1 expression: %s", from
);
2725 read_next_command();
2728 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2729 tagger
= parse_ident(command_buf
.buf
+ 7);
2730 read_next_command();
2734 /* tag payload/message */
2735 parse_data(&msg
, 0, NULL
);
2737 /* build the tag object */
2738 strbuf_reset(&new_data
);
2740 strbuf_addf(&new_data
,
2744 sha1_to_hex(sha1
), typename(type
), t
->name
);
2746 strbuf_addf(&new_data
,
2747 "tagger %s\n", tagger
);
2748 strbuf_addch(&new_data
, '\n');
2749 strbuf_addbuf(&new_data
, &msg
);
2752 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2753 t
->pack_id
= MAX_PACK_ID
;
2755 t
->pack_id
= pack_id
;
2758 static void parse_reset_branch(void)
2763 /* Obtain the branch name from the rest of our command */
2764 sp
= strchr(command_buf
.buf
, ' ') + 1;
2765 b
= lookup_branch(sp
);
2768 hashclr(b
->branch_tree
.versions
[0].sha1
);
2769 hashclr(b
->branch_tree
.versions
[1].sha1
);
2770 if (b
->branch_tree
.tree
) {
2771 release_tree_content_recursive(b
->branch_tree
.tree
);
2772 b
->branch_tree
.tree
= NULL
;
2777 read_next_command();
2779 if (command_buf
.len
> 0)
2780 unread_command_buf
= 1;
2783 static void cat_blob_write(const char *buf
, unsigned long size
)
2785 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2786 die_errno("Write to frontend failed");
2789 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2791 struct strbuf line
= STRBUF_INIT
;
2793 enum object_type type
= 0;
2796 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2797 buf
= read_sha1_file(sha1
, &type
, &size
);
2800 buf
= gfi_unpack_entry(oe
, &size
);
2804 * Output based on batch_one_object() from cat-file.c.
2807 strbuf_reset(&line
);
2808 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2809 cat_blob_write(line
.buf
, line
.len
);
2810 strbuf_release(&line
);
2815 die("Can't read object %s", sha1_to_hex(sha1
));
2816 if (type
!= OBJ_BLOB
)
2817 die("Object %s is a %s but a blob was expected.",
2818 sha1_to_hex(sha1
), typename(type
));
2819 strbuf_reset(&line
);
2820 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2821 typename(type
), size
);
2822 cat_blob_write(line
.buf
, line
.len
);
2823 strbuf_release(&line
);
2824 cat_blob_write(buf
, size
);
2825 cat_blob_write("\n", 1);
2829 static void parse_cat_blob(void)
2832 struct object_entry
*oe
= oe
;
2833 unsigned char sha1
[20];
2835 /* cat-blob SP <object> LF */
2836 p
= command_buf
.buf
+ strlen("cat-blob ");
2839 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2841 die("Invalid mark: %s", command_buf
.buf
);
2843 die("Unknown mark: %s", command_buf
.buf
);
2845 die("Garbage after mark: %s", command_buf
.buf
);
2846 hashcpy(sha1
, oe
->idx
.sha1
);
2848 if (get_sha1_hex(p
, sha1
))
2849 die("Invalid SHA1: %s", command_buf
.buf
);
2851 die("Garbage after SHA1: %s", command_buf
.buf
);
2852 oe
= find_object(sha1
);
2858 static struct object_entry
*dereference(struct object_entry
*oe
,
2859 unsigned char sha1
[20])
2864 enum object_type type
= sha1_object_info(sha1
, NULL
);
2866 die("object not found: %s", sha1_to_hex(sha1
));
2868 oe
= insert_object(sha1
);
2870 oe
->pack_id
= MAX_PACK_ID
;
2874 case OBJ_TREE
: /* easy case. */
2880 die("Not a treeish: %s", command_buf
.buf
);
2883 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
2884 buf
= gfi_unpack_entry(oe
, &size
);
2886 enum object_type unused
;
2887 buf
= read_sha1_file(sha1
, &unused
, &size
);
2890 die("Can't load object %s", sha1_to_hex(sha1
));
2892 /* Peel one layer. */
2895 if (size
< 40 + strlen("object ") ||
2896 get_sha1_hex(buf
+ strlen("object "), sha1
))
2897 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
2900 if (size
< 40 + strlen("tree ") ||
2901 get_sha1_hex(buf
+ strlen("tree "), sha1
))
2902 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
2906 return find_object(sha1
);
2909 static struct object_entry
*parse_treeish_dataref(const char **p
)
2911 unsigned char sha1
[20];
2912 struct object_entry
*e
;
2914 if (**p
== ':') { /* <mark> */
2916 e
= find_mark(strtoumax(*p
+ 1, &endptr
, 10));
2917 if (endptr
== *p
+ 1)
2918 die("Invalid mark: %s", command_buf
.buf
);
2920 die("Unknown mark: %s", command_buf
.buf
);
2922 hashcpy(sha1
, e
->idx
.sha1
);
2923 } else { /* <sha1> */
2924 if (get_sha1_hex(*p
, sha1
))
2925 die("Invalid SHA1: %s", command_buf
.buf
);
2926 e
= find_object(sha1
);
2930 while (!e
|| e
->type
!= OBJ_TREE
)
2931 e
= dereference(e
, sha1
);
2935 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
2937 static struct strbuf line
= STRBUF_INIT
;
2939 /* See show_tree(). */
2941 S_ISGITLINK(mode
) ? commit_type
:
2942 S_ISDIR(mode
) ? tree_type
:
2946 /* missing SP path LF */
2947 strbuf_reset(&line
);
2948 strbuf_addstr(&line
, "missing ");
2949 quote_c_style(path
, &line
, NULL
, 0);
2950 strbuf_addch(&line
, '\n');
2952 /* mode SP type SP object_name TAB path LF */
2953 strbuf_reset(&line
);
2954 strbuf_addf(&line
, "%06o %s %s\t",
2955 mode
& ~NO_DELTA
, type
, sha1_to_hex(sha1
));
2956 quote_c_style(path
, &line
, NULL
, 0);
2957 strbuf_addch(&line
, '\n');
2959 cat_blob_write(line
.buf
, line
.len
);
2962 static void parse_ls(struct branch
*b
)
2965 struct tree_entry
*root
= NULL
;
2966 struct tree_entry leaf
= {NULL
};
2968 /* ls SP (<treeish> SP)? <path> */
2969 p
= command_buf
.buf
+ strlen("ls ");
2972 die("Not in a commit: %s", command_buf
.buf
);
2973 root
= &b
->branch_tree
;
2975 struct object_entry
*e
= parse_treeish_dataref(&p
);
2976 root
= new_tree_entry();
2977 hashcpy(root
->versions
[1].sha1
, e
->idx
.sha1
);
2980 die("Missing space after tree-ish: %s", command_buf
.buf
);
2983 static struct strbuf uq
= STRBUF_INIT
;
2986 if (unquote_c_style(&uq
, p
, &endp
))
2987 die("Invalid path: %s", command_buf
.buf
);
2989 die("Garbage after path in: %s", command_buf
.buf
);
2992 tree_content_get(root
, p
, &leaf
);
2994 * A directory in preparation would have a sha1 of zero
2995 * until it is saved. Save, for simplicity.
2997 if (S_ISDIR(leaf
.versions
[1].mode
))
3000 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].sha1
, p
);
3001 if (!b
|| root
!= &b
->branch_tree
)
3002 release_tree_entry(root
);
3005 static void checkpoint(void)
3007 checkpoint_requested
= 0;
3016 static void parse_checkpoint(void)
3018 checkpoint_requested
= 1;
3022 static void parse_progress(void)
3024 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3025 fputc('\n', stdout
);
3030 static char* make_fast_import_path(const char *path
)
3032 struct strbuf abs_path
= STRBUF_INIT
;
3034 if (!relative_marks_paths
|| is_absolute_path(path
))
3035 return xstrdup(path
);
3036 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
3037 return strbuf_detach(&abs_path
, NULL
);
3040 static void option_import_marks(const char *marks
,
3041 int from_stream
, int ignore_missing
)
3043 if (import_marks_file
) {
3045 die("Only one import-marks command allowed per stream");
3047 /* read previous mark file */
3048 if(!import_marks_file_from_stream
)
3052 import_marks_file
= make_fast_import_path(marks
);
3053 safe_create_leading_directories_const(import_marks_file
);
3054 import_marks_file_from_stream
= from_stream
;
3055 import_marks_file_ignore_missing
= ignore_missing
;
3058 static void option_date_format(const char *fmt
)
3060 if (!strcmp(fmt
, "raw"))
3061 whenspec
= WHENSPEC_RAW
;
3062 else if (!strcmp(fmt
, "rfc2822"))
3063 whenspec
= WHENSPEC_RFC2822
;
3064 else if (!strcmp(fmt
, "now"))
3065 whenspec
= WHENSPEC_NOW
;
3067 die("unknown --date-format argument %s", fmt
);
3070 static unsigned long ulong_arg(const char *option
, const char *arg
)
3073 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3074 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3075 die("%s: argument must be a non-negative integer", option
);
3079 static void option_depth(const char *depth
)
3081 max_depth
= ulong_arg("--depth", depth
);
3082 if (max_depth
> MAX_DEPTH
)
3083 die("--depth cannot exceed %u", MAX_DEPTH
);
3086 static void option_active_branches(const char *branches
)
3088 max_active_branches
= ulong_arg("--active-branches", branches
);
3091 static void option_export_marks(const char *marks
)
3093 export_marks_file
= make_fast_import_path(marks
);
3094 safe_create_leading_directories_const(export_marks_file
);
3097 static void option_cat_blob_fd(const char *fd
)
3099 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3100 if (n
> (unsigned long) INT_MAX
)
3101 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3102 cat_blob_fd
= (int) n
;
3105 static void option_export_pack_edges(const char *edges
)
3109 pack_edges
= fopen(edges
, "a");
3111 die_errno("Cannot open '%s'", edges
);
3114 static int parse_one_option(const char *option
)
3116 if (!prefixcmp(option
, "max-pack-size=")) {
3118 if (!git_parse_ulong(option
+ 14, &v
))
3121 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3123 } else if (v
< 1024 * 1024) {
3124 warning("minimum max-pack-size is 1 MiB");
3128 } else if (!prefixcmp(option
, "big-file-threshold=")) {
3130 if (!git_parse_ulong(option
+ 19, &v
))
3132 big_file_threshold
= v
;
3133 } else if (!prefixcmp(option
, "depth=")) {
3134 option_depth(option
+ 6);
3135 } else if (!prefixcmp(option
, "active-branches=")) {
3136 option_active_branches(option
+ 16);
3137 } else if (!prefixcmp(option
, "export-pack-edges=")) {
3138 option_export_pack_edges(option
+ 18);
3139 } else if (!prefixcmp(option
, "quiet")) {
3141 } else if (!prefixcmp(option
, "stats")) {
3150 static int parse_one_feature(const char *feature
, int from_stream
)
3152 if (!prefixcmp(feature
, "date-format=")) {
3153 option_date_format(feature
+ 12);
3154 } else if (!prefixcmp(feature
, "import-marks=")) {
3155 option_import_marks(feature
+ 13, from_stream
, 0);
3156 } else if (!prefixcmp(feature
, "import-marks-if-exists=")) {
3157 option_import_marks(feature
+ strlen("import-marks-if-exists="),
3159 } else if (!prefixcmp(feature
, "export-marks=")) {
3160 option_export_marks(feature
+ 13);
3161 } else if (!strcmp(feature
, "cat-blob")) {
3162 ; /* Don't die - this feature is supported */
3163 } else if (!strcmp(feature
, "relative-marks")) {
3164 relative_marks_paths
= 1;
3165 } else if (!strcmp(feature
, "no-relative-marks")) {
3166 relative_marks_paths
= 0;
3167 } else if (!strcmp(feature
, "force")) {
3169 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3170 ; /* do nothing; we have the feature */
3178 static void parse_feature(void)
3180 char *feature
= command_buf
.buf
+ 8;
3182 if (seen_data_command
)
3183 die("Got feature command '%s' after data command", feature
);
3185 if (parse_one_feature(feature
, 1))
3188 die("This version of fast-import does not support feature %s.", feature
);
3191 static void parse_option(void)
3193 char *option
= command_buf
.buf
+ 11;
3195 if (seen_data_command
)
3196 die("Got option command '%s' after data command", option
);
3198 if (parse_one_option(option
))
3201 die("This version of fast-import does not support option: %s", option
);
3204 static int git_pack_config(const char *k
, const char *v
, void *cb
)
3206 if (!strcmp(k
, "pack.depth")) {
3207 max_depth
= git_config_int(k
, v
);
3208 if (max_depth
> MAX_DEPTH
)
3209 max_depth
= MAX_DEPTH
;
3212 if (!strcmp(k
, "pack.compression")) {
3213 int level
= git_config_int(k
, v
);
3215 level
= Z_DEFAULT_COMPRESSION
;
3216 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
3217 die("bad pack compression level %d", level
);
3218 pack_compression_level
= level
;
3219 pack_compression_seen
= 1;
3222 if (!strcmp(k
, "pack.indexversion")) {
3223 pack_idx_default_version
= git_config_int(k
, v
);
3224 if (pack_idx_default_version
> 2)
3225 die("bad pack.indexversion=%"PRIu32
,
3226 pack_idx_default_version
);
3229 if (!strcmp(k
, "pack.packsizelimit")) {
3230 max_packsize
= git_config_ulong(k
, v
);
3233 return git_default_config(k
, v
, cb
);
3236 static const char fast_import_usage
[] =
3237 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3239 static void parse_argv(void)
3243 for (i
= 1; i
< global_argc
; i
++) {
3244 const char *a
= global_argv
[i
];
3246 if (*a
!= '-' || !strcmp(a
, "--"))
3249 if (parse_one_option(a
+ 2))
3252 if (parse_one_feature(a
+ 2, 0))
3255 if (!prefixcmp(a
+ 2, "cat-blob-fd=")) {
3256 option_cat_blob_fd(a
+ 2 + strlen("cat-blob-fd="));
3260 die("unknown option %s", a
);
3262 if (i
!= global_argc
)
3263 usage(fast_import_usage
);
3265 seen_data_command
= 1;
3266 if (import_marks_file
)
3270 int main(int argc
, const char **argv
)
3274 git_extract_argv0_path(argv
[0]);
3276 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3277 usage(fast_import_usage
);
3279 setup_git_directory();
3280 git_config(git_pack_config
, NULL
);
3281 if (!pack_compression_seen
&& core_compression_seen
)
3282 pack_compression_level
= core_compression_level
;
3284 alloc_objects(object_entry_alloc
);
3285 strbuf_init(&command_buf
, 0);
3286 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3287 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3288 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3289 marks
= pool_calloc(1, sizeof(struct mark_set
));
3294 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3295 for (i
= 0; i
< (cmd_save
- 1); i
++)
3296 rc_free
[i
].next
= &rc_free
[i
+ 1];
3297 rc_free
[cmd_save
- 1].next
= NULL
;
3299 prepare_packed_git();
3301 set_die_routine(die_nicely
);
3302 set_checkpoint_signal();
3303 while (read_next_command() != EOF
) {
3304 if (!strcmp("blob", command_buf
.buf
))
3306 else if (!prefixcmp(command_buf
.buf
, "ls "))
3308 else if (!prefixcmp(command_buf
.buf
, "commit "))
3310 else if (!prefixcmp(command_buf
.buf
, "tag "))
3312 else if (!prefixcmp(command_buf
.buf
, "reset "))
3313 parse_reset_branch();
3314 else if (!strcmp("checkpoint", command_buf
.buf
))
3316 else if (!prefixcmp(command_buf
.buf
, "progress "))
3318 else if (!prefixcmp(command_buf
.buf
, "feature "))
3320 else if (!prefixcmp(command_buf
.buf
, "option git "))
3322 else if (!prefixcmp(command_buf
.buf
, "option "))
3323 /* ignore non-git options*/;
3325 die("Unsupported command: %s", command_buf
.buf
);
3327 if (checkpoint_requested
)
3331 /* argv hasn't been parsed yet, do so */
3332 if (!seen_data_command
)
3346 uintmax_t total_count
= 0, duplicate_count
= 0;
3347 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3348 total_count
+= object_count_by_type
[i
];
3349 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3350 duplicate_count
+= duplicate_count_by_type
[i
];
3352 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3353 fprintf(stderr
, "---------------------------------------------------------------------\n");
3354 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3355 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3356 fprintf(stderr
, " blobs : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_BLOB
], duplicate_count_by_type
[OBJ_BLOB
], delta_count_by_type
[OBJ_BLOB
]);
3357 fprintf(stderr
, " trees : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_TREE
], duplicate_count_by_type
[OBJ_TREE
], delta_count_by_type
[OBJ_TREE
]);
3358 fprintf(stderr
, " commits: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_COMMIT
], duplicate_count_by_type
[OBJ_COMMIT
], delta_count_by_type
[OBJ_COMMIT
]);
3359 fprintf(stderr
, " tags : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_TAG
], duplicate_count_by_type
[OBJ_TAG
], delta_count_by_type
[OBJ_TAG
]);
3360 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3361 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3362 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3363 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3364 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3365 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3366 fprintf(stderr
, "---------------------------------------------------------------------\n");
3368 fprintf(stderr
, "---------------------------------------------------------------------\n");
3369 fprintf(stderr
, "\n");
3372 return failure
? 1 : 0;