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 void load_tree(struct tree_entry
*root
)
1241 struct object_id
*oid
= &root
->versions
[1].oid
;
1242 struct object_entry
*myoe
;
1243 struct tree_content
*t
;
1248 root
->tree
= t
= new_tree_content(8);
1249 if (is_null_oid(oid
))
1252 myoe
= find_object(oid
);
1253 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1254 if (myoe
->type
!= OBJ_TREE
)
1255 die("Not a tree: %s", oid_to_hex(oid
));
1256 t
->delta_depth
= myoe
->depth
;
1257 buf
= gfi_unpack_entry(myoe
, &size
);
1259 die("Can't load tree %s", oid_to_hex(oid
));
1261 enum object_type type
;
1262 buf
= repo_read_object_file(the_repository
, oid
, &type
, &size
);
1263 if (!buf
|| type
!= OBJ_TREE
)
1264 die("Can't load tree %s", oid_to_hex(oid
));
1268 while (c
!= (buf
+ size
)) {
1269 struct tree_entry
*e
= new_tree_entry();
1271 if (t
->entry_count
== t
->entry_capacity
)
1272 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1273 t
->entries
[t
->entry_count
++] = e
;
1276 c
= parse_mode(c
, &e
->versions
[1].mode
);
1278 die("Corrupt mode in %s", oid_to_hex(oid
));
1279 e
->versions
[0].mode
= e
->versions
[1].mode
;
1280 e
->name
= to_atom(c
, strlen(c
));
1281 c
+= e
->name
->str_len
+ 1;
1282 oidread(&e
->versions
[0].oid
, (unsigned char *)c
);
1283 oidread(&e
->versions
[1].oid
, (unsigned char *)c
);
1284 c
+= the_hash_algo
->rawsz
;
1289 static int tecmp0 (const void *_a
, const void *_b
)
1291 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1292 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1293 return base_name_compare(
1294 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1295 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1298 static int tecmp1 (const void *_a
, const void *_b
)
1300 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1301 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1302 return base_name_compare(
1303 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1304 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1307 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1313 QSORT(t
->entries
, t
->entry_count
, tecmp0
);
1315 QSORT(t
->entries
, t
->entry_count
, tecmp1
);
1317 for (i
= 0; i
< t
->entry_count
; i
++) {
1318 if (t
->entries
[i
]->versions
[v
].mode
)
1319 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1323 strbuf_grow(b
, maxlen
);
1324 for (i
= 0; i
< t
->entry_count
; i
++) {
1325 struct tree_entry
*e
= t
->entries
[i
];
1326 if (!e
->versions
[v
].mode
)
1328 strbuf_addf(b
, "%o %s%c",
1329 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1330 e
->name
->str_dat
, '\0');
1331 strbuf_add(b
, e
->versions
[v
].oid
.hash
, the_hash_algo
->rawsz
);
1335 static void store_tree(struct tree_entry
*root
)
1337 struct tree_content
*t
;
1338 unsigned int i
, j
, del
;
1339 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1340 struct object_entry
*le
= NULL
;
1342 if (!is_null_oid(&root
->versions
[1].oid
))
1349 for (i
= 0; i
< t
->entry_count
; i
++) {
1350 if (t
->entries
[i
]->tree
)
1351 store_tree(t
->entries
[i
]);
1354 if (!(root
->versions
[0].mode
& NO_DELTA
))
1355 le
= find_object(&root
->versions
[0].oid
);
1356 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1357 mktree(t
, 0, &old_tree
);
1359 lo
.offset
= le
->idx
.offset
;
1360 lo
.depth
= t
->delta_depth
;
1363 mktree(t
, 1, &new_tree
);
1364 store_object(OBJ_TREE
, &new_tree
, &lo
, &root
->versions
[1].oid
, 0);
1366 t
->delta_depth
= lo
.depth
;
1367 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1368 struct tree_entry
*e
= t
->entries
[i
];
1369 if (e
->versions
[1].mode
) {
1370 e
->versions
[0].mode
= e
->versions
[1].mode
;
1371 oidcpy(&e
->versions
[0].oid
, &e
->versions
[1].oid
);
1372 t
->entries
[j
++] = e
;
1374 release_tree_entry(e
);
1378 t
->entry_count
-= del
;
1381 static void tree_content_replace(
1382 struct tree_entry
*root
,
1383 const struct object_id
*oid
,
1384 const uint16_t mode
,
1385 struct tree_content
*newtree
)
1388 die("Root cannot be a non-directory");
1389 oidclr(&root
->versions
[0].oid
);
1390 oidcpy(&root
->versions
[1].oid
, oid
);
1392 release_tree_content_recursive(root
->tree
);
1393 root
->tree
= newtree
;
1396 static int tree_content_set(
1397 struct tree_entry
*root
,
1399 const struct object_id
*oid
,
1400 const uint16_t mode
,
1401 struct tree_content
*subtree
)
1403 struct tree_content
*t
;
1406 struct tree_entry
*e
;
1408 slash1
= strchrnul(p
, '/');
1411 die("Empty path component found in input");
1412 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1413 die("Non-directories cannot have subtrees");
1418 for (i
= 0; i
< t
->entry_count
; i
++) {
1420 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1423 && e
->versions
[1].mode
== mode
1424 && oideq(&e
->versions
[1].oid
, oid
))
1426 e
->versions
[1].mode
= mode
;
1427 oidcpy(&e
->versions
[1].oid
, oid
);
1429 release_tree_content_recursive(e
->tree
);
1433 * We need to leave e->versions[0].sha1 alone
1434 * to avoid modifying the preimage tree used
1435 * when writing out the parent directory.
1436 * But after replacing the subdir with a
1437 * completely different one, it's not a good
1438 * delta base any more, and besides, we've
1439 * thrown away the tree entries needed to
1440 * make a delta against it.
1442 * So let's just explicitly disable deltas
1445 if (S_ISDIR(e
->versions
[0].mode
))
1446 e
->versions
[0].mode
|= NO_DELTA
;
1448 oidclr(&root
->versions
[1].oid
);
1451 if (!S_ISDIR(e
->versions
[1].mode
)) {
1452 e
->tree
= new_tree_content(8);
1453 e
->versions
[1].mode
= S_IFDIR
;
1457 if (tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
)) {
1458 oidclr(&root
->versions
[1].oid
);
1465 if (t
->entry_count
== t
->entry_capacity
)
1466 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1467 e
= new_tree_entry();
1468 e
->name
= to_atom(p
, n
);
1469 e
->versions
[0].mode
= 0;
1470 oidclr(&e
->versions
[0].oid
);
1471 t
->entries
[t
->entry_count
++] = e
;
1473 e
->tree
= new_tree_content(8);
1474 e
->versions
[1].mode
= S_IFDIR
;
1475 tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
);
1478 e
->versions
[1].mode
= mode
;
1479 oidcpy(&e
->versions
[1].oid
, oid
);
1481 oidclr(&root
->versions
[1].oid
);
1485 static int tree_content_remove(
1486 struct tree_entry
*root
,
1488 struct tree_entry
*backup_leaf
,
1491 struct tree_content
*t
;
1494 struct tree_entry
*e
;
1496 slash1
= strchrnul(p
, '/');
1502 if (!*p
&& allow_root
) {
1508 for (i
= 0; i
< t
->entry_count
; i
++) {
1510 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1511 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1513 * If p names a file in some subdirectory, and a
1514 * file or symlink matching the name of the
1515 * parent directory of p exists, then p cannot
1516 * exist and need not be deleted.
1519 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1523 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1524 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1525 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1526 oidclr(&root
->versions
[1].oid
);
1540 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1542 release_tree_content_recursive(e
->tree
);
1544 e
->versions
[1].mode
= 0;
1545 oidclr(&e
->versions
[1].oid
);
1546 oidclr(&root
->versions
[1].oid
);
1550 static int tree_content_get(
1551 struct tree_entry
*root
,
1553 struct tree_entry
*leaf
,
1556 struct tree_content
*t
;
1559 struct tree_entry
*e
;
1561 slash1
= strchrnul(p
, '/');
1563 if (!n
&& !allow_root
)
1564 die("Empty path component found in input");
1575 for (i
= 0; i
< t
->entry_count
; i
++) {
1577 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1580 if (!S_ISDIR(e
->versions
[1].mode
))
1584 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1590 memcpy(leaf
, e
, sizeof(*leaf
));
1591 if (e
->tree
&& is_null_oid(&e
->versions
[1].oid
))
1592 leaf
->tree
= dup_tree_content(e
->tree
);
1598 static int update_branch(struct branch
*b
)
1600 static const char *msg
= "fast-import";
1601 struct ref_transaction
*transaction
;
1602 struct object_id old_oid
;
1603 struct strbuf err
= STRBUF_INIT
;
1605 if (is_null_oid(&b
->oid
)) {
1607 refs_delete_ref(get_main_ref_store(the_repository
),
1608 NULL
, b
->name
, NULL
, 0);
1611 if (refs_read_ref(get_main_ref_store(the_repository
), b
->name
, &old_oid
))
1613 if (!force_update
&& !is_null_oid(&old_oid
)) {
1614 struct commit
*old_cmit
, *new_cmit
;
1617 old_cmit
= lookup_commit_reference_gently(the_repository
,
1619 new_cmit
= lookup_commit_reference_gently(the_repository
,
1621 if (!old_cmit
|| !new_cmit
)
1622 return error("Branch %s is missing commits.", b
->name
);
1624 ret
= repo_in_merge_bases(the_repository
, old_cmit
, new_cmit
);
1628 warning("Not updating %s"
1629 " (new tip %s does not contain %s)",
1630 b
->name
, oid_to_hex(&b
->oid
),
1631 oid_to_hex(&old_oid
));
1635 transaction
= ref_store_transaction_begin(get_main_ref_store(the_repository
),
1638 ref_transaction_update(transaction
, b
->name
, &b
->oid
, &old_oid
,
1639 NULL
, NULL
, 0, msg
, &err
) ||
1640 ref_transaction_commit(transaction
, &err
)) {
1641 ref_transaction_free(transaction
);
1642 error("%s", err
.buf
);
1643 strbuf_release(&err
);
1646 ref_transaction_free(transaction
);
1647 strbuf_release(&err
);
1651 static void dump_branches(void)
1656 for (i
= 0; i
< branch_table_sz
; i
++) {
1657 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1658 failure
|= update_branch(b
);
1662 static void dump_tags(void)
1664 static const char *msg
= "fast-import";
1666 struct strbuf ref_name
= STRBUF_INIT
;
1667 struct strbuf err
= STRBUF_INIT
;
1668 struct ref_transaction
*transaction
;
1670 transaction
= ref_store_transaction_begin(get_main_ref_store(the_repository
),
1673 failure
|= error("%s", err
.buf
);
1676 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1677 strbuf_reset(&ref_name
);
1678 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1680 if (ref_transaction_update(transaction
, ref_name
.buf
,
1681 &t
->oid
, NULL
, NULL
, NULL
,
1683 failure
|= error("%s", err
.buf
);
1687 if (ref_transaction_commit(transaction
, &err
))
1688 failure
|= error("%s", err
.buf
);
1691 ref_transaction_free(transaction
);
1692 strbuf_release(&ref_name
);
1693 strbuf_release(&err
);
1696 static void dump_marks(void)
1698 struct lock_file mark_lock
= LOCK_INIT
;
1701 if (!export_marks_file
|| (import_marks_file
&& !import_marks_file_done
))
1704 if (safe_create_leading_directories_const(export_marks_file
)) {
1705 failure
|= error_errno("unable to create leading directories of %s",
1710 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1711 failure
|= error_errno("Unable to write marks file %s",
1716 f
= fdopen_lock_file(&mark_lock
, "w");
1718 int saved_errno
= errno
;
1719 rollback_lock_file(&mark_lock
);
1720 failure
|= error("Unable to write marks file %s: %s",
1721 export_marks_file
, strerror(saved_errno
));
1725 for_each_mark(marks
, 0, dump_marks_fn
, f
);
1726 if (commit_lock_file(&mark_lock
)) {
1727 failure
|= error_errno("Unable to write file %s",
1733 static void insert_object_entry(struct mark_set
**s
, struct object_id
*oid
, uintmax_t mark
)
1735 struct object_entry
*e
;
1736 e
= find_object(oid
);
1738 enum object_type type
= oid_object_info(the_repository
,
1741 die("object not found: %s", oid_to_hex(oid
));
1742 e
= insert_object(oid
);
1744 e
->pack_id
= MAX_PACK_ID
;
1745 e
->idx
.offset
= 1; /* just not zero! */
1747 insert_mark(s
, mark
, e
);
1750 static void insert_oid_entry(struct mark_set
**s
, struct object_id
*oid
, uintmax_t mark
)
1752 insert_mark(s
, mark
, xmemdupz(oid
, sizeof(*oid
)));
1755 static void read_mark_file(struct mark_set
**s
, FILE *f
, mark_set_inserter_t inserter
)
1758 while (fgets(line
, sizeof(line
), f
)) {
1761 struct object_id oid
;
1763 /* Ensure SHA-1 objects are padded with zeros. */
1764 memset(oid
.hash
, 0, sizeof(oid
.hash
));
1766 end
= strchr(line
, '\n');
1767 if (line
[0] != ':' || !end
)
1768 die("corrupt mark line: %s", line
);
1770 mark
= strtoumax(line
+ 1, &end
, 10);
1771 if (!mark
|| end
== line
+ 1
1773 || get_oid_hex_any(end
+ 1, &oid
) == GIT_HASH_UNKNOWN
)
1774 die("corrupt mark line: %s", line
);
1775 inserter(s
, &oid
, mark
);
1779 static void read_marks(void)
1781 FILE *f
= fopen(import_marks_file
, "r");
1784 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1785 goto done
; /* Marks file does not exist */
1787 die_errno("cannot read '%s'", import_marks_file
);
1788 read_mark_file(&marks
, f
, insert_object_entry
);
1791 import_marks_file_done
= 1;
1795 static int read_next_command(void)
1797 static int stdin_eof
= 0;
1800 unread_command_buf
= 0;
1805 if (unread_command_buf
) {
1806 unread_command_buf
= 0;
1808 struct recent_command
*rc
;
1810 stdin_eof
= strbuf_getline_lf(&command_buf
, stdin
);
1814 if (!seen_data_command
1815 && !starts_with(command_buf
.buf
, "feature ")
1816 && !starts_with(command_buf
.buf
, "option ")) {
1825 cmd_hist
.next
= rc
->next
;
1826 cmd_hist
.next
->prev
= &cmd_hist
;
1830 rc
->buf
= xstrdup(command_buf
.buf
);
1831 rc
->prev
= cmd_tail
;
1832 rc
->next
= cmd_hist
.prev
;
1833 rc
->prev
->next
= rc
;
1836 if (command_buf
.buf
[0] == '#')
1842 static void skip_optional_lf(void)
1844 int term_char
= fgetc(stdin
);
1845 if (term_char
!= '\n' && term_char
!= EOF
)
1846 ungetc(term_char
, stdin
);
1849 static void parse_mark(void)
1852 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1853 next_mark
= strtoumax(v
, NULL
, 10);
1854 read_next_command();
1860 static void parse_original_identifier(void)
1863 if (skip_prefix(command_buf
.buf
, "original-oid ", &v
))
1864 read_next_command();
1867 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1872 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1873 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1875 if (skip_prefix(data
, "<<", &data
)) {
1876 char *term
= xstrdup(data
);
1877 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1880 if (strbuf_getline_lf(&command_buf
, stdin
) == EOF
)
1881 die("EOF in data (terminator '%s' not found)", term
);
1882 if (term_len
== command_buf
.len
1883 && !strcmp(term
, command_buf
.buf
))
1885 strbuf_addbuf(sb
, &command_buf
);
1886 strbuf_addch(sb
, '\n');
1891 uintmax_t len
= strtoumax(data
, NULL
, 10);
1892 size_t n
= 0, length
= (size_t)len
;
1894 if (limit
&& limit
< len
) {
1899 die("data is too large to use in this context");
1901 while (n
< length
) {
1902 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1903 if (!s
&& feof(stdin
))
1904 die("EOF in data (%lu bytes remaining)",
1905 (unsigned long)(length
- n
));
1914 static int validate_raw_date(const char *src
, struct strbuf
*result
, int strict
)
1916 const char *orig_src
= src
;
1922 num
= strtoul(src
, &endp
, 10);
1924 * NEEDSWORK: perhaps check for reasonable values? For example, we
1925 * could error on values representing times more than a
1926 * day in the future.
1928 if (errno
|| endp
== src
|| *endp
!= ' ')
1932 if (*src
!= '-' && *src
!= '+')
1935 num
= strtoul(src
+ 1, &endp
, 10);
1937 * NEEDSWORK: check for brokenness other than num > 1400, such as
1938 * (num % 100) >= 60, or ((num % 100) % 15) != 0 ?
1940 if (errno
|| endp
== src
+ 1 || *endp
|| /* did not parse */
1941 (strict
&& (1400 < num
)) /* parsed a broken timezone */
1945 strbuf_addstr(result
, orig_src
);
1949 static char *parse_ident(const char *buf
)
1953 struct strbuf ident
= STRBUF_INIT
;
1955 /* ensure there is a space delimiter even if there is no name */
1959 ltgt
= buf
+ strcspn(buf
, "<>");
1961 die("Missing < in ident string: %s", buf
);
1962 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
1963 die("Missing space before < in ident string: %s", buf
);
1964 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
1966 die("Missing > in ident string: %s", buf
);
1969 die("Missing space after > in ident string: %s", buf
);
1971 name_len
= ltgt
- buf
;
1972 strbuf_add(&ident
, buf
, name_len
);
1976 if (validate_raw_date(ltgt
, &ident
, 1) < 0)
1977 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1979 case WHENSPEC_RAW_PERMISSIVE
:
1980 if (validate_raw_date(ltgt
, &ident
, 0) < 0)
1981 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1983 case WHENSPEC_RFC2822
:
1984 if (parse_date(ltgt
, &ident
) < 0)
1985 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
1988 if (strcmp("now", ltgt
))
1989 die("Date in ident must be 'now': %s", buf
);
1994 return strbuf_detach(&ident
, NULL
);
1997 static void parse_and_store_blob(
1998 struct last_object
*last
,
1999 struct object_id
*oidout
,
2002 static struct strbuf buf
= STRBUF_INIT
;
2005 if (parse_data(&buf
, big_file_threshold
, &len
))
2006 store_object(OBJ_BLOB
, &buf
, last
, oidout
, mark
);
2009 strbuf_release(&last
->data
);
2013 stream_blob(len
, oidout
, mark
);
2018 static void parse_new_blob(void)
2020 read_next_command();
2022 parse_original_identifier();
2023 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2026 static void unload_one_branch(void)
2028 while (cur_active_branches
2029 && cur_active_branches
>= max_active_branches
) {
2030 uintmax_t min_commit
= ULONG_MAX
;
2031 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2033 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2034 if (e
->last_commit
< min_commit
) {
2036 min_commit
= e
->last_commit
;
2042 e
= p
->active_next_branch
;
2043 p
->active_next_branch
= e
->active_next_branch
;
2045 e
= active_branches
;
2046 active_branches
= e
->active_next_branch
;
2049 e
->active_next_branch
= NULL
;
2050 if (e
->branch_tree
.tree
) {
2051 release_tree_content_recursive(e
->branch_tree
.tree
);
2052 e
->branch_tree
.tree
= NULL
;
2054 cur_active_branches
--;
2058 static void load_branch(struct branch
*b
)
2060 load_tree(&b
->branch_tree
);
2063 b
->active_next_branch
= active_branches
;
2064 active_branches
= b
;
2065 cur_active_branches
++;
2066 branch_load_count
++;
2070 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2072 unsigned char fanout
= 0;
2073 while ((num_notes
>>= 8))
2078 static void construct_path_with_fanout(const char *hex_sha1
,
2079 unsigned char fanout
, char *path
)
2081 unsigned int i
= 0, j
= 0;
2082 if (fanout
>= the_hash_algo
->rawsz
)
2083 die("Too large fanout (%u)", fanout
);
2085 path
[i
++] = hex_sha1
[j
++];
2086 path
[i
++] = hex_sha1
[j
++];
2090 memcpy(path
+ i
, hex_sha1
+ j
, the_hash_algo
->hexsz
- j
);
2091 path
[i
+ the_hash_algo
->hexsz
- j
] = '\0';
2094 static uintmax_t do_change_note_fanout(
2095 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2096 char *hex_oid
, unsigned int hex_oid_len
,
2097 char *fullpath
, unsigned int fullpath_len
,
2098 unsigned char fanout
)
2100 struct tree_content
*t
;
2101 struct tree_entry
*e
, leaf
;
2102 unsigned int i
, tmp_hex_oid_len
, tmp_fullpath_len
;
2103 uintmax_t num_notes
= 0;
2104 struct object_id oid
;
2105 /* hex oid + '/' between each pair of hex digits + NUL */
2106 char realpath
[GIT_MAX_HEXSZ
+ ((GIT_MAX_HEXSZ
/ 2) - 1) + 1];
2107 const unsigned hexsz
= the_hash_algo
->hexsz
;
2113 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2115 tmp_hex_oid_len
= hex_oid_len
+ e
->name
->str_len
;
2116 tmp_fullpath_len
= fullpath_len
;
2119 * We're interested in EITHER existing note entries (entries
2120 * with exactly 40 hex chars in path, not including directory
2121 * separators), OR directory entries that may contain note
2122 * entries (with < 40 hex chars in path).
2123 * Also, each path component in a note entry must be a multiple
2126 if (!e
->versions
[1].mode
||
2127 tmp_hex_oid_len
> hexsz
||
2128 e
->name
->str_len
% 2)
2131 /* This _may_ be a note entry, or a subdir containing notes */
2132 memcpy(hex_oid
+ hex_oid_len
, e
->name
->str_dat
,
2134 if (tmp_fullpath_len
)
2135 fullpath
[tmp_fullpath_len
++] = '/';
2136 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2138 tmp_fullpath_len
+= e
->name
->str_len
;
2139 fullpath
[tmp_fullpath_len
] = '\0';
2141 if (tmp_hex_oid_len
== hexsz
&& !get_oid_hex(hex_oid
, &oid
)) {
2142 /* This is a note entry */
2143 if (fanout
== 0xff) {
2144 /* Counting mode, no rename */
2148 construct_path_with_fanout(hex_oid
, fanout
, realpath
);
2149 if (!strcmp(fullpath
, realpath
)) {
2150 /* Note entry is in correct location */
2155 /* Rename fullpath to realpath */
2156 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2157 die("Failed to remove path %s", fullpath
);
2158 tree_content_set(orig_root
, realpath
,
2159 &leaf
.versions
[1].oid
,
2160 leaf
.versions
[1].mode
,
2162 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2163 /* This is a subdir that may contain note entries */
2164 num_notes
+= do_change_note_fanout(orig_root
, e
,
2165 hex_oid
, tmp_hex_oid_len
,
2166 fullpath
, tmp_fullpath_len
, fanout
);
2169 /* The above may have reallocated the current tree_content */
2175 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2176 unsigned char fanout
)
2179 * The size of path is due to one slash between every two hex digits,
2180 * plus the terminating NUL. Note that there is no slash at the end, so
2181 * the number of slashes is one less than half the number of hex
2184 char hex_oid
[GIT_MAX_HEXSZ
], path
[GIT_MAX_HEXSZ
+ (GIT_MAX_HEXSZ
/ 2) - 1 + 1];
2185 return do_change_note_fanout(root
, root
, hex_oid
, 0, path
, 0, fanout
);
2188 static int parse_mapped_oid_hex(const char *hex
, struct object_id
*oid
, const char **end
)
2193 /* Make SHA-1 object IDs have all-zero padding. */
2194 memset(oid
->hash
, 0, sizeof(oid
->hash
));
2196 algo
= parse_oid_hex_any(hex
, oid
, end
);
2197 if (algo
== GIT_HASH_UNKNOWN
)
2200 it
= kh_get_oid_map(sub_oid_map
, *oid
);
2201 /* No such object? */
2202 if (it
== kh_end(sub_oid_map
)) {
2203 /* If we're using the same algorithm, pass it through. */
2204 if (hash_algos
[algo
].format_id
== the_hash_algo
->format_id
)
2208 oidcpy(oid
, kh_value(sub_oid_map
, it
));
2213 * Given a pointer into a string, parse a mark reference:
2215 * idnum ::= ':' bigint;
2217 * Update *endptr to point to the first character after the value.
2219 * Complain if the following character is not what is expected,
2220 * either a space or end of the string.
2222 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2228 mark
= strtoumax(p
, endptr
, 10);
2230 die("No value after ':' in mark: %s", command_buf
.buf
);
2235 * Parse the mark reference, and complain if this is not the end of
2238 static uintmax_t parse_mark_ref_eol(const char *p
)
2243 mark
= parse_mark_ref(p
, &end
);
2245 die("Garbage after mark: %s", command_buf
.buf
);
2250 * Parse the mark reference, demanding a trailing space. Update *p to
2251 * point to the first character after the space.
2253 static uintmax_t parse_mark_ref_space(const char **p
)
2258 mark
= parse_mark_ref(*p
, &end
);
2260 die("Missing space after mark: %s", command_buf
.buf
);
2266 * Parse the path string into the strbuf. The path can either be quoted with
2267 * escape sequences or unquoted without escape sequences. Unquoted strings may
2268 * contain spaces only if `is_last_field` is nonzero; otherwise, it stops
2269 * parsing at the first space.
2271 static void parse_path(struct strbuf
*sb
, const char *p
, const char **endp
,
2272 int is_last_field
, const char *field
)
2275 if (unquote_c_style(sb
, p
, endp
))
2276 die("Invalid %s: %s", field
, command_buf
.buf
);
2277 if (strlen(sb
->buf
) != sb
->len
)
2278 die("NUL in %s: %s", field
, command_buf
.buf
);
2281 * Unless we are parsing the last field of a line,
2282 * SP is the end of this field.
2284 *endp
= is_last_field
2286 : strchrnul(p
, ' ');
2287 strbuf_add(sb
, p
, *endp
- p
);
2292 * Parse the path string into the strbuf, and complain if this is not the end of
2293 * the string. Unquoted strings may contain spaces.
2295 static void parse_path_eol(struct strbuf
*sb
, const char *p
, const char *field
)
2299 parse_path(sb
, p
, &end
, 1, field
);
2301 die("Garbage after %s: %s", field
, command_buf
.buf
);
2305 * Parse the path string into the strbuf, and ensure it is followed by a space.
2306 * Unquoted strings may not contain spaces. Update *endp to point to the first
2307 * character after the space.
2309 static void parse_path_space(struct strbuf
*sb
, const char *p
,
2310 const char **endp
, const char *field
)
2312 parse_path(sb
, p
, endp
, 0, field
);
2314 die("Missing space after %s: %s", field
, command_buf
.buf
);
2318 static void file_change_m(const char *p
, struct branch
*b
)
2320 static struct strbuf path
= STRBUF_INIT
;
2321 struct object_entry
*oe
;
2322 struct object_id oid
;
2323 uint16_t mode
, inline_data
= 0;
2325 p
= parse_mode(p
, &mode
);
2327 die("Corrupt mode: %s", command_buf
.buf
);
2332 case S_IFREG
| 0644:
2333 case S_IFREG
| 0755:
2340 die("Corrupt mode: %s", command_buf
.buf
);
2344 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2345 oidcpy(&oid
, &oe
->idx
.oid
);
2346 } else if (skip_prefix(p
, "inline ", &p
)) {
2348 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2350 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2351 die("Invalid dataref: %s", command_buf
.buf
);
2352 oe
= find_object(&oid
);
2354 die("Missing space after SHA1: %s", command_buf
.buf
);
2357 strbuf_reset(&path
);
2358 parse_path_eol(&path
, p
, "path");
2360 /* Git does not track empty, non-toplevel directories. */
2361 if (S_ISDIR(mode
) && is_empty_tree_oid(&oid
) && *path
.buf
) {
2362 tree_content_remove(&b
->branch_tree
, path
.buf
, NULL
, 0);
2366 if (S_ISGITLINK(mode
)) {
2368 die("Git links cannot be specified 'inline': %s",
2371 if (oe
->type
!= OBJ_COMMIT
)
2372 die("Not a commit (actually a %s): %s",
2373 type_name(oe
->type
), command_buf
.buf
);
2376 * Accept the sha1 without checking; it expected to be in
2377 * another repository.
2379 } else if (inline_data
) {
2381 die("Directories cannot be specified 'inline': %s",
2383 while (read_next_command() != EOF
) {
2385 if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2388 parse_and_store_blob(&last_blob
, &oid
, 0);
2393 enum object_type expected
= S_ISDIR(mode
) ?
2395 enum object_type type
= oe
? oe
->type
:
2396 oid_object_info(the_repository
, &oid
,
2399 die("%s not found: %s",
2400 S_ISDIR(mode
) ? "Tree" : "Blob",
2402 if (type
!= expected
)
2403 die("Not a %s (actually a %s): %s",
2404 type_name(expected
), type_name(type
),
2409 tree_content_replace(&b
->branch_tree
, &oid
, mode
, NULL
);
2412 tree_content_set(&b
->branch_tree
, path
.buf
, &oid
, mode
, NULL
);
2415 static void file_change_d(const char *p
, struct branch
*b
)
2417 static struct strbuf path
= STRBUF_INIT
;
2419 strbuf_reset(&path
);
2420 parse_path_eol(&path
, p
, "path");
2421 tree_content_remove(&b
->branch_tree
, path
.buf
, NULL
, 1);
2424 static void file_change_cr(const char *p
, struct branch
*b
, int rename
)
2426 static struct strbuf source
= STRBUF_INIT
;
2427 static struct strbuf dest
= STRBUF_INIT
;
2428 struct tree_entry leaf
;
2430 strbuf_reset(&source
);
2431 parse_path_space(&source
, p
, &p
, "source");
2432 strbuf_reset(&dest
);
2433 parse_path_eol(&dest
, p
, "dest");
2435 memset(&leaf
, 0, sizeof(leaf
));
2437 tree_content_remove(&b
->branch_tree
, source
.buf
, &leaf
, 1);
2439 tree_content_get(&b
->branch_tree
, source
.buf
, &leaf
, 1);
2440 if (!leaf
.versions
[1].mode
)
2441 die("Path %s not in branch", source
.buf
);
2442 if (!*dest
.buf
) { /* C "path/to/subdir" "" */
2443 tree_content_replace(&b
->branch_tree
,
2444 &leaf
.versions
[1].oid
,
2445 leaf
.versions
[1].mode
,
2449 tree_content_set(&b
->branch_tree
, dest
.buf
,
2450 &leaf
.versions
[1].oid
,
2451 leaf
.versions
[1].mode
,
2455 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2457 struct object_entry
*oe
;
2459 struct object_id oid
, commit_oid
;
2460 char path
[GIT_MAX_RAWSZ
* 3];
2461 uint16_t inline_data
= 0;
2462 unsigned char new_fanout
;
2465 * When loading a branch, we don't traverse its tree to count the real
2466 * number of notes (too expensive to do this for all non-note refs).
2467 * This means that recently loaded notes refs might incorrectly have
2468 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2470 * Fix this by traversing the tree and counting the number of notes
2471 * when b->num_notes == 0. If the notes tree is truly empty, the
2472 * calculation should not take long.
2474 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2475 /* Invoke change_note_fanout() in "counting mode". */
2476 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2477 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2480 /* Now parse the notemodify command. */
2481 /* <dataref> or 'inline' */
2483 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2484 oidcpy(&oid
, &oe
->idx
.oid
);
2485 } else if (skip_prefix(p
, "inline ", &p
)) {
2487 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2489 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2490 die("Invalid dataref: %s", command_buf
.buf
);
2491 oe
= find_object(&oid
);
2493 die("Missing space after SHA1: %s", command_buf
.buf
);
2497 s
= lookup_branch(p
);
2499 if (is_null_oid(&s
->oid
))
2500 die("Can't add a note on empty branch.");
2501 oidcpy(&commit_oid
, &s
->oid
);
2502 } else if (*p
== ':') {
2503 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2504 struct object_entry
*commit_oe
= find_mark(marks
, commit_mark
);
2505 if (commit_oe
->type
!= OBJ_COMMIT
)
2506 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2507 oidcpy(&commit_oid
, &commit_oe
->idx
.oid
);
2508 } else if (!repo_get_oid(the_repository
, p
, &commit_oid
)) {
2510 char *buf
= read_object_with_reference(the_repository
,
2514 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2515 die("Not a valid commit: %s", p
);
2518 die("Invalid ref name or SHA1 expression: %s", p
);
2521 read_next_command();
2522 parse_and_store_blob(&last_blob
, &oid
, 0);
2524 if (oe
->type
!= OBJ_BLOB
)
2525 die("Not a blob (actually a %s): %s",
2526 type_name(oe
->type
), command_buf
.buf
);
2527 } else if (!is_null_oid(&oid
)) {
2528 enum object_type type
= oid_object_info(the_repository
, &oid
,
2531 die("Blob not found: %s", command_buf
.buf
);
2532 if (type
!= OBJ_BLOB
)
2533 die("Not a blob (actually a %s): %s",
2534 type_name(type
), command_buf
.buf
);
2537 construct_path_with_fanout(oid_to_hex(&commit_oid
), *old_fanout
, path
);
2538 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2541 if (is_null_oid(&oid
))
2542 return; /* nothing to insert */
2545 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2546 construct_path_with_fanout(oid_to_hex(&commit_oid
), new_fanout
, path
);
2547 tree_content_set(&b
->branch_tree
, path
, &oid
, S_IFREG
| 0644, NULL
);
2550 static void file_change_deleteall(struct branch
*b
)
2552 release_tree_content_recursive(b
->branch_tree
.tree
);
2553 oidclr(&b
->branch_tree
.versions
[0].oid
);
2554 oidclr(&b
->branch_tree
.versions
[1].oid
);
2555 load_tree(&b
->branch_tree
);
2559 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2561 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2562 die("Not a valid commit: %s", oid_to_hex(&b
->oid
));
2563 if (memcmp("tree ", buf
, 5)
2564 || get_oid_hex(buf
+ 5, &b
->branch_tree
.versions
[1].oid
))
2565 die("The commit %s is corrupt", oid_to_hex(&b
->oid
));
2566 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2567 &b
->branch_tree
.versions
[1].oid
);
2570 static void parse_from_existing(struct branch
*b
)
2572 if (is_null_oid(&b
->oid
)) {
2573 oidclr(&b
->branch_tree
.versions
[0].oid
);
2574 oidclr(&b
->branch_tree
.versions
[1].oid
);
2579 buf
= read_object_with_reference(the_repository
,
2580 &b
->oid
, OBJ_COMMIT
, &size
,
2582 parse_from_commit(b
, buf
, size
);
2587 static int parse_objectish(struct branch
*b
, const char *objectish
)
2590 struct object_id oid
;
2592 oidcpy(&oid
, &b
->branch_tree
.versions
[1].oid
);
2594 s
= lookup_branch(objectish
);
2596 die("Can't create a branch from itself: %s", b
->name
);
2598 struct object_id
*t
= &s
->branch_tree
.versions
[1].oid
;
2599 oidcpy(&b
->oid
, &s
->oid
);
2600 oidcpy(&b
->branch_tree
.versions
[0].oid
, t
);
2601 oidcpy(&b
->branch_tree
.versions
[1].oid
, t
);
2602 } else if (*objectish
== ':') {
2603 uintmax_t idnum
= parse_mark_ref_eol(objectish
);
2604 struct object_entry
*oe
= find_mark(marks
, idnum
);
2605 if (oe
->type
!= OBJ_COMMIT
)
2606 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2607 if (!oideq(&b
->oid
, &oe
->idx
.oid
)) {
2608 oidcpy(&b
->oid
, &oe
->idx
.oid
);
2609 if (oe
->pack_id
!= MAX_PACK_ID
) {
2611 char *buf
= gfi_unpack_entry(oe
, &size
);
2612 parse_from_commit(b
, buf
, size
);
2615 parse_from_existing(b
);
2617 } else if (!repo_get_oid(the_repository
, objectish
, &b
->oid
)) {
2618 parse_from_existing(b
);
2619 if (is_null_oid(&b
->oid
))
2623 die("Invalid ref name or SHA1 expression: %s", objectish
);
2625 if (b
->branch_tree
.tree
&& !oideq(&oid
, &b
->branch_tree
.versions
[1].oid
)) {
2626 release_tree_content_recursive(b
->branch_tree
.tree
);
2627 b
->branch_tree
.tree
= NULL
;
2630 read_next_command();
2634 static int parse_from(struct branch
*b
)
2638 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2641 return parse_objectish(b
, from
);
2644 static int parse_objectish_with_prefix(struct branch
*b
, const char *prefix
)
2648 if (!skip_prefix(command_buf
.buf
, prefix
, &base
))
2651 return parse_objectish(b
, base
);
2654 static struct hash_list
*parse_merge(unsigned int *count
)
2656 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2661 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2662 n
= xmalloc(sizeof(*n
));
2663 s
= lookup_branch(from
);
2665 oidcpy(&n
->oid
, &s
->oid
);
2666 else if (*from
== ':') {
2667 uintmax_t idnum
= parse_mark_ref_eol(from
);
2668 struct object_entry
*oe
= find_mark(marks
, idnum
);
2669 if (oe
->type
!= OBJ_COMMIT
)
2670 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2671 oidcpy(&n
->oid
, &oe
->idx
.oid
);
2672 } else if (!repo_get_oid(the_repository
, from
, &n
->oid
)) {
2674 char *buf
= read_object_with_reference(the_repository
,
2678 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2679 die("Not a valid commit: %s", from
);
2682 die("Invalid ref name or SHA1 expression: %s", from
);
2689 read_next_command();
2694 static void parse_new_commit(const char *arg
)
2696 static struct strbuf msg
= STRBUF_INIT
;
2698 char *author
= NULL
;
2699 char *committer
= NULL
;
2700 char *encoding
= NULL
;
2701 struct hash_list
*merge_list
= NULL
;
2702 unsigned int merge_count
;
2703 unsigned char prev_fanout
, new_fanout
;
2706 b
= lookup_branch(arg
);
2708 b
= new_branch(arg
);
2710 read_next_command();
2712 parse_original_identifier();
2713 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2714 author
= parse_ident(v
);
2715 read_next_command();
2717 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2718 committer
= parse_ident(v
);
2719 read_next_command();
2722 die("Expected committer but didn't get one");
2723 if (skip_prefix(command_buf
.buf
, "encoding ", &v
)) {
2724 encoding
= xstrdup(v
);
2725 read_next_command();
2727 parse_data(&msg
, 0, NULL
);
2728 read_next_command();
2730 merge_list
= parse_merge(&merge_count
);
2732 /* ensure the branch is active/loaded */
2733 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2734 unload_one_branch();
2738 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2741 while (command_buf
.len
> 0) {
2742 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2743 file_change_m(v
, b
);
2744 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2745 file_change_d(v
, b
);
2746 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2747 file_change_cr(v
, b
, 1);
2748 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2749 file_change_cr(v
, b
, 0);
2750 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2751 note_change_n(v
, b
, &prev_fanout
);
2752 else if (!strcmp("deleteall", command_buf
.buf
))
2753 file_change_deleteall(b
);
2754 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2756 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2759 unread_command_buf
= 1;
2762 if (read_next_command() == EOF
)
2766 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2767 if (new_fanout
!= prev_fanout
)
2768 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2770 /* build the tree and the commit */
2771 store_tree(&b
->branch_tree
);
2772 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2773 &b
->branch_tree
.versions
[1].oid
);
2775 strbuf_reset(&new_data
);
2776 strbuf_addf(&new_data
, "tree %s\n",
2777 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
2778 if (!is_null_oid(&b
->oid
))
2779 strbuf_addf(&new_data
, "parent %s\n",
2780 oid_to_hex(&b
->oid
));
2781 while (merge_list
) {
2782 struct hash_list
*next
= merge_list
->next
;
2783 strbuf_addf(&new_data
, "parent %s\n",
2784 oid_to_hex(&merge_list
->oid
));
2788 strbuf_addf(&new_data
,
2791 author
? author
: committer
, committer
);
2793 strbuf_addf(&new_data
,
2796 strbuf_addch(&new_data
, '\n');
2797 strbuf_addbuf(&new_data
, &msg
);
2802 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, &b
->oid
, next_mark
))
2803 b
->pack_id
= pack_id
;
2804 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2807 static void parse_new_tag(const char *arg
)
2809 static struct strbuf msg
= STRBUF_INIT
;
2814 uintmax_t from_mark
= 0;
2815 struct object_id oid
;
2816 enum object_type type
;
2819 t
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct tag
));
2820 t
->name
= mem_pool_strdup(&fi_mem_pool
, arg
);
2822 last_tag
->next_tag
= t
;
2826 read_next_command();
2830 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2831 die("Expected from command, got %s", command_buf
.buf
);
2832 s
= lookup_branch(from
);
2834 if (is_null_oid(&s
->oid
))
2835 die("Can't tag an empty branch.");
2836 oidcpy(&oid
, &s
->oid
);
2838 } else if (*from
== ':') {
2839 struct object_entry
*oe
;
2840 from_mark
= parse_mark_ref_eol(from
);
2841 oe
= find_mark(marks
, from_mark
);
2843 oidcpy(&oid
, &oe
->idx
.oid
);
2844 } else if (!repo_get_oid(the_repository
, from
, &oid
)) {
2845 struct object_entry
*oe
= find_object(&oid
);
2847 type
= oid_object_info(the_repository
, &oid
, NULL
);
2849 die("Not a valid object: %s", from
);
2853 die("Invalid ref name or SHA1 expression: %s", from
);
2854 read_next_command();
2856 /* original-oid ... */
2857 parse_original_identifier();
2860 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2861 tagger
= parse_ident(v
);
2862 read_next_command();
2866 /* tag payload/message */
2867 parse_data(&msg
, 0, NULL
);
2869 /* build the tag object */
2870 strbuf_reset(&new_data
);
2872 strbuf_addf(&new_data
,
2876 oid_to_hex(&oid
), type_name(type
), t
->name
);
2878 strbuf_addf(&new_data
,
2879 "tagger %s\n", tagger
);
2880 strbuf_addch(&new_data
, '\n');
2881 strbuf_addbuf(&new_data
, &msg
);
2884 if (store_object(OBJ_TAG
, &new_data
, NULL
, &t
->oid
, next_mark
))
2885 t
->pack_id
= MAX_PACK_ID
;
2887 t
->pack_id
= pack_id
;
2890 static void parse_reset_branch(const char *arg
)
2893 const char *tag_name
;
2895 b
= lookup_branch(arg
);
2898 oidclr(&b
->branch_tree
.versions
[0].oid
);
2899 oidclr(&b
->branch_tree
.versions
[1].oid
);
2900 if (b
->branch_tree
.tree
) {
2901 release_tree_content_recursive(b
->branch_tree
.tree
);
2902 b
->branch_tree
.tree
= NULL
;
2906 b
= new_branch(arg
);
2907 read_next_command();
2909 if (b
->delete && skip_prefix(b
->name
, "refs/tags/", &tag_name
)) {
2911 * Elsewhere, we call dump_branches() before dump_tags(),
2912 * and dump_branches() will handle ref deletions first, so
2913 * in order to make sure the deletion actually takes effect,
2914 * we need to remove the tag from our list of tags to update.
2916 * NEEDSWORK: replace list of tags with hashmap for faster
2919 struct tag
*t
, *prev
= NULL
;
2920 for (t
= first_tag
; t
; t
= t
->next_tag
) {
2921 if (!strcmp(t
->name
, tag_name
))
2927 prev
->next_tag
= t
->next_tag
;
2929 first_tag
= t
->next_tag
;
2932 /* There is no mem_pool_free(t) function to call. */
2935 if (command_buf
.len
> 0)
2936 unread_command_buf
= 1;
2939 static void cat_blob_write(const char *buf
, unsigned long size
)
2941 if (write_in_full(cat_blob_fd
, buf
, size
) < 0)
2942 die_errno("Write to frontend failed");
2945 static void cat_blob(struct object_entry
*oe
, struct object_id
*oid
)
2947 struct strbuf line
= STRBUF_INIT
;
2949 enum object_type type
= 0;
2952 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2953 buf
= repo_read_object_file(the_repository
, oid
, &type
, &size
);
2956 buf
= gfi_unpack_entry(oe
, &size
);
2960 * Output based on batch_one_object() from cat-file.c.
2963 strbuf_reset(&line
);
2964 strbuf_addf(&line
, "%s missing\n", oid_to_hex(oid
));
2965 cat_blob_write(line
.buf
, line
.len
);
2966 strbuf_release(&line
);
2971 die("Can't read object %s", oid_to_hex(oid
));
2972 if (type
!= OBJ_BLOB
)
2973 die("Object %s is a %s but a blob was expected.",
2974 oid_to_hex(oid
), type_name(type
));
2975 strbuf_reset(&line
);
2976 strbuf_addf(&line
, "%s %s %"PRIuMAX
"\n", oid_to_hex(oid
),
2977 type_name(type
), (uintmax_t)size
);
2978 cat_blob_write(line
.buf
, line
.len
);
2979 strbuf_release(&line
);
2980 cat_blob_write(buf
, size
);
2981 cat_blob_write("\n", 1);
2982 if (oe
&& oe
->pack_id
== pack_id
) {
2983 last_blob
.offset
= oe
->idx
.offset
;
2984 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2985 last_blob
.depth
= oe
->depth
;
2990 static void parse_get_mark(const char *p
)
2992 struct object_entry
*oe
;
2993 char output
[GIT_MAX_HEXSZ
+ 2];
2995 /* get-mark SP <object> LF */
2997 die("Not a mark: %s", p
);
2999 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
3001 die("Unknown mark: %s", command_buf
.buf
);
3003 xsnprintf(output
, sizeof(output
), "%s\n", oid_to_hex(&oe
->idx
.oid
));
3004 cat_blob_write(output
, the_hash_algo
->hexsz
+ 1);
3007 static void parse_cat_blob(const char *p
)
3009 struct object_entry
*oe
;
3010 struct object_id oid
;
3012 /* cat-blob SP <object> LF */
3014 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
3016 die("Unknown mark: %s", command_buf
.buf
);
3017 oidcpy(&oid
, &oe
->idx
.oid
);
3019 if (parse_mapped_oid_hex(p
, &oid
, &p
))
3020 die("Invalid dataref: %s", command_buf
.buf
);
3022 die("Garbage after SHA1: %s", command_buf
.buf
);
3023 oe
= find_object(&oid
);
3029 static struct object_entry
*dereference(struct object_entry
*oe
,
3030 struct object_id
*oid
)
3034 const unsigned hexsz
= the_hash_algo
->hexsz
;
3037 enum object_type type
= oid_object_info(the_repository
, oid
,
3040 die("object not found: %s", oid_to_hex(oid
));
3042 oe
= insert_object(oid
);
3044 oe
->pack_id
= MAX_PACK_ID
;
3048 case OBJ_TREE
: /* easy case. */
3054 die("Not a tree-ish: %s", command_buf
.buf
);
3057 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
3058 buf
= gfi_unpack_entry(oe
, &size
);
3060 enum object_type unused
;
3061 buf
= repo_read_object_file(the_repository
, oid
, &unused
,
3065 die("Can't load object %s", oid_to_hex(oid
));
3067 /* Peel one layer. */
3070 if (size
< hexsz
+ strlen("object ") ||
3071 get_oid_hex(buf
+ strlen("object "), oid
))
3072 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
3075 if (size
< hexsz
+ strlen("tree ") ||
3076 get_oid_hex(buf
+ strlen("tree "), oid
))
3077 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
3081 return find_object(oid
);
3084 static void insert_mapped_mark(uintmax_t mark
, void *object
, void *cbp
)
3086 struct object_id
*fromoid
= object
;
3087 struct object_id
*tooid
= find_mark(cbp
, mark
);
3091 it
= kh_put_oid_map(sub_oid_map
, *fromoid
, &ret
);
3092 /* We've already seen this object. */
3095 kh_value(sub_oid_map
, it
) = tooid
;
3098 static void build_mark_map_one(struct mark_set
*from
, struct mark_set
*to
)
3100 for_each_mark(from
, 0, insert_mapped_mark
, to
);
3103 static void build_mark_map(struct string_list
*from
, struct string_list
*to
)
3105 struct string_list_item
*fromp
, *top
;
3107 sub_oid_map
= kh_init_oid_map();
3109 for_each_string_list_item(fromp
, from
) {
3110 top
= string_list_lookup(to
, fromp
->string
);
3112 die(_("Missing from marks for submodule '%s'"), fromp
->string
);
3113 } else if (!top
|| !top
->util
) {
3114 die(_("Missing to marks for submodule '%s'"), fromp
->string
);
3116 build_mark_map_one(fromp
->util
, top
->util
);
3120 static struct object_entry
*parse_treeish_dataref(const char **p
)
3122 struct object_id oid
;
3123 struct object_entry
*e
;
3125 if (**p
== ':') { /* <mark> */
3126 e
= find_mark(marks
, parse_mark_ref_space(p
));
3128 die("Unknown mark: %s", command_buf
.buf
);
3129 oidcpy(&oid
, &e
->idx
.oid
);
3130 } else { /* <sha1> */
3131 if (parse_mapped_oid_hex(*p
, &oid
, p
))
3132 die("Invalid dataref: %s", command_buf
.buf
);
3133 e
= find_object(&oid
);
3135 die("Missing space after tree-ish: %s", command_buf
.buf
);
3138 while (!e
|| e
->type
!= OBJ_TREE
)
3139 e
= dereference(e
, &oid
);
3143 static void print_ls(int mode
, const unsigned char *hash
, const char *path
)
3145 static struct strbuf line
= STRBUF_INIT
;
3147 /* See show_tree(). */
3149 S_ISGITLINK(mode
) ? commit_type
:
3150 S_ISDIR(mode
) ? tree_type
:
3154 /* missing SP path LF */
3155 strbuf_reset(&line
);
3156 strbuf_addstr(&line
, "missing ");
3157 quote_c_style(path
, &line
, NULL
, 0);
3158 strbuf_addch(&line
, '\n');
3160 /* mode SP type SP object_name TAB path LF */
3161 strbuf_reset(&line
);
3162 strbuf_addf(&line
, "%06o %s %s\t",
3163 mode
& ~NO_DELTA
, type
, hash_to_hex(hash
));
3164 quote_c_style(path
, &line
, NULL
, 0);
3165 strbuf_addch(&line
, '\n');
3167 cat_blob_write(line
.buf
, line
.len
);
3170 static void parse_ls(const char *p
, struct branch
*b
)
3172 static struct strbuf path
= STRBUF_INIT
;
3173 struct tree_entry
*root
= NULL
;
3174 struct tree_entry leaf
= {NULL
};
3176 /* ls SP (<tree-ish> SP)? <path> */
3179 die("Not in a commit: %s", command_buf
.buf
);
3180 root
= &b
->branch_tree
;
3182 struct object_entry
*e
= parse_treeish_dataref(&p
);
3183 root
= new_tree_entry();
3184 oidcpy(&root
->versions
[1].oid
, &e
->idx
.oid
);
3185 if (!is_null_oid(&root
->versions
[1].oid
))
3186 root
->versions
[1].mode
= S_IFDIR
;
3189 strbuf_reset(&path
);
3190 parse_path_eol(&path
, p
, "path");
3191 tree_content_get(root
, path
.buf
, &leaf
, 1);
3193 * A directory in preparation would have a sha1 of zero
3194 * until it is saved. Save, for simplicity.
3196 if (S_ISDIR(leaf
.versions
[1].mode
))
3199 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].oid
.hash
, path
.buf
);
3201 release_tree_content_recursive(leaf
.tree
);
3202 if (!b
|| root
!= &b
->branch_tree
)
3203 release_tree_entry(root
);
3206 static void checkpoint(void)
3208 checkpoint_requested
= 0;
3217 static void parse_checkpoint(void)
3219 checkpoint_requested
= 1;
3223 static void parse_progress(void)
3225 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3226 fputc('\n', stdout
);
3231 static void parse_alias(void)
3233 struct object_entry
*e
;
3237 read_next_command();
3242 die(_("Expected 'mark' command, got %s"), command_buf
.buf
);
3245 memset(&b
, 0, sizeof(b
));
3246 if (!parse_objectish_with_prefix(&b
, "to "))
3247 die(_("Expected 'to' command, got %s"), command_buf
.buf
);
3248 e
= find_object(&b
.oid
);
3250 insert_mark(&marks
, next_mark
, e
);
3253 static char* make_fast_import_path(const char *path
)
3255 if (!relative_marks_paths
|| is_absolute_path(path
))
3256 return prefix_filename(global_prefix
, path
);
3257 return git_pathdup("info/fast-import/%s", path
);
3260 static void option_import_marks(const char *marks
,
3261 int from_stream
, int ignore_missing
)
3263 if (import_marks_file
) {
3265 die("Only one import-marks command allowed per stream");
3267 /* read previous mark file */
3268 if(!import_marks_file_from_stream
)
3272 import_marks_file
= make_fast_import_path(marks
);
3273 import_marks_file_from_stream
= from_stream
;
3274 import_marks_file_ignore_missing
= ignore_missing
;
3277 static void option_date_format(const char *fmt
)
3279 if (!strcmp(fmt
, "raw"))
3280 whenspec
= WHENSPEC_RAW
;
3281 else if (!strcmp(fmt
, "raw-permissive"))
3282 whenspec
= WHENSPEC_RAW_PERMISSIVE
;
3283 else if (!strcmp(fmt
, "rfc2822"))
3284 whenspec
= WHENSPEC_RFC2822
;
3285 else if (!strcmp(fmt
, "now"))
3286 whenspec
= WHENSPEC_NOW
;
3288 die("unknown --date-format argument %s", fmt
);
3291 static unsigned long ulong_arg(const char *option
, const char *arg
)
3294 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3295 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3296 die("%s: argument must be a non-negative integer", option
);
3300 static void option_depth(const char *depth
)
3302 max_depth
= ulong_arg("--depth", depth
);
3303 if (max_depth
> MAX_DEPTH
)
3304 die("--depth cannot exceed %u", MAX_DEPTH
);
3307 static void option_active_branches(const char *branches
)
3309 max_active_branches
= ulong_arg("--active-branches", branches
);
3312 static void option_export_marks(const char *marks
)
3314 export_marks_file
= make_fast_import_path(marks
);
3317 static void option_cat_blob_fd(const char *fd
)
3319 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3320 if (n
> (unsigned long) INT_MAX
)
3321 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3322 cat_blob_fd
= (int) n
;
3325 static void option_export_pack_edges(const char *edges
)
3327 char *fn
= prefix_filename(global_prefix
, edges
);
3330 pack_edges
= xfopen(fn
, "a");
3334 static void option_rewrite_submodules(const char *arg
, struct string_list
*list
)
3336 struct mark_set
*ms
;
3338 char *s
= xstrdup(arg
);
3339 char *f
= strchr(s
, ':');
3341 die(_("Expected format name:filename for submodule rewrite option"));
3344 CALLOC_ARRAY(ms
, 1);
3346 f
= prefix_filename(global_prefix
, f
);
3349 die_errno("cannot read '%s'", f
);
3350 read_mark_file(&ms
, fp
, insert_oid_entry
);
3354 string_list_insert(list
, s
)->util
= ms
;
3357 static int parse_one_option(const char *option
)
3359 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3361 if (!git_parse_ulong(option
, &v
))
3364 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3366 } else if (v
< 1024 * 1024) {
3367 warning("minimum max-pack-size is 1 MiB");
3371 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3373 if (!git_parse_ulong(option
, &v
))
3375 big_file_threshold
= v
;
3376 } else if (skip_prefix(option
, "depth=", &option
)) {
3377 option_depth(option
);
3378 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3379 option_active_branches(option
);
3380 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3381 option_export_pack_edges(option
);
3382 } else if (!strcmp(option
, "quiet")) {
3384 } else if (!strcmp(option
, "stats")) {
3386 } else if (!strcmp(option
, "allow-unsafe-features")) {
3387 ; /* already handled during early option parsing */
3395 static void check_unsafe_feature(const char *feature
, int from_stream
)
3397 if (from_stream
&& !allow_unsafe_features
)
3398 die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
3402 static int parse_one_feature(const char *feature
, int from_stream
)
3406 if (skip_prefix(feature
, "date-format=", &arg
)) {
3407 option_date_format(arg
);
3408 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3409 check_unsafe_feature("import-marks", from_stream
);
3410 option_import_marks(arg
, from_stream
, 0);
3411 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3412 check_unsafe_feature("import-marks-if-exists", from_stream
);
3413 option_import_marks(arg
, from_stream
, 1);
3414 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3415 check_unsafe_feature(feature
, from_stream
);
3416 option_export_marks(arg
);
3417 } else if (!strcmp(feature
, "alias")) {
3418 ; /* Don't die - this feature is supported */
3419 } else if (skip_prefix(feature
, "rewrite-submodules-to=", &arg
)) {
3420 option_rewrite_submodules(arg
, &sub_marks_to
);
3421 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3422 option_rewrite_submodules(arg
, &sub_marks_from
);
3423 } else if (!strcmp(feature
, "get-mark")) {
3424 ; /* Don't die - this feature is supported */
3425 } else if (!strcmp(feature
, "cat-blob")) {
3426 ; /* Don't die - this feature is supported */
3427 } else if (!strcmp(feature
, "relative-marks")) {
3428 relative_marks_paths
= 1;
3429 } else if (!strcmp(feature
, "no-relative-marks")) {
3430 relative_marks_paths
= 0;
3431 } else if (!strcmp(feature
, "done")) {
3432 require_explicit_termination
= 1;
3433 } else if (!strcmp(feature
, "force")) {
3435 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3436 ; /* do nothing; we have the feature */
3444 static void parse_feature(const char *feature
)
3446 if (seen_data_command
)
3447 die("Got feature command '%s' after data command", feature
);
3449 if (parse_one_feature(feature
, 1))
3452 die("This version of fast-import does not support feature %s.", feature
);
3455 static void parse_option(const char *option
)
3457 if (seen_data_command
)
3458 die("Got option command '%s' after data command", option
);
3460 if (parse_one_option(option
))
3463 die("This version of fast-import does not support option: %s", option
);
3466 static void git_pack_config(void)
3468 int indexversion_value
;
3470 unsigned long packsizelimit_value
;
3472 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3473 if (max_depth
> MAX_DEPTH
)
3474 max_depth
= MAX_DEPTH
;
3476 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3477 pack_idx_opts
.version
= indexversion_value
;
3478 if (pack_idx_opts
.version
> 2)
3479 git_die_config("pack.indexversion",
3480 "bad pack.indexVersion=%"PRIu32
, pack_idx_opts
.version
);
3482 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3483 max_packsize
= packsizelimit_value
;
3485 if (!git_config_get_int("fastimport.unpacklimit", &limit
))
3486 unpack_limit
= limit
;
3487 else if (!git_config_get_int("transfer.unpacklimit", &limit
))
3488 unpack_limit
= limit
;
3490 git_config(git_default_config
, NULL
);
3493 static const char fast_import_usage
[] =
3494 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3496 static void parse_argv(void)
3500 for (i
= 1; i
< global_argc
; i
++) {
3501 const char *a
= global_argv
[i
];
3503 if (*a
!= '-' || !strcmp(a
, "--"))
3506 if (!skip_prefix(a
, "--", &a
))
3507 die("unknown option %s", a
);
3509 if (parse_one_option(a
))
3512 if (parse_one_feature(a
, 0))
3515 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3516 option_cat_blob_fd(a
);
3520 die("unknown option --%s", a
);
3522 if (i
!= global_argc
)
3523 usage(fast_import_usage
);
3525 seen_data_command
= 1;
3526 if (import_marks_file
)
3528 build_mark_map(&sub_marks_from
, &sub_marks_to
);
3531 int cmd_fast_import(int argc
, const char **argv
, const char *prefix
)
3535 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3536 usage(fast_import_usage
);
3538 reset_pack_idx_option(&pack_idx_opts
);
3541 alloc_objects(object_entry_alloc
);
3542 strbuf_init(&command_buf
, 0);
3543 CALLOC_ARRAY(atom_table
, atom_table_sz
);
3544 CALLOC_ARRAY(branch_table
, branch_table_sz
);
3545 CALLOC_ARRAY(avail_tree_table
, avail_tree_table_sz
);
3546 marks
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
3548 hashmap_init(&object_table
, object_entry_hashcmp
, NULL
, 0);
3551 * We don't parse most options until after we've seen the set of
3552 * "feature" lines at the start of the stream (which allows the command
3553 * line to override stream data). But we must do an early parse of any
3554 * command-line options that impact how we interpret the feature lines.
3556 for (i
= 1; i
< argc
; i
++) {
3557 const char *arg
= argv
[i
];
3558 if (*arg
!= '-' || !strcmp(arg
, "--"))
3560 if (!strcmp(arg
, "--allow-unsafe-features"))
3561 allow_unsafe_features
= 1;
3566 global_prefix
= prefix
;
3568 rc_free
= mem_pool_alloc(&fi_mem_pool
, cmd_save
* sizeof(*rc_free
));
3569 for (i
= 0; i
< (cmd_save
- 1); i
++)
3570 rc_free
[i
].next
= &rc_free
[i
+ 1];
3571 rc_free
[cmd_save
- 1].next
= NULL
;
3574 set_die_routine(die_nicely
);
3575 set_checkpoint_signal();
3576 while (read_next_command() != EOF
) {
3578 if (!strcmp("blob", command_buf
.buf
))
3580 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3581 parse_new_commit(v
);
3582 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3584 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3585 parse_reset_branch(v
);
3586 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3588 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
3590 else if (skip_prefix(command_buf
.buf
, "get-mark ", &v
))
3592 else if (!strcmp("checkpoint", command_buf
.buf
))
3594 else if (!strcmp("done", command_buf
.buf
))
3596 else if (!strcmp("alias", command_buf
.buf
))
3598 else if (starts_with(command_buf
.buf
, "progress "))
3600 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3602 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3604 else if (starts_with(command_buf
.buf
, "option "))
3605 /* ignore non-git options*/;
3607 die("Unsupported command: %s", command_buf
.buf
);
3609 if (checkpoint_requested
)
3613 /* argv hasn't been parsed yet, do so */
3614 if (!seen_data_command
)
3617 if (require_explicit_termination
&& feof(stdin
))
3618 die("stream ends early");
3631 uintmax_t total_count
= 0, duplicate_count
= 0;
3632 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3633 total_count
+= object_count_by_type
[i
];
3634 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3635 duplicate_count
+= duplicate_count_by_type
[i
];
3637 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3638 fprintf(stderr
, "---------------------------------------------------------------------\n");
3639 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3640 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3641 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
]);
3642 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
]);
3643 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
]);
3644 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
]);
3645 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3646 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3647 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3648 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (tree_entry_allocd
+ fi_mem_pool
.pool_alloc
+ alloc_count
*sizeof(struct object_entry
))/1024);
3649 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd
+ fi_mem_pool
.pool_alloc
) /1024));
3650 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3651 fprintf(stderr
, "---------------------------------------------------------------------\n");
3653 fprintf(stderr
, "---------------------------------------------------------------------\n");
3654 fprintf(stderr
, "\n");
3657 return failure
? 1 : 0;