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)
173 struct object_entry
{
174 struct pack_idx_entry idx
;
175 struct object_entry
*next
;
176 uint32_t type
: TYPE_BITS
,
177 pack_id
: PACK_ID_BITS
,
181 struct object_entry_pool
{
182 struct object_entry_pool
*next_pool
;
183 struct object_entry
*next_free
;
184 struct object_entry
*end
;
185 struct object_entry entries
[FLEX_ARRAY
]; /* more */
190 struct object_entry
*marked
[1024];
191 struct mark_set
*sets
[1024];
200 unsigned no_swap
: 1;
204 struct mem_pool
*next_pool
;
207 uintmax_t space
[FLEX_ARRAY
]; /* more */
211 struct atom_str
*next_atom
;
212 unsigned short str_len
;
213 char str_dat
[FLEX_ARRAY
]; /* more */
218 struct tree_content
*tree
;
219 struct atom_str
*name
;
220 struct tree_entry_ms
{
222 unsigned char sha1
[20];
226 struct tree_content
{
227 unsigned int entry_capacity
; /* must match avail_tree_content */
228 unsigned int entry_count
;
229 unsigned int delta_depth
;
230 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
233 struct avail_tree_content
{
234 unsigned int entry_capacity
; /* must match tree_content */
235 struct avail_tree_content
*next_avail
;
239 struct branch
*table_next_branch
;
240 struct branch
*active_next_branch
;
242 struct tree_entry branch_tree
;
243 uintmax_t last_commit
;
246 unsigned pack_id
: PACK_ID_BITS
;
247 unsigned char sha1
[20];
251 struct tag
*next_tag
;
253 unsigned int pack_id
;
254 unsigned char sha1
[20];
258 struct hash_list
*next
;
259 unsigned char sha1
[20];
268 struct recent_command
{
269 struct recent_command
*prev
;
270 struct recent_command
*next
;
274 /* Configured limits on output */
275 static unsigned long max_depth
= 10;
276 static off_t max_packsize
;
277 static int force_update
;
278 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
279 static int pack_compression_seen
;
281 /* Stats and misc. counters */
282 static uintmax_t alloc_count
;
283 static uintmax_t marks_set_count
;
284 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
285 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
286 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
287 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
288 static unsigned long object_count
;
289 static unsigned long branch_count
;
290 static unsigned long branch_load_count
;
292 static FILE *pack_edges
;
293 static unsigned int show_stats
= 1;
294 static int global_argc
;
295 static const char **global_argv
;
298 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
299 static size_t total_allocd
;
300 static struct mem_pool
*mem_pool
;
302 /* Atom management */
303 static unsigned int atom_table_sz
= 4451;
304 static unsigned int atom_cnt
;
305 static struct atom_str
**atom_table
;
307 /* The .pack file being generated */
308 static unsigned int pack_id
;
309 static struct sha1file
*pack_file
;
310 static struct packed_git
*pack_data
;
311 static struct packed_git
**all_packs
;
312 static off_t pack_size
;
314 /* Table of objects we've written. */
315 static unsigned int object_entry_alloc
= 5000;
316 static struct object_entry_pool
*blocks
;
317 static struct object_entry
*object_table
[1 << 16];
318 static struct mark_set
*marks
;
319 static const char *export_marks_file
;
320 static const char *import_marks_file
;
321 static int import_marks_file_from_stream
;
322 static int import_marks_file_ignore_missing
;
323 static int relative_marks_paths
;
326 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
328 /* Tree management */
329 static unsigned int tree_entry_alloc
= 1000;
330 static void *avail_tree_entry
;
331 static unsigned int avail_tree_table_sz
= 100;
332 static struct avail_tree_content
**avail_tree_table
;
333 static struct strbuf old_tree
= STRBUF_INIT
;
334 static struct strbuf new_tree
= STRBUF_INIT
;
337 static unsigned long max_active_branches
= 5;
338 static unsigned long cur_active_branches
;
339 static unsigned long branch_table_sz
= 1039;
340 static struct branch
**branch_table
;
341 static struct branch
*active_branches
;
344 static struct tag
*first_tag
;
345 static struct tag
*last_tag
;
347 /* Input stream parsing */
348 static whenspec_type whenspec
= WHENSPEC_RAW
;
349 static struct strbuf command_buf
= STRBUF_INIT
;
350 static int unread_command_buf
;
351 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
352 static struct recent_command
*cmd_tail
= &cmd_hist
;
353 static struct recent_command
*rc_free
;
354 static unsigned int cmd_save
= 100;
355 static uintmax_t next_mark
;
356 static struct strbuf new_data
= STRBUF_INIT
;
357 static int seen_data_command
;
359 /* Signal handling */
360 static volatile sig_atomic_t checkpoint_requested
;
362 /* Where to write output of cat-blob commands */
363 static int cat_blob_fd
= STDOUT_FILENO
;
365 static void parse_argv(void);
366 static void parse_cat_blob(void);
367 static void parse_ls(struct branch
*b
);
369 static void write_branch_report(FILE *rpt
, struct branch
*b
)
371 fprintf(rpt
, "%s:\n", b
->name
);
373 fprintf(rpt
, " status :");
375 fputs(" active", rpt
);
376 if (b
->branch_tree
.tree
)
377 fputs(" loaded", rpt
);
378 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
379 fputs(" dirty", rpt
);
382 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
383 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
384 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
385 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
387 fputs(" last pack : ", rpt
);
388 if (b
->pack_id
< MAX_PACK_ID
)
389 fprintf(rpt
, "%u", b
->pack_id
);
395 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
397 static void write_crash_report(const char *err
)
399 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
400 FILE *rpt
= fopen(loc
, "w");
403 struct recent_command
*rc
;
406 error("can't write crash report %s: %s", loc
, strerror(errno
));
410 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
412 fprintf(rpt
, "fast-import crash report:\n");
413 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
414 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
415 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
418 fputs("fatal: ", rpt
);
423 fputs("Most Recent Commands Before Crash\n", rpt
);
424 fputs("---------------------------------\n", rpt
);
425 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
426 if (rc
->next
== &cmd_hist
)
435 fputs("Active Branch LRU\n", rpt
);
436 fputs("-----------------\n", rpt
);
437 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
439 max_active_branches
);
441 fputs(" pos clock name\n", rpt
);
442 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
443 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
444 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
445 ++lu
, b
->last_commit
, b
->name
);
448 fputs("Inactive Branches\n", rpt
);
449 fputs("-----------------\n", rpt
);
450 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
451 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
452 write_branch_report(rpt
, b
);
458 fputs("Annotated Tags\n", rpt
);
459 fputs("--------------\n", rpt
);
460 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
461 fputs(sha1_to_hex(tg
->sha1
), rpt
);
463 fputs(tg
->name
, rpt
);
469 fputs("Marks\n", rpt
);
470 fputs("-----\n", rpt
);
471 if (export_marks_file
)
472 fprintf(rpt
, " exported to %s\n", export_marks_file
);
474 dump_marks_helper(rpt
, 0, marks
);
477 fputs("-------------------\n", rpt
);
478 fputs("END OF CRASH REPORT\n", rpt
);
482 static void end_packfile(void);
483 static void unkeep_all_packs(void);
484 static void dump_marks(void);
486 static NORETURN
void die_nicely(const char *err
, va_list params
)
489 char message
[2 * PATH_MAX
];
491 vsnprintf(message
, sizeof(message
), err
, params
);
492 fputs("fatal: ", stderr
);
493 fputs(message
, stderr
);
498 write_crash_report(message
);
506 #ifndef SIGUSR1 /* Windows, for example */
508 static void set_checkpoint_signal(void)
514 static void checkpoint_signal(int signo
)
516 checkpoint_requested
= 1;
519 static void set_checkpoint_signal(void)
523 memset(&sa
, 0, sizeof(sa
));
524 sa
.sa_handler
= checkpoint_signal
;
525 sigemptyset(&sa
.sa_mask
);
526 sa
.sa_flags
= SA_RESTART
;
527 sigaction(SIGUSR1
, &sa
, NULL
);
532 static void alloc_objects(unsigned int cnt
)
534 struct object_entry_pool
*b
;
536 b
= xmalloc(sizeof(struct object_entry_pool
)
537 + cnt
* sizeof(struct object_entry
));
538 b
->next_pool
= blocks
;
539 b
->next_free
= b
->entries
;
540 b
->end
= b
->entries
+ cnt
;
545 static struct object_entry
*new_object(unsigned char *sha1
)
547 struct object_entry
*e
;
549 if (blocks
->next_free
== blocks
->end
)
550 alloc_objects(object_entry_alloc
);
552 e
= blocks
->next_free
++;
553 hashcpy(e
->idx
.sha1
, sha1
);
557 static struct object_entry
*find_object(unsigned char *sha1
)
559 unsigned int h
= sha1
[0] << 8 | sha1
[1];
560 struct object_entry
*e
;
561 for (e
= object_table
[h
]; e
; e
= e
->next
)
562 if (!hashcmp(sha1
, e
->idx
.sha1
))
567 static struct object_entry
*insert_object(unsigned char *sha1
)
569 unsigned int h
= sha1
[0] << 8 | sha1
[1];
570 struct object_entry
*e
= object_table
[h
];
573 if (!hashcmp(sha1
, e
->idx
.sha1
))
578 e
= new_object(sha1
);
579 e
->next
= object_table
[h
];
585 static unsigned int hc_str(const char *s
, size_t len
)
593 static void *pool_alloc(size_t len
)
598 /* round up to a 'uintmax_t' alignment */
599 if (len
& (sizeof(uintmax_t) - 1))
600 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
602 for (p
= mem_pool
; p
; p
= p
->next_pool
)
603 if ((p
->end
- p
->next_free
>= len
))
607 if (len
>= (mem_pool_alloc
/2)) {
611 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
612 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
613 p
->next_pool
= mem_pool
;
614 p
->next_free
= (char *) p
->space
;
615 p
->end
= p
->next_free
+ mem_pool_alloc
;
624 static void *pool_calloc(size_t count
, size_t size
)
626 size_t len
= count
* size
;
627 void *r
= pool_alloc(len
);
632 static char *pool_strdup(const char *s
)
634 char *r
= pool_alloc(strlen(s
) + 1);
639 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
641 struct mark_set
*s
= marks
;
642 while ((idnum
>> s
->shift
) >= 1024) {
643 s
= pool_calloc(1, sizeof(struct mark_set
));
644 s
->shift
= marks
->shift
+ 10;
645 s
->data
.sets
[0] = marks
;
649 uintmax_t i
= idnum
>> s
->shift
;
650 idnum
-= i
<< s
->shift
;
651 if (!s
->data
.sets
[i
]) {
652 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
653 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
657 if (!s
->data
.marked
[idnum
])
659 s
->data
.marked
[idnum
] = oe
;
662 static struct object_entry
*find_mark(uintmax_t idnum
)
664 uintmax_t orig_idnum
= idnum
;
665 struct mark_set
*s
= marks
;
666 struct object_entry
*oe
= NULL
;
667 if ((idnum
>> s
->shift
) < 1024) {
668 while (s
&& s
->shift
) {
669 uintmax_t i
= idnum
>> s
->shift
;
670 idnum
-= i
<< s
->shift
;
674 oe
= s
->data
.marked
[idnum
];
677 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
681 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
683 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
686 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
687 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
690 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
692 strncpy(c
->str_dat
, s
, len
);
694 c
->next_atom
= atom_table
[hc
];
700 static struct branch
*lookup_branch(const char *name
)
702 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
705 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
706 if (!strcmp(name
, b
->name
))
711 static struct branch
*new_branch(const char *name
)
713 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
714 struct branch
*b
= lookup_branch(name
);
717 die("Invalid attempt to create duplicate branch: %s", name
);
718 switch (check_ref_format(name
)) {
719 case 0: break; /* its valid */
720 case CHECK_REF_FORMAT_ONELEVEL
:
721 break; /* valid, but too few '/', allow anyway */
723 die("Branch name doesn't conform to GIT standards: %s", name
);
726 b
= pool_calloc(1, sizeof(struct branch
));
727 b
->name
= pool_strdup(name
);
728 b
->table_next_branch
= branch_table
[hc
];
729 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
730 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
733 b
->pack_id
= MAX_PACK_ID
;
734 branch_table
[hc
] = b
;
739 static unsigned int hc_entries(unsigned int cnt
)
741 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
742 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
745 static struct tree_content
*new_tree_content(unsigned int cnt
)
747 struct avail_tree_content
*f
, *l
= NULL
;
748 struct tree_content
*t
;
749 unsigned int hc
= hc_entries(cnt
);
751 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
752 if (f
->entry_capacity
>= cnt
)
757 l
->next_avail
= f
->next_avail
;
759 avail_tree_table
[hc
] = f
->next_avail
;
761 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
762 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
763 f
->entry_capacity
= cnt
;
766 t
= (struct tree_content
*)f
;
772 static void release_tree_entry(struct tree_entry
*e
);
773 static void release_tree_content(struct tree_content
*t
)
775 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
776 unsigned int hc
= hc_entries(f
->entry_capacity
);
777 f
->next_avail
= avail_tree_table
[hc
];
778 avail_tree_table
[hc
] = f
;
781 static void release_tree_content_recursive(struct tree_content
*t
)
784 for (i
= 0; i
< t
->entry_count
; i
++)
785 release_tree_entry(t
->entries
[i
]);
786 release_tree_content(t
);
789 static struct tree_content
*grow_tree_content(
790 struct tree_content
*t
,
793 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
794 r
->entry_count
= t
->entry_count
;
795 r
->delta_depth
= t
->delta_depth
;
796 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
797 release_tree_content(t
);
801 static struct tree_entry
*new_tree_entry(void)
803 struct tree_entry
*e
;
805 if (!avail_tree_entry
) {
806 unsigned int n
= tree_entry_alloc
;
807 total_allocd
+= n
* sizeof(struct tree_entry
);
808 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
810 *((void**)e
) = e
+ 1;
816 e
= avail_tree_entry
;
817 avail_tree_entry
= *((void**)e
);
821 static void release_tree_entry(struct tree_entry
*e
)
824 release_tree_content_recursive(e
->tree
);
825 *((void**)e
) = avail_tree_entry
;
826 avail_tree_entry
= e
;
829 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
831 struct tree_content
*d
;
832 struct tree_entry
*a
, *b
;
837 d
= new_tree_content(s
->entry_count
);
838 for (i
= 0; i
< s
->entry_count
; i
++) {
840 b
= new_tree_entry();
841 memcpy(b
, a
, sizeof(*a
));
842 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
843 b
->tree
= dup_tree_content(a
->tree
);
848 d
->entry_count
= s
->entry_count
;
849 d
->delta_depth
= s
->delta_depth
;
854 static void start_packfile(void)
856 static char tmpfile
[PATH_MAX
];
857 struct packed_git
*p
;
858 struct pack_header hdr
;
861 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
862 "pack/tmp_pack_XXXXXX");
863 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
864 strcpy(p
->pack_name
, tmpfile
);
865 p
->pack_fd
= pack_fd
;
867 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
869 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
870 hdr
.hdr_version
= htonl(2);
872 sha1write(pack_file
, &hdr
, sizeof(hdr
));
875 pack_size
= sizeof(hdr
);
878 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
879 all_packs
[pack_id
] = p
;
882 static const char *create_index(void)
885 struct pack_idx_entry
**idx
, **c
, **last
;
886 struct object_entry
*e
;
887 struct object_entry_pool
*o
;
889 /* Build the table of object IDs. */
890 idx
= xmalloc(object_count
* sizeof(*idx
));
892 for (o
= blocks
; o
; o
= o
->next_pool
)
893 for (e
= o
->next_free
; e
-- != o
->entries
;)
894 if (pack_id
== e
->pack_id
)
896 last
= idx
+ object_count
;
898 die("internal consistency error creating the index");
900 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
905 static char *keep_pack(const char *curr_index_name
)
907 static char name
[PATH_MAX
];
908 static const char *keep_msg
= "fast-import";
911 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
913 die_errno("cannot create keep file");
914 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
916 die_errno("failed to write keep file");
918 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
919 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
920 if (move_temp_to_file(pack_data
->pack_name
, name
))
921 die("cannot store pack file");
923 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
924 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
925 if (move_temp_to_file(curr_index_name
, name
))
926 die("cannot store index file");
927 free((void *)curr_index_name
);
931 static void unkeep_all_packs(void)
933 static char name
[PATH_MAX
];
936 for (k
= 0; k
< pack_id
; k
++) {
937 struct packed_git
*p
= all_packs
[k
];
938 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
939 get_object_directory(), sha1_to_hex(p
->sha1
));
940 unlink_or_warn(name
);
944 static void end_packfile(void)
946 struct packed_git
*old_p
= pack_data
, *new_p
;
948 clear_delta_base_cache();
950 unsigned char cur_pack_sha1
[20];
956 close_pack_windows(pack_data
);
957 sha1close(pack_file
, cur_pack_sha1
, 0);
958 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
959 pack_data
->pack_name
, object_count
,
960 cur_pack_sha1
, pack_size
);
961 close(pack_data
->pack_fd
);
962 idx_name
= keep_pack(create_index());
964 /* Register the packfile with core git's machinery. */
965 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
967 die("core git rejected index %s", idx_name
);
968 all_packs
[pack_id
] = new_p
;
969 install_packed_git(new_p
);
971 /* Print the boundary */
973 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
974 for (i
= 0; i
< branch_table_sz
; i
++) {
975 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
976 if (b
->pack_id
== pack_id
)
977 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
980 for (t
= first_tag
; t
; t
= t
->next_tag
) {
981 if (t
->pack_id
== pack_id
)
982 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
984 fputc('\n', pack_edges
);
991 close(old_p
->pack_fd
);
992 unlink_or_warn(old_p
->pack_name
);
996 /* We can't carry a delta across packfiles. */
997 strbuf_release(&last_blob
.data
);
998 last_blob
.offset
= 0;
1002 static void cycle_packfile(void)
1008 static int store_object(
1009 enum object_type type
,
1011 struct last_object
*last
,
1012 unsigned char *sha1out
,
1016 struct object_entry
*e
;
1017 unsigned char hdr
[96];
1018 unsigned char sha1
[20];
1019 unsigned long hdrlen
, deltalen
;
1023 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1024 (unsigned long)dat
->len
) + 1;
1026 git_SHA1_Update(&c
, hdr
, hdrlen
);
1027 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1028 git_SHA1_Final(sha1
, &c
);
1030 hashcpy(sha1out
, sha1
);
1032 e
= insert_object(sha1
);
1034 insert_mark(mark
, e
);
1035 if (e
->idx
.offset
) {
1036 duplicate_count_by_type
[type
]++;
1038 } else if (find_sha1_pack(sha1
, packed_git
)) {
1040 e
->pack_id
= MAX_PACK_ID
;
1041 e
->idx
.offset
= 1; /* just not zero! */
1042 duplicate_count_by_type
[type
]++;
1046 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1047 delta_count_attempts_by_type
[type
]++;
1048 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1050 &deltalen
, dat
->len
- 20);
1054 memset(&s
, 0, sizeof(s
));
1055 deflateInit(&s
, pack_compression_level
);
1058 s
.avail_in
= deltalen
;
1060 s
.next_in
= (void *)dat
->buf
;
1061 s
.avail_in
= dat
->len
;
1063 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1064 s
.next_out
= out
= xmalloc(s
.avail_out
);
1065 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1069 /* Determine if we should auto-checkpoint. */
1070 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1071 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1073 /* This new object needs to *not* have the current pack_id. */
1074 e
->pack_id
= pack_id
+ 1;
1077 /* We cannot carry a delta into the new pack. */
1082 memset(&s
, 0, sizeof(s
));
1083 deflateInit(&s
, pack_compression_level
);
1084 s
.next_in
= (void *)dat
->buf
;
1085 s
.avail_in
= dat
->len
;
1086 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1087 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1088 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1095 e
->pack_id
= pack_id
;
1096 e
->idx
.offset
= pack_size
;
1098 object_count_by_type
[type
]++;
1100 crc32_begin(pack_file
);
1103 off_t ofs
= e
->idx
.offset
- last
->offset
;
1104 unsigned pos
= sizeof(hdr
) - 1;
1106 delta_count_by_type
[type
]++;
1107 e
->depth
= last
->depth
+ 1;
1109 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1110 sha1write(pack_file
, hdr
, hdrlen
);
1111 pack_size
+= hdrlen
;
1113 hdr
[pos
] = ofs
& 127;
1115 hdr
[--pos
] = 128 | (--ofs
& 127);
1116 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1117 pack_size
+= sizeof(hdr
) - pos
;
1120 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1121 sha1write(pack_file
, hdr
, hdrlen
);
1122 pack_size
+= hdrlen
;
1125 sha1write(pack_file
, out
, s
.total_out
);
1126 pack_size
+= s
.total_out
;
1128 e
->idx
.crc32
= crc32_end(pack_file
);
1133 if (last
->no_swap
) {
1136 strbuf_swap(&last
->data
, dat
);
1138 last
->offset
= e
->idx
.offset
;
1139 last
->depth
= e
->depth
;
1144 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1146 if (ftruncate(pack_data
->pack_fd
, to
)
1147 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1148 die_errno("cannot truncate pack to skip duplicate");
1151 /* yes this is a layering violation */
1152 pack_file
->total
= to
;
1153 pack_file
->offset
= 0;
1154 pack_file
->ctx
= *ctx
;
1157 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1159 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1160 unsigned char *in_buf
= xmalloc(in_sz
);
1161 unsigned char *out_buf
= xmalloc(out_sz
);
1162 struct object_entry
*e
;
1163 unsigned char sha1
[20];
1164 unsigned long hdrlen
;
1167 git_SHA_CTX pack_file_ctx
;
1171 /* Determine if we should auto-checkpoint. */
1172 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1173 || (pack_size
+ 60 + len
) < pack_size
)
1178 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1179 sha1flush(pack_file
);
1180 pack_file_ctx
= pack_file
->ctx
;
1182 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1183 if (out_sz
<= hdrlen
)
1184 die("impossibly large object header");
1187 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1189 crc32_begin(pack_file
);
1191 memset(&s
, 0, sizeof(s
));
1192 deflateInit(&s
, pack_compression_level
);
1194 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1195 if (out_sz
<= hdrlen
)
1196 die("impossibly large object header");
1198 s
.next_out
= out_buf
+ hdrlen
;
1199 s
.avail_out
= out_sz
- hdrlen
;
1201 while (status
!= Z_STREAM_END
) {
1202 if (0 < len
&& !s
.avail_in
) {
1203 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1204 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1205 if (!n
&& feof(stdin
))
1206 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1208 git_SHA1_Update(&c
, in_buf
, n
);
1214 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1216 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1217 size_t n
= s
.next_out
- out_buf
;
1218 sha1write(pack_file
, out_buf
, n
);
1220 s
.next_out
= out_buf
;
1221 s
.avail_out
= out_sz
;
1230 die("unexpected deflate failure: %d", status
);
1234 git_SHA1_Final(sha1
, &c
);
1237 hashcpy(sha1out
, sha1
);
1239 e
= insert_object(sha1
);
1242 insert_mark(mark
, e
);
1244 if (e
->idx
.offset
) {
1245 duplicate_count_by_type
[OBJ_BLOB
]++;
1246 truncate_pack(offset
, &pack_file_ctx
);
1248 } else if (find_sha1_pack(sha1
, packed_git
)) {
1250 e
->pack_id
= MAX_PACK_ID
;
1251 e
->idx
.offset
= 1; /* just not zero! */
1252 duplicate_count_by_type
[OBJ_BLOB
]++;
1253 truncate_pack(offset
, &pack_file_ctx
);
1258 e
->pack_id
= pack_id
;
1259 e
->idx
.offset
= offset
;
1260 e
->idx
.crc32
= crc32_end(pack_file
);
1262 object_count_by_type
[OBJ_BLOB
]++;
1269 /* All calls must be guarded by find_object() or find_mark() to
1270 * ensure the 'struct object_entry' passed was written by this
1271 * process instance. We unpack the entry by the offset, avoiding
1272 * the need for the corresponding .idx file. This unpacking rule
1273 * works because we only use OBJ_REF_DELTA within the packfiles
1274 * created by fast-import.
1276 * oe must not be NULL. Such an oe usually comes from giving
1277 * an unknown SHA-1 to find_object() or an undefined mark to
1278 * find_mark(). Callers must test for this condition and use
1279 * the standard read_sha1_file() when it happens.
1281 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1282 * find_mark(), where the mark was reloaded from an existing marks
1283 * file and is referencing an object that this fast-import process
1284 * instance did not write out to a packfile. Callers must test for
1285 * this condition and use read_sha1_file() instead.
1287 static void *gfi_unpack_entry(
1288 struct object_entry
*oe
,
1289 unsigned long *sizep
)
1291 enum object_type type
;
1292 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1293 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1294 /* The object is stored in the packfile we are writing to
1295 * and we have modified it since the last time we scanned
1296 * back to read a previously written object. If an old
1297 * window covered [p->pack_size, p->pack_size + 20) its
1298 * data is stale and is not valid. Closing all windows
1299 * and updating the packfile length ensures we can read
1300 * the newly written data.
1302 close_pack_windows(p
);
1303 sha1flush(pack_file
);
1305 /* We have to offer 20 bytes additional on the end of
1306 * the packfile as the core unpacker code assumes the
1307 * footer is present at the file end and must promise
1308 * at least 20 bytes within any window it maps. But
1309 * we don't actually create the footer here.
1311 p
->pack_size
= pack_size
+ 20;
1313 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1316 static const char *get_mode(const char *str
, uint16_t *modep
)
1321 while ((c
= *str
++) != ' ') {
1322 if (c
< '0' || c
> '7')
1324 mode
= (mode
<< 3) + (c
- '0');
1330 static void load_tree(struct tree_entry
*root
)
1332 unsigned char *sha1
= root
->versions
[1].sha1
;
1333 struct object_entry
*myoe
;
1334 struct tree_content
*t
;
1339 root
->tree
= t
= new_tree_content(8);
1340 if (is_null_sha1(sha1
))
1343 myoe
= find_object(sha1
);
1344 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1345 if (myoe
->type
!= OBJ_TREE
)
1346 die("Not a tree: %s", sha1_to_hex(sha1
));
1347 t
->delta_depth
= myoe
->depth
;
1348 buf
= gfi_unpack_entry(myoe
, &size
);
1350 die("Can't load tree %s", sha1_to_hex(sha1
));
1352 enum object_type type
;
1353 buf
= read_sha1_file(sha1
, &type
, &size
);
1354 if (!buf
|| type
!= OBJ_TREE
)
1355 die("Can't load tree %s", sha1_to_hex(sha1
));
1359 while (c
!= (buf
+ size
)) {
1360 struct tree_entry
*e
= new_tree_entry();
1362 if (t
->entry_count
== t
->entry_capacity
)
1363 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1364 t
->entries
[t
->entry_count
++] = e
;
1367 c
= get_mode(c
, &e
->versions
[1].mode
);
1369 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1370 e
->versions
[0].mode
= e
->versions
[1].mode
;
1371 e
->name
= to_atom(c
, strlen(c
));
1372 c
+= e
->name
->str_len
+ 1;
1373 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1374 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1380 static int tecmp0 (const void *_a
, const void *_b
)
1382 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1383 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1384 return base_name_compare(
1385 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1386 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1389 static int tecmp1 (const void *_a
, const void *_b
)
1391 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1392 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1393 return base_name_compare(
1394 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1395 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1398 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1404 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1406 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1408 for (i
= 0; i
< t
->entry_count
; i
++) {
1409 if (t
->entries
[i
]->versions
[v
].mode
)
1410 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1414 strbuf_grow(b
, maxlen
);
1415 for (i
= 0; i
< t
->entry_count
; i
++) {
1416 struct tree_entry
*e
= t
->entries
[i
];
1417 if (!e
->versions
[v
].mode
)
1419 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1420 e
->name
->str_dat
, '\0');
1421 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1425 static void store_tree(struct tree_entry
*root
)
1427 struct tree_content
*t
= root
->tree
;
1428 unsigned int i
, j
, del
;
1429 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1430 struct object_entry
*le
;
1432 if (!is_null_sha1(root
->versions
[1].sha1
))
1435 for (i
= 0; i
< t
->entry_count
; i
++) {
1436 if (t
->entries
[i
]->tree
)
1437 store_tree(t
->entries
[i
]);
1440 le
= find_object(root
->versions
[0].sha1
);
1441 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1442 mktree(t
, 0, &old_tree
);
1444 lo
.offset
= le
->idx
.offset
;
1445 lo
.depth
= t
->delta_depth
;
1448 mktree(t
, 1, &new_tree
);
1449 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1451 t
->delta_depth
= lo
.depth
;
1452 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1453 struct tree_entry
*e
= t
->entries
[i
];
1454 if (e
->versions
[1].mode
) {
1455 e
->versions
[0].mode
= e
->versions
[1].mode
;
1456 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1457 t
->entries
[j
++] = e
;
1459 release_tree_entry(e
);
1463 t
->entry_count
-= del
;
1466 static void tree_content_replace(
1467 struct tree_entry
*root
,
1468 const unsigned char *sha1
,
1469 const uint16_t mode
,
1470 struct tree_content
*newtree
)
1473 die("Root cannot be a non-directory");
1474 hashcpy(root
->versions
[1].sha1
, sha1
);
1476 release_tree_content_recursive(root
->tree
);
1477 root
->tree
= newtree
;
1480 static int tree_content_set(
1481 struct tree_entry
*root
,
1483 const unsigned char *sha1
,
1484 const uint16_t mode
,
1485 struct tree_content
*subtree
)
1487 struct tree_content
*t
;
1490 struct tree_entry
*e
;
1492 slash1
= strchr(p
, '/');
1498 die("Empty path component found in input");
1499 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1500 die("Non-directories cannot have subtrees");
1505 for (i
= 0; i
< t
->entry_count
; i
++) {
1507 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1510 && e
->versions
[1].mode
== mode
1511 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1513 e
->versions
[1].mode
= mode
;
1514 hashcpy(e
->versions
[1].sha1
, sha1
);
1516 release_tree_content_recursive(e
->tree
);
1518 hashclr(root
->versions
[1].sha1
);
1521 if (!S_ISDIR(e
->versions
[1].mode
)) {
1522 e
->tree
= new_tree_content(8);
1523 e
->versions
[1].mode
= S_IFDIR
;
1527 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1528 hashclr(root
->versions
[1].sha1
);
1535 if (t
->entry_count
== t
->entry_capacity
)
1536 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1537 e
= new_tree_entry();
1538 e
->name
= to_atom(p
, n
);
1539 e
->versions
[0].mode
= 0;
1540 hashclr(e
->versions
[0].sha1
);
1541 t
->entries
[t
->entry_count
++] = e
;
1543 e
->tree
= new_tree_content(8);
1544 e
->versions
[1].mode
= S_IFDIR
;
1545 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1548 e
->versions
[1].mode
= mode
;
1549 hashcpy(e
->versions
[1].sha1
, sha1
);
1551 hashclr(root
->versions
[1].sha1
);
1555 static int tree_content_remove(
1556 struct tree_entry
*root
,
1558 struct tree_entry
*backup_leaf
)
1560 struct tree_content
*t
;
1563 struct tree_entry
*e
;
1565 slash1
= strchr(p
, '/');
1574 for (i
= 0; i
< t
->entry_count
; i
++) {
1576 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1577 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1579 * If p names a file in some subdirectory, and a
1580 * file or symlink matching the name of the
1581 * parent directory of p exists, then p cannot
1582 * exist and need not be deleted.
1585 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1589 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1590 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1591 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1592 hashclr(root
->versions
[1].sha1
);
1606 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1608 release_tree_content_recursive(e
->tree
);
1610 e
->versions
[1].mode
= 0;
1611 hashclr(e
->versions
[1].sha1
);
1612 hashclr(root
->versions
[1].sha1
);
1616 static int tree_content_get(
1617 struct tree_entry
*root
,
1619 struct tree_entry
*leaf
)
1621 struct tree_content
*t
;
1624 struct tree_entry
*e
;
1626 slash1
= strchr(p
, '/');
1635 for (i
= 0; i
< t
->entry_count
; i
++) {
1637 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1639 memcpy(leaf
, e
, sizeof(*leaf
));
1640 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1641 leaf
->tree
= dup_tree_content(e
->tree
);
1646 if (!S_ISDIR(e
->versions
[1].mode
))
1650 return tree_content_get(e
, slash1
+ 1, leaf
);
1656 static int update_branch(struct branch
*b
)
1658 static const char *msg
= "fast-import";
1659 struct ref_lock
*lock
;
1660 unsigned char old_sha1
[20];
1662 if (is_null_sha1(b
->sha1
))
1664 if (read_ref(b
->name
, old_sha1
))
1666 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1668 return error("Unable to lock %s", b
->name
);
1669 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1670 struct commit
*old_cmit
, *new_cmit
;
1672 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1673 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1674 if (!old_cmit
|| !new_cmit
) {
1676 return error("Branch %s is missing commits.", b
->name
);
1679 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1681 warning("Not updating %s"
1682 " (new tip %s does not contain %s)",
1683 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1687 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1688 return error("Unable to update %s", b
->name
);
1692 static void dump_branches(void)
1697 for (i
= 0; i
< branch_table_sz
; i
++) {
1698 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1699 failure
|= update_branch(b
);
1703 static void dump_tags(void)
1705 static const char *msg
= "fast-import";
1707 struct ref_lock
*lock
;
1708 char ref_name
[PATH_MAX
];
1710 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1711 sprintf(ref_name
, "tags/%s", t
->name
);
1712 lock
= lock_ref_sha1(ref_name
, NULL
);
1713 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1714 failure
|= error("Unable to update %s", ref_name
);
1718 static void dump_marks_helper(FILE *f
,
1724 for (k
= 0; k
< 1024; k
++) {
1725 if (m
->data
.sets
[k
])
1726 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1730 for (k
= 0; k
< 1024; k
++) {
1731 if (m
->data
.marked
[k
])
1732 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1733 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1738 static void dump_marks(void)
1740 static struct lock_file mark_lock
;
1744 if (!export_marks_file
)
1747 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1749 failure
|= error("Unable to write marks file %s: %s",
1750 export_marks_file
, strerror(errno
));
1754 f
= fdopen(mark_fd
, "w");
1756 int saved_errno
= errno
;
1757 rollback_lock_file(&mark_lock
);
1758 failure
|= error("Unable to write marks file %s: %s",
1759 export_marks_file
, strerror(saved_errno
));
1764 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1765 * Assign -1 to the lock file descriptor so that commit_lock_file()
1766 * won't try to close() it.
1770 dump_marks_helper(f
, 0, marks
);
1771 if (ferror(f
) || fclose(f
)) {
1772 int saved_errno
= errno
;
1773 rollback_lock_file(&mark_lock
);
1774 failure
|= error("Unable to write marks file %s: %s",
1775 export_marks_file
, strerror(saved_errno
));
1779 if (commit_lock_file(&mark_lock
)) {
1780 int saved_errno
= errno
;
1781 rollback_lock_file(&mark_lock
);
1782 failure
|= error("Unable to commit marks file %s: %s",
1783 export_marks_file
, strerror(saved_errno
));
1788 static void read_marks(void)
1791 FILE *f
= fopen(import_marks_file
, "r");
1794 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1795 return; /* Marks file does not exist */
1797 die_errno("cannot read '%s'", import_marks_file
);
1798 while (fgets(line
, sizeof(line
), f
)) {
1801 unsigned char sha1
[20];
1802 struct object_entry
*e
;
1804 end
= strchr(line
, '\n');
1805 if (line
[0] != ':' || !end
)
1806 die("corrupt mark line: %s", line
);
1808 mark
= strtoumax(line
+ 1, &end
, 10);
1809 if (!mark
|| end
== line
+ 1
1810 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1811 die("corrupt mark line: %s", line
);
1812 e
= find_object(sha1
);
1814 enum object_type type
= sha1_object_info(sha1
, NULL
);
1816 die("object not found: %s", sha1_to_hex(sha1
));
1817 e
= insert_object(sha1
);
1819 e
->pack_id
= MAX_PACK_ID
;
1820 e
->idx
.offset
= 1; /* just not zero! */
1822 insert_mark(mark
, e
);
1828 static int read_next_command(void)
1830 static int stdin_eof
= 0;
1833 unread_command_buf
= 0;
1838 if (unread_command_buf
) {
1839 unread_command_buf
= 0;
1841 struct recent_command
*rc
;
1843 strbuf_detach(&command_buf
, NULL
);
1844 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1848 if (!seen_data_command
1849 && prefixcmp(command_buf
.buf
, "feature ")
1850 && prefixcmp(command_buf
.buf
, "option ")) {
1859 cmd_hist
.next
= rc
->next
;
1860 cmd_hist
.next
->prev
= &cmd_hist
;
1864 rc
->buf
= command_buf
.buf
;
1865 rc
->prev
= cmd_tail
;
1866 rc
->next
= cmd_hist
.prev
;
1867 rc
->prev
->next
= rc
;
1870 if (!prefixcmp(command_buf
.buf
, "cat-blob ")) {
1874 if (command_buf
.buf
[0] == '#')
1880 static void skip_optional_lf(void)
1882 int term_char
= fgetc(stdin
);
1883 if (term_char
!= '\n' && term_char
!= EOF
)
1884 ungetc(term_char
, stdin
);
1887 static void parse_mark(void)
1889 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1890 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1891 read_next_command();
1897 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1901 if (prefixcmp(command_buf
.buf
, "data "))
1902 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1904 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1905 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1906 size_t term_len
= command_buf
.len
- 5 - 2;
1908 strbuf_detach(&command_buf
, NULL
);
1910 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1911 die("EOF in data (terminator '%s' not found)", term
);
1912 if (term_len
== command_buf
.len
1913 && !strcmp(term
, command_buf
.buf
))
1915 strbuf_addbuf(sb
, &command_buf
);
1916 strbuf_addch(sb
, '\n');
1921 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1922 size_t n
= 0, length
= (size_t)len
;
1924 if (limit
&& limit
< len
) {
1929 die("data is too large to use in this context");
1931 while (n
< length
) {
1932 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1933 if (!s
&& feof(stdin
))
1934 die("EOF in data (%lu bytes remaining)",
1935 (unsigned long)(length
- n
));
1944 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1946 const char *orig_src
= src
;
1952 num
= strtoul(src
, &endp
, 10);
1953 /* NEEDSWORK: perhaps check for reasonable values? */
1954 if (errno
|| endp
== src
|| *endp
!= ' ')
1958 if (*src
!= '-' && *src
!= '+')
1961 num
= strtoul(src
+ 1, &endp
, 10);
1962 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1966 strcpy(result
, orig_src
);
1970 static char *parse_ident(const char *buf
)
1976 gt
= strrchr(buf
, '>');
1978 die("Missing > in ident string: %s", buf
);
1981 die("Missing space after > in ident string: %s", buf
);
1983 name_len
= gt
- buf
;
1984 ident
= xmalloc(name_len
+ 24);
1985 strncpy(ident
, buf
, name_len
);
1989 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1990 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1992 case WHENSPEC_RFC2822
:
1993 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1994 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1997 if (strcmp("now", gt
))
1998 die("Date in ident must be 'now': %s", buf
);
1999 datestamp(ident
+ name_len
, 24);
2006 static void parse_and_store_blob(
2007 struct last_object
*last
,
2008 unsigned char *sha1out
,
2011 static struct strbuf buf
= STRBUF_INIT
;
2014 if (parse_data(&buf
, big_file_threshold
, &len
))
2015 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2018 strbuf_release(&last
->data
);
2022 stream_blob(len
, sha1out
, mark
);
2027 static void parse_new_blob(void)
2029 read_next_command();
2031 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2034 static void unload_one_branch(void)
2036 while (cur_active_branches
2037 && cur_active_branches
>= max_active_branches
) {
2038 uintmax_t min_commit
= ULONG_MAX
;
2039 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2041 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2042 if (e
->last_commit
< min_commit
) {
2044 min_commit
= e
->last_commit
;
2050 e
= p
->active_next_branch
;
2051 p
->active_next_branch
= e
->active_next_branch
;
2053 e
= active_branches
;
2054 active_branches
= e
->active_next_branch
;
2057 e
->active_next_branch
= NULL
;
2058 if (e
->branch_tree
.tree
) {
2059 release_tree_content_recursive(e
->branch_tree
.tree
);
2060 e
->branch_tree
.tree
= NULL
;
2062 cur_active_branches
--;
2066 static void load_branch(struct branch
*b
)
2068 load_tree(&b
->branch_tree
);
2071 b
->active_next_branch
= active_branches
;
2072 active_branches
= b
;
2073 cur_active_branches
++;
2074 branch_load_count
++;
2078 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2080 unsigned char fanout
= 0;
2081 while ((num_notes
>>= 8))
2086 static void construct_path_with_fanout(const char *hex_sha1
,
2087 unsigned char fanout
, char *path
)
2089 unsigned int i
= 0, j
= 0;
2091 die("Too large fanout (%u)", fanout
);
2093 path
[i
++] = hex_sha1
[j
++];
2094 path
[i
++] = hex_sha1
[j
++];
2098 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2099 path
[i
+ 40 - j
] = '\0';
2102 static uintmax_t do_change_note_fanout(
2103 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2104 char *hex_sha1
, unsigned int hex_sha1_len
,
2105 char *fullpath
, unsigned int fullpath_len
,
2106 unsigned char fanout
)
2108 struct tree_content
*t
= root
->tree
;
2109 struct tree_entry
*e
, leaf
;
2110 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2111 uintmax_t num_notes
= 0;
2112 unsigned char sha1
[20];
2115 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2117 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2118 tmp_fullpath_len
= fullpath_len
;
2121 * We're interested in EITHER existing note entries (entries
2122 * with exactly 40 hex chars in path, not including directory
2123 * separators), OR directory entries that may contain note
2124 * entries (with < 40 hex chars in path).
2125 * Also, each path component in a note entry must be a multiple
2128 if (!e
->versions
[1].mode
||
2129 tmp_hex_sha1_len
> 40 ||
2130 e
->name
->str_len
% 2)
2133 /* This _may_ be a note entry, or a subdir containing notes */
2134 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2136 if (tmp_fullpath_len
)
2137 fullpath
[tmp_fullpath_len
++] = '/';
2138 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2140 tmp_fullpath_len
+= e
->name
->str_len
;
2141 fullpath
[tmp_fullpath_len
] = '\0';
2143 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2144 /* This is a note entry */
2145 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2146 if (!strcmp(fullpath
, realpath
)) {
2147 /* Note entry is in correct location */
2152 /* Rename fullpath to realpath */
2153 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2154 die("Failed to remove path %s", fullpath
);
2155 tree_content_set(orig_root
, realpath
,
2156 leaf
.versions
[1].sha1
,
2157 leaf
.versions
[1].mode
,
2159 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2160 /* This is a subdir that may contain note entries */
2163 num_notes
+= do_change_note_fanout(orig_root
, e
,
2164 hex_sha1
, tmp_hex_sha1_len
,
2165 fullpath
, tmp_fullpath_len
, fanout
);
2168 /* The above may have reallocated the current tree_content */
2174 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2175 unsigned char fanout
)
2177 char hex_sha1
[40], path
[60];
2178 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2181 static void file_change_m(struct branch
*b
)
2183 const char *p
= command_buf
.buf
+ 2;
2184 static struct strbuf uq
= STRBUF_INIT
;
2186 struct object_entry
*oe
= oe
;
2187 unsigned char sha1
[20];
2188 uint16_t mode
, inline_data
= 0;
2190 p
= get_mode(p
, &mode
);
2192 die("Corrupt mode: %s", command_buf
.buf
);
2197 case S_IFREG
| 0644:
2198 case S_IFREG
| 0755:
2205 die("Corrupt mode: %s", command_buf
.buf
);
2210 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2211 hashcpy(sha1
, oe
->idx
.sha1
);
2213 } else if (!prefixcmp(p
, "inline")) {
2217 if (get_sha1_hex(p
, sha1
))
2218 die("Invalid SHA1: %s", command_buf
.buf
);
2219 oe
= find_object(sha1
);
2223 die("Missing space after SHA1: %s", command_buf
.buf
);
2226 if (!unquote_c_style(&uq
, p
, &endp
)) {
2228 die("Garbage after path in: %s", command_buf
.buf
);
2232 /* Git does not track empty, non-toplevel directories. */
2233 if (S_ISDIR(mode
) && !memcmp(sha1
, EMPTY_TREE_SHA1_BIN
, 20) && *p
) {
2234 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2238 if (S_ISGITLINK(mode
)) {
2240 die("Git links cannot be specified 'inline': %s",
2243 if (oe
->type
!= OBJ_COMMIT
)
2244 die("Not a commit (actually a %s): %s",
2245 typename(oe
->type
), command_buf
.buf
);
2248 * Accept the sha1 without checking; it expected to be in
2249 * another repository.
2251 } else if (inline_data
) {
2253 die("Directories cannot be specified 'inline': %s",
2256 strbuf_addstr(&uq
, p
);
2259 read_next_command();
2260 parse_and_store_blob(&last_blob
, sha1
, 0);
2262 enum object_type expected
= S_ISDIR(mode
) ?
2264 enum object_type type
= oe
? oe
->type
:
2265 sha1_object_info(sha1
, NULL
);
2267 die("%s not found: %s",
2268 S_ISDIR(mode
) ? "Tree" : "Blob",
2270 if (type
!= expected
)
2271 die("Not a %s (actually a %s): %s",
2272 typename(expected
), typename(type
),
2277 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2280 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2283 static void file_change_d(struct branch
*b
)
2285 const char *p
= command_buf
.buf
+ 2;
2286 static struct strbuf uq
= STRBUF_INIT
;
2290 if (!unquote_c_style(&uq
, p
, &endp
)) {
2292 die("Garbage after path in: %s", command_buf
.buf
);
2295 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2298 static void file_change_cr(struct branch
*b
, int rename
)
2301 static struct strbuf s_uq
= STRBUF_INIT
;
2302 static struct strbuf d_uq
= STRBUF_INIT
;
2304 struct tree_entry leaf
;
2306 s
= command_buf
.buf
+ 2;
2307 strbuf_reset(&s_uq
);
2308 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2310 die("Missing space after source: %s", command_buf
.buf
);
2312 endp
= strchr(s
, ' ');
2314 die("Missing space after source: %s", command_buf
.buf
);
2315 strbuf_add(&s_uq
, s
, endp
- s
);
2321 die("Missing dest: %s", command_buf
.buf
);
2324 strbuf_reset(&d_uq
);
2325 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2327 die("Garbage after dest in: %s", command_buf
.buf
);
2331 memset(&leaf
, 0, sizeof(leaf
));
2333 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2335 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2336 if (!leaf
.versions
[1].mode
)
2337 die("Path %s not in branch", s
);
2338 if (!*d
) { /* C "path/to/subdir" "" */
2339 tree_content_replace(&b
->branch_tree
,
2340 leaf
.versions
[1].sha1
,
2341 leaf
.versions
[1].mode
,
2345 tree_content_set(&b
->branch_tree
, d
,
2346 leaf
.versions
[1].sha1
,
2347 leaf
.versions
[1].mode
,
2351 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2353 const char *p
= command_buf
.buf
+ 2;
2354 static struct strbuf uq
= STRBUF_INIT
;
2355 struct object_entry
*oe
= oe
;
2357 unsigned char sha1
[20], commit_sha1
[20];
2359 uint16_t inline_data
= 0;
2360 unsigned char new_fanout
;
2362 /* <dataref> or 'inline' */
2365 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2366 hashcpy(sha1
, oe
->idx
.sha1
);
2368 } else if (!prefixcmp(p
, "inline")) {
2372 if (get_sha1_hex(p
, sha1
))
2373 die("Invalid SHA1: %s", command_buf
.buf
);
2374 oe
= find_object(sha1
);
2378 die("Missing space after SHA1: %s", command_buf
.buf
);
2381 s
= lookup_branch(p
);
2383 hashcpy(commit_sha1
, s
->sha1
);
2384 } else if (*p
== ':') {
2385 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2386 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2387 if (commit_oe
->type
!= OBJ_COMMIT
)
2388 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2389 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2390 } else if (!get_sha1(p
, commit_sha1
)) {
2392 char *buf
= read_object_with_reference(commit_sha1
,
2393 commit_type
, &size
, commit_sha1
);
2394 if (!buf
|| size
< 46)
2395 die("Not a valid commit: %s", p
);
2398 die("Invalid ref name or SHA1 expression: %s", p
);
2402 strbuf_addstr(&uq
, p
);
2405 read_next_command();
2406 parse_and_store_blob(&last_blob
, sha1
, 0);
2408 if (oe
->type
!= OBJ_BLOB
)
2409 die("Not a blob (actually a %s): %s",
2410 typename(oe
->type
), command_buf
.buf
);
2411 } else if (!is_null_sha1(sha1
)) {
2412 enum object_type type
= sha1_object_info(sha1
, NULL
);
2414 die("Blob not found: %s", command_buf
.buf
);
2415 if (type
!= OBJ_BLOB
)
2416 die("Not a blob (actually a %s): %s",
2417 typename(type
), command_buf
.buf
);
2420 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2421 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2424 if (is_null_sha1(sha1
))
2425 return; /* nothing to insert */
2428 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2429 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2430 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2433 static void file_change_deleteall(struct branch
*b
)
2435 release_tree_content_recursive(b
->branch_tree
.tree
);
2436 hashclr(b
->branch_tree
.versions
[0].sha1
);
2437 hashclr(b
->branch_tree
.versions
[1].sha1
);
2438 load_tree(&b
->branch_tree
);
2442 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2444 if (!buf
|| size
< 46)
2445 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2446 if (memcmp("tree ", buf
, 5)
2447 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2448 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2449 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2450 b
->branch_tree
.versions
[1].sha1
);
2453 static void parse_from_existing(struct branch
*b
)
2455 if (is_null_sha1(b
->sha1
)) {
2456 hashclr(b
->branch_tree
.versions
[0].sha1
);
2457 hashclr(b
->branch_tree
.versions
[1].sha1
);
2462 buf
= read_object_with_reference(b
->sha1
,
2463 commit_type
, &size
, b
->sha1
);
2464 parse_from_commit(b
, buf
, size
);
2469 static int parse_from(struct branch
*b
)
2474 if (prefixcmp(command_buf
.buf
, "from "))
2477 if (b
->branch_tree
.tree
) {
2478 release_tree_content_recursive(b
->branch_tree
.tree
);
2479 b
->branch_tree
.tree
= NULL
;
2482 from
= strchr(command_buf
.buf
, ' ') + 1;
2483 s
= lookup_branch(from
);
2485 die("Can't create a branch from itself: %s", b
->name
);
2487 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2488 hashcpy(b
->sha1
, s
->sha1
);
2489 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2490 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2491 } else if (*from
== ':') {
2492 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2493 struct object_entry
*oe
= find_mark(idnum
);
2494 if (oe
->type
!= OBJ_COMMIT
)
2495 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2496 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2497 if (oe
->pack_id
!= MAX_PACK_ID
) {
2499 char *buf
= gfi_unpack_entry(oe
, &size
);
2500 parse_from_commit(b
, buf
, size
);
2503 parse_from_existing(b
);
2504 } else if (!get_sha1(from
, b
->sha1
))
2505 parse_from_existing(b
);
2507 die("Invalid ref name or SHA1 expression: %s", from
);
2509 read_next_command();
2513 static struct hash_list
*parse_merge(unsigned int *count
)
2515 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2520 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2521 from
= strchr(command_buf
.buf
, ' ') + 1;
2522 n
= xmalloc(sizeof(*n
));
2523 s
= lookup_branch(from
);
2525 hashcpy(n
->sha1
, s
->sha1
);
2526 else if (*from
== ':') {
2527 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2528 struct object_entry
*oe
= find_mark(idnum
);
2529 if (oe
->type
!= OBJ_COMMIT
)
2530 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2531 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2532 } else if (!get_sha1(from
, n
->sha1
)) {
2534 char *buf
= read_object_with_reference(n
->sha1
,
2535 commit_type
, &size
, n
->sha1
);
2536 if (!buf
|| size
< 46)
2537 die("Not a valid commit: %s", from
);
2540 die("Invalid ref name or SHA1 expression: %s", from
);
2549 read_next_command();
2554 static void parse_new_commit(void)
2556 static struct strbuf msg
= STRBUF_INIT
;
2559 char *author
= NULL
;
2560 char *committer
= NULL
;
2561 struct hash_list
*merge_list
= NULL
;
2562 unsigned int merge_count
;
2563 unsigned char prev_fanout
, new_fanout
;
2565 /* Obtain the branch name from the rest of our command */
2566 sp
= strchr(command_buf
.buf
, ' ') + 1;
2567 b
= lookup_branch(sp
);
2571 read_next_command();
2573 if (!prefixcmp(command_buf
.buf
, "author ")) {
2574 author
= parse_ident(command_buf
.buf
+ 7);
2575 read_next_command();
2577 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2578 committer
= parse_ident(command_buf
.buf
+ 10);
2579 read_next_command();
2582 die("Expected committer but didn't get one");
2583 parse_data(&msg
, 0, NULL
);
2584 read_next_command();
2586 merge_list
= parse_merge(&merge_count
);
2588 /* ensure the branch is active/loaded */
2589 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2590 unload_one_branch();
2594 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2597 while (command_buf
.len
> 0) {
2598 if (!prefixcmp(command_buf
.buf
, "M "))
2600 else if (!prefixcmp(command_buf
.buf
, "D "))
2602 else if (!prefixcmp(command_buf
.buf
, "R "))
2603 file_change_cr(b
, 1);
2604 else if (!prefixcmp(command_buf
.buf
, "C "))
2605 file_change_cr(b
, 0);
2606 else if (!prefixcmp(command_buf
.buf
, "N "))
2607 note_change_n(b
, prev_fanout
);
2608 else if (!strcmp("deleteall", command_buf
.buf
))
2609 file_change_deleteall(b
);
2610 else if (!prefixcmp(command_buf
.buf
, "ls "))
2613 unread_command_buf
= 1;
2616 if (read_next_command() == EOF
)
2620 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2621 if (new_fanout
!= prev_fanout
)
2622 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2624 /* build the tree and the commit */
2625 store_tree(&b
->branch_tree
);
2626 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2627 b
->branch_tree
.versions
[1].sha1
);
2629 strbuf_reset(&new_data
);
2630 strbuf_addf(&new_data
, "tree %s\n",
2631 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2632 if (!is_null_sha1(b
->sha1
))
2633 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2634 while (merge_list
) {
2635 struct hash_list
*next
= merge_list
->next
;
2636 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2640 strbuf_addf(&new_data
,
2644 author
? author
: committer
, committer
);
2645 strbuf_addbuf(&new_data
, &msg
);
2649 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2650 b
->pack_id
= pack_id
;
2651 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2654 static void parse_new_tag(void)
2656 static struct strbuf msg
= STRBUF_INIT
;
2662 uintmax_t from_mark
= 0;
2663 unsigned char sha1
[20];
2664 enum object_type type
;
2666 /* Obtain the new tag name from the rest of our command */
2667 sp
= strchr(command_buf
.buf
, ' ') + 1;
2668 t
= pool_alloc(sizeof(struct tag
));
2670 t
->name
= pool_strdup(sp
);
2672 last_tag
->next_tag
= t
;
2676 read_next_command();
2679 if (prefixcmp(command_buf
.buf
, "from "))
2680 die("Expected from command, got %s", command_buf
.buf
);
2681 from
= strchr(command_buf
.buf
, ' ') + 1;
2682 s
= lookup_branch(from
);
2684 hashcpy(sha1
, s
->sha1
);
2686 } else if (*from
== ':') {
2687 struct object_entry
*oe
;
2688 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2689 oe
= find_mark(from_mark
);
2691 hashcpy(sha1
, oe
->idx
.sha1
);
2692 } else if (!get_sha1(from
, sha1
)) {
2696 buf
= read_sha1_file(sha1
, &type
, &size
);
2697 if (!buf
|| size
< 46)
2698 die("Not a valid commit: %s", from
);
2701 die("Invalid ref name or SHA1 expression: %s", from
);
2702 read_next_command();
2705 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2706 tagger
= parse_ident(command_buf
.buf
+ 7);
2707 read_next_command();
2711 /* tag payload/message */
2712 parse_data(&msg
, 0, NULL
);
2714 /* build the tag object */
2715 strbuf_reset(&new_data
);
2717 strbuf_addf(&new_data
,
2721 sha1_to_hex(sha1
), typename(type
), t
->name
);
2723 strbuf_addf(&new_data
,
2724 "tagger %s\n", tagger
);
2725 strbuf_addch(&new_data
, '\n');
2726 strbuf_addbuf(&new_data
, &msg
);
2729 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2730 t
->pack_id
= MAX_PACK_ID
;
2732 t
->pack_id
= pack_id
;
2735 static void parse_reset_branch(void)
2740 /* Obtain the branch name from the rest of our command */
2741 sp
= strchr(command_buf
.buf
, ' ') + 1;
2742 b
= lookup_branch(sp
);
2745 hashclr(b
->branch_tree
.versions
[0].sha1
);
2746 hashclr(b
->branch_tree
.versions
[1].sha1
);
2747 if (b
->branch_tree
.tree
) {
2748 release_tree_content_recursive(b
->branch_tree
.tree
);
2749 b
->branch_tree
.tree
= NULL
;
2754 read_next_command();
2756 if (command_buf
.len
> 0)
2757 unread_command_buf
= 1;
2760 static void cat_blob_write(const char *buf
, unsigned long size
)
2762 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2763 die_errno("Write to frontend failed");
2766 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2768 struct strbuf line
= STRBUF_INIT
;
2770 enum object_type type
= 0;
2773 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2774 buf
= read_sha1_file(sha1
, &type
, &size
);
2777 buf
= gfi_unpack_entry(oe
, &size
);
2781 * Output based on batch_one_object() from cat-file.c.
2784 strbuf_reset(&line
);
2785 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2786 cat_blob_write(line
.buf
, line
.len
);
2787 strbuf_release(&line
);
2792 die("Can't read object %s", sha1_to_hex(sha1
));
2793 if (type
!= OBJ_BLOB
)
2794 die("Object %s is a %s but a blob was expected.",
2795 sha1_to_hex(sha1
), typename(type
));
2796 strbuf_reset(&line
);
2797 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2798 typename(type
), size
);
2799 cat_blob_write(line
.buf
, line
.len
);
2800 strbuf_release(&line
);
2801 cat_blob_write(buf
, size
);
2802 cat_blob_write("\n", 1);
2803 if (oe
&& oe
->pack_id
== pack_id
) {
2804 last_blob
.offset
= oe
->idx
.offset
;
2805 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2806 last_blob
.depth
= oe
->depth
;
2811 static void parse_cat_blob(void)
2814 struct object_entry
*oe
= oe
;
2815 unsigned char sha1
[20];
2817 /* cat-blob SP <object> LF */
2818 p
= command_buf
.buf
+ strlen("cat-blob ");
2821 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2823 die("Invalid mark: %s", command_buf
.buf
);
2825 die("Unknown mark: %s", command_buf
.buf
);
2827 die("Garbage after mark: %s", command_buf
.buf
);
2828 hashcpy(sha1
, oe
->idx
.sha1
);
2830 if (get_sha1_hex(p
, sha1
))
2831 die("Invalid SHA1: %s", command_buf
.buf
);
2833 die("Garbage after SHA1: %s", command_buf
.buf
);
2834 oe
= find_object(sha1
);
2840 static struct object_entry
*dereference(struct object_entry
*oe
,
2841 unsigned char sha1
[20])
2846 enum object_type type
= sha1_object_info(sha1
, NULL
);
2848 die("object not found: %s", sha1_to_hex(sha1
));
2850 oe
= insert_object(sha1
);
2852 oe
->pack_id
= MAX_PACK_ID
;
2856 case OBJ_TREE
: /* easy case. */
2862 die("Not a treeish: %s", command_buf
.buf
);
2865 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
2866 buf
= gfi_unpack_entry(oe
, &size
);
2868 enum object_type unused
;
2869 buf
= read_sha1_file(sha1
, &unused
, &size
);
2872 die("Can't load object %s", sha1_to_hex(sha1
));
2874 /* Peel one layer. */
2877 if (size
< 40 + strlen("object ") ||
2878 get_sha1_hex(buf
+ strlen("object "), sha1
))
2879 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
2882 if (size
< 40 + strlen("tree ") ||
2883 get_sha1_hex(buf
+ strlen("tree "), sha1
))
2884 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
2888 return find_object(sha1
);
2891 static struct object_entry
*parse_treeish_dataref(const char **p
)
2893 unsigned char sha1
[20];
2894 struct object_entry
*e
;
2896 if (**p
== ':') { /* <mark> */
2898 e
= find_mark(strtoumax(*p
+ 1, &endptr
, 10));
2899 if (endptr
== *p
+ 1)
2900 die("Invalid mark: %s", command_buf
.buf
);
2902 die("Unknown mark: %s", command_buf
.buf
);
2904 hashcpy(sha1
, e
->idx
.sha1
);
2905 } else { /* <sha1> */
2906 if (get_sha1_hex(*p
, sha1
))
2907 die("Invalid SHA1: %s", command_buf
.buf
);
2908 e
= find_object(sha1
);
2912 while (!e
|| e
->type
!= OBJ_TREE
)
2913 e
= dereference(e
, sha1
);
2917 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
2919 static struct strbuf line
= STRBUF_INIT
;
2921 /* See show_tree(). */
2923 S_ISGITLINK(mode
) ? commit_type
:
2924 S_ISDIR(mode
) ? tree_type
:
2928 /* missing SP path LF */
2929 strbuf_reset(&line
);
2930 strbuf_addstr(&line
, "missing ");
2931 quote_c_style(path
, &line
, NULL
, 0);
2932 strbuf_addch(&line
, '\n');
2934 /* mode SP type SP object_name TAB path LF */
2935 strbuf_reset(&line
);
2936 strbuf_addf(&line
, "%06o %s %s\t",
2937 mode
, type
, sha1_to_hex(sha1
));
2938 quote_c_style(path
, &line
, NULL
, 0);
2939 strbuf_addch(&line
, '\n');
2941 cat_blob_write(line
.buf
, line
.len
);
2944 static void parse_ls(struct branch
*b
)
2947 struct tree_entry
*root
= NULL
;
2948 struct tree_entry leaf
= {NULL
};
2950 /* ls SP (<treeish> SP)? <path> */
2951 p
= command_buf
.buf
+ strlen("ls ");
2954 die("Not in a commit: %s", command_buf
.buf
);
2955 root
= &b
->branch_tree
;
2957 struct object_entry
*e
= parse_treeish_dataref(&p
);
2958 root
= new_tree_entry();
2959 hashcpy(root
->versions
[1].sha1
, e
->idx
.sha1
);
2962 die("Missing space after tree-ish: %s", command_buf
.buf
);
2965 static struct strbuf uq
= STRBUF_INIT
;
2968 if (unquote_c_style(&uq
, p
, &endp
))
2969 die("Invalid path: %s", command_buf
.buf
);
2971 die("Garbage after path in: %s", command_buf
.buf
);
2974 tree_content_get(root
, p
, &leaf
);
2976 * A directory in preparation would have a sha1 of zero
2977 * until it is saved. Save, for simplicity.
2979 if (S_ISDIR(leaf
.versions
[1].mode
))
2982 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].sha1
, p
);
2983 if (!b
|| root
!= &b
->branch_tree
)
2984 release_tree_entry(root
);
2987 static void checkpoint(void)
2989 checkpoint_requested
= 0;
2998 static void parse_checkpoint(void)
3000 checkpoint_requested
= 1;
3004 static void parse_progress(void)
3006 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3007 fputc('\n', stdout
);
3012 static char* make_fast_import_path(const char *path
)
3014 struct strbuf abs_path
= STRBUF_INIT
;
3016 if (!relative_marks_paths
|| is_absolute_path(path
))
3017 return xstrdup(path
);
3018 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
3019 return strbuf_detach(&abs_path
, NULL
);
3022 static void option_import_marks(const char *marks
,
3023 int from_stream
, int ignore_missing
)
3025 if (import_marks_file
) {
3027 die("Only one import-marks command allowed per stream");
3029 /* read previous mark file */
3030 if(!import_marks_file_from_stream
)
3034 import_marks_file
= make_fast_import_path(marks
);
3035 safe_create_leading_directories_const(import_marks_file
);
3036 import_marks_file_from_stream
= from_stream
;
3037 import_marks_file_ignore_missing
= ignore_missing
;
3040 static void option_date_format(const char *fmt
)
3042 if (!strcmp(fmt
, "raw"))
3043 whenspec
= WHENSPEC_RAW
;
3044 else if (!strcmp(fmt
, "rfc2822"))
3045 whenspec
= WHENSPEC_RFC2822
;
3046 else if (!strcmp(fmt
, "now"))
3047 whenspec
= WHENSPEC_NOW
;
3049 die("unknown --date-format argument %s", fmt
);
3052 static unsigned long ulong_arg(const char *option
, const char *arg
)
3055 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3056 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3057 die("%s: argument must be a non-negative integer", option
);
3061 static void option_depth(const char *depth
)
3063 max_depth
= ulong_arg("--depth", depth
);
3064 if (max_depth
> MAX_DEPTH
)
3065 die("--depth cannot exceed %u", MAX_DEPTH
);
3068 static void option_active_branches(const char *branches
)
3070 max_active_branches
= ulong_arg("--active-branches", branches
);
3073 static void option_export_marks(const char *marks
)
3075 export_marks_file
= make_fast_import_path(marks
);
3076 safe_create_leading_directories_const(export_marks_file
);
3079 static void option_cat_blob_fd(const char *fd
)
3081 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3082 if (n
> (unsigned long) INT_MAX
)
3083 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3084 cat_blob_fd
= (int) n
;
3087 static void option_export_pack_edges(const char *edges
)
3091 pack_edges
= fopen(edges
, "a");
3093 die_errno("Cannot open '%s'", edges
);
3096 static int parse_one_option(const char *option
)
3098 if (!prefixcmp(option
, "max-pack-size=")) {
3100 if (!git_parse_ulong(option
+ 14, &v
))
3103 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3105 } else if (v
< 1024 * 1024) {
3106 warning("minimum max-pack-size is 1 MiB");
3110 } else if (!prefixcmp(option
, "big-file-threshold=")) {
3112 if (!git_parse_ulong(option
+ 19, &v
))
3114 big_file_threshold
= v
;
3115 } else if (!prefixcmp(option
, "depth=")) {
3116 option_depth(option
+ 6);
3117 } else if (!prefixcmp(option
, "active-branches=")) {
3118 option_active_branches(option
+ 16);
3119 } else if (!prefixcmp(option
, "export-pack-edges=")) {
3120 option_export_pack_edges(option
+ 18);
3121 } else if (!prefixcmp(option
, "quiet")) {
3123 } else if (!prefixcmp(option
, "stats")) {
3132 static int parse_one_feature(const char *feature
, int from_stream
)
3134 if (!prefixcmp(feature
, "date-format=")) {
3135 option_date_format(feature
+ 12);
3136 } else if (!prefixcmp(feature
, "import-marks=")) {
3137 option_import_marks(feature
+ 13, from_stream
, 0);
3138 } else if (!prefixcmp(feature
, "import-marks-if-exists=")) {
3139 option_import_marks(feature
+ strlen("import-marks-if-exists="),
3141 } else if (!prefixcmp(feature
, "export-marks=")) {
3142 option_export_marks(feature
+ 13);
3143 } else if (!strcmp(feature
, "cat-blob")) {
3144 ; /* Don't die - this feature is supported */
3145 } else if (!strcmp(feature
, "relative-marks")) {
3146 relative_marks_paths
= 1;
3147 } else if (!strcmp(feature
, "no-relative-marks")) {
3148 relative_marks_paths
= 0;
3149 } else if (!strcmp(feature
, "force")) {
3151 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3152 ; /* do nothing; we have the feature */
3160 static void parse_feature(void)
3162 char *feature
= command_buf
.buf
+ 8;
3164 if (seen_data_command
)
3165 die("Got feature command '%s' after data command", feature
);
3167 if (parse_one_feature(feature
, 1))
3170 die("This version of fast-import does not support feature %s.", feature
);
3173 static void parse_option(void)
3175 char *option
= command_buf
.buf
+ 11;
3177 if (seen_data_command
)
3178 die("Got option command '%s' after data command", option
);
3180 if (parse_one_option(option
))
3183 die("This version of fast-import does not support option: %s", option
);
3186 static int git_pack_config(const char *k
, const char *v
, void *cb
)
3188 if (!strcmp(k
, "pack.depth")) {
3189 max_depth
= git_config_int(k
, v
);
3190 if (max_depth
> MAX_DEPTH
)
3191 max_depth
= MAX_DEPTH
;
3194 if (!strcmp(k
, "pack.compression")) {
3195 int level
= git_config_int(k
, v
);
3197 level
= Z_DEFAULT_COMPRESSION
;
3198 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
3199 die("bad pack compression level %d", level
);
3200 pack_compression_level
= level
;
3201 pack_compression_seen
= 1;
3204 if (!strcmp(k
, "pack.indexversion")) {
3205 pack_idx_default_version
= git_config_int(k
, v
);
3206 if (pack_idx_default_version
> 2)
3207 die("bad pack.indexversion=%"PRIu32
,
3208 pack_idx_default_version
);
3211 if (!strcmp(k
, "pack.packsizelimit")) {
3212 max_packsize
= git_config_ulong(k
, v
);
3215 return git_default_config(k
, v
, cb
);
3218 static const char fast_import_usage
[] =
3219 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3221 static void parse_argv(void)
3225 for (i
= 1; i
< global_argc
; i
++) {
3226 const char *a
= global_argv
[i
];
3228 if (*a
!= '-' || !strcmp(a
, "--"))
3231 if (parse_one_option(a
+ 2))
3234 if (parse_one_feature(a
+ 2, 0))
3237 if (!prefixcmp(a
+ 2, "cat-blob-fd=")) {
3238 option_cat_blob_fd(a
+ 2 + strlen("cat-blob-fd="));
3242 die("unknown option %s", a
);
3244 if (i
!= global_argc
)
3245 usage(fast_import_usage
);
3247 seen_data_command
= 1;
3248 if (import_marks_file
)
3252 int main(int argc
, const char **argv
)
3256 git_extract_argv0_path(argv
[0]);
3258 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3259 usage(fast_import_usage
);
3261 setup_git_directory();
3262 git_config(git_pack_config
, NULL
);
3263 if (!pack_compression_seen
&& core_compression_seen
)
3264 pack_compression_level
= core_compression_level
;
3266 alloc_objects(object_entry_alloc
);
3267 strbuf_init(&command_buf
, 0);
3268 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3269 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3270 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3271 marks
= pool_calloc(1, sizeof(struct mark_set
));
3276 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3277 for (i
= 0; i
< (cmd_save
- 1); i
++)
3278 rc_free
[i
].next
= &rc_free
[i
+ 1];
3279 rc_free
[cmd_save
- 1].next
= NULL
;
3281 prepare_packed_git();
3283 set_die_routine(die_nicely
);
3284 set_checkpoint_signal();
3285 while (read_next_command() != EOF
) {
3286 if (!strcmp("blob", command_buf
.buf
))
3288 else if (!prefixcmp(command_buf
.buf
, "ls "))
3290 else if (!prefixcmp(command_buf
.buf
, "commit "))
3292 else if (!prefixcmp(command_buf
.buf
, "tag "))
3294 else if (!prefixcmp(command_buf
.buf
, "reset "))
3295 parse_reset_branch();
3296 else if (!strcmp("checkpoint", command_buf
.buf
))
3298 else if (!prefixcmp(command_buf
.buf
, "progress "))
3300 else if (!prefixcmp(command_buf
.buf
, "feature "))
3302 else if (!prefixcmp(command_buf
.buf
, "option git "))
3304 else if (!prefixcmp(command_buf
.buf
, "option "))
3305 /* ignore non-git options*/;
3307 die("Unsupported command: %s", command_buf
.buf
);
3309 if (checkpoint_requested
)
3313 /* argv hasn't been parsed yet, do so */
3314 if (!seen_data_command
)
3328 uintmax_t total_count
= 0, duplicate_count
= 0;
3329 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3330 total_count
+= object_count_by_type
[i
];
3331 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3332 duplicate_count
+= duplicate_count_by_type
[i
];
3334 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3335 fprintf(stderr
, "---------------------------------------------------------------------\n");
3336 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3337 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3338 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
]);
3339 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
]);
3340 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
]);
3341 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
]);
3342 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3343 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3344 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3345 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3346 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3347 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3348 fprintf(stderr
, "---------------------------------------------------------------------\n");
3350 fprintf(stderr
, "---------------------------------------------------------------------\n");
3351 fprintf(stderr
, "\n");
3354 return failure
? 1 : 0;