3 #include "environment.h"
6 #include "repository.h"
17 #include "csum-file.h"
20 #include "run-command.h"
22 #include "object-file.h"
23 #include "object-name.h"
24 #include "object-store-ll.h"
26 #include "commit-reach.h"
30 #define PACK_ID_BITS 16
31 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
33 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
36 * We abuse the setuid bit on directories to mean "do not delta".
38 #define NO_DELTA S_ISUID
41 * The amount of additional space required in order to write an object into the
42 * current pack. This is the hash lengths at the end of the pack, plus the
43 * length of one object ID.
45 #define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3)
48 struct pack_idx_entry idx
;
49 struct hashmap_entry ent
;
50 uint32_t type
: TYPE_BITS
,
51 pack_id
: PACK_ID_BITS
,
55 static int object_entry_hashcmp(const void *map_data UNUSED
,
56 const struct hashmap_entry
*eptr
,
57 const struct hashmap_entry
*entry_or_key
,
60 const struct object_id
*oid
= keydata
;
61 const struct object_entry
*e1
, *e2
;
63 e1
= container_of(eptr
, const struct object_entry
, ent
);
65 return oidcmp(&e1
->idx
.oid
, oid
);
67 e2
= container_of(entry_or_key
, const struct object_entry
, ent
);
68 return oidcmp(&e1
->idx
.oid
, &e2
->idx
.oid
);
71 struct object_entry_pool
{
72 struct object_entry_pool
*next_pool
;
73 struct object_entry
*next_free
;
74 struct object_entry
*end
;
75 struct object_entry entries
[FLEX_ARRAY
]; /* more */
80 struct object_id
*oids
[1024];
81 struct object_entry
*marked
[1024];
82 struct mark_set
*sets
[1024];
95 struct atom_str
*next_atom
;
96 unsigned short str_len
;
97 char str_dat
[FLEX_ARRAY
]; /* more */
102 struct tree_content
*tree
;
103 struct atom_str
*name
;
104 struct tree_entry_ms
{
106 struct object_id oid
;
110 struct tree_content
{
111 unsigned int entry_capacity
; /* must match avail_tree_content */
112 unsigned int entry_count
;
113 unsigned int delta_depth
;
114 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
117 struct avail_tree_content
{
118 unsigned int entry_capacity
; /* must match tree_content */
119 struct avail_tree_content
*next_avail
;
123 struct branch
*table_next_branch
;
124 struct branch
*active_next_branch
;
126 struct tree_entry branch_tree
;
127 uintmax_t last_commit
;
131 unsigned pack_id
: PACK_ID_BITS
;
132 struct object_id oid
;
136 struct tag
*next_tag
;
138 unsigned int pack_id
;
139 struct object_id oid
;
143 struct hash_list
*next
;
144 struct object_id oid
;
149 WHENSPEC_RAW_PERMISSIVE
,
154 struct recent_command
{
155 struct recent_command
*prev
;
156 struct recent_command
*next
;
160 typedef void (*mark_set_inserter_t
)(struct mark_set
**s
, struct object_id
*oid
, uintmax_t mark
);
161 typedef void (*each_mark_fn_t
)(uintmax_t mark
, void *obj
, void *cbp
);
163 /* Configured limits on output */
164 static unsigned long max_depth
= 50;
165 static off_t max_packsize
;
166 static int unpack_limit
= 100;
167 static int force_update
;
169 /* Stats and misc. counters */
170 static uintmax_t alloc_count
;
171 static uintmax_t marks_set_count
;
172 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
173 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
174 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
175 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
176 static unsigned long object_count
;
177 static unsigned long branch_count
;
178 static unsigned long branch_load_count
;
180 static FILE *pack_edges
;
181 static unsigned int show_stats
= 1;
182 static int global_argc
;
183 static const char **global_argv
;
184 static const char *global_prefix
;
187 static struct mem_pool fi_mem_pool
= {
188 .block_alloc
= 2*1024*1024 - sizeof(struct mp_block
),
191 /* Atom management */
192 static unsigned int atom_table_sz
= 4451;
193 static unsigned int atom_cnt
;
194 static struct atom_str
**atom_table
;
196 /* The .pack file being generated */
197 static struct pack_idx_option pack_idx_opts
;
198 static unsigned int pack_id
;
199 static struct hashfile
*pack_file
;
200 static struct packed_git
*pack_data
;
201 static struct packed_git
**all_packs
;
202 static off_t pack_size
;
204 /* Table of objects we've written. */
205 static unsigned int object_entry_alloc
= 5000;
206 static struct object_entry_pool
*blocks
;
207 static struct hashmap object_table
;
208 static struct mark_set
*marks
;
209 static const char *export_marks_file
;
210 static const char *import_marks_file
;
211 static int import_marks_file_from_stream
;
212 static int import_marks_file_ignore_missing
;
213 static int import_marks_file_done
;
214 static int relative_marks_paths
;
217 static struct last_object last_blob
= {
221 /* Tree management */
222 static unsigned int tree_entry_alloc
= 1000;
223 static void *avail_tree_entry
;
224 static unsigned int avail_tree_table_sz
= 100;
225 static struct avail_tree_content
**avail_tree_table
;
226 static size_t tree_entry_allocd
;
227 static struct strbuf old_tree
= STRBUF_INIT
;
228 static struct strbuf new_tree
= STRBUF_INIT
;
231 static unsigned long max_active_branches
= 5;
232 static unsigned long cur_active_branches
;
233 static unsigned long branch_table_sz
= 1039;
234 static struct branch
**branch_table
;
235 static struct branch
*active_branches
;
238 static struct tag
*first_tag
;
239 static struct tag
*last_tag
;
241 /* Input stream parsing */
242 static whenspec_type whenspec
= WHENSPEC_RAW
;
243 static struct strbuf command_buf
= STRBUF_INIT
;
244 static int unread_command_buf
;
245 static struct recent_command cmd_hist
= {
249 static struct recent_command
*cmd_tail
= &cmd_hist
;
250 static struct recent_command
*rc_free
;
251 static unsigned int cmd_save
= 100;
252 static uintmax_t next_mark
;
253 static struct strbuf new_data
= STRBUF_INIT
;
254 static int seen_data_command
;
255 static int require_explicit_termination
;
256 static int allow_unsafe_features
;
258 /* Signal handling */
259 static volatile sig_atomic_t checkpoint_requested
;
261 /* Submodule marks */
262 static struct string_list sub_marks_from
= STRING_LIST_INIT_DUP
;
263 static struct string_list sub_marks_to
= STRING_LIST_INIT_DUP
;
264 static kh_oid_map_t
*sub_oid_map
;
266 /* Where to write output of cat-blob commands */
267 static int cat_blob_fd
= STDOUT_FILENO
;
269 static void parse_argv(void);
270 static void parse_get_mark(const char *p
);
271 static void parse_cat_blob(const char *p
);
272 static void parse_ls(const char *p
, struct branch
*b
);
274 static void for_each_mark(struct mark_set
*m
, uintmax_t base
, each_mark_fn_t callback
, void *p
)
278 for (k
= 0; k
< 1024; k
++) {
280 for_each_mark(m
->data
.sets
[k
], base
+ (k
<< m
->shift
), callback
, p
);
283 for (k
= 0; k
< 1024; k
++) {
284 if (m
->data
.marked
[k
])
285 callback(base
+ k
, m
->data
.marked
[k
], p
);
290 static void dump_marks_fn(uintmax_t mark
, void *object
, void *cbp
) {
291 struct object_entry
*e
= object
;
294 fprintf(f
, ":%" PRIuMAX
" %s\n", mark
, oid_to_hex(&e
->idx
.oid
));
297 static void write_branch_report(FILE *rpt
, struct branch
*b
)
299 fprintf(rpt
, "%s:\n", b
->name
);
301 fprintf(rpt
, " status :");
303 fputs(" active", rpt
);
304 if (b
->branch_tree
.tree
)
305 fputs(" loaded", rpt
);
306 if (is_null_oid(&b
->branch_tree
.versions
[1].oid
))
307 fputs(" dirty", rpt
);
310 fprintf(rpt
, " tip commit : %s\n", oid_to_hex(&b
->oid
));
311 fprintf(rpt
, " old tree : %s\n",
312 oid_to_hex(&b
->branch_tree
.versions
[0].oid
));
313 fprintf(rpt
, " cur tree : %s\n",
314 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
315 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
317 fputs(" last pack : ", rpt
);
318 if (b
->pack_id
< MAX_PACK_ID
)
319 fprintf(rpt
, "%u", b
->pack_id
);
325 static void write_crash_report(const char *err
)
327 char *loc
= git_pathdup("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
328 FILE *rpt
= fopen(loc
, "w");
331 struct recent_command
*rc
;
334 error_errno("can't write crash report %s", loc
);
339 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
341 fprintf(rpt
, "fast-import crash report:\n");
342 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
343 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
344 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_MODE(ISO8601
)));
347 fputs("fatal: ", rpt
);
352 fputs("Most Recent Commands Before Crash\n", rpt
);
353 fputs("---------------------------------\n", rpt
);
354 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
355 if (rc
->next
== &cmd_hist
)
364 fputs("Active Branch LRU\n", rpt
);
365 fputs("-----------------\n", rpt
);
366 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
368 max_active_branches
);
370 fputs(" pos clock name\n", rpt
);
371 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
372 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
373 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
374 ++lu
, b
->last_commit
, b
->name
);
377 fputs("Inactive Branches\n", rpt
);
378 fputs("-----------------\n", rpt
);
379 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
380 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
381 write_branch_report(rpt
, b
);
387 fputs("Annotated Tags\n", rpt
);
388 fputs("--------------\n", rpt
);
389 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
390 fputs(oid_to_hex(&tg
->oid
), rpt
);
392 fputs(tg
->name
, rpt
);
398 fputs("Marks\n", rpt
);
399 fputs("-----\n", rpt
);
400 if (export_marks_file
)
401 fprintf(rpt
, " exported to %s\n", export_marks_file
);
403 for_each_mark(marks
, 0, dump_marks_fn
, rpt
);
406 fputs("-------------------\n", rpt
);
407 fputs("END OF CRASH REPORT\n", rpt
);
412 static void end_packfile(void);
413 static void unkeep_all_packs(void);
414 static void dump_marks(void);
416 static NORETURN
void die_nicely(const char *err
, va_list params
)
420 report_fn die_message_fn
= get_die_message_routine();
423 die_message_fn(err
, params
);
426 char message
[2 * PATH_MAX
];
429 vsnprintf(message
, sizeof(message
), err
, cp
);
430 write_crash_report(message
);
438 #ifndef SIGUSR1 /* Windows, for example */
440 static void set_checkpoint_signal(void)
446 static void checkpoint_signal(int signo UNUSED
)
448 checkpoint_requested
= 1;
451 static void set_checkpoint_signal(void)
455 memset(&sa
, 0, sizeof(sa
));
456 sa
.sa_handler
= checkpoint_signal
;
457 sigemptyset(&sa
.sa_mask
);
458 sa
.sa_flags
= SA_RESTART
;
459 sigaction(SIGUSR1
, &sa
, NULL
);
464 static void alloc_objects(unsigned int cnt
)
466 struct object_entry_pool
*b
;
468 b
= xmalloc(sizeof(struct object_entry_pool
)
469 + cnt
* sizeof(struct object_entry
));
470 b
->next_pool
= blocks
;
471 b
->next_free
= b
->entries
;
472 b
->end
= b
->entries
+ cnt
;
477 static struct object_entry
*new_object(struct object_id
*oid
)
479 struct object_entry
*e
;
481 if (blocks
->next_free
== blocks
->end
)
482 alloc_objects(object_entry_alloc
);
484 e
= blocks
->next_free
++;
485 oidcpy(&e
->idx
.oid
, oid
);
489 static struct object_entry
*find_object(struct object_id
*oid
)
491 return hashmap_get_entry_from_hash(&object_table
, oidhash(oid
), oid
,
492 struct object_entry
, ent
);
495 static struct object_entry
*insert_object(struct object_id
*oid
)
497 struct object_entry
*e
;
498 unsigned int hash
= oidhash(oid
);
500 e
= hashmap_get_entry_from_hash(&object_table
, hash
, oid
,
501 struct object_entry
, ent
);
505 hashmap_entry_init(&e
->ent
, hash
);
506 hashmap_add(&object_table
, &e
->ent
);
512 static void invalidate_pack_id(unsigned int id
)
516 struct hashmap_iter iter
;
517 struct object_entry
*e
;
519 hashmap_for_each_entry(&object_table
, &iter
, e
, ent
) {
520 if (e
->pack_id
== id
)
521 e
->pack_id
= MAX_PACK_ID
;
524 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
527 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
528 if (b
->pack_id
== id
)
529 b
->pack_id
= MAX_PACK_ID
;
532 for (t
= first_tag
; t
; t
= t
->next_tag
)
533 if (t
->pack_id
== id
)
534 t
->pack_id
= MAX_PACK_ID
;
537 static unsigned int hc_str(const char *s
, size_t len
)
545 static void insert_mark(struct mark_set
**top
, uintmax_t idnum
, struct object_entry
*oe
)
547 struct mark_set
*s
= *top
;
549 while ((idnum
>> s
->shift
) >= 1024) {
550 s
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
551 s
->shift
= (*top
)->shift
+ 10;
552 s
->data
.sets
[0] = *top
;
556 uintmax_t i
= idnum
>> s
->shift
;
557 idnum
-= i
<< s
->shift
;
558 if (!s
->data
.sets
[i
]) {
559 s
->data
.sets
[i
] = mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
560 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
564 if (!s
->data
.marked
[idnum
])
566 s
->data
.marked
[idnum
] = oe
;
569 static void *find_mark(struct mark_set
*s
, uintmax_t idnum
)
571 uintmax_t orig_idnum
= idnum
;
572 struct object_entry
*oe
= NULL
;
573 if ((idnum
>> s
->shift
) < 1024) {
574 while (s
&& s
->shift
) {
575 uintmax_t i
= idnum
>> s
->shift
;
576 idnum
-= i
<< s
->shift
;
580 oe
= s
->data
.marked
[idnum
];
583 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
587 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
589 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
592 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
593 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
596 c
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct atom_str
) + len
+ 1);
598 memcpy(c
->str_dat
, s
, len
);
600 c
->next_atom
= atom_table
[hc
];
606 static struct branch
*lookup_branch(const char *name
)
608 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
611 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
612 if (!strcmp(name
, b
->name
))
617 static struct branch
*new_branch(const char *name
)
619 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
620 struct branch
*b
= lookup_branch(name
);
623 die("Invalid attempt to create duplicate branch: %s", name
);
624 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
625 die("Branch name doesn't conform to GIT standards: %s", name
);
627 b
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct branch
));
628 b
->name
= mem_pool_strdup(&fi_mem_pool
, name
);
629 b
->table_next_branch
= branch_table
[hc
];
630 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
631 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
634 b
->pack_id
= MAX_PACK_ID
;
635 branch_table
[hc
] = b
;
640 static unsigned int hc_entries(unsigned int cnt
)
642 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
643 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
646 static struct tree_content
*new_tree_content(unsigned int cnt
)
648 struct avail_tree_content
*f
, *l
= NULL
;
649 struct tree_content
*t
;
650 unsigned int hc
= hc_entries(cnt
);
652 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
653 if (f
->entry_capacity
>= cnt
)
658 l
->next_avail
= f
->next_avail
;
660 avail_tree_table
[hc
] = f
->next_avail
;
662 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
663 f
= mem_pool_alloc(&fi_mem_pool
, sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
664 f
->entry_capacity
= cnt
;
667 t
= (struct tree_content
*)f
;
673 static void release_tree_entry(struct tree_entry
*e
);
674 static void release_tree_content(struct tree_content
*t
)
676 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
677 unsigned int hc
= hc_entries(f
->entry_capacity
);
678 f
->next_avail
= avail_tree_table
[hc
];
679 avail_tree_table
[hc
] = f
;
682 static void release_tree_content_recursive(struct tree_content
*t
)
685 for (i
= 0; i
< t
->entry_count
; i
++)
686 release_tree_entry(t
->entries
[i
]);
687 release_tree_content(t
);
690 static struct tree_content
*grow_tree_content(
691 struct tree_content
*t
,
694 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
695 r
->entry_count
= t
->entry_count
;
696 r
->delta_depth
= t
->delta_depth
;
697 COPY_ARRAY(r
->entries
, t
->entries
, t
->entry_count
);
698 release_tree_content(t
);
702 static struct tree_entry
*new_tree_entry(void)
704 struct tree_entry
*e
;
706 if (!avail_tree_entry
) {
707 unsigned int n
= tree_entry_alloc
;
708 tree_entry_allocd
+= n
* sizeof(struct tree_entry
);
710 avail_tree_entry
= e
;
712 *((void**)e
) = e
+ 1;
718 e
= avail_tree_entry
;
719 avail_tree_entry
= *((void**)e
);
723 static void release_tree_entry(struct tree_entry
*e
)
726 release_tree_content_recursive(e
->tree
);
727 *((void**)e
) = avail_tree_entry
;
728 avail_tree_entry
= e
;
731 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
733 struct tree_content
*d
;
734 struct tree_entry
*a
, *b
;
739 d
= new_tree_content(s
->entry_count
);
740 for (i
= 0; i
< s
->entry_count
; i
++) {
742 b
= new_tree_entry();
743 memcpy(b
, a
, sizeof(*a
));
744 if (a
->tree
&& is_null_oid(&b
->versions
[1].oid
))
745 b
->tree
= dup_tree_content(a
->tree
);
750 d
->entry_count
= s
->entry_count
;
751 d
->delta_depth
= s
->delta_depth
;
756 static void start_packfile(void)
758 struct strbuf tmp_file
= STRBUF_INIT
;
759 struct packed_git
*p
;
762 pack_fd
= odb_mkstemp(&tmp_file
, "pack/tmp_pack_XXXXXX");
763 FLEX_ALLOC_STR(p
, pack_name
, tmp_file
.buf
);
764 strbuf_release(&tmp_file
);
766 p
->pack_fd
= pack_fd
;
768 pack_file
= hashfd(pack_fd
, p
->pack_name
);
771 pack_size
= write_pack_header(pack_file
, 0);
774 REALLOC_ARRAY(all_packs
, pack_id
+ 1);
775 all_packs
[pack_id
] = p
;
778 static const char *create_index(void)
781 struct pack_idx_entry
**idx
, **c
, **last
;
782 struct object_entry
*e
;
783 struct object_entry_pool
*o
;
785 /* Build the table of object IDs. */
786 ALLOC_ARRAY(idx
, object_count
);
788 for (o
= blocks
; o
; o
= o
->next_pool
)
789 for (e
= o
->next_free
; e
-- != o
->entries
;)
790 if (pack_id
== e
->pack_id
)
792 last
= idx
+ object_count
;
794 die("internal consistency error creating the index");
796 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
,
802 static char *keep_pack(const char *curr_index_name
)
804 static const char *keep_msg
= "fast-import";
805 struct strbuf name
= STRBUF_INIT
;
808 odb_pack_name(&name
, pack_data
->hash
, "keep");
809 keep_fd
= odb_pack_keep(name
.buf
);
811 die_errno("cannot create keep file");
812 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
814 die_errno("failed to write keep file");
816 odb_pack_name(&name
, pack_data
->hash
, "pack");
817 if (finalize_object_file(pack_data
->pack_name
, name
.buf
))
818 die("cannot store pack file");
820 odb_pack_name(&name
, pack_data
->hash
, "idx");
821 if (finalize_object_file(curr_index_name
, name
.buf
))
822 die("cannot store index file");
823 free((void *)curr_index_name
);
824 return strbuf_detach(&name
, NULL
);
827 static void unkeep_all_packs(void)
829 struct strbuf name
= STRBUF_INIT
;
832 for (k
= 0; k
< pack_id
; k
++) {
833 struct packed_git
*p
= all_packs
[k
];
834 odb_pack_name(&name
, p
->hash
, "keep");
835 unlink_or_warn(name
.buf
);
837 strbuf_release(&name
);
840 static int loosen_small_pack(const struct packed_git
*p
)
842 struct child_process unpack
= CHILD_PROCESS_INIT
;
844 if (lseek(p
->pack_fd
, 0, SEEK_SET
) < 0)
845 die_errno("Failed seeking to start of '%s'", p
->pack_name
);
847 unpack
.in
= p
->pack_fd
;
849 unpack
.stdout_to_stderr
= 1;
850 strvec_push(&unpack
.args
, "unpack-objects");
852 strvec_push(&unpack
.args
, "-q");
854 return run_command(&unpack
);
857 static void end_packfile(void)
861 if (running
|| !pack_data
)
865 clear_delta_base_cache();
867 struct packed_git
*new_p
;
868 struct object_id cur_pack_oid
;
874 close_pack_windows(pack_data
);
875 finalize_hashfile(pack_file
, cur_pack_oid
.hash
, FSYNC_COMPONENT_PACK
, 0);
876 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->hash
,
877 pack_data
->pack_name
, object_count
,
878 cur_pack_oid
.hash
, pack_size
);
880 if (object_count
<= unpack_limit
) {
881 if (!loosen_small_pack(pack_data
)) {
882 invalidate_pack_id(pack_id
);
887 close(pack_data
->pack_fd
);
888 idx_name
= keep_pack(create_index());
890 /* Register the packfile with core git's machinery. */
891 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
893 die("core git rejected index %s", idx_name
);
894 all_packs
[pack_id
] = new_p
;
895 install_packed_git(the_repository
, new_p
);
898 /* Print the boundary */
900 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
901 for (i
= 0; i
< branch_table_sz
; i
++) {
902 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
903 if (b
->pack_id
== pack_id
)
904 fprintf(pack_edges
, " %s",
905 oid_to_hex(&b
->oid
));
908 for (t
= first_tag
; t
; t
= t
->next_tag
) {
909 if (t
->pack_id
== pack_id
)
910 fprintf(pack_edges
, " %s",
911 oid_to_hex(&t
->oid
));
913 fputc('\n', pack_edges
);
921 close(pack_data
->pack_fd
);
922 unlink_or_warn(pack_data
->pack_name
);
924 FREE_AND_NULL(pack_data
);
927 /* We can't carry a delta across packfiles. */
928 strbuf_release(&last_blob
.data
);
929 last_blob
.offset
= 0;
933 static void cycle_packfile(void)
939 static int store_object(
940 enum object_type type
,
942 struct last_object
*last
,
943 struct object_id
*oidout
,
947 struct object_entry
*e
;
948 unsigned char hdr
[96];
949 struct object_id oid
;
950 unsigned long hdrlen
, deltalen
;
954 hdrlen
= format_object_header((char *)hdr
, sizeof(hdr
), type
,
956 the_hash_algo
->init_fn(&c
);
957 the_hash_algo
->update_fn(&c
, hdr
, hdrlen
);
958 the_hash_algo
->update_fn(&c
, dat
->buf
, dat
->len
);
959 the_hash_algo
->final_oid_fn(&oid
, &c
);
961 oidcpy(oidout
, &oid
);
963 e
= insert_object(&oid
);
965 insert_mark(&marks
, mark
, e
);
967 duplicate_count_by_type
[type
]++;
969 } else if (find_sha1_pack(oid
.hash
,
970 get_all_packs(the_repository
))) {
972 e
->pack_id
= MAX_PACK_ID
;
973 e
->idx
.offset
= 1; /* just not zero! */
974 duplicate_count_by_type
[type
]++;
978 if (last
&& last
->data
.len
&& last
->data
.buf
&& last
->depth
< max_depth
979 && dat
->len
> the_hash_algo
->rawsz
) {
981 delta_count_attempts_by_type
[type
]++;
982 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
984 &deltalen
, dat
->len
- the_hash_algo
->rawsz
);
988 git_deflate_init(&s
, pack_compression_level
);
991 s
.avail_in
= deltalen
;
993 s
.next_in
= (void *)dat
->buf
;
994 s
.avail_in
= dat
->len
;
996 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
997 s
.next_out
= out
= xmalloc(s
.avail_out
);
998 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1000 git_deflate_end(&s
);
1002 /* Determine if we should auto-checkpoint. */
1004 && (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) > max_packsize
)
1005 || (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) < pack_size
) {
1007 /* This new object needs to *not* have the current pack_id. */
1008 e
->pack_id
= pack_id
+ 1;
1011 /* We cannot carry a delta into the new pack. */
1013 FREE_AND_NULL(delta
);
1015 git_deflate_init(&s
, pack_compression_level
);
1016 s
.next_in
= (void *)dat
->buf
;
1017 s
.avail_in
= dat
->len
;
1018 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1019 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1020 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1022 git_deflate_end(&s
);
1027 e
->pack_id
= pack_id
;
1028 e
->idx
.offset
= pack_size
;
1030 object_count_by_type
[type
]++;
1032 crc32_begin(pack_file
);
1035 off_t ofs
= e
->idx
.offset
- last
->offset
;
1036 unsigned pos
= sizeof(hdr
) - 1;
1038 delta_count_by_type
[type
]++;
1039 e
->depth
= last
->depth
+ 1;
1041 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1042 OBJ_OFS_DELTA
, deltalen
);
1043 hashwrite(pack_file
, hdr
, hdrlen
);
1044 pack_size
+= hdrlen
;
1046 hdr
[pos
] = ofs
& 127;
1048 hdr
[--pos
] = 128 | (--ofs
& 127);
1049 hashwrite(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1050 pack_size
+= sizeof(hdr
) - pos
;
1053 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1055 hashwrite(pack_file
, hdr
, hdrlen
);
1056 pack_size
+= hdrlen
;
1059 hashwrite(pack_file
, out
, s
.total_out
);
1060 pack_size
+= s
.total_out
;
1062 e
->idx
.crc32
= crc32_end(pack_file
);
1067 if (last
->no_swap
) {
1070 strbuf_swap(&last
->data
, dat
);
1072 last
->offset
= e
->idx
.offset
;
1073 last
->depth
= e
->depth
;
1078 static void truncate_pack(struct hashfile_checkpoint
*checkpoint
)
1080 if (hashfile_truncate(pack_file
, checkpoint
))
1081 die_errno("cannot truncate pack to skip duplicate");
1082 pack_size
= checkpoint
->offset
;
1085 static void stream_blob(uintmax_t len
, struct object_id
*oidout
, uintmax_t mark
)
1087 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1088 unsigned char *in_buf
= xmalloc(in_sz
);
1089 unsigned char *out_buf
= xmalloc(out_sz
);
1090 struct object_entry
*e
;
1091 struct object_id oid
;
1092 unsigned long hdrlen
;
1096 struct hashfile_checkpoint checkpoint
;
1099 /* Determine if we should auto-checkpoint. */
1101 && (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) > max_packsize
)
1102 || (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) < pack_size
)
1105 the_hash_algo
->init_fn(&checkpoint
.ctx
);
1106 hashfile_checkpoint(pack_file
, &checkpoint
);
1107 offset
= checkpoint
.offset
;
1109 hdrlen
= format_object_header((char *)out_buf
, out_sz
, OBJ_BLOB
, len
);
1111 the_hash_algo
->init_fn(&c
);
1112 the_hash_algo
->update_fn(&c
, out_buf
, hdrlen
);
1114 crc32_begin(pack_file
);
1116 git_deflate_init(&s
, pack_compression_level
);
1118 hdrlen
= encode_in_pack_object_header(out_buf
, out_sz
, OBJ_BLOB
, len
);
1120 s
.next_out
= out_buf
+ hdrlen
;
1121 s
.avail_out
= out_sz
- hdrlen
;
1123 while (status
!= Z_STREAM_END
) {
1124 if (0 < len
&& !s
.avail_in
) {
1125 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1126 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1127 if (!n
&& feof(stdin
))
1128 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1130 the_hash_algo
->update_fn(&c
, in_buf
, n
);
1136 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1138 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1139 size_t n
= s
.next_out
- out_buf
;
1140 hashwrite(pack_file
, out_buf
, n
);
1142 s
.next_out
= out_buf
;
1143 s
.avail_out
= out_sz
;
1152 die("unexpected deflate failure: %d", status
);
1155 git_deflate_end(&s
);
1156 the_hash_algo
->final_oid_fn(&oid
, &c
);
1159 oidcpy(oidout
, &oid
);
1161 e
= insert_object(&oid
);
1164 insert_mark(&marks
, mark
, e
);
1166 if (e
->idx
.offset
) {
1167 duplicate_count_by_type
[OBJ_BLOB
]++;
1168 truncate_pack(&checkpoint
);
1170 } else if (find_sha1_pack(oid
.hash
,
1171 get_all_packs(the_repository
))) {
1173 e
->pack_id
= MAX_PACK_ID
;
1174 e
->idx
.offset
= 1; /* just not zero! */
1175 duplicate_count_by_type
[OBJ_BLOB
]++;
1176 truncate_pack(&checkpoint
);
1181 e
->pack_id
= pack_id
;
1182 e
->idx
.offset
= offset
;
1183 e
->idx
.crc32
= crc32_end(pack_file
);
1185 object_count_by_type
[OBJ_BLOB
]++;
1192 /* All calls must be guarded by find_object() or find_mark() to
1193 * ensure the 'struct object_entry' passed was written by this
1194 * process instance. We unpack the entry by the offset, avoiding
1195 * the need for the corresponding .idx file. This unpacking rule
1196 * works because we only use OBJ_REF_DELTA within the packfiles
1197 * created by fast-import.
1199 * oe must not be NULL. Such an oe usually comes from giving
1200 * an unknown SHA-1 to find_object() or an undefined mark to
1201 * find_mark(). Callers must test for this condition and use
1202 * the standard read_sha1_file() when it happens.
1204 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1205 * find_mark(), where the mark was reloaded from an existing marks
1206 * file and is referencing an object that this fast-import process
1207 * instance did not write out to a packfile. Callers must test for
1208 * this condition and use read_sha1_file() instead.
1210 static void *gfi_unpack_entry(
1211 struct object_entry
*oe
,
1212 unsigned long *sizep
)
1214 enum object_type type
;
1215 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1216 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ the_hash_algo
->rawsz
)) {
1217 /* The object is stored in the packfile we are writing to
1218 * and we have modified it since the last time we scanned
1219 * back to read a previously written object. If an old
1220 * window covered [p->pack_size, p->pack_size + rawsz) its
1221 * data is stale and is not valid. Closing all windows
1222 * and updating the packfile length ensures we can read
1223 * the newly written data.
1225 close_pack_windows(p
);
1226 hashflush(pack_file
);
1228 /* We have to offer rawsz bytes additional on the end of
1229 * the packfile as the core unpacker code assumes the
1230 * footer is present at the file end and must promise
1231 * at least rawsz bytes within any window it maps. But
1232 * we don't actually create the footer here.
1234 p
->pack_size
= pack_size
+ the_hash_algo
->rawsz
;
1236 return unpack_entry(the_repository
, p
, oe
->idx
.offset
, &type
, sizep
);
1239 static const char *get_mode(const char *str
, uint16_t *modep
)
1244 while ((c
= *str
++) != ' ') {
1245 if (c
< '0' || c
> '7')
1247 mode
= (mode
<< 3) + (c
- '0');
1253 static void load_tree(struct tree_entry
*root
)
1255 struct object_id
*oid
= &root
->versions
[1].oid
;
1256 struct object_entry
*myoe
;
1257 struct tree_content
*t
;
1262 root
->tree
= t
= new_tree_content(8);
1263 if (is_null_oid(oid
))
1266 myoe
= find_object(oid
);
1267 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1268 if (myoe
->type
!= OBJ_TREE
)
1269 die("Not a tree: %s", oid_to_hex(oid
));
1270 t
->delta_depth
= myoe
->depth
;
1271 buf
= gfi_unpack_entry(myoe
, &size
);
1273 die("Can't load tree %s", oid_to_hex(oid
));
1275 enum object_type type
;
1276 buf
= repo_read_object_file(the_repository
, oid
, &type
, &size
);
1277 if (!buf
|| type
!= OBJ_TREE
)
1278 die("Can't load tree %s", oid_to_hex(oid
));
1282 while (c
!= (buf
+ size
)) {
1283 struct tree_entry
*e
= new_tree_entry();
1285 if (t
->entry_count
== t
->entry_capacity
)
1286 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1287 t
->entries
[t
->entry_count
++] = e
;
1290 c
= get_mode(c
, &e
->versions
[1].mode
);
1292 die("Corrupt mode in %s", oid_to_hex(oid
));
1293 e
->versions
[0].mode
= e
->versions
[1].mode
;
1294 e
->name
= to_atom(c
, strlen(c
));
1295 c
+= e
->name
->str_len
+ 1;
1296 oidread(&e
->versions
[0].oid
, (unsigned char *)c
);
1297 oidread(&e
->versions
[1].oid
, (unsigned char *)c
);
1298 c
+= the_hash_algo
->rawsz
;
1303 static int tecmp0 (const void *_a
, const void *_b
)
1305 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1306 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1307 return base_name_compare(
1308 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1309 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1312 static int tecmp1 (const void *_a
, const void *_b
)
1314 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1315 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1316 return base_name_compare(
1317 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1318 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1321 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1327 QSORT(t
->entries
, t
->entry_count
, tecmp0
);
1329 QSORT(t
->entries
, t
->entry_count
, tecmp1
);
1331 for (i
= 0; i
< t
->entry_count
; i
++) {
1332 if (t
->entries
[i
]->versions
[v
].mode
)
1333 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1337 strbuf_grow(b
, maxlen
);
1338 for (i
= 0; i
< t
->entry_count
; i
++) {
1339 struct tree_entry
*e
= t
->entries
[i
];
1340 if (!e
->versions
[v
].mode
)
1342 strbuf_addf(b
, "%o %s%c",
1343 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1344 e
->name
->str_dat
, '\0');
1345 strbuf_add(b
, e
->versions
[v
].oid
.hash
, the_hash_algo
->rawsz
);
1349 static void store_tree(struct tree_entry
*root
)
1351 struct tree_content
*t
;
1352 unsigned int i
, j
, del
;
1353 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1354 struct object_entry
*le
= NULL
;
1356 if (!is_null_oid(&root
->versions
[1].oid
))
1363 for (i
= 0; i
< t
->entry_count
; i
++) {
1364 if (t
->entries
[i
]->tree
)
1365 store_tree(t
->entries
[i
]);
1368 if (!(root
->versions
[0].mode
& NO_DELTA
))
1369 le
= find_object(&root
->versions
[0].oid
);
1370 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1371 mktree(t
, 0, &old_tree
);
1373 lo
.offset
= le
->idx
.offset
;
1374 lo
.depth
= t
->delta_depth
;
1377 mktree(t
, 1, &new_tree
);
1378 store_object(OBJ_TREE
, &new_tree
, &lo
, &root
->versions
[1].oid
, 0);
1380 t
->delta_depth
= lo
.depth
;
1381 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1382 struct tree_entry
*e
= t
->entries
[i
];
1383 if (e
->versions
[1].mode
) {
1384 e
->versions
[0].mode
= e
->versions
[1].mode
;
1385 oidcpy(&e
->versions
[0].oid
, &e
->versions
[1].oid
);
1386 t
->entries
[j
++] = e
;
1388 release_tree_entry(e
);
1392 t
->entry_count
-= del
;
1395 static void tree_content_replace(
1396 struct tree_entry
*root
,
1397 const struct object_id
*oid
,
1398 const uint16_t mode
,
1399 struct tree_content
*newtree
)
1402 die("Root cannot be a non-directory");
1403 oidclr(&root
->versions
[0].oid
);
1404 oidcpy(&root
->versions
[1].oid
, oid
);
1406 release_tree_content_recursive(root
->tree
);
1407 root
->tree
= newtree
;
1410 static int tree_content_set(
1411 struct tree_entry
*root
,
1413 const struct object_id
*oid
,
1414 const uint16_t mode
,
1415 struct tree_content
*subtree
)
1417 struct tree_content
*t
;
1420 struct tree_entry
*e
;
1422 slash1
= strchrnul(p
, '/');
1425 die("Empty path component found in input");
1426 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1427 die("Non-directories cannot have subtrees");
1432 for (i
= 0; i
< t
->entry_count
; i
++) {
1434 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1437 && e
->versions
[1].mode
== mode
1438 && oideq(&e
->versions
[1].oid
, oid
))
1440 e
->versions
[1].mode
= mode
;
1441 oidcpy(&e
->versions
[1].oid
, oid
);
1443 release_tree_content_recursive(e
->tree
);
1447 * We need to leave e->versions[0].sha1 alone
1448 * to avoid modifying the preimage tree used
1449 * when writing out the parent directory.
1450 * But after replacing the subdir with a
1451 * completely different one, it's not a good
1452 * delta base any more, and besides, we've
1453 * thrown away the tree entries needed to
1454 * make a delta against it.
1456 * So let's just explicitly disable deltas
1459 if (S_ISDIR(e
->versions
[0].mode
))
1460 e
->versions
[0].mode
|= NO_DELTA
;
1462 oidclr(&root
->versions
[1].oid
);
1465 if (!S_ISDIR(e
->versions
[1].mode
)) {
1466 e
->tree
= new_tree_content(8);
1467 e
->versions
[1].mode
= S_IFDIR
;
1471 if (tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
)) {
1472 oidclr(&root
->versions
[1].oid
);
1479 if (t
->entry_count
== t
->entry_capacity
)
1480 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1481 e
= new_tree_entry();
1482 e
->name
= to_atom(p
, n
);
1483 e
->versions
[0].mode
= 0;
1484 oidclr(&e
->versions
[0].oid
);
1485 t
->entries
[t
->entry_count
++] = e
;
1487 e
->tree
= new_tree_content(8);
1488 e
->versions
[1].mode
= S_IFDIR
;
1489 tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
);
1492 e
->versions
[1].mode
= mode
;
1493 oidcpy(&e
->versions
[1].oid
, oid
);
1495 oidclr(&root
->versions
[1].oid
);
1499 static int tree_content_remove(
1500 struct tree_entry
*root
,
1502 struct tree_entry
*backup_leaf
,
1505 struct tree_content
*t
;
1508 struct tree_entry
*e
;
1510 slash1
= strchrnul(p
, '/');
1516 if (!*p
&& allow_root
) {
1522 for (i
= 0; i
< t
->entry_count
; i
++) {
1524 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1525 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1527 * If p names a file in some subdirectory, and a
1528 * file or symlink matching the name of the
1529 * parent directory of p exists, then p cannot
1530 * exist and need not be deleted.
1533 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1537 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1538 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1539 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1540 oidclr(&root
->versions
[1].oid
);
1554 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1556 release_tree_content_recursive(e
->tree
);
1558 e
->versions
[1].mode
= 0;
1559 oidclr(&e
->versions
[1].oid
);
1560 oidclr(&root
->versions
[1].oid
);
1564 static int tree_content_get(
1565 struct tree_entry
*root
,
1567 struct tree_entry
*leaf
,
1570 struct tree_content
*t
;
1573 struct tree_entry
*e
;
1575 slash1
= strchrnul(p
, '/');
1577 if (!n
&& !allow_root
)
1578 die("Empty path component found in input");
1589 for (i
= 0; i
< t
->entry_count
; i
++) {
1591 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1594 if (!S_ISDIR(e
->versions
[1].mode
))
1598 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1604 memcpy(leaf
, e
, sizeof(*leaf
));
1605 if (e
->tree
&& is_null_oid(&e
->versions
[1].oid
))
1606 leaf
->tree
= dup_tree_content(e
->tree
);
1612 static int update_branch(struct branch
*b
)
1614 static const char *msg
= "fast-import";
1615 struct ref_transaction
*transaction
;
1616 struct object_id old_oid
;
1617 struct strbuf err
= STRBUF_INIT
;
1619 if (is_null_oid(&b
->oid
)) {
1621 delete_ref(NULL
, b
->name
, NULL
, 0);
1624 if (read_ref(b
->name
, &old_oid
))
1626 if (!force_update
&& !is_null_oid(&old_oid
)) {
1627 struct commit
*old_cmit
, *new_cmit
;
1630 old_cmit
= lookup_commit_reference_gently(the_repository
,
1632 new_cmit
= lookup_commit_reference_gently(the_repository
,
1634 if (!old_cmit
|| !new_cmit
)
1635 return error("Branch %s is missing commits.", b
->name
);
1637 ret
= repo_in_merge_bases(the_repository
, old_cmit
, new_cmit
);
1641 warning("Not updating %s"
1642 " (new tip %s does not contain %s)",
1643 b
->name
, oid_to_hex(&b
->oid
),
1644 oid_to_hex(&old_oid
));
1648 transaction
= ref_transaction_begin(&err
);
1650 ref_transaction_update(transaction
, b
->name
, &b
->oid
, &old_oid
,
1652 ref_transaction_commit(transaction
, &err
)) {
1653 ref_transaction_free(transaction
);
1654 error("%s", err
.buf
);
1655 strbuf_release(&err
);
1658 ref_transaction_free(transaction
);
1659 strbuf_release(&err
);
1663 static void dump_branches(void)
1668 for (i
= 0; i
< branch_table_sz
; i
++) {
1669 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1670 failure
|= update_branch(b
);
1674 static void dump_tags(void)
1676 static const char *msg
= "fast-import";
1678 struct strbuf ref_name
= STRBUF_INIT
;
1679 struct strbuf err
= STRBUF_INIT
;
1680 struct ref_transaction
*transaction
;
1682 transaction
= ref_transaction_begin(&err
);
1684 failure
|= error("%s", err
.buf
);
1687 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1688 strbuf_reset(&ref_name
);
1689 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1691 if (ref_transaction_update(transaction
, ref_name
.buf
,
1692 &t
->oid
, NULL
, 0, msg
, &err
)) {
1693 failure
|= error("%s", err
.buf
);
1697 if (ref_transaction_commit(transaction
, &err
))
1698 failure
|= error("%s", err
.buf
);
1701 ref_transaction_free(transaction
);
1702 strbuf_release(&ref_name
);
1703 strbuf_release(&err
);
1706 static void dump_marks(void)
1708 struct lock_file mark_lock
= LOCK_INIT
;
1711 if (!export_marks_file
|| (import_marks_file
&& !import_marks_file_done
))
1714 if (safe_create_leading_directories_const(export_marks_file
)) {
1715 failure
|= error_errno("unable to create leading directories of %s",
1720 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1721 failure
|= error_errno("Unable to write marks file %s",
1726 f
= fdopen_lock_file(&mark_lock
, "w");
1728 int saved_errno
= errno
;
1729 rollback_lock_file(&mark_lock
);
1730 failure
|= error("Unable to write marks file %s: %s",
1731 export_marks_file
, strerror(saved_errno
));
1735 for_each_mark(marks
, 0, dump_marks_fn
, f
);
1736 if (commit_lock_file(&mark_lock
)) {
1737 failure
|= error_errno("Unable to write file %s",
1743 static void insert_object_entry(struct mark_set
**s
, struct object_id
*oid
, uintmax_t mark
)
1745 struct object_entry
*e
;
1746 e
= find_object(oid
);
1748 enum object_type type
= oid_object_info(the_repository
,
1751 die("object not found: %s", oid_to_hex(oid
));
1752 e
= insert_object(oid
);
1754 e
->pack_id
= MAX_PACK_ID
;
1755 e
->idx
.offset
= 1; /* just not zero! */
1757 insert_mark(s
, mark
, e
);
1760 static void insert_oid_entry(struct mark_set
**s
, struct object_id
*oid
, uintmax_t mark
)
1762 insert_mark(s
, mark
, xmemdupz(oid
, sizeof(*oid
)));
1765 static void read_mark_file(struct mark_set
**s
, FILE *f
, mark_set_inserter_t inserter
)
1768 while (fgets(line
, sizeof(line
), f
)) {
1771 struct object_id oid
;
1773 /* Ensure SHA-1 objects are padded with zeros. */
1774 memset(oid
.hash
, 0, sizeof(oid
.hash
));
1776 end
= strchr(line
, '\n');
1777 if (line
[0] != ':' || !end
)
1778 die("corrupt mark line: %s", line
);
1780 mark
= strtoumax(line
+ 1, &end
, 10);
1781 if (!mark
|| end
== line
+ 1
1783 || get_oid_hex_any(end
+ 1, &oid
) == GIT_HASH_UNKNOWN
)
1784 die("corrupt mark line: %s", line
);
1785 inserter(s
, &oid
, mark
);
1789 static void read_marks(void)
1791 FILE *f
= fopen(import_marks_file
, "r");
1794 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1795 goto done
; /* Marks file does not exist */
1797 die_errno("cannot read '%s'", import_marks_file
);
1798 read_mark_file(&marks
, f
, insert_object_entry
);
1801 import_marks_file_done
= 1;
1805 static int read_next_command(void)
1807 static int stdin_eof
= 0;
1810 unread_command_buf
= 0;
1815 if (unread_command_buf
) {
1816 unread_command_buf
= 0;
1818 struct recent_command
*rc
;
1820 stdin_eof
= strbuf_getline_lf(&command_buf
, stdin
);
1824 if (!seen_data_command
1825 && !starts_with(command_buf
.buf
, "feature ")
1826 && !starts_with(command_buf
.buf
, "option ")) {
1835 cmd_hist
.next
= rc
->next
;
1836 cmd_hist
.next
->prev
= &cmd_hist
;
1840 rc
->buf
= xstrdup(command_buf
.buf
);
1841 rc
->prev
= cmd_tail
;
1842 rc
->next
= cmd_hist
.prev
;
1843 rc
->prev
->next
= rc
;
1846 if (command_buf
.buf
[0] == '#')
1852 static void skip_optional_lf(void)
1854 int term_char
= fgetc(stdin
);
1855 if (term_char
!= '\n' && term_char
!= EOF
)
1856 ungetc(term_char
, stdin
);
1859 static void parse_mark(void)
1862 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1863 next_mark
= strtoumax(v
, NULL
, 10);
1864 read_next_command();
1870 static void parse_original_identifier(void)
1873 if (skip_prefix(command_buf
.buf
, "original-oid ", &v
))
1874 read_next_command();
1877 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1882 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1883 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1885 if (skip_prefix(data
, "<<", &data
)) {
1886 char *term
= xstrdup(data
);
1887 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1890 if (strbuf_getline_lf(&command_buf
, stdin
) == EOF
)
1891 die("EOF in data (terminator '%s' not found)", term
);
1892 if (term_len
== command_buf
.len
1893 && !strcmp(term
, command_buf
.buf
))
1895 strbuf_addbuf(sb
, &command_buf
);
1896 strbuf_addch(sb
, '\n');
1901 uintmax_t len
= strtoumax(data
, NULL
, 10);
1902 size_t n
= 0, length
= (size_t)len
;
1904 if (limit
&& limit
< len
) {
1909 die("data is too large to use in this context");
1911 while (n
< length
) {
1912 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1913 if (!s
&& feof(stdin
))
1914 die("EOF in data (%lu bytes remaining)",
1915 (unsigned long)(length
- n
));
1924 static int validate_raw_date(const char *src
, struct strbuf
*result
, int strict
)
1926 const char *orig_src
= src
;
1932 num
= strtoul(src
, &endp
, 10);
1934 * NEEDSWORK: perhaps check for reasonable values? For example, we
1935 * could error on values representing times more than a
1936 * day in the future.
1938 if (errno
|| endp
== src
|| *endp
!= ' ')
1942 if (*src
!= '-' && *src
!= '+')
1945 num
= strtoul(src
+ 1, &endp
, 10);
1947 * NEEDSWORK: check for brokenness other than num > 1400, such as
1948 * (num % 100) >= 60, or ((num % 100) % 15) != 0 ?
1950 if (errno
|| endp
== src
+ 1 || *endp
|| /* did not parse */
1951 (strict
&& (1400 < num
)) /* parsed a broken timezone */
1955 strbuf_addstr(result
, orig_src
);
1959 static char *parse_ident(const char *buf
)
1963 struct strbuf ident
= STRBUF_INIT
;
1965 /* ensure there is a space delimiter even if there is no name */
1969 ltgt
= buf
+ strcspn(buf
, "<>");
1971 die("Missing < in ident string: %s", buf
);
1972 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
1973 die("Missing space before < in ident string: %s", buf
);
1974 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
1976 die("Missing > in ident string: %s", buf
);
1979 die("Missing space after > in ident string: %s", buf
);
1981 name_len
= ltgt
- buf
;
1982 strbuf_add(&ident
, buf
, name_len
);
1986 if (validate_raw_date(ltgt
, &ident
, 1) < 0)
1987 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1989 case WHENSPEC_RAW_PERMISSIVE
:
1990 if (validate_raw_date(ltgt
, &ident
, 0) < 0)
1991 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1993 case WHENSPEC_RFC2822
:
1994 if (parse_date(ltgt
, &ident
) < 0)
1995 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
1998 if (strcmp("now", ltgt
))
1999 die("Date in ident must be 'now': %s", buf
);
2004 return strbuf_detach(&ident
, NULL
);
2007 static void parse_and_store_blob(
2008 struct last_object
*last
,
2009 struct object_id
*oidout
,
2012 static struct strbuf buf
= STRBUF_INIT
;
2015 if (parse_data(&buf
, big_file_threshold
, &len
))
2016 store_object(OBJ_BLOB
, &buf
, last
, oidout
, mark
);
2019 strbuf_release(&last
->data
);
2023 stream_blob(len
, oidout
, mark
);
2028 static void parse_new_blob(void)
2030 read_next_command();
2032 parse_original_identifier();
2033 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2036 static void unload_one_branch(void)
2038 while (cur_active_branches
2039 && cur_active_branches
>= max_active_branches
) {
2040 uintmax_t min_commit
= ULONG_MAX
;
2041 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2043 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2044 if (e
->last_commit
< min_commit
) {
2046 min_commit
= e
->last_commit
;
2052 e
= p
->active_next_branch
;
2053 p
->active_next_branch
= e
->active_next_branch
;
2055 e
= active_branches
;
2056 active_branches
= e
->active_next_branch
;
2059 e
->active_next_branch
= NULL
;
2060 if (e
->branch_tree
.tree
) {
2061 release_tree_content_recursive(e
->branch_tree
.tree
);
2062 e
->branch_tree
.tree
= NULL
;
2064 cur_active_branches
--;
2068 static void load_branch(struct branch
*b
)
2070 load_tree(&b
->branch_tree
);
2073 b
->active_next_branch
= active_branches
;
2074 active_branches
= b
;
2075 cur_active_branches
++;
2076 branch_load_count
++;
2080 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2082 unsigned char fanout
= 0;
2083 while ((num_notes
>>= 8))
2088 static void construct_path_with_fanout(const char *hex_sha1
,
2089 unsigned char fanout
, char *path
)
2091 unsigned int i
= 0, j
= 0;
2092 if (fanout
>= the_hash_algo
->rawsz
)
2093 die("Too large fanout (%u)", fanout
);
2095 path
[i
++] = hex_sha1
[j
++];
2096 path
[i
++] = hex_sha1
[j
++];
2100 memcpy(path
+ i
, hex_sha1
+ j
, the_hash_algo
->hexsz
- j
);
2101 path
[i
+ the_hash_algo
->hexsz
- j
] = '\0';
2104 static uintmax_t do_change_note_fanout(
2105 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2106 char *hex_oid
, unsigned int hex_oid_len
,
2107 char *fullpath
, unsigned int fullpath_len
,
2108 unsigned char fanout
)
2110 struct tree_content
*t
;
2111 struct tree_entry
*e
, leaf
;
2112 unsigned int i
, tmp_hex_oid_len
, tmp_fullpath_len
;
2113 uintmax_t num_notes
= 0;
2114 struct object_id oid
;
2115 /* hex oid + '/' between each pair of hex digits + NUL */
2116 char realpath
[GIT_MAX_HEXSZ
+ ((GIT_MAX_HEXSZ
/ 2) - 1) + 1];
2117 const unsigned hexsz
= the_hash_algo
->hexsz
;
2123 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2125 tmp_hex_oid_len
= hex_oid_len
+ e
->name
->str_len
;
2126 tmp_fullpath_len
= fullpath_len
;
2129 * We're interested in EITHER existing note entries (entries
2130 * with exactly 40 hex chars in path, not including directory
2131 * separators), OR directory entries that may contain note
2132 * entries (with < 40 hex chars in path).
2133 * Also, each path component in a note entry must be a multiple
2136 if (!e
->versions
[1].mode
||
2137 tmp_hex_oid_len
> hexsz
||
2138 e
->name
->str_len
% 2)
2141 /* This _may_ be a note entry, or a subdir containing notes */
2142 memcpy(hex_oid
+ hex_oid_len
, e
->name
->str_dat
,
2144 if (tmp_fullpath_len
)
2145 fullpath
[tmp_fullpath_len
++] = '/';
2146 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2148 tmp_fullpath_len
+= e
->name
->str_len
;
2149 fullpath
[tmp_fullpath_len
] = '\0';
2151 if (tmp_hex_oid_len
== hexsz
&& !get_oid_hex(hex_oid
, &oid
)) {
2152 /* This is a note entry */
2153 if (fanout
== 0xff) {
2154 /* Counting mode, no rename */
2158 construct_path_with_fanout(hex_oid
, fanout
, realpath
);
2159 if (!strcmp(fullpath
, realpath
)) {
2160 /* Note entry is in correct location */
2165 /* Rename fullpath to realpath */
2166 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2167 die("Failed to remove path %s", fullpath
);
2168 tree_content_set(orig_root
, realpath
,
2169 &leaf
.versions
[1].oid
,
2170 leaf
.versions
[1].mode
,
2172 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2173 /* This is a subdir that may contain note entries */
2174 num_notes
+= do_change_note_fanout(orig_root
, e
,
2175 hex_oid
, tmp_hex_oid_len
,
2176 fullpath
, tmp_fullpath_len
, fanout
);
2179 /* The above may have reallocated the current tree_content */
2185 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2186 unsigned char fanout
)
2189 * The size of path is due to one slash between every two hex digits,
2190 * plus the terminating NUL. Note that there is no slash at the end, so
2191 * the number of slashes is one less than half the number of hex
2194 char hex_oid
[GIT_MAX_HEXSZ
], path
[GIT_MAX_HEXSZ
+ (GIT_MAX_HEXSZ
/ 2) - 1 + 1];
2195 return do_change_note_fanout(root
, root
, hex_oid
, 0, path
, 0, fanout
);
2198 static int parse_mapped_oid_hex(const char *hex
, struct object_id
*oid
, const char **end
)
2203 /* Make SHA-1 object IDs have all-zero padding. */
2204 memset(oid
->hash
, 0, sizeof(oid
->hash
));
2206 algo
= parse_oid_hex_any(hex
, oid
, end
);
2207 if (algo
== GIT_HASH_UNKNOWN
)
2210 it
= kh_get_oid_map(sub_oid_map
, *oid
);
2211 /* No such object? */
2212 if (it
== kh_end(sub_oid_map
)) {
2213 /* If we're using the same algorithm, pass it through. */
2214 if (hash_algos
[algo
].format_id
== the_hash_algo
->format_id
)
2218 oidcpy(oid
, kh_value(sub_oid_map
, it
));
2223 * Given a pointer into a string, parse a mark reference:
2225 * idnum ::= ':' bigint;
2227 * Return the first character after the value in *endptr.
2229 * Complain if the following character is not what is expected,
2230 * either a space or end of the string.
2232 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2238 mark
= strtoumax(p
, endptr
, 10);
2240 die("No value after ':' in mark: %s", command_buf
.buf
);
2245 * Parse the mark reference, and complain if this is not the end of
2248 static uintmax_t parse_mark_ref_eol(const char *p
)
2253 mark
= parse_mark_ref(p
, &end
);
2255 die("Garbage after mark: %s", command_buf
.buf
);
2260 * Parse the mark reference, demanding a trailing space. Return a
2261 * pointer to the space.
2263 static uintmax_t parse_mark_ref_space(const char **p
)
2268 mark
= parse_mark_ref(*p
, &end
);
2270 die("Missing space after mark: %s", command_buf
.buf
);
2275 static void file_change_m(const char *p
, struct branch
*b
)
2277 static struct strbuf uq
= STRBUF_INIT
;
2279 struct object_entry
*oe
;
2280 struct object_id oid
;
2281 uint16_t mode
, inline_data
= 0;
2283 p
= get_mode(p
, &mode
);
2285 die("Corrupt mode: %s", command_buf
.buf
);
2290 case S_IFREG
| 0644:
2291 case S_IFREG
| 0755:
2298 die("Corrupt mode: %s", command_buf
.buf
);
2302 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2303 oidcpy(&oid
, &oe
->idx
.oid
);
2304 } else if (skip_prefix(p
, "inline ", &p
)) {
2306 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2308 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2309 die("Invalid dataref: %s", command_buf
.buf
);
2310 oe
= find_object(&oid
);
2312 die("Missing space after SHA1: %s", command_buf
.buf
);
2316 if (!unquote_c_style(&uq
, p
, &endp
)) {
2318 die("Garbage after path in: %s", command_buf
.buf
);
2322 /* Git does not track empty, non-toplevel directories. */
2323 if (S_ISDIR(mode
) && is_empty_tree_oid(&oid
) && *p
) {
2324 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2328 if (S_ISGITLINK(mode
)) {
2330 die("Git links cannot be specified 'inline': %s",
2333 if (oe
->type
!= OBJ_COMMIT
)
2334 die("Not a commit (actually a %s): %s",
2335 type_name(oe
->type
), command_buf
.buf
);
2338 * Accept the sha1 without checking; it expected to be in
2339 * another repository.
2341 } else if (inline_data
) {
2343 die("Directories cannot be specified 'inline': %s",
2346 strbuf_addstr(&uq
, p
);
2349 while (read_next_command() != EOF
) {
2351 if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2354 parse_and_store_blob(&last_blob
, &oid
, 0);
2359 enum object_type expected
= S_ISDIR(mode
) ?
2361 enum object_type type
= oe
? oe
->type
:
2362 oid_object_info(the_repository
, &oid
,
2365 die("%s not found: %s",
2366 S_ISDIR(mode
) ? "Tree" : "Blob",
2368 if (type
!= expected
)
2369 die("Not a %s (actually a %s): %s",
2370 type_name(expected
), type_name(type
),
2375 tree_content_replace(&b
->branch_tree
, &oid
, mode
, NULL
);
2378 tree_content_set(&b
->branch_tree
, p
, &oid
, mode
, NULL
);
2381 static void file_change_d(const char *p
, struct branch
*b
)
2383 static struct strbuf uq
= STRBUF_INIT
;
2387 if (!unquote_c_style(&uq
, p
, &endp
)) {
2389 die("Garbage after path in: %s", command_buf
.buf
);
2392 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2395 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2398 static struct strbuf s_uq
= STRBUF_INIT
;
2399 static struct strbuf d_uq
= STRBUF_INIT
;
2401 struct tree_entry leaf
;
2403 strbuf_reset(&s_uq
);
2404 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2406 die("Missing space after source: %s", command_buf
.buf
);
2408 endp
= strchr(s
, ' ');
2410 die("Missing space after source: %s", command_buf
.buf
);
2411 strbuf_add(&s_uq
, s
, endp
- s
);
2417 die("Missing dest: %s", command_buf
.buf
);
2420 strbuf_reset(&d_uq
);
2421 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2423 die("Garbage after dest in: %s", command_buf
.buf
);
2427 memset(&leaf
, 0, sizeof(leaf
));
2429 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2431 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2432 if (!leaf
.versions
[1].mode
)
2433 die("Path %s not in branch", s
);
2434 if (!*d
) { /* C "path/to/subdir" "" */
2435 tree_content_replace(&b
->branch_tree
,
2436 &leaf
.versions
[1].oid
,
2437 leaf
.versions
[1].mode
,
2441 tree_content_set(&b
->branch_tree
, d
,
2442 &leaf
.versions
[1].oid
,
2443 leaf
.versions
[1].mode
,
2447 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2449 static struct strbuf uq
= STRBUF_INIT
;
2450 struct object_entry
*oe
;
2452 struct object_id oid
, commit_oid
;
2453 char path
[GIT_MAX_RAWSZ
* 3];
2454 uint16_t inline_data
= 0;
2455 unsigned char new_fanout
;
2458 * When loading a branch, we don't traverse its tree to count the real
2459 * number of notes (too expensive to do this for all non-note refs).
2460 * This means that recently loaded notes refs might incorrectly have
2461 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2463 * Fix this by traversing the tree and counting the number of notes
2464 * when b->num_notes == 0. If the notes tree is truly empty, the
2465 * calculation should not take long.
2467 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2468 /* Invoke change_note_fanout() in "counting mode". */
2469 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2470 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2473 /* Now parse the notemodify command. */
2474 /* <dataref> or 'inline' */
2476 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2477 oidcpy(&oid
, &oe
->idx
.oid
);
2478 } else if (skip_prefix(p
, "inline ", &p
)) {
2480 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2482 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2483 die("Invalid dataref: %s", command_buf
.buf
);
2484 oe
= find_object(&oid
);
2486 die("Missing space after SHA1: %s", command_buf
.buf
);
2490 s
= lookup_branch(p
);
2492 if (is_null_oid(&s
->oid
))
2493 die("Can't add a note on empty branch.");
2494 oidcpy(&commit_oid
, &s
->oid
);
2495 } else if (*p
== ':') {
2496 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2497 struct object_entry
*commit_oe
= find_mark(marks
, commit_mark
);
2498 if (commit_oe
->type
!= OBJ_COMMIT
)
2499 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2500 oidcpy(&commit_oid
, &commit_oe
->idx
.oid
);
2501 } else if (!repo_get_oid(the_repository
, p
, &commit_oid
)) {
2503 char *buf
= read_object_with_reference(the_repository
,
2507 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2508 die("Not a valid commit: %s", p
);
2511 die("Invalid ref name or SHA1 expression: %s", p
);
2515 strbuf_addstr(&uq
, p
);
2518 read_next_command();
2519 parse_and_store_blob(&last_blob
, &oid
, 0);
2521 if (oe
->type
!= OBJ_BLOB
)
2522 die("Not a blob (actually a %s): %s",
2523 type_name(oe
->type
), command_buf
.buf
);
2524 } else if (!is_null_oid(&oid
)) {
2525 enum object_type type
= oid_object_info(the_repository
, &oid
,
2528 die("Blob not found: %s", command_buf
.buf
);
2529 if (type
!= OBJ_BLOB
)
2530 die("Not a blob (actually a %s): %s",
2531 type_name(type
), command_buf
.buf
);
2534 construct_path_with_fanout(oid_to_hex(&commit_oid
), *old_fanout
, path
);
2535 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2538 if (is_null_oid(&oid
))
2539 return; /* nothing to insert */
2542 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2543 construct_path_with_fanout(oid_to_hex(&commit_oid
), new_fanout
, path
);
2544 tree_content_set(&b
->branch_tree
, path
, &oid
, S_IFREG
| 0644, NULL
);
2547 static void file_change_deleteall(struct branch
*b
)
2549 release_tree_content_recursive(b
->branch_tree
.tree
);
2550 oidclr(&b
->branch_tree
.versions
[0].oid
);
2551 oidclr(&b
->branch_tree
.versions
[1].oid
);
2552 load_tree(&b
->branch_tree
);
2556 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2558 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2559 die("Not a valid commit: %s", oid_to_hex(&b
->oid
));
2560 if (memcmp("tree ", buf
, 5)
2561 || get_oid_hex(buf
+ 5, &b
->branch_tree
.versions
[1].oid
))
2562 die("The commit %s is corrupt", oid_to_hex(&b
->oid
));
2563 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2564 &b
->branch_tree
.versions
[1].oid
);
2567 static void parse_from_existing(struct branch
*b
)
2569 if (is_null_oid(&b
->oid
)) {
2570 oidclr(&b
->branch_tree
.versions
[0].oid
);
2571 oidclr(&b
->branch_tree
.versions
[1].oid
);
2576 buf
= read_object_with_reference(the_repository
,
2577 &b
->oid
, OBJ_COMMIT
, &size
,
2579 parse_from_commit(b
, buf
, size
);
2584 static int parse_objectish(struct branch
*b
, const char *objectish
)
2587 struct object_id oid
;
2589 oidcpy(&oid
, &b
->branch_tree
.versions
[1].oid
);
2591 s
= lookup_branch(objectish
);
2593 die("Can't create a branch from itself: %s", b
->name
);
2595 struct object_id
*t
= &s
->branch_tree
.versions
[1].oid
;
2596 oidcpy(&b
->oid
, &s
->oid
);
2597 oidcpy(&b
->branch_tree
.versions
[0].oid
, t
);
2598 oidcpy(&b
->branch_tree
.versions
[1].oid
, t
);
2599 } else if (*objectish
== ':') {
2600 uintmax_t idnum
= parse_mark_ref_eol(objectish
);
2601 struct object_entry
*oe
= find_mark(marks
, idnum
);
2602 if (oe
->type
!= OBJ_COMMIT
)
2603 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2604 if (!oideq(&b
->oid
, &oe
->idx
.oid
)) {
2605 oidcpy(&b
->oid
, &oe
->idx
.oid
);
2606 if (oe
->pack_id
!= MAX_PACK_ID
) {
2608 char *buf
= gfi_unpack_entry(oe
, &size
);
2609 parse_from_commit(b
, buf
, size
);
2612 parse_from_existing(b
);
2614 } else if (!repo_get_oid(the_repository
, objectish
, &b
->oid
)) {
2615 parse_from_existing(b
);
2616 if (is_null_oid(&b
->oid
))
2620 die("Invalid ref name or SHA1 expression: %s", objectish
);
2622 if (b
->branch_tree
.tree
&& !oideq(&oid
, &b
->branch_tree
.versions
[1].oid
)) {
2623 release_tree_content_recursive(b
->branch_tree
.tree
);
2624 b
->branch_tree
.tree
= NULL
;
2627 read_next_command();
2631 static int parse_from(struct branch
*b
)
2635 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2638 return parse_objectish(b
, from
);
2641 static int parse_objectish_with_prefix(struct branch
*b
, const char *prefix
)
2645 if (!skip_prefix(command_buf
.buf
, prefix
, &base
))
2648 return parse_objectish(b
, base
);
2651 static struct hash_list
*parse_merge(unsigned int *count
)
2653 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2658 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2659 n
= xmalloc(sizeof(*n
));
2660 s
= lookup_branch(from
);
2662 oidcpy(&n
->oid
, &s
->oid
);
2663 else if (*from
== ':') {
2664 uintmax_t idnum
= parse_mark_ref_eol(from
);
2665 struct object_entry
*oe
= find_mark(marks
, idnum
);
2666 if (oe
->type
!= OBJ_COMMIT
)
2667 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2668 oidcpy(&n
->oid
, &oe
->idx
.oid
);
2669 } else if (!repo_get_oid(the_repository
, from
, &n
->oid
)) {
2671 char *buf
= read_object_with_reference(the_repository
,
2675 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2676 die("Not a valid commit: %s", from
);
2679 die("Invalid ref name or SHA1 expression: %s", from
);
2686 read_next_command();
2691 static void parse_new_commit(const char *arg
)
2693 static struct strbuf msg
= STRBUF_INIT
;
2695 char *author
= NULL
;
2696 char *committer
= NULL
;
2697 char *encoding
= NULL
;
2698 struct hash_list
*merge_list
= NULL
;
2699 unsigned int merge_count
;
2700 unsigned char prev_fanout
, new_fanout
;
2703 b
= lookup_branch(arg
);
2705 b
= new_branch(arg
);
2707 read_next_command();
2709 parse_original_identifier();
2710 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2711 author
= parse_ident(v
);
2712 read_next_command();
2714 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2715 committer
= parse_ident(v
);
2716 read_next_command();
2719 die("Expected committer but didn't get one");
2720 if (skip_prefix(command_buf
.buf
, "encoding ", &v
)) {
2721 encoding
= xstrdup(v
);
2722 read_next_command();
2724 parse_data(&msg
, 0, NULL
);
2725 read_next_command();
2727 merge_list
= parse_merge(&merge_count
);
2729 /* ensure the branch is active/loaded */
2730 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2731 unload_one_branch();
2735 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2738 while (command_buf
.len
> 0) {
2739 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2740 file_change_m(v
, b
);
2741 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2742 file_change_d(v
, b
);
2743 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2744 file_change_cr(v
, b
, 1);
2745 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2746 file_change_cr(v
, b
, 0);
2747 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2748 note_change_n(v
, b
, &prev_fanout
);
2749 else if (!strcmp("deleteall", command_buf
.buf
))
2750 file_change_deleteall(b
);
2751 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2753 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2756 unread_command_buf
= 1;
2759 if (read_next_command() == EOF
)
2763 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2764 if (new_fanout
!= prev_fanout
)
2765 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2767 /* build the tree and the commit */
2768 store_tree(&b
->branch_tree
);
2769 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2770 &b
->branch_tree
.versions
[1].oid
);
2772 strbuf_reset(&new_data
);
2773 strbuf_addf(&new_data
, "tree %s\n",
2774 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
2775 if (!is_null_oid(&b
->oid
))
2776 strbuf_addf(&new_data
, "parent %s\n",
2777 oid_to_hex(&b
->oid
));
2778 while (merge_list
) {
2779 struct hash_list
*next
= merge_list
->next
;
2780 strbuf_addf(&new_data
, "parent %s\n",
2781 oid_to_hex(&merge_list
->oid
));
2785 strbuf_addf(&new_data
,
2788 author
? author
: committer
, committer
);
2790 strbuf_addf(&new_data
,
2793 strbuf_addch(&new_data
, '\n');
2794 strbuf_addbuf(&new_data
, &msg
);
2799 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, &b
->oid
, next_mark
))
2800 b
->pack_id
= pack_id
;
2801 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2804 static void parse_new_tag(const char *arg
)
2806 static struct strbuf msg
= STRBUF_INIT
;
2811 uintmax_t from_mark
= 0;
2812 struct object_id oid
;
2813 enum object_type type
;
2816 t
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct tag
));
2817 t
->name
= mem_pool_strdup(&fi_mem_pool
, arg
);
2819 last_tag
->next_tag
= t
;
2823 read_next_command();
2827 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2828 die("Expected from command, got %s", command_buf
.buf
);
2829 s
= lookup_branch(from
);
2831 if (is_null_oid(&s
->oid
))
2832 die("Can't tag an empty branch.");
2833 oidcpy(&oid
, &s
->oid
);
2835 } else if (*from
== ':') {
2836 struct object_entry
*oe
;
2837 from_mark
= parse_mark_ref_eol(from
);
2838 oe
= find_mark(marks
, from_mark
);
2840 oidcpy(&oid
, &oe
->idx
.oid
);
2841 } else if (!repo_get_oid(the_repository
, from
, &oid
)) {
2842 struct object_entry
*oe
= find_object(&oid
);
2844 type
= oid_object_info(the_repository
, &oid
, NULL
);
2846 die("Not a valid object: %s", from
);
2850 die("Invalid ref name or SHA1 expression: %s", from
);
2851 read_next_command();
2853 /* original-oid ... */
2854 parse_original_identifier();
2857 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2858 tagger
= parse_ident(v
);
2859 read_next_command();
2863 /* tag payload/message */
2864 parse_data(&msg
, 0, NULL
);
2866 /* build the tag object */
2867 strbuf_reset(&new_data
);
2869 strbuf_addf(&new_data
,
2873 oid_to_hex(&oid
), type_name(type
), t
->name
);
2875 strbuf_addf(&new_data
,
2876 "tagger %s\n", tagger
);
2877 strbuf_addch(&new_data
, '\n');
2878 strbuf_addbuf(&new_data
, &msg
);
2881 if (store_object(OBJ_TAG
, &new_data
, NULL
, &t
->oid
, next_mark
))
2882 t
->pack_id
= MAX_PACK_ID
;
2884 t
->pack_id
= pack_id
;
2887 static void parse_reset_branch(const char *arg
)
2890 const char *tag_name
;
2892 b
= lookup_branch(arg
);
2895 oidclr(&b
->branch_tree
.versions
[0].oid
);
2896 oidclr(&b
->branch_tree
.versions
[1].oid
);
2897 if (b
->branch_tree
.tree
) {
2898 release_tree_content_recursive(b
->branch_tree
.tree
);
2899 b
->branch_tree
.tree
= NULL
;
2903 b
= new_branch(arg
);
2904 read_next_command();
2906 if (b
->delete && skip_prefix(b
->name
, "refs/tags/", &tag_name
)) {
2908 * Elsewhere, we call dump_branches() before dump_tags(),
2909 * and dump_branches() will handle ref deletions first, so
2910 * in order to make sure the deletion actually takes effect,
2911 * we need to remove the tag from our list of tags to update.
2913 * NEEDSWORK: replace list of tags with hashmap for faster
2916 struct tag
*t
, *prev
= NULL
;
2917 for (t
= first_tag
; t
; t
= t
->next_tag
) {
2918 if (!strcmp(t
->name
, tag_name
))
2924 prev
->next_tag
= t
->next_tag
;
2926 first_tag
= t
->next_tag
;
2929 /* There is no mem_pool_free(t) function to call. */
2932 if (command_buf
.len
> 0)
2933 unread_command_buf
= 1;
2936 static void cat_blob_write(const char *buf
, unsigned long size
)
2938 if (write_in_full(cat_blob_fd
, buf
, size
) < 0)
2939 die_errno("Write to frontend failed");
2942 static void cat_blob(struct object_entry
*oe
, struct object_id
*oid
)
2944 struct strbuf line
= STRBUF_INIT
;
2946 enum object_type type
= 0;
2949 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2950 buf
= repo_read_object_file(the_repository
, oid
, &type
, &size
);
2953 buf
= gfi_unpack_entry(oe
, &size
);
2957 * Output based on batch_one_object() from cat-file.c.
2960 strbuf_reset(&line
);
2961 strbuf_addf(&line
, "%s missing\n", oid_to_hex(oid
));
2962 cat_blob_write(line
.buf
, line
.len
);
2963 strbuf_release(&line
);
2968 die("Can't read object %s", oid_to_hex(oid
));
2969 if (type
!= OBJ_BLOB
)
2970 die("Object %s is a %s but a blob was expected.",
2971 oid_to_hex(oid
), type_name(type
));
2972 strbuf_reset(&line
);
2973 strbuf_addf(&line
, "%s %s %"PRIuMAX
"\n", oid_to_hex(oid
),
2974 type_name(type
), (uintmax_t)size
);
2975 cat_blob_write(line
.buf
, line
.len
);
2976 strbuf_release(&line
);
2977 cat_blob_write(buf
, size
);
2978 cat_blob_write("\n", 1);
2979 if (oe
&& oe
->pack_id
== pack_id
) {
2980 last_blob
.offset
= oe
->idx
.offset
;
2981 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2982 last_blob
.depth
= oe
->depth
;
2987 static void parse_get_mark(const char *p
)
2989 struct object_entry
*oe
;
2990 char output
[GIT_MAX_HEXSZ
+ 2];
2992 /* get-mark SP <object> LF */
2994 die("Not a mark: %s", p
);
2996 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
2998 die("Unknown mark: %s", command_buf
.buf
);
3000 xsnprintf(output
, sizeof(output
), "%s\n", oid_to_hex(&oe
->idx
.oid
));
3001 cat_blob_write(output
, the_hash_algo
->hexsz
+ 1);
3004 static void parse_cat_blob(const char *p
)
3006 struct object_entry
*oe
;
3007 struct object_id oid
;
3009 /* cat-blob SP <object> LF */
3011 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
3013 die("Unknown mark: %s", command_buf
.buf
);
3014 oidcpy(&oid
, &oe
->idx
.oid
);
3016 if (parse_mapped_oid_hex(p
, &oid
, &p
))
3017 die("Invalid dataref: %s", command_buf
.buf
);
3019 die("Garbage after SHA1: %s", command_buf
.buf
);
3020 oe
= find_object(&oid
);
3026 static struct object_entry
*dereference(struct object_entry
*oe
,
3027 struct object_id
*oid
)
3031 const unsigned hexsz
= the_hash_algo
->hexsz
;
3034 enum object_type type
= oid_object_info(the_repository
, oid
,
3037 die("object not found: %s", oid_to_hex(oid
));
3039 oe
= insert_object(oid
);
3041 oe
->pack_id
= MAX_PACK_ID
;
3045 case OBJ_TREE
: /* easy case. */
3051 die("Not a tree-ish: %s", command_buf
.buf
);
3054 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
3055 buf
= gfi_unpack_entry(oe
, &size
);
3057 enum object_type unused
;
3058 buf
= repo_read_object_file(the_repository
, oid
, &unused
,
3062 die("Can't load object %s", oid_to_hex(oid
));
3064 /* Peel one layer. */
3067 if (size
< hexsz
+ strlen("object ") ||
3068 get_oid_hex(buf
+ strlen("object "), oid
))
3069 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
3072 if (size
< hexsz
+ strlen("tree ") ||
3073 get_oid_hex(buf
+ strlen("tree "), oid
))
3074 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
3078 return find_object(oid
);
3081 static void insert_mapped_mark(uintmax_t mark
, void *object
, void *cbp
)
3083 struct object_id
*fromoid
= object
;
3084 struct object_id
*tooid
= find_mark(cbp
, mark
);
3088 it
= kh_put_oid_map(sub_oid_map
, *fromoid
, &ret
);
3089 /* We've already seen this object. */
3092 kh_value(sub_oid_map
, it
) = tooid
;
3095 static void build_mark_map_one(struct mark_set
*from
, struct mark_set
*to
)
3097 for_each_mark(from
, 0, insert_mapped_mark
, to
);
3100 static void build_mark_map(struct string_list
*from
, struct string_list
*to
)
3102 struct string_list_item
*fromp
, *top
;
3104 sub_oid_map
= kh_init_oid_map();
3106 for_each_string_list_item(fromp
, from
) {
3107 top
= string_list_lookup(to
, fromp
->string
);
3109 die(_("Missing from marks for submodule '%s'"), fromp
->string
);
3110 } else if (!top
|| !top
->util
) {
3111 die(_("Missing to marks for submodule '%s'"), fromp
->string
);
3113 build_mark_map_one(fromp
->util
, top
->util
);
3117 static struct object_entry
*parse_treeish_dataref(const char **p
)
3119 struct object_id oid
;
3120 struct object_entry
*e
;
3122 if (**p
== ':') { /* <mark> */
3123 e
= find_mark(marks
, parse_mark_ref_space(p
));
3125 die("Unknown mark: %s", command_buf
.buf
);
3126 oidcpy(&oid
, &e
->idx
.oid
);
3127 } else { /* <sha1> */
3128 if (parse_mapped_oid_hex(*p
, &oid
, p
))
3129 die("Invalid dataref: %s", command_buf
.buf
);
3130 e
= find_object(&oid
);
3132 die("Missing space after tree-ish: %s", command_buf
.buf
);
3135 while (!e
|| e
->type
!= OBJ_TREE
)
3136 e
= dereference(e
, &oid
);
3140 static void print_ls(int mode
, const unsigned char *hash
, const char *path
)
3142 static struct strbuf line
= STRBUF_INIT
;
3144 /* See show_tree(). */
3146 S_ISGITLINK(mode
) ? commit_type
:
3147 S_ISDIR(mode
) ? tree_type
:
3151 /* missing SP path LF */
3152 strbuf_reset(&line
);
3153 strbuf_addstr(&line
, "missing ");
3154 quote_c_style(path
, &line
, NULL
, 0);
3155 strbuf_addch(&line
, '\n');
3157 /* mode SP type SP object_name TAB path LF */
3158 strbuf_reset(&line
);
3159 strbuf_addf(&line
, "%06o %s %s\t",
3160 mode
& ~NO_DELTA
, type
, hash_to_hex(hash
));
3161 quote_c_style(path
, &line
, NULL
, 0);
3162 strbuf_addch(&line
, '\n');
3164 cat_blob_write(line
.buf
, line
.len
);
3167 static void parse_ls(const char *p
, struct branch
*b
)
3169 struct tree_entry
*root
= NULL
;
3170 struct tree_entry leaf
= {NULL
};
3172 /* ls SP (<tree-ish> SP)? <path> */
3175 die("Not in a commit: %s", command_buf
.buf
);
3176 root
= &b
->branch_tree
;
3178 struct object_entry
*e
= parse_treeish_dataref(&p
);
3179 root
= new_tree_entry();
3180 oidcpy(&root
->versions
[1].oid
, &e
->idx
.oid
);
3181 if (!is_null_oid(&root
->versions
[1].oid
))
3182 root
->versions
[1].mode
= S_IFDIR
;
3186 static struct strbuf uq
= STRBUF_INIT
;
3189 if (unquote_c_style(&uq
, p
, &endp
))
3190 die("Invalid path: %s", command_buf
.buf
);
3192 die("Garbage after path in: %s", command_buf
.buf
);
3195 tree_content_get(root
, p
, &leaf
, 1);
3197 * A directory in preparation would have a sha1 of zero
3198 * until it is saved. Save, for simplicity.
3200 if (S_ISDIR(leaf
.versions
[1].mode
))
3203 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].oid
.hash
, p
);
3205 release_tree_content_recursive(leaf
.tree
);
3206 if (!b
|| root
!= &b
->branch_tree
)
3207 release_tree_entry(root
);
3210 static void checkpoint(void)
3212 checkpoint_requested
= 0;
3221 static void parse_checkpoint(void)
3223 checkpoint_requested
= 1;
3227 static void parse_progress(void)
3229 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3230 fputc('\n', stdout
);
3235 static void parse_alias(void)
3237 struct object_entry
*e
;
3241 read_next_command();
3246 die(_("Expected 'mark' command, got %s"), command_buf
.buf
);
3249 memset(&b
, 0, sizeof(b
));
3250 if (!parse_objectish_with_prefix(&b
, "to "))
3251 die(_("Expected 'to' command, got %s"), command_buf
.buf
);
3252 e
= find_object(&b
.oid
);
3254 insert_mark(&marks
, next_mark
, e
);
3257 static char* make_fast_import_path(const char *path
)
3259 if (!relative_marks_paths
|| is_absolute_path(path
))
3260 return prefix_filename(global_prefix
, path
);
3261 return git_pathdup("info/fast-import/%s", path
);
3264 static void option_import_marks(const char *marks
,
3265 int from_stream
, int ignore_missing
)
3267 if (import_marks_file
) {
3269 die("Only one import-marks command allowed per stream");
3271 /* read previous mark file */
3272 if(!import_marks_file_from_stream
)
3276 import_marks_file
= make_fast_import_path(marks
);
3277 import_marks_file_from_stream
= from_stream
;
3278 import_marks_file_ignore_missing
= ignore_missing
;
3281 static void option_date_format(const char *fmt
)
3283 if (!strcmp(fmt
, "raw"))
3284 whenspec
= WHENSPEC_RAW
;
3285 else if (!strcmp(fmt
, "raw-permissive"))
3286 whenspec
= WHENSPEC_RAW_PERMISSIVE
;
3287 else if (!strcmp(fmt
, "rfc2822"))
3288 whenspec
= WHENSPEC_RFC2822
;
3289 else if (!strcmp(fmt
, "now"))
3290 whenspec
= WHENSPEC_NOW
;
3292 die("unknown --date-format argument %s", fmt
);
3295 static unsigned long ulong_arg(const char *option
, const char *arg
)
3298 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3299 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3300 die("%s: argument must be a non-negative integer", option
);
3304 static void option_depth(const char *depth
)
3306 max_depth
= ulong_arg("--depth", depth
);
3307 if (max_depth
> MAX_DEPTH
)
3308 die("--depth cannot exceed %u", MAX_DEPTH
);
3311 static void option_active_branches(const char *branches
)
3313 max_active_branches
= ulong_arg("--active-branches", branches
);
3316 static void option_export_marks(const char *marks
)
3318 export_marks_file
= make_fast_import_path(marks
);
3321 static void option_cat_blob_fd(const char *fd
)
3323 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3324 if (n
> (unsigned long) INT_MAX
)
3325 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3326 cat_blob_fd
= (int) n
;
3329 static void option_export_pack_edges(const char *edges
)
3331 char *fn
= prefix_filename(global_prefix
, edges
);
3334 pack_edges
= xfopen(fn
, "a");
3338 static void option_rewrite_submodules(const char *arg
, struct string_list
*list
)
3340 struct mark_set
*ms
;
3342 char *s
= xstrdup(arg
);
3343 char *f
= strchr(s
, ':');
3345 die(_("Expected format name:filename for submodule rewrite option"));
3348 CALLOC_ARRAY(ms
, 1);
3350 f
= prefix_filename(global_prefix
, f
);
3353 die_errno("cannot read '%s'", f
);
3354 read_mark_file(&ms
, fp
, insert_oid_entry
);
3358 string_list_insert(list
, s
)->util
= ms
;
3361 static int parse_one_option(const char *option
)
3363 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3365 if (!git_parse_ulong(option
, &v
))
3368 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3370 } else if (v
< 1024 * 1024) {
3371 warning("minimum max-pack-size is 1 MiB");
3375 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3377 if (!git_parse_ulong(option
, &v
))
3379 big_file_threshold
= v
;
3380 } else if (skip_prefix(option
, "depth=", &option
)) {
3381 option_depth(option
);
3382 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3383 option_active_branches(option
);
3384 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3385 option_export_pack_edges(option
);
3386 } else if (!strcmp(option
, "quiet")) {
3388 } else if (!strcmp(option
, "stats")) {
3390 } else if (!strcmp(option
, "allow-unsafe-features")) {
3391 ; /* already handled during early option parsing */
3399 static void check_unsafe_feature(const char *feature
, int from_stream
)
3401 if (from_stream
&& !allow_unsafe_features
)
3402 die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
3406 static int parse_one_feature(const char *feature
, int from_stream
)
3410 if (skip_prefix(feature
, "date-format=", &arg
)) {
3411 option_date_format(arg
);
3412 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3413 check_unsafe_feature("import-marks", from_stream
);
3414 option_import_marks(arg
, from_stream
, 0);
3415 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3416 check_unsafe_feature("import-marks-if-exists", from_stream
);
3417 option_import_marks(arg
, from_stream
, 1);
3418 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3419 check_unsafe_feature(feature
, from_stream
);
3420 option_export_marks(arg
);
3421 } else if (!strcmp(feature
, "alias")) {
3422 ; /* Don't die - this feature is supported */
3423 } else if (skip_prefix(feature
, "rewrite-submodules-to=", &arg
)) {
3424 option_rewrite_submodules(arg
, &sub_marks_to
);
3425 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3426 option_rewrite_submodules(arg
, &sub_marks_from
);
3427 } else if (!strcmp(feature
, "get-mark")) {
3428 ; /* Don't die - this feature is supported */
3429 } else if (!strcmp(feature
, "cat-blob")) {
3430 ; /* Don't die - this feature is supported */
3431 } else if (!strcmp(feature
, "relative-marks")) {
3432 relative_marks_paths
= 1;
3433 } else if (!strcmp(feature
, "no-relative-marks")) {
3434 relative_marks_paths
= 0;
3435 } else if (!strcmp(feature
, "done")) {
3436 require_explicit_termination
= 1;
3437 } else if (!strcmp(feature
, "force")) {
3439 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3440 ; /* do nothing; we have the feature */
3448 static void parse_feature(const char *feature
)
3450 if (seen_data_command
)
3451 die("Got feature command '%s' after data command", feature
);
3453 if (parse_one_feature(feature
, 1))
3456 die("This version of fast-import does not support feature %s.", feature
);
3459 static void parse_option(const char *option
)
3461 if (seen_data_command
)
3462 die("Got option command '%s' after data command", option
);
3464 if (parse_one_option(option
))
3467 die("This version of fast-import does not support option: %s", option
);
3470 static void git_pack_config(void)
3472 int indexversion_value
;
3474 unsigned long packsizelimit_value
;
3476 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3477 if (max_depth
> MAX_DEPTH
)
3478 max_depth
= MAX_DEPTH
;
3480 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3481 pack_idx_opts
.version
= indexversion_value
;
3482 if (pack_idx_opts
.version
> 2)
3483 git_die_config("pack.indexversion",
3484 "bad pack.indexVersion=%"PRIu32
, pack_idx_opts
.version
);
3486 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3487 max_packsize
= packsizelimit_value
;
3489 if (!git_config_get_int("fastimport.unpacklimit", &limit
))
3490 unpack_limit
= limit
;
3491 else if (!git_config_get_int("transfer.unpacklimit", &limit
))
3492 unpack_limit
= limit
;
3494 git_config(git_default_config
, NULL
);
3497 static const char fast_import_usage
[] =
3498 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3500 static void parse_argv(void)
3504 for (i
= 1; i
< global_argc
; i
++) {
3505 const char *a
= global_argv
[i
];
3507 if (*a
!= '-' || !strcmp(a
, "--"))
3510 if (!skip_prefix(a
, "--", &a
))
3511 die("unknown option %s", a
);
3513 if (parse_one_option(a
))
3516 if (parse_one_feature(a
, 0))
3519 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3520 option_cat_blob_fd(a
);
3524 die("unknown option --%s", a
);
3526 if (i
!= global_argc
)
3527 usage(fast_import_usage
);
3529 seen_data_command
= 1;
3530 if (import_marks_file
)
3532 build_mark_map(&sub_marks_from
, &sub_marks_to
);
3535 int cmd_fast_import(int argc
, const char **argv
, const char *prefix
)
3539 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3540 usage(fast_import_usage
);
3542 reset_pack_idx_option(&pack_idx_opts
);
3545 alloc_objects(object_entry_alloc
);
3546 strbuf_init(&command_buf
, 0);
3547 CALLOC_ARRAY(atom_table
, atom_table_sz
);
3548 CALLOC_ARRAY(branch_table
, branch_table_sz
);
3549 CALLOC_ARRAY(avail_tree_table
, avail_tree_table_sz
);
3550 marks
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
3552 hashmap_init(&object_table
, object_entry_hashcmp
, NULL
, 0);
3555 * We don't parse most options until after we've seen the set of
3556 * "feature" lines at the start of the stream (which allows the command
3557 * line to override stream data). But we must do an early parse of any
3558 * command-line options that impact how we interpret the feature lines.
3560 for (i
= 1; i
< argc
; i
++) {
3561 const char *arg
= argv
[i
];
3562 if (*arg
!= '-' || !strcmp(arg
, "--"))
3564 if (!strcmp(arg
, "--allow-unsafe-features"))
3565 allow_unsafe_features
= 1;
3570 global_prefix
= prefix
;
3572 rc_free
= mem_pool_alloc(&fi_mem_pool
, cmd_save
* sizeof(*rc_free
));
3573 for (i
= 0; i
< (cmd_save
- 1); i
++)
3574 rc_free
[i
].next
= &rc_free
[i
+ 1];
3575 rc_free
[cmd_save
- 1].next
= NULL
;
3578 set_die_routine(die_nicely
);
3579 set_checkpoint_signal();
3580 while (read_next_command() != EOF
) {
3582 if (!strcmp("blob", command_buf
.buf
))
3584 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3585 parse_new_commit(v
);
3586 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3588 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3589 parse_reset_branch(v
);
3590 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3592 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
3594 else if (skip_prefix(command_buf
.buf
, "get-mark ", &v
))
3596 else if (!strcmp("checkpoint", command_buf
.buf
))
3598 else if (!strcmp("done", command_buf
.buf
))
3600 else if (!strcmp("alias", command_buf
.buf
))
3602 else if (starts_with(command_buf
.buf
, "progress "))
3604 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3606 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3608 else if (starts_with(command_buf
.buf
, "option "))
3609 /* ignore non-git options*/;
3611 die("Unsupported command: %s", command_buf
.buf
);
3613 if (checkpoint_requested
)
3617 /* argv hasn't been parsed yet, do so */
3618 if (!seen_data_command
)
3621 if (require_explicit_termination
&& feof(stdin
))
3622 die("stream ends early");
3635 uintmax_t total_count
= 0, duplicate_count
= 0;
3636 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3637 total_count
+= object_count_by_type
[i
];
3638 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3639 duplicate_count
+= duplicate_count_by_type
[i
];
3641 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3642 fprintf(stderr
, "---------------------------------------------------------------------\n");
3643 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3644 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3645 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
]);
3646 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
]);
3647 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
]);
3648 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
]);
3649 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3650 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3651 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3652 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (tree_entry_allocd
+ fi_mem_pool
.pool_alloc
+ alloc_count
*sizeof(struct object_entry
))/1024);
3653 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd
+ fi_mem_pool
.pool_alloc
) /1024));
3654 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3655 fprintf(stderr
, "---------------------------------------------------------------------\n");
3657 fprintf(stderr
, "---------------------------------------------------------------------\n");
3658 fprintf(stderr
, "\n");
3661 return failure
? 1 : 0;