3 #include "repository.h"
13 #include "csum-file.h"
16 #include "run-command.h"
18 #include "object-store.h"
20 #include "commit-reach.h"
22 #define PACK_ID_BITS 16
23 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
25 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
28 * We abuse the setuid bit on directories to mean "do not delta".
30 #define NO_DELTA S_ISUID
33 struct pack_idx_entry idx
;
34 struct object_entry
*next
;
35 uint32_t type
: TYPE_BITS
,
36 pack_id
: PACK_ID_BITS
,
40 struct object_entry_pool
{
41 struct object_entry_pool
*next_pool
;
42 struct object_entry
*next_free
;
43 struct object_entry
*end
;
44 struct object_entry entries
[FLEX_ARRAY
]; /* more */
49 struct object_entry
*marked
[1024];
50 struct mark_set
*sets
[1024];
63 struct atom_str
*next_atom
;
64 unsigned short str_len
;
65 char str_dat
[FLEX_ARRAY
]; /* more */
70 struct tree_content
*tree
;
71 struct atom_str
*name
;
72 struct tree_entry_ms
{
79 unsigned int entry_capacity
; /* must match avail_tree_content */
80 unsigned int entry_count
;
81 unsigned int delta_depth
;
82 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
85 struct avail_tree_content
{
86 unsigned int entry_capacity
; /* must match tree_content */
87 struct avail_tree_content
*next_avail
;
91 struct branch
*table_next_branch
;
92 struct branch
*active_next_branch
;
94 struct tree_entry branch_tree
;
95 uintmax_t last_commit
;
99 unsigned pack_id
: PACK_ID_BITS
;
100 struct object_id oid
;
104 struct tag
*next_tag
;
106 unsigned int pack_id
;
107 struct object_id oid
;
111 struct hash_list
*next
;
112 struct object_id oid
;
121 struct recent_command
{
122 struct recent_command
*prev
;
123 struct recent_command
*next
;
127 /* Configured limits on output */
128 static unsigned long max_depth
= 50;
129 static off_t max_packsize
;
130 static int unpack_limit
= 100;
131 static int force_update
;
133 /* Stats and misc. counters */
134 static uintmax_t alloc_count
;
135 static uintmax_t marks_set_count
;
136 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
137 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
138 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
139 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
140 static unsigned long object_count
;
141 static unsigned long branch_count
;
142 static unsigned long branch_load_count
;
144 static FILE *pack_edges
;
145 static unsigned int show_stats
= 1;
146 static int global_argc
;
147 static const char **global_argv
;
150 static struct mem_pool fi_mem_pool
= {NULL
, 2*1024*1024 -
151 sizeof(struct mp_block
), 0 };
153 /* Atom management */
154 static unsigned int atom_table_sz
= 4451;
155 static unsigned int atom_cnt
;
156 static struct atom_str
**atom_table
;
158 /* The .pack file being generated */
159 static struct pack_idx_option pack_idx_opts
;
160 static unsigned int pack_id
;
161 static struct hashfile
*pack_file
;
162 static struct packed_git
*pack_data
;
163 static struct packed_git
**all_packs
;
164 static off_t pack_size
;
166 /* Table of objects we've written. */
167 static unsigned int object_entry_alloc
= 5000;
168 static struct object_entry_pool
*blocks
;
169 static struct object_entry
*object_table
[1 << 16];
170 static struct mark_set
*marks
;
171 static const char *export_marks_file
;
172 static const char *import_marks_file
;
173 static int import_marks_file_from_stream
;
174 static int import_marks_file_ignore_missing
;
175 static int import_marks_file_done
;
176 static int relative_marks_paths
;
179 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
181 /* Tree management */
182 static unsigned int tree_entry_alloc
= 1000;
183 static void *avail_tree_entry
;
184 static unsigned int avail_tree_table_sz
= 100;
185 static struct avail_tree_content
**avail_tree_table
;
186 static size_t tree_entry_allocd
;
187 static struct strbuf old_tree
= STRBUF_INIT
;
188 static struct strbuf new_tree
= STRBUF_INIT
;
191 static unsigned long max_active_branches
= 5;
192 static unsigned long cur_active_branches
;
193 static unsigned long branch_table_sz
= 1039;
194 static struct branch
**branch_table
;
195 static struct branch
*active_branches
;
198 static struct tag
*first_tag
;
199 static struct tag
*last_tag
;
201 /* Input stream parsing */
202 static whenspec_type whenspec
= WHENSPEC_RAW
;
203 static struct strbuf command_buf
= STRBUF_INIT
;
204 static int unread_command_buf
;
205 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
206 static struct recent_command
*cmd_tail
= &cmd_hist
;
207 static struct recent_command
*rc_free
;
208 static unsigned int cmd_save
= 100;
209 static uintmax_t next_mark
;
210 static struct strbuf new_data
= STRBUF_INIT
;
211 static int seen_data_command
;
212 static int require_explicit_termination
;
214 /* Signal handling */
215 static volatile sig_atomic_t checkpoint_requested
;
217 /* Where to write output of cat-blob commands */
218 static int cat_blob_fd
= STDOUT_FILENO
;
220 static void parse_argv(void);
221 static void parse_get_mark(const char *p
);
222 static void parse_cat_blob(const char *p
);
223 static void parse_ls(const char *p
, struct branch
*b
);
225 static void write_branch_report(FILE *rpt
, struct branch
*b
)
227 fprintf(rpt
, "%s:\n", b
->name
);
229 fprintf(rpt
, " status :");
231 fputs(" active", rpt
);
232 if (b
->branch_tree
.tree
)
233 fputs(" loaded", rpt
);
234 if (is_null_oid(&b
->branch_tree
.versions
[1].oid
))
235 fputs(" dirty", rpt
);
238 fprintf(rpt
, " tip commit : %s\n", oid_to_hex(&b
->oid
));
239 fprintf(rpt
, " old tree : %s\n",
240 oid_to_hex(&b
->branch_tree
.versions
[0].oid
));
241 fprintf(rpt
, " cur tree : %s\n",
242 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
243 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
245 fputs(" last pack : ", rpt
);
246 if (b
->pack_id
< MAX_PACK_ID
)
247 fprintf(rpt
, "%u", b
->pack_id
);
253 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
255 static void write_crash_report(const char *err
)
257 char *loc
= git_pathdup("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
258 FILE *rpt
= fopen(loc
, "w");
261 struct recent_command
*rc
;
264 error_errno("can't write crash report %s", loc
);
269 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
271 fprintf(rpt
, "fast-import crash report:\n");
272 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
273 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
274 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_MODE(ISO8601
)));
277 fputs("fatal: ", rpt
);
282 fputs("Most Recent Commands Before Crash\n", rpt
);
283 fputs("---------------------------------\n", rpt
);
284 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
285 if (rc
->next
== &cmd_hist
)
294 fputs("Active Branch LRU\n", rpt
);
295 fputs("-----------------\n", rpt
);
296 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
298 max_active_branches
);
300 fputs(" pos clock name\n", rpt
);
301 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
302 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
303 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
304 ++lu
, b
->last_commit
, b
->name
);
307 fputs("Inactive Branches\n", rpt
);
308 fputs("-----------------\n", rpt
);
309 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
310 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
311 write_branch_report(rpt
, b
);
317 fputs("Annotated Tags\n", rpt
);
318 fputs("--------------\n", rpt
);
319 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
320 fputs(oid_to_hex(&tg
->oid
), rpt
);
322 fputs(tg
->name
, rpt
);
328 fputs("Marks\n", rpt
);
329 fputs("-----\n", rpt
);
330 if (export_marks_file
)
331 fprintf(rpt
, " exported to %s\n", export_marks_file
);
333 dump_marks_helper(rpt
, 0, marks
);
336 fputs("-------------------\n", rpt
);
337 fputs("END OF CRASH REPORT\n", rpt
);
342 static void end_packfile(void);
343 static void unkeep_all_packs(void);
344 static void dump_marks(void);
346 static NORETURN
void die_nicely(const char *err
, va_list params
)
349 char message
[2 * PATH_MAX
];
351 vsnprintf(message
, sizeof(message
), err
, params
);
352 fputs("fatal: ", stderr
);
353 fputs(message
, stderr
);
358 write_crash_report(message
);
366 #ifndef SIGUSR1 /* Windows, for example */
368 static void set_checkpoint_signal(void)
374 static void checkpoint_signal(int signo
)
376 checkpoint_requested
= 1;
379 static void set_checkpoint_signal(void)
383 memset(&sa
, 0, sizeof(sa
));
384 sa
.sa_handler
= checkpoint_signal
;
385 sigemptyset(&sa
.sa_mask
);
386 sa
.sa_flags
= SA_RESTART
;
387 sigaction(SIGUSR1
, &sa
, NULL
);
392 static void alloc_objects(unsigned int cnt
)
394 struct object_entry_pool
*b
;
396 b
= xmalloc(sizeof(struct object_entry_pool
)
397 + cnt
* sizeof(struct object_entry
));
398 b
->next_pool
= blocks
;
399 b
->next_free
= b
->entries
;
400 b
->end
= b
->entries
+ cnt
;
405 static struct object_entry
*new_object(struct object_id
*oid
)
407 struct object_entry
*e
;
409 if (blocks
->next_free
== blocks
->end
)
410 alloc_objects(object_entry_alloc
);
412 e
= blocks
->next_free
++;
413 oidcpy(&e
->idx
.oid
, oid
);
417 static struct object_entry
*find_object(struct object_id
*oid
)
419 unsigned int h
= oid
->hash
[0] << 8 | oid
->hash
[1];
420 struct object_entry
*e
;
421 for (e
= object_table
[h
]; e
; e
= e
->next
)
422 if (oideq(oid
, &e
->idx
.oid
))
427 static struct object_entry
*insert_object(struct object_id
*oid
)
429 unsigned int h
= oid
->hash
[0] << 8 | oid
->hash
[1];
430 struct object_entry
*e
= object_table
[h
];
433 if (oideq(oid
, &e
->idx
.oid
))
439 e
->next
= object_table
[h
];
445 static void invalidate_pack_id(unsigned int id
)
451 for (h
= 0; h
< ARRAY_SIZE(object_table
); h
++) {
452 struct object_entry
*e
;
454 for (e
= object_table
[h
]; e
; e
= e
->next
)
455 if (e
->pack_id
== id
)
456 e
->pack_id
= MAX_PACK_ID
;
459 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
462 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
463 if (b
->pack_id
== id
)
464 b
->pack_id
= MAX_PACK_ID
;
467 for (t
= first_tag
; t
; t
= t
->next_tag
)
468 if (t
->pack_id
== id
)
469 t
->pack_id
= MAX_PACK_ID
;
472 static unsigned int hc_str(const char *s
, size_t len
)
480 static char *pool_strdup(const char *s
)
482 size_t len
= strlen(s
) + 1;
483 char *r
= mem_pool_alloc(&fi_mem_pool
, len
);
488 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
490 struct mark_set
*s
= marks
;
491 while ((idnum
>> s
->shift
) >= 1024) {
492 s
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
493 s
->shift
= marks
->shift
+ 10;
494 s
->data
.sets
[0] = marks
;
498 uintmax_t i
= idnum
>> s
->shift
;
499 idnum
-= i
<< s
->shift
;
500 if (!s
->data
.sets
[i
]) {
501 s
->data
.sets
[i
] = mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
502 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
506 if (!s
->data
.marked
[idnum
])
508 s
->data
.marked
[idnum
] = oe
;
511 static struct object_entry
*find_mark(uintmax_t idnum
)
513 uintmax_t orig_idnum
= idnum
;
514 struct mark_set
*s
= marks
;
515 struct object_entry
*oe
= NULL
;
516 if ((idnum
>> s
->shift
) < 1024) {
517 while (s
&& s
->shift
) {
518 uintmax_t i
= idnum
>> s
->shift
;
519 idnum
-= i
<< s
->shift
;
523 oe
= s
->data
.marked
[idnum
];
526 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
530 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
532 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
535 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
536 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
539 c
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct atom_str
) + len
+ 1);
541 memcpy(c
->str_dat
, s
, len
);
543 c
->next_atom
= atom_table
[hc
];
549 static struct branch
*lookup_branch(const char *name
)
551 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
554 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
555 if (!strcmp(name
, b
->name
))
560 static struct branch
*new_branch(const char *name
)
562 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
563 struct branch
*b
= lookup_branch(name
);
566 die("Invalid attempt to create duplicate branch: %s", name
);
567 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
568 die("Branch name doesn't conform to GIT standards: %s", name
);
570 b
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct branch
));
571 b
->name
= pool_strdup(name
);
572 b
->table_next_branch
= branch_table
[hc
];
573 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
574 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
577 b
->pack_id
= MAX_PACK_ID
;
578 branch_table
[hc
] = b
;
583 static unsigned int hc_entries(unsigned int cnt
)
585 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
586 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
589 static struct tree_content
*new_tree_content(unsigned int cnt
)
591 struct avail_tree_content
*f
, *l
= NULL
;
592 struct tree_content
*t
;
593 unsigned int hc
= hc_entries(cnt
);
595 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
596 if (f
->entry_capacity
>= cnt
)
601 l
->next_avail
= f
->next_avail
;
603 avail_tree_table
[hc
] = f
->next_avail
;
605 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
606 f
= mem_pool_alloc(&fi_mem_pool
, sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
607 f
->entry_capacity
= cnt
;
610 t
= (struct tree_content
*)f
;
616 static void release_tree_entry(struct tree_entry
*e
);
617 static void release_tree_content(struct tree_content
*t
)
619 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
620 unsigned int hc
= hc_entries(f
->entry_capacity
);
621 f
->next_avail
= avail_tree_table
[hc
];
622 avail_tree_table
[hc
] = f
;
625 static void release_tree_content_recursive(struct tree_content
*t
)
628 for (i
= 0; i
< t
->entry_count
; i
++)
629 release_tree_entry(t
->entries
[i
]);
630 release_tree_content(t
);
633 static struct tree_content
*grow_tree_content(
634 struct tree_content
*t
,
637 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
638 r
->entry_count
= t
->entry_count
;
639 r
->delta_depth
= t
->delta_depth
;
640 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
641 release_tree_content(t
);
645 static struct tree_entry
*new_tree_entry(void)
647 struct tree_entry
*e
;
649 if (!avail_tree_entry
) {
650 unsigned int n
= tree_entry_alloc
;
651 tree_entry_allocd
+= n
* sizeof(struct tree_entry
);
653 avail_tree_entry
= e
;
655 *((void**)e
) = e
+ 1;
661 e
= avail_tree_entry
;
662 avail_tree_entry
= *((void**)e
);
666 static void release_tree_entry(struct tree_entry
*e
)
669 release_tree_content_recursive(e
->tree
);
670 *((void**)e
) = avail_tree_entry
;
671 avail_tree_entry
= e
;
674 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
676 struct tree_content
*d
;
677 struct tree_entry
*a
, *b
;
682 d
= new_tree_content(s
->entry_count
);
683 for (i
= 0; i
< s
->entry_count
; i
++) {
685 b
= new_tree_entry();
686 memcpy(b
, a
, sizeof(*a
));
687 if (a
->tree
&& is_null_oid(&b
->versions
[1].oid
))
688 b
->tree
= dup_tree_content(a
->tree
);
693 d
->entry_count
= s
->entry_count
;
694 d
->delta_depth
= s
->delta_depth
;
699 static void start_packfile(void)
701 struct strbuf tmp_file
= STRBUF_INIT
;
702 struct packed_git
*p
;
703 struct pack_header hdr
;
706 pack_fd
= odb_mkstemp(&tmp_file
, "pack/tmp_pack_XXXXXX");
707 FLEX_ALLOC_STR(p
, pack_name
, tmp_file
.buf
);
708 strbuf_release(&tmp_file
);
710 p
->pack_fd
= pack_fd
;
712 pack_file
= hashfd(pack_fd
, p
->pack_name
);
714 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
715 hdr
.hdr_version
= htonl(2);
717 hashwrite(pack_file
, &hdr
, sizeof(hdr
));
720 pack_size
= sizeof(hdr
);
723 REALLOC_ARRAY(all_packs
, pack_id
+ 1);
724 all_packs
[pack_id
] = p
;
727 static const char *create_index(void)
730 struct pack_idx_entry
**idx
, **c
, **last
;
731 struct object_entry
*e
;
732 struct object_entry_pool
*o
;
734 /* Build the table of object IDs. */
735 ALLOC_ARRAY(idx
, object_count
);
737 for (o
= blocks
; o
; o
= o
->next_pool
)
738 for (e
= o
->next_free
; e
-- != o
->entries
;)
739 if (pack_id
== e
->pack_id
)
741 last
= idx
+ object_count
;
743 die("internal consistency error creating the index");
745 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
, pack_data
->sha1
);
750 static char *keep_pack(const char *curr_index_name
)
752 static const char *keep_msg
= "fast-import";
753 struct strbuf name
= STRBUF_INIT
;
756 odb_pack_name(&name
, pack_data
->sha1
, "keep");
757 keep_fd
= odb_pack_keep(name
.buf
);
759 die_errno("cannot create keep file");
760 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
762 die_errno("failed to write keep file");
764 odb_pack_name(&name
, pack_data
->sha1
, "pack");
765 if (finalize_object_file(pack_data
->pack_name
, name
.buf
))
766 die("cannot store pack file");
768 odb_pack_name(&name
, pack_data
->sha1
, "idx");
769 if (finalize_object_file(curr_index_name
, name
.buf
))
770 die("cannot store index file");
771 free((void *)curr_index_name
);
772 return strbuf_detach(&name
, NULL
);
775 static void unkeep_all_packs(void)
777 struct strbuf name
= STRBUF_INIT
;
780 for (k
= 0; k
< pack_id
; k
++) {
781 struct packed_git
*p
= all_packs
[k
];
782 odb_pack_name(&name
, p
->sha1
, "keep");
783 unlink_or_warn(name
.buf
);
785 strbuf_release(&name
);
788 static int loosen_small_pack(const struct packed_git
*p
)
790 struct child_process unpack
= CHILD_PROCESS_INIT
;
792 if (lseek(p
->pack_fd
, 0, SEEK_SET
) < 0)
793 die_errno("Failed seeking to start of '%s'", p
->pack_name
);
795 unpack
.in
= p
->pack_fd
;
797 unpack
.stdout_to_stderr
= 1;
798 argv_array_push(&unpack
.args
, "unpack-objects");
800 argv_array_push(&unpack
.args
, "-q");
802 return run_command(&unpack
);
805 static void end_packfile(void)
809 if (running
|| !pack_data
)
813 clear_delta_base_cache();
815 struct packed_git
*new_p
;
816 struct object_id cur_pack_oid
;
822 close_pack_windows(pack_data
);
823 finalize_hashfile(pack_file
, cur_pack_oid
.hash
, 0);
824 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
825 pack_data
->pack_name
, object_count
,
826 cur_pack_oid
.hash
, pack_size
);
828 if (object_count
<= unpack_limit
) {
829 if (!loosen_small_pack(pack_data
)) {
830 invalidate_pack_id(pack_id
);
835 close(pack_data
->pack_fd
);
836 idx_name
= keep_pack(create_index());
838 /* Register the packfile with core git's machinery. */
839 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
841 die("core git rejected index %s", idx_name
);
842 all_packs
[pack_id
] = new_p
;
843 install_packed_git(the_repository
, new_p
);
846 /* Print the boundary */
848 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
849 for (i
= 0; i
< branch_table_sz
; i
++) {
850 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
851 if (b
->pack_id
== pack_id
)
852 fprintf(pack_edges
, " %s",
853 oid_to_hex(&b
->oid
));
856 for (t
= first_tag
; t
; t
= t
->next_tag
) {
857 if (t
->pack_id
== pack_id
)
858 fprintf(pack_edges
, " %s",
859 oid_to_hex(&t
->oid
));
861 fputc('\n', pack_edges
);
869 close(pack_data
->pack_fd
);
870 unlink_or_warn(pack_data
->pack_name
);
872 FREE_AND_NULL(pack_data
);
875 /* We can't carry a delta across packfiles. */
876 strbuf_release(&last_blob
.data
);
877 last_blob
.offset
= 0;
881 static void cycle_packfile(void)
887 static int store_object(
888 enum object_type type
,
890 struct last_object
*last
,
891 struct object_id
*oidout
,
895 struct object_entry
*e
;
896 unsigned char hdr
[96];
897 struct object_id oid
;
898 unsigned long hdrlen
, deltalen
;
902 hdrlen
= xsnprintf((char *)hdr
, sizeof(hdr
), "%s %lu",
903 type_name(type
), (unsigned long)dat
->len
) + 1;
904 the_hash_algo
->init_fn(&c
);
905 the_hash_algo
->update_fn(&c
, hdr
, hdrlen
);
906 the_hash_algo
->update_fn(&c
, dat
->buf
, dat
->len
);
907 the_hash_algo
->final_fn(oid
.hash
, &c
);
909 oidcpy(oidout
, &oid
);
911 e
= insert_object(&oid
);
913 insert_mark(mark
, e
);
915 duplicate_count_by_type
[type
]++;
917 } else if (find_sha1_pack(oid
.hash
,
918 get_all_packs(the_repository
))) {
920 e
->pack_id
= MAX_PACK_ID
;
921 e
->idx
.offset
= 1; /* just not zero! */
922 duplicate_count_by_type
[type
]++;
926 if (last
&& last
->data
.len
&& last
->data
.buf
&& last
->depth
< max_depth
927 && dat
->len
> the_hash_algo
->rawsz
) {
929 delta_count_attempts_by_type
[type
]++;
930 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
932 &deltalen
, dat
->len
- the_hash_algo
->rawsz
);
936 git_deflate_init(&s
, pack_compression_level
);
939 s
.avail_in
= deltalen
;
941 s
.next_in
= (void *)dat
->buf
;
942 s
.avail_in
= dat
->len
;
944 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
945 s
.next_out
= out
= xmalloc(s
.avail_out
);
946 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
950 /* Determine if we should auto-checkpoint. */
951 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
952 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
954 /* This new object needs to *not* have the current pack_id. */
955 e
->pack_id
= pack_id
+ 1;
958 /* We cannot carry a delta into the new pack. */
960 FREE_AND_NULL(delta
);
962 git_deflate_init(&s
, pack_compression_level
);
963 s
.next_in
= (void *)dat
->buf
;
964 s
.avail_in
= dat
->len
;
965 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
966 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
967 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
974 e
->pack_id
= pack_id
;
975 e
->idx
.offset
= pack_size
;
977 object_count_by_type
[type
]++;
979 crc32_begin(pack_file
);
982 off_t ofs
= e
->idx
.offset
- last
->offset
;
983 unsigned pos
= sizeof(hdr
) - 1;
985 delta_count_by_type
[type
]++;
986 e
->depth
= last
->depth
+ 1;
988 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
989 OBJ_OFS_DELTA
, deltalen
);
990 hashwrite(pack_file
, hdr
, hdrlen
);
993 hdr
[pos
] = ofs
& 127;
995 hdr
[--pos
] = 128 | (--ofs
& 127);
996 hashwrite(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
997 pack_size
+= sizeof(hdr
) - pos
;
1000 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1002 hashwrite(pack_file
, hdr
, hdrlen
);
1003 pack_size
+= hdrlen
;
1006 hashwrite(pack_file
, out
, s
.total_out
);
1007 pack_size
+= s
.total_out
;
1009 e
->idx
.crc32
= crc32_end(pack_file
);
1014 if (last
->no_swap
) {
1017 strbuf_swap(&last
->data
, dat
);
1019 last
->offset
= e
->idx
.offset
;
1020 last
->depth
= e
->depth
;
1025 static void truncate_pack(struct hashfile_checkpoint
*checkpoint
)
1027 if (hashfile_truncate(pack_file
, checkpoint
))
1028 die_errno("cannot truncate pack to skip duplicate");
1029 pack_size
= checkpoint
->offset
;
1032 static void stream_blob(uintmax_t len
, struct object_id
*oidout
, uintmax_t mark
)
1034 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1035 unsigned char *in_buf
= xmalloc(in_sz
);
1036 unsigned char *out_buf
= xmalloc(out_sz
);
1037 struct object_entry
*e
;
1038 struct object_id oid
;
1039 unsigned long hdrlen
;
1043 struct hashfile_checkpoint checkpoint
;
1046 /* Determine if we should auto-checkpoint. */
1047 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1048 || (pack_size
+ 60 + len
) < pack_size
)
1051 hashfile_checkpoint(pack_file
, &checkpoint
);
1052 offset
= checkpoint
.offset
;
1054 hdrlen
= xsnprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1056 the_hash_algo
->init_fn(&c
);
1057 the_hash_algo
->update_fn(&c
, out_buf
, hdrlen
);
1059 crc32_begin(pack_file
);
1061 git_deflate_init(&s
, pack_compression_level
);
1063 hdrlen
= encode_in_pack_object_header(out_buf
, out_sz
, OBJ_BLOB
, len
);
1065 s
.next_out
= out_buf
+ hdrlen
;
1066 s
.avail_out
= out_sz
- hdrlen
;
1068 while (status
!= Z_STREAM_END
) {
1069 if (0 < len
&& !s
.avail_in
) {
1070 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1071 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1072 if (!n
&& feof(stdin
))
1073 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1075 the_hash_algo
->update_fn(&c
, in_buf
, n
);
1081 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1083 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1084 size_t n
= s
.next_out
- out_buf
;
1085 hashwrite(pack_file
, out_buf
, n
);
1087 s
.next_out
= out_buf
;
1088 s
.avail_out
= out_sz
;
1097 die("unexpected deflate failure: %d", status
);
1100 git_deflate_end(&s
);
1101 the_hash_algo
->final_fn(oid
.hash
, &c
);
1104 oidcpy(oidout
, &oid
);
1106 e
= insert_object(&oid
);
1109 insert_mark(mark
, e
);
1111 if (e
->idx
.offset
) {
1112 duplicate_count_by_type
[OBJ_BLOB
]++;
1113 truncate_pack(&checkpoint
);
1115 } else if (find_sha1_pack(oid
.hash
,
1116 get_all_packs(the_repository
))) {
1118 e
->pack_id
= MAX_PACK_ID
;
1119 e
->idx
.offset
= 1; /* just not zero! */
1120 duplicate_count_by_type
[OBJ_BLOB
]++;
1121 truncate_pack(&checkpoint
);
1126 e
->pack_id
= pack_id
;
1127 e
->idx
.offset
= offset
;
1128 e
->idx
.crc32
= crc32_end(pack_file
);
1130 object_count_by_type
[OBJ_BLOB
]++;
1137 /* All calls must be guarded by find_object() or find_mark() to
1138 * ensure the 'struct object_entry' passed was written by this
1139 * process instance. We unpack the entry by the offset, avoiding
1140 * the need for the corresponding .idx file. This unpacking rule
1141 * works because we only use OBJ_REF_DELTA within the packfiles
1142 * created by fast-import.
1144 * oe must not be NULL. Such an oe usually comes from giving
1145 * an unknown SHA-1 to find_object() or an undefined mark to
1146 * find_mark(). Callers must test for this condition and use
1147 * the standard read_sha1_file() when it happens.
1149 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1150 * find_mark(), where the mark was reloaded from an existing marks
1151 * file and is referencing an object that this fast-import process
1152 * instance did not write out to a packfile. Callers must test for
1153 * this condition and use read_sha1_file() instead.
1155 static void *gfi_unpack_entry(
1156 struct object_entry
*oe
,
1157 unsigned long *sizep
)
1159 enum object_type type
;
1160 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1161 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ the_hash_algo
->rawsz
)) {
1162 /* The object is stored in the packfile we are writing to
1163 * and we have modified it since the last time we scanned
1164 * back to read a previously written object. If an old
1165 * window covered [p->pack_size, p->pack_size + rawsz) its
1166 * data is stale and is not valid. Closing all windows
1167 * and updating the packfile length ensures we can read
1168 * the newly written data.
1170 close_pack_windows(p
);
1171 hashflush(pack_file
);
1173 /* We have to offer rawsz bytes additional on the end of
1174 * the packfile as the core unpacker code assumes the
1175 * footer is present at the file end and must promise
1176 * at least rawsz bytes within any window it maps. But
1177 * we don't actually create the footer here.
1179 p
->pack_size
= pack_size
+ the_hash_algo
->rawsz
;
1181 return unpack_entry(the_repository
, p
, oe
->idx
.offset
, &type
, sizep
);
1184 static const char *get_mode(const char *str
, uint16_t *modep
)
1189 while ((c
= *str
++) != ' ') {
1190 if (c
< '0' || c
> '7')
1192 mode
= (mode
<< 3) + (c
- '0');
1198 static void load_tree(struct tree_entry
*root
)
1200 struct object_id
*oid
= &root
->versions
[1].oid
;
1201 struct object_entry
*myoe
;
1202 struct tree_content
*t
;
1207 root
->tree
= t
= new_tree_content(8);
1208 if (is_null_oid(oid
))
1211 myoe
= find_object(oid
);
1212 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1213 if (myoe
->type
!= OBJ_TREE
)
1214 die("Not a tree: %s", oid_to_hex(oid
));
1215 t
->delta_depth
= myoe
->depth
;
1216 buf
= gfi_unpack_entry(myoe
, &size
);
1218 die("Can't load tree %s", oid_to_hex(oid
));
1220 enum object_type type
;
1221 buf
= read_object_file(oid
, &type
, &size
);
1222 if (!buf
|| type
!= OBJ_TREE
)
1223 die("Can't load tree %s", oid_to_hex(oid
));
1227 while (c
!= (buf
+ size
)) {
1228 struct tree_entry
*e
= new_tree_entry();
1230 if (t
->entry_count
== t
->entry_capacity
)
1231 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1232 t
->entries
[t
->entry_count
++] = e
;
1235 c
= get_mode(c
, &e
->versions
[1].mode
);
1237 die("Corrupt mode in %s", oid_to_hex(oid
));
1238 e
->versions
[0].mode
= e
->versions
[1].mode
;
1239 e
->name
= to_atom(c
, strlen(c
));
1240 c
+= e
->name
->str_len
+ 1;
1241 hashcpy(e
->versions
[0].oid
.hash
, (unsigned char *)c
);
1242 hashcpy(e
->versions
[1].oid
.hash
, (unsigned char *)c
);
1243 c
+= GIT_SHA1_RAWSZ
;
1248 static int tecmp0 (const void *_a
, const void *_b
)
1250 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1251 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1252 return base_name_compare(
1253 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1254 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1257 static int tecmp1 (const void *_a
, const void *_b
)
1259 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1260 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1261 return base_name_compare(
1262 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1263 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1266 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1272 QSORT(t
->entries
, t
->entry_count
, tecmp0
);
1274 QSORT(t
->entries
, t
->entry_count
, tecmp1
);
1276 for (i
= 0; i
< t
->entry_count
; i
++) {
1277 if (t
->entries
[i
]->versions
[v
].mode
)
1278 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1282 strbuf_grow(b
, maxlen
);
1283 for (i
= 0; i
< t
->entry_count
; i
++) {
1284 struct tree_entry
*e
= t
->entries
[i
];
1285 if (!e
->versions
[v
].mode
)
1287 strbuf_addf(b
, "%o %s%c",
1288 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1289 e
->name
->str_dat
, '\0');
1290 strbuf_add(b
, e
->versions
[v
].oid
.hash
, GIT_SHA1_RAWSZ
);
1294 static void store_tree(struct tree_entry
*root
)
1296 struct tree_content
*t
;
1297 unsigned int i
, j
, del
;
1298 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1299 struct object_entry
*le
= NULL
;
1301 if (!is_null_oid(&root
->versions
[1].oid
))
1308 for (i
= 0; i
< t
->entry_count
; i
++) {
1309 if (t
->entries
[i
]->tree
)
1310 store_tree(t
->entries
[i
]);
1313 if (!(root
->versions
[0].mode
& NO_DELTA
))
1314 le
= find_object(&root
->versions
[0].oid
);
1315 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1316 mktree(t
, 0, &old_tree
);
1318 lo
.offset
= le
->idx
.offset
;
1319 lo
.depth
= t
->delta_depth
;
1322 mktree(t
, 1, &new_tree
);
1323 store_object(OBJ_TREE
, &new_tree
, &lo
, &root
->versions
[1].oid
, 0);
1325 t
->delta_depth
= lo
.depth
;
1326 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1327 struct tree_entry
*e
= t
->entries
[i
];
1328 if (e
->versions
[1].mode
) {
1329 e
->versions
[0].mode
= e
->versions
[1].mode
;
1330 oidcpy(&e
->versions
[0].oid
, &e
->versions
[1].oid
);
1331 t
->entries
[j
++] = e
;
1333 release_tree_entry(e
);
1337 t
->entry_count
-= del
;
1340 static void tree_content_replace(
1341 struct tree_entry
*root
,
1342 const struct object_id
*oid
,
1343 const uint16_t mode
,
1344 struct tree_content
*newtree
)
1347 die("Root cannot be a non-directory");
1348 oidclr(&root
->versions
[0].oid
);
1349 oidcpy(&root
->versions
[1].oid
, oid
);
1351 release_tree_content_recursive(root
->tree
);
1352 root
->tree
= newtree
;
1355 static int tree_content_set(
1356 struct tree_entry
*root
,
1358 const struct object_id
*oid
,
1359 const uint16_t mode
,
1360 struct tree_content
*subtree
)
1362 struct tree_content
*t
;
1365 struct tree_entry
*e
;
1367 slash1
= strchrnul(p
, '/');
1370 die("Empty path component found in input");
1371 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1372 die("Non-directories cannot have subtrees");
1377 for (i
= 0; i
< t
->entry_count
; i
++) {
1379 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1382 && e
->versions
[1].mode
== mode
1383 && oideq(&e
->versions
[1].oid
, oid
))
1385 e
->versions
[1].mode
= mode
;
1386 oidcpy(&e
->versions
[1].oid
, oid
);
1388 release_tree_content_recursive(e
->tree
);
1392 * We need to leave e->versions[0].sha1 alone
1393 * to avoid modifying the preimage tree used
1394 * when writing out the parent directory.
1395 * But after replacing the subdir with a
1396 * completely different one, it's not a good
1397 * delta base any more, and besides, we've
1398 * thrown away the tree entries needed to
1399 * make a delta against it.
1401 * So let's just explicitly disable deltas
1404 if (S_ISDIR(e
->versions
[0].mode
))
1405 e
->versions
[0].mode
|= NO_DELTA
;
1407 oidclr(&root
->versions
[1].oid
);
1410 if (!S_ISDIR(e
->versions
[1].mode
)) {
1411 e
->tree
= new_tree_content(8);
1412 e
->versions
[1].mode
= S_IFDIR
;
1416 if (tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
)) {
1417 oidclr(&root
->versions
[1].oid
);
1424 if (t
->entry_count
== t
->entry_capacity
)
1425 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1426 e
= new_tree_entry();
1427 e
->name
= to_atom(p
, n
);
1428 e
->versions
[0].mode
= 0;
1429 oidclr(&e
->versions
[0].oid
);
1430 t
->entries
[t
->entry_count
++] = e
;
1432 e
->tree
= new_tree_content(8);
1433 e
->versions
[1].mode
= S_IFDIR
;
1434 tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
);
1437 e
->versions
[1].mode
= mode
;
1438 oidcpy(&e
->versions
[1].oid
, oid
);
1440 oidclr(&root
->versions
[1].oid
);
1444 static int tree_content_remove(
1445 struct tree_entry
*root
,
1447 struct tree_entry
*backup_leaf
,
1450 struct tree_content
*t
;
1453 struct tree_entry
*e
;
1455 slash1
= strchrnul(p
, '/');
1461 if (!*p
&& allow_root
) {
1467 for (i
= 0; i
< t
->entry_count
; i
++) {
1469 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1470 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1472 * If p names a file in some subdirectory, and a
1473 * file or symlink matching the name of the
1474 * parent directory of p exists, then p cannot
1475 * exist and need not be deleted.
1478 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1482 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1483 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1484 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1485 oidclr(&root
->versions
[1].oid
);
1499 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1501 release_tree_content_recursive(e
->tree
);
1503 e
->versions
[1].mode
= 0;
1504 oidclr(&e
->versions
[1].oid
);
1505 oidclr(&root
->versions
[1].oid
);
1509 static int tree_content_get(
1510 struct tree_entry
*root
,
1512 struct tree_entry
*leaf
,
1515 struct tree_content
*t
;
1518 struct tree_entry
*e
;
1520 slash1
= strchrnul(p
, '/');
1522 if (!n
&& !allow_root
)
1523 die("Empty path component found in input");
1534 for (i
= 0; i
< t
->entry_count
; i
++) {
1536 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1539 if (!S_ISDIR(e
->versions
[1].mode
))
1543 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1549 memcpy(leaf
, e
, sizeof(*leaf
));
1550 if (e
->tree
&& is_null_oid(&e
->versions
[1].oid
))
1551 leaf
->tree
= dup_tree_content(e
->tree
);
1557 static int update_branch(struct branch
*b
)
1559 static const char *msg
= "fast-import";
1560 struct ref_transaction
*transaction
;
1561 struct object_id old_oid
;
1562 struct strbuf err
= STRBUF_INIT
;
1564 if (is_null_oid(&b
->oid
)) {
1566 delete_ref(NULL
, b
->name
, NULL
, 0);
1569 if (read_ref(b
->name
, &old_oid
))
1571 if (!force_update
&& !is_null_oid(&old_oid
)) {
1572 struct commit
*old_cmit
, *new_cmit
;
1574 old_cmit
= lookup_commit_reference_gently(the_repository
,
1576 new_cmit
= lookup_commit_reference_gently(the_repository
,
1578 if (!old_cmit
|| !new_cmit
)
1579 return error("Branch %s is missing commits.", b
->name
);
1581 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1582 warning("Not updating %s"
1583 " (new tip %s does not contain %s)",
1584 b
->name
, oid_to_hex(&b
->oid
),
1585 oid_to_hex(&old_oid
));
1589 transaction
= ref_transaction_begin(&err
);
1591 ref_transaction_update(transaction
, b
->name
, &b
->oid
, &old_oid
,
1593 ref_transaction_commit(transaction
, &err
)) {
1594 ref_transaction_free(transaction
);
1595 error("%s", err
.buf
);
1596 strbuf_release(&err
);
1599 ref_transaction_free(transaction
);
1600 strbuf_release(&err
);
1604 static void dump_branches(void)
1609 for (i
= 0; i
< branch_table_sz
; i
++) {
1610 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1611 failure
|= update_branch(b
);
1615 static void dump_tags(void)
1617 static const char *msg
= "fast-import";
1619 struct strbuf ref_name
= STRBUF_INIT
;
1620 struct strbuf err
= STRBUF_INIT
;
1621 struct ref_transaction
*transaction
;
1623 transaction
= ref_transaction_begin(&err
);
1625 failure
|= error("%s", err
.buf
);
1628 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1629 strbuf_reset(&ref_name
);
1630 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1632 if (ref_transaction_update(transaction
, ref_name
.buf
,
1633 &t
->oid
, NULL
, 0, msg
, &err
)) {
1634 failure
|= error("%s", err
.buf
);
1638 if (ref_transaction_commit(transaction
, &err
))
1639 failure
|= error("%s", err
.buf
);
1642 ref_transaction_free(transaction
);
1643 strbuf_release(&ref_name
);
1644 strbuf_release(&err
);
1647 static void dump_marks_helper(FILE *f
,
1653 for (k
= 0; k
< 1024; k
++) {
1654 if (m
->data
.sets
[k
])
1655 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1659 for (k
= 0; k
< 1024; k
++) {
1660 if (m
->data
.marked
[k
])
1661 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1662 oid_to_hex(&m
->data
.marked
[k
]->idx
.oid
));
1667 static void dump_marks(void)
1669 struct lock_file mark_lock
= LOCK_INIT
;
1672 if (!export_marks_file
|| (import_marks_file
&& !import_marks_file_done
))
1675 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1676 failure
|= error_errno("Unable to write marks file %s",
1681 f
= fdopen_lock_file(&mark_lock
, "w");
1683 int saved_errno
= errno
;
1684 rollback_lock_file(&mark_lock
);
1685 failure
|= error("Unable to write marks file %s: %s",
1686 export_marks_file
, strerror(saved_errno
));
1690 dump_marks_helper(f
, 0, marks
);
1691 if (commit_lock_file(&mark_lock
)) {
1692 failure
|= error_errno("Unable to write file %s",
1698 static void read_marks(void)
1701 FILE *f
= fopen(import_marks_file
, "r");
1704 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1705 goto done
; /* Marks file does not exist */
1707 die_errno("cannot read '%s'", import_marks_file
);
1708 while (fgets(line
, sizeof(line
), f
)) {
1711 struct object_id oid
;
1712 struct object_entry
*e
;
1714 end
= strchr(line
, '\n');
1715 if (line
[0] != ':' || !end
)
1716 die("corrupt mark line: %s", line
);
1718 mark
= strtoumax(line
+ 1, &end
, 10);
1719 if (!mark
|| end
== line
+ 1
1720 || *end
!= ' ' || get_oid_hex(end
+ 1, &oid
))
1721 die("corrupt mark line: %s", line
);
1722 e
= find_object(&oid
);
1724 enum object_type type
= oid_object_info(the_repository
,
1727 die("object not found: %s", oid_to_hex(&oid
));
1728 e
= insert_object(&oid
);
1730 e
->pack_id
= MAX_PACK_ID
;
1731 e
->idx
.offset
= 1; /* just not zero! */
1733 insert_mark(mark
, e
);
1737 import_marks_file_done
= 1;
1741 static int read_next_command(void)
1743 static int stdin_eof
= 0;
1746 unread_command_buf
= 0;
1753 if (unread_command_buf
) {
1754 unread_command_buf
= 0;
1756 struct recent_command
*rc
;
1758 strbuf_detach(&command_buf
, NULL
);
1759 stdin_eof
= strbuf_getline_lf(&command_buf
, stdin
);
1763 if (!seen_data_command
1764 && !starts_with(command_buf
.buf
, "feature ")
1765 && !starts_with(command_buf
.buf
, "option ")) {
1774 cmd_hist
.next
= rc
->next
;
1775 cmd_hist
.next
->prev
= &cmd_hist
;
1779 rc
->buf
= command_buf
.buf
;
1780 rc
->prev
= cmd_tail
;
1781 rc
->next
= cmd_hist
.prev
;
1782 rc
->prev
->next
= rc
;
1785 if (skip_prefix(command_buf
.buf
, "get-mark ", &p
)) {
1789 if (skip_prefix(command_buf
.buf
, "cat-blob ", &p
)) {
1793 if (command_buf
.buf
[0] == '#')
1799 static void skip_optional_lf(void)
1801 int term_char
= fgetc(stdin
);
1802 if (term_char
!= '\n' && term_char
!= EOF
)
1803 ungetc(term_char
, stdin
);
1806 static void parse_mark(void)
1809 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1810 next_mark
= strtoumax(v
, NULL
, 10);
1811 read_next_command();
1817 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1822 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1823 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1825 if (skip_prefix(data
, "<<", &data
)) {
1826 char *term
= xstrdup(data
);
1827 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1829 strbuf_detach(&command_buf
, NULL
);
1831 if (strbuf_getline_lf(&command_buf
, stdin
) == EOF
)
1832 die("EOF in data (terminator '%s' not found)", term
);
1833 if (term_len
== command_buf
.len
1834 && !strcmp(term
, command_buf
.buf
))
1836 strbuf_addbuf(sb
, &command_buf
);
1837 strbuf_addch(sb
, '\n');
1842 uintmax_t len
= strtoumax(data
, NULL
, 10);
1843 size_t n
= 0, length
= (size_t)len
;
1845 if (limit
&& limit
< len
) {
1850 die("data is too large to use in this context");
1852 while (n
< length
) {
1853 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1854 if (!s
&& feof(stdin
))
1855 die("EOF in data (%lu bytes remaining)",
1856 (unsigned long)(length
- n
));
1865 static int validate_raw_date(const char *src
, struct strbuf
*result
)
1867 const char *orig_src
= src
;
1873 num
= strtoul(src
, &endp
, 10);
1874 /* NEEDSWORK: perhaps check for reasonable values? */
1875 if (errno
|| endp
== src
|| *endp
!= ' ')
1879 if (*src
!= '-' && *src
!= '+')
1882 num
= strtoul(src
+ 1, &endp
, 10);
1883 if (errno
|| endp
== src
+ 1 || *endp
|| 1400 < num
)
1886 strbuf_addstr(result
, orig_src
);
1890 static char *parse_ident(const char *buf
)
1894 struct strbuf ident
= STRBUF_INIT
;
1896 /* ensure there is a space delimiter even if there is no name */
1900 ltgt
= buf
+ strcspn(buf
, "<>");
1902 die("Missing < in ident string: %s", buf
);
1903 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
1904 die("Missing space before < in ident string: %s", buf
);
1905 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
1907 die("Missing > in ident string: %s", buf
);
1910 die("Missing space after > in ident string: %s", buf
);
1912 name_len
= ltgt
- buf
;
1913 strbuf_add(&ident
, buf
, name_len
);
1917 if (validate_raw_date(ltgt
, &ident
) < 0)
1918 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1920 case WHENSPEC_RFC2822
:
1921 if (parse_date(ltgt
, &ident
) < 0)
1922 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
1925 if (strcmp("now", ltgt
))
1926 die("Date in ident must be 'now': %s", buf
);
1931 return strbuf_detach(&ident
, NULL
);
1934 static void parse_and_store_blob(
1935 struct last_object
*last
,
1936 struct object_id
*oidout
,
1939 static struct strbuf buf
= STRBUF_INIT
;
1942 if (parse_data(&buf
, big_file_threshold
, &len
))
1943 store_object(OBJ_BLOB
, &buf
, last
, oidout
, mark
);
1946 strbuf_release(&last
->data
);
1950 stream_blob(len
, oidout
, mark
);
1955 static void parse_new_blob(void)
1957 read_next_command();
1959 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
1962 static void unload_one_branch(void)
1964 while (cur_active_branches
1965 && cur_active_branches
>= max_active_branches
) {
1966 uintmax_t min_commit
= ULONG_MAX
;
1967 struct branch
*e
, *l
= NULL
, *p
= NULL
;
1969 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
1970 if (e
->last_commit
< min_commit
) {
1972 min_commit
= e
->last_commit
;
1978 e
= p
->active_next_branch
;
1979 p
->active_next_branch
= e
->active_next_branch
;
1981 e
= active_branches
;
1982 active_branches
= e
->active_next_branch
;
1985 e
->active_next_branch
= NULL
;
1986 if (e
->branch_tree
.tree
) {
1987 release_tree_content_recursive(e
->branch_tree
.tree
);
1988 e
->branch_tree
.tree
= NULL
;
1990 cur_active_branches
--;
1994 static void load_branch(struct branch
*b
)
1996 load_tree(&b
->branch_tree
);
1999 b
->active_next_branch
= active_branches
;
2000 active_branches
= b
;
2001 cur_active_branches
++;
2002 branch_load_count
++;
2006 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2008 unsigned char fanout
= 0;
2009 while ((num_notes
>>= 8))
2014 static void construct_path_with_fanout(const char *hex_sha1
,
2015 unsigned char fanout
, char *path
)
2017 unsigned int i
= 0, j
= 0;
2018 if (fanout
>= the_hash_algo
->rawsz
)
2019 die("Too large fanout (%u)", fanout
);
2021 path
[i
++] = hex_sha1
[j
++];
2022 path
[i
++] = hex_sha1
[j
++];
2026 memcpy(path
+ i
, hex_sha1
+ j
, the_hash_algo
->hexsz
- j
);
2027 path
[i
+ the_hash_algo
->hexsz
- j
] = '\0';
2030 static uintmax_t do_change_note_fanout(
2031 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2032 char *hex_oid
, unsigned int hex_oid_len
,
2033 char *fullpath
, unsigned int fullpath_len
,
2034 unsigned char fanout
)
2036 struct tree_content
*t
;
2037 struct tree_entry
*e
, leaf
;
2038 unsigned int i
, tmp_hex_oid_len
, tmp_fullpath_len
;
2039 uintmax_t num_notes
= 0;
2040 struct object_id oid
;
2047 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2049 tmp_hex_oid_len
= hex_oid_len
+ e
->name
->str_len
;
2050 tmp_fullpath_len
= fullpath_len
;
2053 * We're interested in EITHER existing note entries (entries
2054 * with exactly 40 hex chars in path, not including directory
2055 * separators), OR directory entries that may contain note
2056 * entries (with < 40 hex chars in path).
2057 * Also, each path component in a note entry must be a multiple
2060 if (!e
->versions
[1].mode
||
2061 tmp_hex_oid_len
> GIT_SHA1_HEXSZ
||
2062 e
->name
->str_len
% 2)
2065 /* This _may_ be a note entry, or a subdir containing notes */
2066 memcpy(hex_oid
+ hex_oid_len
, e
->name
->str_dat
,
2068 if (tmp_fullpath_len
)
2069 fullpath
[tmp_fullpath_len
++] = '/';
2070 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2072 tmp_fullpath_len
+= e
->name
->str_len
;
2073 fullpath
[tmp_fullpath_len
] = '\0';
2075 if (tmp_hex_oid_len
== GIT_SHA1_HEXSZ
&& !get_oid_hex(hex_oid
, &oid
)) {
2076 /* This is a note entry */
2077 if (fanout
== 0xff) {
2078 /* Counting mode, no rename */
2082 construct_path_with_fanout(hex_oid
, fanout
, realpath
);
2083 if (!strcmp(fullpath
, realpath
)) {
2084 /* Note entry is in correct location */
2089 /* Rename fullpath to realpath */
2090 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2091 die("Failed to remove path %s", fullpath
);
2092 tree_content_set(orig_root
, realpath
,
2093 &leaf
.versions
[1].oid
,
2094 leaf
.versions
[1].mode
,
2096 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2097 /* This is a subdir that may contain note entries */
2098 num_notes
+= do_change_note_fanout(orig_root
, e
,
2099 hex_oid
, tmp_hex_oid_len
,
2100 fullpath
, tmp_fullpath_len
, fanout
);
2103 /* The above may have reallocated the current tree_content */
2109 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2110 unsigned char fanout
)
2113 * The size of path is due to one slash between every two hex digits,
2114 * plus the terminating NUL. Note that there is no slash at the end, so
2115 * the number of slashes is one less than half the number of hex
2118 char hex_oid
[GIT_MAX_HEXSZ
], path
[GIT_MAX_HEXSZ
+ (GIT_MAX_HEXSZ
/ 2) - 1 + 1];
2119 return do_change_note_fanout(root
, root
, hex_oid
, 0, path
, 0, fanout
);
2123 * Given a pointer into a string, parse a mark reference:
2125 * idnum ::= ':' bigint;
2127 * Return the first character after the value in *endptr.
2129 * Complain if the following character is not what is expected,
2130 * either a space or end of the string.
2132 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2138 mark
= strtoumax(p
, endptr
, 10);
2140 die("No value after ':' in mark: %s", command_buf
.buf
);
2145 * Parse the mark reference, and complain if this is not the end of
2148 static uintmax_t parse_mark_ref_eol(const char *p
)
2153 mark
= parse_mark_ref(p
, &end
);
2155 die("Garbage after mark: %s", command_buf
.buf
);
2160 * Parse the mark reference, demanding a trailing space. Return a
2161 * pointer to the space.
2163 static uintmax_t parse_mark_ref_space(const char **p
)
2168 mark
= parse_mark_ref(*p
, &end
);
2170 die("Missing space after mark: %s", command_buf
.buf
);
2175 static void file_change_m(const char *p
, struct branch
*b
)
2177 static struct strbuf uq
= STRBUF_INIT
;
2179 struct object_entry
*oe
;
2180 struct object_id oid
;
2181 uint16_t mode
, inline_data
= 0;
2183 p
= get_mode(p
, &mode
);
2185 die("Corrupt mode: %s", command_buf
.buf
);
2190 case S_IFREG
| 0644:
2191 case S_IFREG
| 0755:
2198 die("Corrupt mode: %s", command_buf
.buf
);
2202 oe
= find_mark(parse_mark_ref_space(&p
));
2203 oidcpy(&oid
, &oe
->idx
.oid
);
2204 } else if (skip_prefix(p
, "inline ", &p
)) {
2206 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2208 if (parse_oid_hex(p
, &oid
, &p
))
2209 die("Invalid dataref: %s", command_buf
.buf
);
2210 oe
= find_object(&oid
);
2212 die("Missing space after SHA1: %s", command_buf
.buf
);
2216 if (!unquote_c_style(&uq
, p
, &endp
)) {
2218 die("Garbage after path in: %s", command_buf
.buf
);
2222 /* Git does not track empty, non-toplevel directories. */
2223 if (S_ISDIR(mode
) && is_empty_tree_oid(&oid
) && *p
) {
2224 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2228 if (S_ISGITLINK(mode
)) {
2230 die("Git links cannot be specified 'inline': %s",
2233 if (oe
->type
!= OBJ_COMMIT
)
2234 die("Not a commit (actually a %s): %s",
2235 type_name(oe
->type
), command_buf
.buf
);
2238 * Accept the sha1 without checking; it expected to be in
2239 * another repository.
2241 } else if (inline_data
) {
2243 die("Directories cannot be specified 'inline': %s",
2246 strbuf_addstr(&uq
, p
);
2249 read_next_command();
2250 parse_and_store_blob(&last_blob
, &oid
, 0);
2252 enum object_type expected
= S_ISDIR(mode
) ?
2254 enum object_type type
= oe
? oe
->type
:
2255 oid_object_info(the_repository
, &oid
,
2258 die("%s not found: %s",
2259 S_ISDIR(mode
) ? "Tree" : "Blob",
2261 if (type
!= expected
)
2262 die("Not a %s (actually a %s): %s",
2263 type_name(expected
), type_name(type
),
2268 tree_content_replace(&b
->branch_tree
, &oid
, mode
, NULL
);
2271 tree_content_set(&b
->branch_tree
, p
, &oid
, mode
, NULL
);
2274 static void file_change_d(const char *p
, struct branch
*b
)
2276 static struct strbuf uq
= STRBUF_INIT
;
2280 if (!unquote_c_style(&uq
, p
, &endp
)) {
2282 die("Garbage after path in: %s", command_buf
.buf
);
2285 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2288 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2291 static struct strbuf s_uq
= STRBUF_INIT
;
2292 static struct strbuf d_uq
= STRBUF_INIT
;
2294 struct tree_entry leaf
;
2296 strbuf_reset(&s_uq
);
2297 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2299 die("Missing space after source: %s", command_buf
.buf
);
2301 endp
= strchr(s
, ' ');
2303 die("Missing space after source: %s", command_buf
.buf
);
2304 strbuf_add(&s_uq
, s
, endp
- s
);
2310 die("Missing dest: %s", command_buf
.buf
);
2313 strbuf_reset(&d_uq
);
2314 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2316 die("Garbage after dest in: %s", command_buf
.buf
);
2320 memset(&leaf
, 0, sizeof(leaf
));
2322 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2324 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2325 if (!leaf
.versions
[1].mode
)
2326 die("Path %s not in branch", s
);
2327 if (!*d
) { /* C "path/to/subdir" "" */
2328 tree_content_replace(&b
->branch_tree
,
2329 &leaf
.versions
[1].oid
,
2330 leaf
.versions
[1].mode
,
2334 tree_content_set(&b
->branch_tree
, d
,
2335 &leaf
.versions
[1].oid
,
2336 leaf
.versions
[1].mode
,
2340 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2342 static struct strbuf uq
= STRBUF_INIT
;
2343 struct object_entry
*oe
;
2345 struct object_id oid
, commit_oid
;
2347 uint16_t inline_data
= 0;
2348 unsigned char new_fanout
;
2351 * When loading a branch, we don't traverse its tree to count the real
2352 * number of notes (too expensive to do this for all non-note refs).
2353 * This means that recently loaded notes refs might incorrectly have
2354 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2356 * Fix this by traversing the tree and counting the number of notes
2357 * when b->num_notes == 0. If the notes tree is truly empty, the
2358 * calculation should not take long.
2360 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2361 /* Invoke change_note_fanout() in "counting mode". */
2362 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2363 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2366 /* Now parse the notemodify command. */
2367 /* <dataref> or 'inline' */
2369 oe
= find_mark(parse_mark_ref_space(&p
));
2370 oidcpy(&oid
, &oe
->idx
.oid
);
2371 } else if (skip_prefix(p
, "inline ", &p
)) {
2373 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2375 if (parse_oid_hex(p
, &oid
, &p
))
2376 die("Invalid dataref: %s", command_buf
.buf
);
2377 oe
= find_object(&oid
);
2379 die("Missing space after SHA1: %s", command_buf
.buf
);
2383 s
= lookup_branch(p
);
2385 if (is_null_oid(&s
->oid
))
2386 die("Can't add a note on empty branch.");
2387 oidcpy(&commit_oid
, &s
->oid
);
2388 } else if (*p
== ':') {
2389 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2390 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2391 if (commit_oe
->type
!= OBJ_COMMIT
)
2392 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2393 oidcpy(&commit_oid
, &commit_oe
->idx
.oid
);
2394 } else if (!get_oid(p
, &commit_oid
)) {
2396 char *buf
= read_object_with_reference(&commit_oid
,
2399 if (!buf
|| size
< 46)
2400 die("Not a valid commit: %s", p
);
2403 die("Invalid ref name or SHA1 expression: %s", p
);
2407 strbuf_addstr(&uq
, p
);
2410 read_next_command();
2411 parse_and_store_blob(&last_blob
, &oid
, 0);
2413 if (oe
->type
!= OBJ_BLOB
)
2414 die("Not a blob (actually a %s): %s",
2415 type_name(oe
->type
), command_buf
.buf
);
2416 } else if (!is_null_oid(&oid
)) {
2417 enum object_type type
= oid_object_info(the_repository
, &oid
,
2420 die("Blob not found: %s", command_buf
.buf
);
2421 if (type
!= OBJ_BLOB
)
2422 die("Not a blob (actually a %s): %s",
2423 type_name(type
), command_buf
.buf
);
2426 construct_path_with_fanout(oid_to_hex(&commit_oid
), *old_fanout
, path
);
2427 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2430 if (is_null_oid(&oid
))
2431 return; /* nothing to insert */
2434 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2435 construct_path_with_fanout(oid_to_hex(&commit_oid
), new_fanout
, path
);
2436 tree_content_set(&b
->branch_tree
, path
, &oid
, S_IFREG
| 0644, NULL
);
2439 static void file_change_deleteall(struct branch
*b
)
2441 release_tree_content_recursive(b
->branch_tree
.tree
);
2442 oidclr(&b
->branch_tree
.versions
[0].oid
);
2443 oidclr(&b
->branch_tree
.versions
[1].oid
);
2444 load_tree(&b
->branch_tree
);
2448 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2450 if (!buf
|| size
< GIT_SHA1_HEXSZ
+ 6)
2451 die("Not a valid commit: %s", oid_to_hex(&b
->oid
));
2452 if (memcmp("tree ", buf
, 5)
2453 || get_oid_hex(buf
+ 5, &b
->branch_tree
.versions
[1].oid
))
2454 die("The commit %s is corrupt", oid_to_hex(&b
->oid
));
2455 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2456 &b
->branch_tree
.versions
[1].oid
);
2459 static void parse_from_existing(struct branch
*b
)
2461 if (is_null_oid(&b
->oid
)) {
2462 oidclr(&b
->branch_tree
.versions
[0].oid
);
2463 oidclr(&b
->branch_tree
.versions
[1].oid
);
2468 buf
= read_object_with_reference(&b
->oid
, commit_type
, &size
,
2470 parse_from_commit(b
, buf
, size
);
2475 static int parse_from(struct branch
*b
)
2479 struct object_id oid
;
2481 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2484 oidcpy(&oid
, &b
->branch_tree
.versions
[1].oid
);
2486 s
= lookup_branch(from
);
2488 die("Can't create a branch from itself: %s", b
->name
);
2490 struct object_id
*t
= &s
->branch_tree
.versions
[1].oid
;
2491 oidcpy(&b
->oid
, &s
->oid
);
2492 oidcpy(&b
->branch_tree
.versions
[0].oid
, t
);
2493 oidcpy(&b
->branch_tree
.versions
[1].oid
, t
);
2494 } else if (*from
== ':') {
2495 uintmax_t idnum
= parse_mark_ref_eol(from
);
2496 struct object_entry
*oe
= find_mark(idnum
);
2497 if (oe
->type
!= OBJ_COMMIT
)
2498 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2499 if (!oideq(&b
->oid
, &oe
->idx
.oid
)) {
2500 oidcpy(&b
->oid
, &oe
->idx
.oid
);
2501 if (oe
->pack_id
!= MAX_PACK_ID
) {
2503 char *buf
= gfi_unpack_entry(oe
, &size
);
2504 parse_from_commit(b
, buf
, size
);
2507 parse_from_existing(b
);
2509 } else if (!get_oid(from
, &b
->oid
)) {
2510 parse_from_existing(b
);
2511 if (is_null_oid(&b
->oid
))
2515 die("Invalid ref name or SHA1 expression: %s", from
);
2517 if (b
->branch_tree
.tree
&& !oideq(&oid
, &b
->branch_tree
.versions
[1].oid
)) {
2518 release_tree_content_recursive(b
->branch_tree
.tree
);
2519 b
->branch_tree
.tree
= NULL
;
2522 read_next_command();
2526 static struct hash_list
*parse_merge(unsigned int *count
)
2528 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2533 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2534 n
= xmalloc(sizeof(*n
));
2535 s
= lookup_branch(from
);
2537 oidcpy(&n
->oid
, &s
->oid
);
2538 else if (*from
== ':') {
2539 uintmax_t idnum
= parse_mark_ref_eol(from
);
2540 struct object_entry
*oe
= find_mark(idnum
);
2541 if (oe
->type
!= OBJ_COMMIT
)
2542 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2543 oidcpy(&n
->oid
, &oe
->idx
.oid
);
2544 } else if (!get_oid(from
, &n
->oid
)) {
2546 char *buf
= read_object_with_reference(&n
->oid
,
2549 if (!buf
|| size
< 46)
2550 die("Not a valid commit: %s", from
);
2553 die("Invalid ref name or SHA1 expression: %s", from
);
2560 read_next_command();
2565 static void parse_new_commit(const char *arg
)
2567 static struct strbuf msg
= STRBUF_INIT
;
2569 char *author
= NULL
;
2570 char *committer
= NULL
;
2571 struct hash_list
*merge_list
= NULL
;
2572 unsigned int merge_count
;
2573 unsigned char prev_fanout
, new_fanout
;
2576 b
= lookup_branch(arg
);
2578 b
= new_branch(arg
);
2580 read_next_command();
2582 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2583 author
= parse_ident(v
);
2584 read_next_command();
2586 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2587 committer
= parse_ident(v
);
2588 read_next_command();
2591 die("Expected committer but didn't get one");
2592 parse_data(&msg
, 0, NULL
);
2593 read_next_command();
2595 merge_list
= parse_merge(&merge_count
);
2597 /* ensure the branch is active/loaded */
2598 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2599 unload_one_branch();
2603 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2606 while (command_buf
.len
> 0) {
2607 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2608 file_change_m(v
, b
);
2609 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2610 file_change_d(v
, b
);
2611 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2612 file_change_cr(v
, b
, 1);
2613 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2614 file_change_cr(v
, b
, 0);
2615 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2616 note_change_n(v
, b
, &prev_fanout
);
2617 else if (!strcmp("deleteall", command_buf
.buf
))
2618 file_change_deleteall(b
);
2619 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2622 unread_command_buf
= 1;
2625 if (read_next_command() == EOF
)
2629 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2630 if (new_fanout
!= prev_fanout
)
2631 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2633 /* build the tree and the commit */
2634 store_tree(&b
->branch_tree
);
2635 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2636 &b
->branch_tree
.versions
[1].oid
);
2638 strbuf_reset(&new_data
);
2639 strbuf_addf(&new_data
, "tree %s\n",
2640 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
2641 if (!is_null_oid(&b
->oid
))
2642 strbuf_addf(&new_data
, "parent %s\n",
2643 oid_to_hex(&b
->oid
));
2644 while (merge_list
) {
2645 struct hash_list
*next
= merge_list
->next
;
2646 strbuf_addf(&new_data
, "parent %s\n",
2647 oid_to_hex(&merge_list
->oid
));
2651 strbuf_addf(&new_data
,
2655 author
? author
: committer
, committer
);
2656 strbuf_addbuf(&new_data
, &msg
);
2660 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, &b
->oid
, next_mark
))
2661 b
->pack_id
= pack_id
;
2662 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2665 static void parse_new_tag(const char *arg
)
2667 static struct strbuf msg
= STRBUF_INIT
;
2672 uintmax_t from_mark
= 0;
2673 struct object_id oid
;
2674 enum object_type type
;
2677 t
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct tag
));
2678 memset(t
, 0, sizeof(struct tag
));
2679 t
->name
= pool_strdup(arg
);
2681 last_tag
->next_tag
= t
;
2685 read_next_command();
2688 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2689 die("Expected from command, got %s", command_buf
.buf
);
2690 s
= lookup_branch(from
);
2692 if (is_null_oid(&s
->oid
))
2693 die("Can't tag an empty branch.");
2694 oidcpy(&oid
, &s
->oid
);
2696 } else if (*from
== ':') {
2697 struct object_entry
*oe
;
2698 from_mark
= parse_mark_ref_eol(from
);
2699 oe
= find_mark(from_mark
);
2701 oidcpy(&oid
, &oe
->idx
.oid
);
2702 } else if (!get_oid(from
, &oid
)) {
2703 struct object_entry
*oe
= find_object(&oid
);
2705 type
= oid_object_info(the_repository
, &oid
, NULL
);
2707 die("Not a valid object: %s", from
);
2711 die("Invalid ref name or SHA1 expression: %s", from
);
2712 read_next_command();
2715 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2716 tagger
= parse_ident(v
);
2717 read_next_command();
2721 /* tag payload/message */
2722 parse_data(&msg
, 0, NULL
);
2724 /* build the tag object */
2725 strbuf_reset(&new_data
);
2727 strbuf_addf(&new_data
,
2731 oid_to_hex(&oid
), type_name(type
), t
->name
);
2733 strbuf_addf(&new_data
,
2734 "tagger %s\n", tagger
);
2735 strbuf_addch(&new_data
, '\n');
2736 strbuf_addbuf(&new_data
, &msg
);
2739 if (store_object(OBJ_TAG
, &new_data
, NULL
, &t
->oid
, 0))
2740 t
->pack_id
= MAX_PACK_ID
;
2742 t
->pack_id
= pack_id
;
2745 static void parse_reset_branch(const char *arg
)
2749 b
= lookup_branch(arg
);
2752 oidclr(&b
->branch_tree
.versions
[0].oid
);
2753 oidclr(&b
->branch_tree
.versions
[1].oid
);
2754 if (b
->branch_tree
.tree
) {
2755 release_tree_content_recursive(b
->branch_tree
.tree
);
2756 b
->branch_tree
.tree
= NULL
;
2760 b
= new_branch(arg
);
2761 read_next_command();
2763 if (command_buf
.len
> 0)
2764 unread_command_buf
= 1;
2767 static void cat_blob_write(const char *buf
, unsigned long size
)
2769 if (write_in_full(cat_blob_fd
, buf
, size
) < 0)
2770 die_errno("Write to frontend failed");
2773 static void cat_blob(struct object_entry
*oe
, struct object_id
*oid
)
2775 struct strbuf line
= STRBUF_INIT
;
2777 enum object_type type
= 0;
2780 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2781 buf
= read_object_file(oid
, &type
, &size
);
2784 buf
= gfi_unpack_entry(oe
, &size
);
2788 * Output based on batch_one_object() from cat-file.c.
2791 strbuf_reset(&line
);
2792 strbuf_addf(&line
, "%s missing\n", oid_to_hex(oid
));
2793 cat_blob_write(line
.buf
, line
.len
);
2794 strbuf_release(&line
);
2799 die("Can't read object %s", oid_to_hex(oid
));
2800 if (type
!= OBJ_BLOB
)
2801 die("Object %s is a %s but a blob was expected.",
2802 oid_to_hex(oid
), type_name(type
));
2803 strbuf_reset(&line
);
2804 strbuf_addf(&line
, "%s %s %lu\n", oid_to_hex(oid
),
2805 type_name(type
), size
);
2806 cat_blob_write(line
.buf
, line
.len
);
2807 strbuf_release(&line
);
2808 cat_blob_write(buf
, size
);
2809 cat_blob_write("\n", 1);
2810 if (oe
&& oe
->pack_id
== pack_id
) {
2811 last_blob
.offset
= oe
->idx
.offset
;
2812 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2813 last_blob
.depth
= oe
->depth
;
2818 static void parse_get_mark(const char *p
)
2820 struct object_entry
*oe
;
2821 char output
[GIT_MAX_HEXSZ
+ 2];
2823 /* get-mark SP <object> LF */
2825 die("Not a mark: %s", p
);
2827 oe
= find_mark(parse_mark_ref_eol(p
));
2829 die("Unknown mark: %s", command_buf
.buf
);
2831 xsnprintf(output
, sizeof(output
), "%s\n", oid_to_hex(&oe
->idx
.oid
));
2832 cat_blob_write(output
, GIT_SHA1_HEXSZ
+ 1);
2835 static void parse_cat_blob(const char *p
)
2837 struct object_entry
*oe
;
2838 struct object_id oid
;
2840 /* cat-blob SP <object> LF */
2842 oe
= find_mark(parse_mark_ref_eol(p
));
2844 die("Unknown mark: %s", command_buf
.buf
);
2845 oidcpy(&oid
, &oe
->idx
.oid
);
2847 if (parse_oid_hex(p
, &oid
, &p
))
2848 die("Invalid dataref: %s", command_buf
.buf
);
2850 die("Garbage after SHA1: %s", command_buf
.buf
);
2851 oe
= find_object(&oid
);
2857 static struct object_entry
*dereference(struct object_entry
*oe
,
2858 struct object_id
*oid
)
2863 enum object_type type
= oid_object_info(the_repository
, oid
,
2866 die("object not found: %s", oid_to_hex(oid
));
2868 oe
= insert_object(oid
);
2870 oe
->pack_id
= MAX_PACK_ID
;
2874 case OBJ_TREE
: /* easy case. */
2880 die("Not a tree-ish: %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_object_file(oid
, &unused
, &size
);
2890 die("Can't load object %s", oid_to_hex(oid
));
2892 /* Peel one layer. */
2895 if (size
< GIT_SHA1_HEXSZ
+ strlen("object ") ||
2896 get_oid_hex(buf
+ strlen("object "), oid
))
2897 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
2900 if (size
< GIT_SHA1_HEXSZ
+ strlen("tree ") ||
2901 get_oid_hex(buf
+ strlen("tree "), oid
))
2902 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
2906 return find_object(oid
);
2909 static struct object_entry
*parse_treeish_dataref(const char **p
)
2911 struct object_id oid
;
2912 struct object_entry
*e
;
2914 if (**p
== ':') { /* <mark> */
2915 e
= find_mark(parse_mark_ref_space(p
));
2917 die("Unknown mark: %s", command_buf
.buf
);
2918 oidcpy(&oid
, &e
->idx
.oid
);
2919 } else { /* <sha1> */
2920 if (parse_oid_hex(*p
, &oid
, p
))
2921 die("Invalid dataref: %s", command_buf
.buf
);
2922 e
= find_object(&oid
);
2924 die("Missing space after tree-ish: %s", command_buf
.buf
);
2927 while (!e
|| e
->type
!= OBJ_TREE
)
2928 e
= dereference(e
, &oid
);
2932 static void print_ls(int mode
, const unsigned char *sha1
, const char *path
)
2934 static struct strbuf line
= STRBUF_INIT
;
2936 /* See show_tree(). */
2938 S_ISGITLINK(mode
) ? commit_type
:
2939 S_ISDIR(mode
) ? tree_type
:
2943 /* missing SP path LF */
2944 strbuf_reset(&line
);
2945 strbuf_addstr(&line
, "missing ");
2946 quote_c_style(path
, &line
, NULL
, 0);
2947 strbuf_addch(&line
, '\n');
2949 /* mode SP type SP object_name TAB path LF */
2950 strbuf_reset(&line
);
2951 strbuf_addf(&line
, "%06o %s %s\t",
2952 mode
& ~NO_DELTA
, type
, sha1_to_hex(sha1
));
2953 quote_c_style(path
, &line
, NULL
, 0);
2954 strbuf_addch(&line
, '\n');
2956 cat_blob_write(line
.buf
, line
.len
);
2959 static void parse_ls(const char *p
, struct branch
*b
)
2961 struct tree_entry
*root
= NULL
;
2962 struct tree_entry leaf
= {NULL
};
2964 /* ls SP (<tree-ish> SP)? <path> */
2967 die("Not in a commit: %s", command_buf
.buf
);
2968 root
= &b
->branch_tree
;
2970 struct object_entry
*e
= parse_treeish_dataref(&p
);
2971 root
= new_tree_entry();
2972 oidcpy(&root
->versions
[1].oid
, &e
->idx
.oid
);
2973 if (!is_null_oid(&root
->versions
[1].oid
))
2974 root
->versions
[1].mode
= S_IFDIR
;
2978 static struct strbuf uq
= STRBUF_INIT
;
2981 if (unquote_c_style(&uq
, p
, &endp
))
2982 die("Invalid path: %s", command_buf
.buf
);
2984 die("Garbage after path in: %s", command_buf
.buf
);
2987 tree_content_get(root
, p
, &leaf
, 1);
2989 * A directory in preparation would have a sha1 of zero
2990 * until it is saved. Save, for simplicity.
2992 if (S_ISDIR(leaf
.versions
[1].mode
))
2995 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].oid
.hash
, p
);
2997 release_tree_content_recursive(leaf
.tree
);
2998 if (!b
|| root
!= &b
->branch_tree
)
2999 release_tree_entry(root
);
3002 static void checkpoint(void)
3004 checkpoint_requested
= 0;
3013 static void parse_checkpoint(void)
3015 checkpoint_requested
= 1;
3019 static void parse_progress(void)
3021 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3022 fputc('\n', stdout
);
3027 static char* make_fast_import_path(const char *path
)
3029 if (!relative_marks_paths
|| is_absolute_path(path
))
3030 return xstrdup(path
);
3031 return git_pathdup("info/fast-import/%s", path
);
3034 static void option_import_marks(const char *marks
,
3035 int from_stream
, int ignore_missing
)
3037 if (import_marks_file
) {
3039 die("Only one import-marks command allowed per stream");
3041 /* read previous mark file */
3042 if(!import_marks_file_from_stream
)
3046 import_marks_file
= make_fast_import_path(marks
);
3047 safe_create_leading_directories_const(import_marks_file
);
3048 import_marks_file_from_stream
= from_stream
;
3049 import_marks_file_ignore_missing
= ignore_missing
;
3052 static void option_date_format(const char *fmt
)
3054 if (!strcmp(fmt
, "raw"))
3055 whenspec
= WHENSPEC_RAW
;
3056 else if (!strcmp(fmt
, "rfc2822"))
3057 whenspec
= WHENSPEC_RFC2822
;
3058 else if (!strcmp(fmt
, "now"))
3059 whenspec
= WHENSPEC_NOW
;
3061 die("unknown --date-format argument %s", fmt
);
3064 static unsigned long ulong_arg(const char *option
, const char *arg
)
3067 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3068 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3069 die("%s: argument must be a non-negative integer", option
);
3073 static void option_depth(const char *depth
)
3075 max_depth
= ulong_arg("--depth", depth
);
3076 if (max_depth
> MAX_DEPTH
)
3077 die("--depth cannot exceed %u", MAX_DEPTH
);
3080 static void option_active_branches(const char *branches
)
3082 max_active_branches
= ulong_arg("--active-branches", branches
);
3085 static void option_export_marks(const char *marks
)
3087 export_marks_file
= make_fast_import_path(marks
);
3088 safe_create_leading_directories_const(export_marks_file
);
3091 static void option_cat_blob_fd(const char *fd
)
3093 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3094 if (n
> (unsigned long) INT_MAX
)
3095 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3096 cat_blob_fd
= (int) n
;
3099 static void option_export_pack_edges(const char *edges
)
3103 pack_edges
= xfopen(edges
, "a");
3106 static int parse_one_option(const char *option
)
3108 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3110 if (!git_parse_ulong(option
, &v
))
3113 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3115 } else if (v
< 1024 * 1024) {
3116 warning("minimum max-pack-size is 1 MiB");
3120 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3122 if (!git_parse_ulong(option
, &v
))
3124 big_file_threshold
= v
;
3125 } else if (skip_prefix(option
, "depth=", &option
)) {
3126 option_depth(option
);
3127 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3128 option_active_branches(option
);
3129 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3130 option_export_pack_edges(option
);
3131 } else if (starts_with(option
, "quiet")) {
3133 } else if (starts_with(option
, "stats")) {
3142 static int parse_one_feature(const char *feature
, int from_stream
)
3146 if (skip_prefix(feature
, "date-format=", &arg
)) {
3147 option_date_format(arg
);
3148 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3149 option_import_marks(arg
, from_stream
, 0);
3150 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3151 option_import_marks(arg
, from_stream
, 1);
3152 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3153 option_export_marks(arg
);
3154 } else if (!strcmp(feature
, "get-mark")) {
3155 ; /* Don't die - this feature is supported */
3156 } else if (!strcmp(feature
, "cat-blob")) {
3157 ; /* Don't die - this feature is supported */
3158 } else if (!strcmp(feature
, "relative-marks")) {
3159 relative_marks_paths
= 1;
3160 } else if (!strcmp(feature
, "no-relative-marks")) {
3161 relative_marks_paths
= 0;
3162 } else if (!strcmp(feature
, "done")) {
3163 require_explicit_termination
= 1;
3164 } else if (!strcmp(feature
, "force")) {
3166 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3167 ; /* do nothing; we have the feature */
3175 static void parse_feature(const char *feature
)
3177 if (seen_data_command
)
3178 die("Got feature command '%s' after data command", feature
);
3180 if (parse_one_feature(feature
, 1))
3183 die("This version of fast-import does not support feature %s.", feature
);
3186 static void parse_option(const char *option
)
3188 if (seen_data_command
)
3189 die("Got option command '%s' after data command", option
);
3191 if (parse_one_option(option
))
3194 die("This version of fast-import does not support option: %s", option
);
3197 static void git_pack_config(void)
3199 int indexversion_value
;
3201 unsigned long packsizelimit_value
;
3203 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3204 if (max_depth
> MAX_DEPTH
)
3205 max_depth
= MAX_DEPTH
;
3207 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3208 pack_idx_opts
.version
= indexversion_value
;
3209 if (pack_idx_opts
.version
> 2)
3210 git_die_config("pack.indexversion",
3211 "bad pack.indexversion=%"PRIu32
, pack_idx_opts
.version
);
3213 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3214 max_packsize
= packsizelimit_value
;
3216 if (!git_config_get_int("fastimport.unpacklimit", &limit
))
3217 unpack_limit
= limit
;
3218 else if (!git_config_get_int("transfer.unpacklimit", &limit
))
3219 unpack_limit
= limit
;
3221 git_config(git_default_config
, NULL
);
3224 static const char fast_import_usage
[] =
3225 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3227 static void parse_argv(void)
3231 for (i
= 1; i
< global_argc
; i
++) {
3232 const char *a
= global_argv
[i
];
3234 if (*a
!= '-' || !strcmp(a
, "--"))
3237 if (!skip_prefix(a
, "--", &a
))
3238 die("unknown option %s", a
);
3240 if (parse_one_option(a
))
3243 if (parse_one_feature(a
, 0))
3246 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3247 option_cat_blob_fd(a
);
3251 die("unknown option --%s", a
);
3253 if (i
!= global_argc
)
3254 usage(fast_import_usage
);
3256 seen_data_command
= 1;
3257 if (import_marks_file
)
3261 int cmd_main(int argc
, const char **argv
)
3265 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3266 usage(fast_import_usage
);
3268 setup_git_directory();
3269 reset_pack_idx_option(&pack_idx_opts
);
3272 alloc_objects(object_entry_alloc
);
3273 strbuf_init(&command_buf
, 0);
3274 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3275 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3276 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3277 marks
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
3282 rc_free
= mem_pool_alloc(&fi_mem_pool
, cmd_save
* sizeof(*rc_free
));
3283 for (i
= 0; i
< (cmd_save
- 1); i
++)
3284 rc_free
[i
].next
= &rc_free
[i
+ 1];
3285 rc_free
[cmd_save
- 1].next
= NULL
;
3288 set_die_routine(die_nicely
);
3289 set_checkpoint_signal();
3290 while (read_next_command() != EOF
) {
3292 if (!strcmp("blob", command_buf
.buf
))
3294 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3296 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3297 parse_new_commit(v
);
3298 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3300 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3301 parse_reset_branch(v
);
3302 else if (!strcmp("checkpoint", command_buf
.buf
))
3304 else if (!strcmp("done", command_buf
.buf
))
3306 else if (starts_with(command_buf
.buf
, "progress "))
3308 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3310 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3312 else if (starts_with(command_buf
.buf
, "option "))
3313 /* ignore non-git options*/;
3315 die("Unsupported command: %s", command_buf
.buf
);
3317 if (checkpoint_requested
)
3321 /* argv hasn't been parsed yet, do so */
3322 if (!seen_data_command
)
3325 if (require_explicit_termination
&& feof(stdin
))
3326 die("stream ends early");
3339 uintmax_t total_count
= 0, duplicate_count
= 0;
3340 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3341 total_count
+= object_count_by_type
[i
];
3342 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3343 duplicate_count
+= duplicate_count_by_type
[i
];
3345 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3346 fprintf(stderr
, "---------------------------------------------------------------------\n");
3347 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3348 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3349 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
]);
3350 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
]);
3351 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
]);
3352 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
]);
3353 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3354 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3355 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3356 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (tree_entry_allocd
+ fi_mem_pool
.pool_alloc
+ alloc_count
*sizeof(struct object_entry
))/1024);
3357 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd
+ fi_mem_pool
.pool_alloc
) /1024));
3358 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3359 fprintf(stderr
, "---------------------------------------------------------------------\n");
3361 fprintf(stderr
, "---------------------------------------------------------------------\n");
3362 fprintf(stderr
, "\n");
3365 return failure
? 1 : 0;