3 #include "repository.h"
13 #include "csum-file.h"
16 #include "run-command.h"
18 #include "object-store.h"
20 #include "commit-reach.h"
23 #define PACK_ID_BITS 16
24 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
26 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
29 * We abuse the setuid bit on directories to mean "do not delta".
31 #define NO_DELTA S_ISUID
34 * The amount of additional space required in order to write an object into the
35 * current pack. This is the hash lengths at the end of the pack, plus the
36 * length of one object ID.
38 #define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3)
41 struct pack_idx_entry idx
;
42 struct hashmap_entry ent
;
43 uint32_t type
: TYPE_BITS
,
44 pack_id
: PACK_ID_BITS
,
48 static int object_entry_hashcmp(const void *map_data
,
49 const struct hashmap_entry
*eptr
,
50 const struct hashmap_entry
*entry_or_key
,
53 const struct object_id
*oid
= keydata
;
54 const struct object_entry
*e1
, *e2
;
56 e1
= container_of(eptr
, const struct object_entry
, ent
);
58 return oidcmp(&e1
->idx
.oid
, oid
);
60 e2
= container_of(entry_or_key
, const struct object_entry
, ent
);
61 return oidcmp(&e1
->idx
.oid
, &e2
->idx
.oid
);
64 struct object_entry_pool
{
65 struct object_entry_pool
*next_pool
;
66 struct object_entry
*next_free
;
67 struct object_entry
*end
;
68 struct object_entry entries
[FLEX_ARRAY
]; /* more */
73 struct object_id
*oids
[1024];
74 struct object_entry
*marked
[1024];
75 struct mark_set
*sets
[1024];
88 struct atom_str
*next_atom
;
89 unsigned short str_len
;
90 char str_dat
[FLEX_ARRAY
]; /* more */
95 struct tree_content
*tree
;
96 struct atom_str
*name
;
97 struct tree_entry_ms
{
103 struct tree_content
{
104 unsigned int entry_capacity
; /* must match avail_tree_content */
105 unsigned int entry_count
;
106 unsigned int delta_depth
;
107 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
110 struct avail_tree_content
{
111 unsigned int entry_capacity
; /* must match tree_content */
112 struct avail_tree_content
*next_avail
;
116 struct branch
*table_next_branch
;
117 struct branch
*active_next_branch
;
119 struct tree_entry branch_tree
;
120 uintmax_t last_commit
;
124 unsigned pack_id
: PACK_ID_BITS
;
125 struct object_id oid
;
129 struct tag
*next_tag
;
131 unsigned int pack_id
;
132 struct object_id oid
;
136 struct hash_list
*next
;
137 struct object_id oid
;
142 WHENSPEC_RAW_PERMISSIVE
,
147 struct recent_command
{
148 struct recent_command
*prev
;
149 struct recent_command
*next
;
153 typedef void (*mark_set_inserter_t
)(struct mark_set
*s
, struct object_id
*oid
, uintmax_t mark
);
154 typedef void (*each_mark_fn_t
)(uintmax_t mark
, void *obj
, void *cbp
);
156 /* Configured limits on output */
157 static unsigned long max_depth
= 50;
158 static off_t max_packsize
;
159 static int unpack_limit
= 100;
160 static int force_update
;
162 /* Stats and misc. counters */
163 static uintmax_t alloc_count
;
164 static uintmax_t marks_set_count
;
165 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
166 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
167 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
168 static uintmax_t delta_count_attempts_by_type
[1 << TYPE_BITS
];
169 static unsigned long object_count
;
170 static unsigned long branch_count
;
171 static unsigned long branch_load_count
;
173 static FILE *pack_edges
;
174 static unsigned int show_stats
= 1;
175 static int global_argc
;
176 static const char **global_argv
;
179 static struct mem_pool fi_mem_pool
= {NULL
, 2*1024*1024 -
180 sizeof(struct mp_block
), 0 };
182 /* Atom management */
183 static unsigned int atom_table_sz
= 4451;
184 static unsigned int atom_cnt
;
185 static struct atom_str
**atom_table
;
187 /* The .pack file being generated */
188 static struct pack_idx_option pack_idx_opts
;
189 static unsigned int pack_id
;
190 static struct hashfile
*pack_file
;
191 static struct packed_git
*pack_data
;
192 static struct packed_git
**all_packs
;
193 static off_t pack_size
;
195 /* Table of objects we've written. */
196 static unsigned int object_entry_alloc
= 5000;
197 static struct object_entry_pool
*blocks
;
198 static struct hashmap object_table
;
199 static struct mark_set
*marks
;
200 static const char *export_marks_file
;
201 static const char *import_marks_file
;
202 static int import_marks_file_from_stream
;
203 static int import_marks_file_ignore_missing
;
204 static int import_marks_file_done
;
205 static int relative_marks_paths
;
208 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
210 /* Tree management */
211 static unsigned int tree_entry_alloc
= 1000;
212 static void *avail_tree_entry
;
213 static unsigned int avail_tree_table_sz
= 100;
214 static struct avail_tree_content
**avail_tree_table
;
215 static size_t tree_entry_allocd
;
216 static struct strbuf old_tree
= STRBUF_INIT
;
217 static struct strbuf new_tree
= STRBUF_INIT
;
220 static unsigned long max_active_branches
= 5;
221 static unsigned long cur_active_branches
;
222 static unsigned long branch_table_sz
= 1039;
223 static struct branch
**branch_table
;
224 static struct branch
*active_branches
;
227 static struct tag
*first_tag
;
228 static struct tag
*last_tag
;
230 /* Input stream parsing */
231 static whenspec_type whenspec
= WHENSPEC_RAW
;
232 static struct strbuf command_buf
= STRBUF_INIT
;
233 static int unread_command_buf
;
234 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
235 static struct recent_command
*cmd_tail
= &cmd_hist
;
236 static struct recent_command
*rc_free
;
237 static unsigned int cmd_save
= 100;
238 static uintmax_t next_mark
;
239 static struct strbuf new_data
= STRBUF_INIT
;
240 static int seen_data_command
;
241 static int require_explicit_termination
;
242 static int allow_unsafe_features
;
244 /* Signal handling */
245 static volatile sig_atomic_t checkpoint_requested
;
247 /* Submodule marks */
248 static struct string_list sub_marks_from
= STRING_LIST_INIT_DUP
;
249 static struct string_list sub_marks_to
= STRING_LIST_INIT_DUP
;
250 static kh_oid_map_t
*sub_oid_map
;
252 /* Where to write output of cat-blob commands */
253 static int cat_blob_fd
= STDOUT_FILENO
;
255 static void parse_argv(void);
256 static void parse_get_mark(const char *p
);
257 static void parse_cat_blob(const char *p
);
258 static void parse_ls(const char *p
, struct branch
*b
);
260 static void for_each_mark(struct mark_set
*m
, uintmax_t base
, each_mark_fn_t callback
, void *p
)
264 for (k
= 0; k
< 1024; k
++) {
266 for_each_mark(m
->data
.sets
[k
], base
+ (k
<< m
->shift
), callback
, p
);
269 for (k
= 0; k
< 1024; k
++) {
270 if (m
->data
.marked
[k
])
271 callback(base
+ k
, m
->data
.marked
[k
], p
);
276 static void dump_marks_fn(uintmax_t mark
, void *object
, void *cbp
) {
277 struct object_entry
*e
= object
;
280 fprintf(f
, ":%" PRIuMAX
" %s\n", mark
, oid_to_hex(&e
->idx
.oid
));
283 static void write_branch_report(FILE *rpt
, struct branch
*b
)
285 fprintf(rpt
, "%s:\n", b
->name
);
287 fprintf(rpt
, " status :");
289 fputs(" active", rpt
);
290 if (b
->branch_tree
.tree
)
291 fputs(" loaded", rpt
);
292 if (is_null_oid(&b
->branch_tree
.versions
[1].oid
))
293 fputs(" dirty", rpt
);
296 fprintf(rpt
, " tip commit : %s\n", oid_to_hex(&b
->oid
));
297 fprintf(rpt
, " old tree : %s\n",
298 oid_to_hex(&b
->branch_tree
.versions
[0].oid
));
299 fprintf(rpt
, " cur tree : %s\n",
300 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
301 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
303 fputs(" last pack : ", rpt
);
304 if (b
->pack_id
< MAX_PACK_ID
)
305 fprintf(rpt
, "%u", b
->pack_id
);
311 static void write_crash_report(const char *err
)
313 char *loc
= git_pathdup("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
314 FILE *rpt
= fopen(loc
, "w");
317 struct recent_command
*rc
;
320 error_errno("can't write crash report %s", loc
);
325 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
327 fprintf(rpt
, "fast-import crash report:\n");
328 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
329 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
330 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_MODE(ISO8601
)));
333 fputs("fatal: ", rpt
);
338 fputs("Most Recent Commands Before Crash\n", rpt
);
339 fputs("---------------------------------\n", rpt
);
340 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
341 if (rc
->next
== &cmd_hist
)
350 fputs("Active Branch LRU\n", rpt
);
351 fputs("-----------------\n", rpt
);
352 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
354 max_active_branches
);
356 fputs(" pos clock name\n", rpt
);
357 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
358 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
359 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
360 ++lu
, b
->last_commit
, b
->name
);
363 fputs("Inactive Branches\n", rpt
);
364 fputs("-----------------\n", rpt
);
365 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
366 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
367 write_branch_report(rpt
, b
);
373 fputs("Annotated Tags\n", rpt
);
374 fputs("--------------\n", rpt
);
375 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
376 fputs(oid_to_hex(&tg
->oid
), rpt
);
378 fputs(tg
->name
, rpt
);
384 fputs("Marks\n", rpt
);
385 fputs("-----\n", rpt
);
386 if (export_marks_file
)
387 fprintf(rpt
, " exported to %s\n", export_marks_file
);
389 for_each_mark(marks
, 0, dump_marks_fn
, rpt
);
392 fputs("-------------------\n", rpt
);
393 fputs("END OF CRASH REPORT\n", rpt
);
398 static void end_packfile(void);
399 static void unkeep_all_packs(void);
400 static void dump_marks(void);
402 static NORETURN
void die_nicely(const char *err
, va_list params
)
405 char message
[2 * PATH_MAX
];
407 vsnprintf(message
, sizeof(message
), err
, params
);
408 fputs("fatal: ", stderr
);
409 fputs(message
, stderr
);
414 write_crash_report(message
);
422 #ifndef SIGUSR1 /* Windows, for example */
424 static void set_checkpoint_signal(void)
430 static void checkpoint_signal(int signo
)
432 checkpoint_requested
= 1;
435 static void set_checkpoint_signal(void)
439 memset(&sa
, 0, sizeof(sa
));
440 sa
.sa_handler
= checkpoint_signal
;
441 sigemptyset(&sa
.sa_mask
);
442 sa
.sa_flags
= SA_RESTART
;
443 sigaction(SIGUSR1
, &sa
, NULL
);
448 static void alloc_objects(unsigned int cnt
)
450 struct object_entry_pool
*b
;
452 b
= xmalloc(sizeof(struct object_entry_pool
)
453 + cnt
* sizeof(struct object_entry
));
454 b
->next_pool
= blocks
;
455 b
->next_free
= b
->entries
;
456 b
->end
= b
->entries
+ cnt
;
461 static struct object_entry
*new_object(struct object_id
*oid
)
463 struct object_entry
*e
;
465 if (blocks
->next_free
== blocks
->end
)
466 alloc_objects(object_entry_alloc
);
468 e
= blocks
->next_free
++;
469 oidcpy(&e
->idx
.oid
, oid
);
473 static struct object_entry
*find_object(struct object_id
*oid
)
475 return hashmap_get_entry_from_hash(&object_table
, oidhash(oid
), oid
,
476 struct object_entry
, ent
);
479 static struct object_entry
*insert_object(struct object_id
*oid
)
481 struct object_entry
*e
;
482 unsigned int hash
= oidhash(oid
);
484 e
= hashmap_get_entry_from_hash(&object_table
, hash
, oid
,
485 struct object_entry
, ent
);
489 hashmap_entry_init(&e
->ent
, hash
);
490 hashmap_add(&object_table
, &e
->ent
);
496 static void invalidate_pack_id(unsigned int id
)
500 struct hashmap_iter iter
;
501 struct object_entry
*e
;
503 hashmap_for_each_entry(&object_table
, &iter
, e
, ent
) {
504 if (e
->pack_id
== id
)
505 e
->pack_id
= MAX_PACK_ID
;
508 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
511 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
512 if (b
->pack_id
== id
)
513 b
->pack_id
= MAX_PACK_ID
;
516 for (t
= first_tag
; t
; t
= t
->next_tag
)
517 if (t
->pack_id
== id
)
518 t
->pack_id
= MAX_PACK_ID
;
521 static unsigned int hc_str(const char *s
, size_t len
)
529 static void insert_mark(struct mark_set
*s
, uintmax_t idnum
, struct object_entry
*oe
)
531 while ((idnum
>> s
->shift
) >= 1024) {
532 s
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
533 s
->shift
= marks
->shift
+ 10;
534 s
->data
.sets
[0] = marks
;
538 uintmax_t i
= idnum
>> s
->shift
;
539 idnum
-= i
<< s
->shift
;
540 if (!s
->data
.sets
[i
]) {
541 s
->data
.sets
[i
] = mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
542 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
546 if (!s
->data
.marked
[idnum
])
548 s
->data
.marked
[idnum
] = oe
;
551 static void *find_mark(struct mark_set
*s
, uintmax_t idnum
)
553 uintmax_t orig_idnum
= idnum
;
554 struct object_entry
*oe
= NULL
;
555 if ((idnum
>> s
->shift
) < 1024) {
556 while (s
&& s
->shift
) {
557 uintmax_t i
= idnum
>> s
->shift
;
558 idnum
-= i
<< s
->shift
;
562 oe
= s
->data
.marked
[idnum
];
565 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
569 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
571 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
574 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
575 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
578 c
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct atom_str
) + len
+ 1);
580 memcpy(c
->str_dat
, s
, len
);
582 c
->next_atom
= atom_table
[hc
];
588 static struct branch
*lookup_branch(const char *name
)
590 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
593 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
594 if (!strcmp(name
, b
->name
))
599 static struct branch
*new_branch(const char *name
)
601 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
602 struct branch
*b
= lookup_branch(name
);
605 die("Invalid attempt to create duplicate branch: %s", name
);
606 if (check_refname_format(name
, REFNAME_ALLOW_ONELEVEL
))
607 die("Branch name doesn't conform to GIT standards: %s", name
);
609 b
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct branch
));
610 b
->name
= mem_pool_strdup(&fi_mem_pool
, name
);
611 b
->table_next_branch
= branch_table
[hc
];
612 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
613 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
616 b
->pack_id
= MAX_PACK_ID
;
617 branch_table
[hc
] = b
;
622 static unsigned int hc_entries(unsigned int cnt
)
624 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
625 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
628 static struct tree_content
*new_tree_content(unsigned int cnt
)
630 struct avail_tree_content
*f
, *l
= NULL
;
631 struct tree_content
*t
;
632 unsigned int hc
= hc_entries(cnt
);
634 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
635 if (f
->entry_capacity
>= cnt
)
640 l
->next_avail
= f
->next_avail
;
642 avail_tree_table
[hc
] = f
->next_avail
;
644 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
645 f
= mem_pool_alloc(&fi_mem_pool
, sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
646 f
->entry_capacity
= cnt
;
649 t
= (struct tree_content
*)f
;
655 static void release_tree_entry(struct tree_entry
*e
);
656 static void release_tree_content(struct tree_content
*t
)
658 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
659 unsigned int hc
= hc_entries(f
->entry_capacity
);
660 f
->next_avail
= avail_tree_table
[hc
];
661 avail_tree_table
[hc
] = f
;
664 static void release_tree_content_recursive(struct tree_content
*t
)
667 for (i
= 0; i
< t
->entry_count
; i
++)
668 release_tree_entry(t
->entries
[i
]);
669 release_tree_content(t
);
672 static struct tree_content
*grow_tree_content(
673 struct tree_content
*t
,
676 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
677 r
->entry_count
= t
->entry_count
;
678 r
->delta_depth
= t
->delta_depth
;
679 COPY_ARRAY(r
->entries
, t
->entries
, t
->entry_count
);
680 release_tree_content(t
);
684 static struct tree_entry
*new_tree_entry(void)
686 struct tree_entry
*e
;
688 if (!avail_tree_entry
) {
689 unsigned int n
= tree_entry_alloc
;
690 tree_entry_allocd
+= n
* sizeof(struct tree_entry
);
692 avail_tree_entry
= e
;
694 *((void**)e
) = e
+ 1;
700 e
= avail_tree_entry
;
701 avail_tree_entry
= *((void**)e
);
705 static void release_tree_entry(struct tree_entry
*e
)
708 release_tree_content_recursive(e
->tree
);
709 *((void**)e
) = avail_tree_entry
;
710 avail_tree_entry
= e
;
713 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
715 struct tree_content
*d
;
716 struct tree_entry
*a
, *b
;
721 d
= new_tree_content(s
->entry_count
);
722 for (i
= 0; i
< s
->entry_count
; i
++) {
724 b
= new_tree_entry();
725 memcpy(b
, a
, sizeof(*a
));
726 if (a
->tree
&& is_null_oid(&b
->versions
[1].oid
))
727 b
->tree
= dup_tree_content(a
->tree
);
732 d
->entry_count
= s
->entry_count
;
733 d
->delta_depth
= s
->delta_depth
;
738 static void start_packfile(void)
740 struct strbuf tmp_file
= STRBUF_INIT
;
741 struct packed_git
*p
;
744 pack_fd
= odb_mkstemp(&tmp_file
, "pack/tmp_pack_XXXXXX");
745 FLEX_ALLOC_STR(p
, pack_name
, tmp_file
.buf
);
746 strbuf_release(&tmp_file
);
748 p
->pack_fd
= pack_fd
;
750 pack_file
= hashfd(pack_fd
, p
->pack_name
);
753 pack_size
= write_pack_header(pack_file
, 0);
756 REALLOC_ARRAY(all_packs
, pack_id
+ 1);
757 all_packs
[pack_id
] = p
;
760 static const char *create_index(void)
763 struct pack_idx_entry
**idx
, **c
, **last
;
764 struct object_entry
*e
;
765 struct object_entry_pool
*o
;
767 /* Build the table of object IDs. */
768 ALLOC_ARRAY(idx
, object_count
);
770 for (o
= blocks
; o
; o
= o
->next_pool
)
771 for (e
= o
->next_free
; e
-- != o
->entries
;)
772 if (pack_id
== e
->pack_id
)
774 last
= idx
+ object_count
;
776 die("internal consistency error creating the index");
778 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
,
784 static char *keep_pack(const char *curr_index_name
)
786 static const char *keep_msg
= "fast-import";
787 struct strbuf name
= STRBUF_INIT
;
790 odb_pack_name(&name
, pack_data
->hash
, "keep");
791 keep_fd
= odb_pack_keep(name
.buf
);
793 die_errno("cannot create keep file");
794 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
796 die_errno("failed to write keep file");
798 odb_pack_name(&name
, pack_data
->hash
, "pack");
799 if (finalize_object_file(pack_data
->pack_name
, name
.buf
))
800 die("cannot store pack file");
802 odb_pack_name(&name
, pack_data
->hash
, "idx");
803 if (finalize_object_file(curr_index_name
, name
.buf
))
804 die("cannot store index file");
805 free((void *)curr_index_name
);
806 return strbuf_detach(&name
, NULL
);
809 static void unkeep_all_packs(void)
811 struct strbuf name
= STRBUF_INIT
;
814 for (k
= 0; k
< pack_id
; k
++) {
815 struct packed_git
*p
= all_packs
[k
];
816 odb_pack_name(&name
, p
->hash
, "keep");
817 unlink_or_warn(name
.buf
);
819 strbuf_release(&name
);
822 static int loosen_small_pack(const struct packed_git
*p
)
824 struct child_process unpack
= CHILD_PROCESS_INIT
;
826 if (lseek(p
->pack_fd
, 0, SEEK_SET
) < 0)
827 die_errno("Failed seeking to start of '%s'", p
->pack_name
);
829 unpack
.in
= p
->pack_fd
;
831 unpack
.stdout_to_stderr
= 1;
832 strvec_push(&unpack
.args
, "unpack-objects");
834 strvec_push(&unpack
.args
, "-q");
836 return run_command(&unpack
);
839 static void end_packfile(void)
843 if (running
|| !pack_data
)
847 clear_delta_base_cache();
849 struct packed_git
*new_p
;
850 struct object_id cur_pack_oid
;
856 close_pack_windows(pack_data
);
857 finalize_hashfile(pack_file
, cur_pack_oid
.hash
, 0);
858 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->hash
,
859 pack_data
->pack_name
, object_count
,
860 cur_pack_oid
.hash
, pack_size
);
862 if (object_count
<= unpack_limit
) {
863 if (!loosen_small_pack(pack_data
)) {
864 invalidate_pack_id(pack_id
);
869 close(pack_data
->pack_fd
);
870 idx_name
= keep_pack(create_index());
872 /* Register the packfile with core git's machinery. */
873 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
875 die("core git rejected index %s", idx_name
);
876 all_packs
[pack_id
] = new_p
;
877 install_packed_git(the_repository
, new_p
);
880 /* Print the boundary */
882 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
883 for (i
= 0; i
< branch_table_sz
; i
++) {
884 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
885 if (b
->pack_id
== pack_id
)
886 fprintf(pack_edges
, " %s",
887 oid_to_hex(&b
->oid
));
890 for (t
= first_tag
; t
; t
= t
->next_tag
) {
891 if (t
->pack_id
== pack_id
)
892 fprintf(pack_edges
, " %s",
893 oid_to_hex(&t
->oid
));
895 fputc('\n', pack_edges
);
903 close(pack_data
->pack_fd
);
904 unlink_or_warn(pack_data
->pack_name
);
906 FREE_AND_NULL(pack_data
);
909 /* We can't carry a delta across packfiles. */
910 strbuf_release(&last_blob
.data
);
911 last_blob
.offset
= 0;
915 static void cycle_packfile(void)
921 static int store_object(
922 enum object_type type
,
924 struct last_object
*last
,
925 struct object_id
*oidout
,
929 struct object_entry
*e
;
930 unsigned char hdr
[96];
931 struct object_id oid
;
932 unsigned long hdrlen
, deltalen
;
936 hdrlen
= xsnprintf((char *)hdr
, sizeof(hdr
), "%s %lu",
937 type_name(type
), (unsigned long)dat
->len
) + 1;
938 the_hash_algo
->init_fn(&c
);
939 the_hash_algo
->update_fn(&c
, hdr
, hdrlen
);
940 the_hash_algo
->update_fn(&c
, dat
->buf
, dat
->len
);
941 the_hash_algo
->final_fn(oid
.hash
, &c
);
943 oidcpy(oidout
, &oid
);
945 e
= insert_object(&oid
);
947 insert_mark(marks
, mark
, e
);
949 duplicate_count_by_type
[type
]++;
951 } else if (find_sha1_pack(oid
.hash
,
952 get_all_packs(the_repository
))) {
954 e
->pack_id
= MAX_PACK_ID
;
955 e
->idx
.offset
= 1; /* just not zero! */
956 duplicate_count_by_type
[type
]++;
960 if (last
&& last
->data
.len
&& last
->data
.buf
&& last
->depth
< max_depth
961 && dat
->len
> the_hash_algo
->rawsz
) {
963 delta_count_attempts_by_type
[type
]++;
964 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
966 &deltalen
, dat
->len
- the_hash_algo
->rawsz
);
970 git_deflate_init(&s
, pack_compression_level
);
973 s
.avail_in
= deltalen
;
975 s
.next_in
= (void *)dat
->buf
;
976 s
.avail_in
= dat
->len
;
978 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
979 s
.next_out
= out
= xmalloc(s
.avail_out
);
980 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
984 /* Determine if we should auto-checkpoint. */
986 && (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) > max_packsize
)
987 || (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) < pack_size
) {
989 /* This new object needs to *not* have the current pack_id. */
990 e
->pack_id
= pack_id
+ 1;
993 /* We cannot carry a delta into the new pack. */
995 FREE_AND_NULL(delta
);
997 git_deflate_init(&s
, pack_compression_level
);
998 s
.next_in
= (void *)dat
->buf
;
999 s
.avail_in
= dat
->len
;
1000 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1001 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1002 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1004 git_deflate_end(&s
);
1009 e
->pack_id
= pack_id
;
1010 e
->idx
.offset
= pack_size
;
1012 object_count_by_type
[type
]++;
1014 crc32_begin(pack_file
);
1017 off_t ofs
= e
->idx
.offset
- last
->offset
;
1018 unsigned pos
= sizeof(hdr
) - 1;
1020 delta_count_by_type
[type
]++;
1021 e
->depth
= last
->depth
+ 1;
1023 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1024 OBJ_OFS_DELTA
, deltalen
);
1025 hashwrite(pack_file
, hdr
, hdrlen
);
1026 pack_size
+= hdrlen
;
1028 hdr
[pos
] = ofs
& 127;
1030 hdr
[--pos
] = 128 | (--ofs
& 127);
1031 hashwrite(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1032 pack_size
+= sizeof(hdr
) - pos
;
1035 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1037 hashwrite(pack_file
, hdr
, hdrlen
);
1038 pack_size
+= hdrlen
;
1041 hashwrite(pack_file
, out
, s
.total_out
);
1042 pack_size
+= s
.total_out
;
1044 e
->idx
.crc32
= crc32_end(pack_file
);
1049 if (last
->no_swap
) {
1052 strbuf_swap(&last
->data
, dat
);
1054 last
->offset
= e
->idx
.offset
;
1055 last
->depth
= e
->depth
;
1060 static void truncate_pack(struct hashfile_checkpoint
*checkpoint
)
1062 if (hashfile_truncate(pack_file
, checkpoint
))
1063 die_errno("cannot truncate pack to skip duplicate");
1064 pack_size
= checkpoint
->offset
;
1067 static void stream_blob(uintmax_t len
, struct object_id
*oidout
, uintmax_t mark
)
1069 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1070 unsigned char *in_buf
= xmalloc(in_sz
);
1071 unsigned char *out_buf
= xmalloc(out_sz
);
1072 struct object_entry
*e
;
1073 struct object_id oid
;
1074 unsigned long hdrlen
;
1078 struct hashfile_checkpoint checkpoint
;
1081 /* Determine if we should auto-checkpoint. */
1083 && (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) > max_packsize
)
1084 || (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) < pack_size
)
1087 hashfile_checkpoint(pack_file
, &checkpoint
);
1088 offset
= checkpoint
.offset
;
1090 hdrlen
= xsnprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1092 the_hash_algo
->init_fn(&c
);
1093 the_hash_algo
->update_fn(&c
, out_buf
, hdrlen
);
1095 crc32_begin(pack_file
);
1097 git_deflate_init(&s
, pack_compression_level
);
1099 hdrlen
= encode_in_pack_object_header(out_buf
, out_sz
, OBJ_BLOB
, len
);
1101 s
.next_out
= out_buf
+ hdrlen
;
1102 s
.avail_out
= out_sz
- hdrlen
;
1104 while (status
!= Z_STREAM_END
) {
1105 if (0 < len
&& !s
.avail_in
) {
1106 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1107 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1108 if (!n
&& feof(stdin
))
1109 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1111 the_hash_algo
->update_fn(&c
, in_buf
, n
);
1117 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1119 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1120 size_t n
= s
.next_out
- out_buf
;
1121 hashwrite(pack_file
, out_buf
, n
);
1123 s
.next_out
= out_buf
;
1124 s
.avail_out
= out_sz
;
1133 die("unexpected deflate failure: %d", status
);
1136 git_deflate_end(&s
);
1137 the_hash_algo
->final_fn(oid
.hash
, &c
);
1140 oidcpy(oidout
, &oid
);
1142 e
= insert_object(&oid
);
1145 insert_mark(marks
, mark
, e
);
1147 if (e
->idx
.offset
) {
1148 duplicate_count_by_type
[OBJ_BLOB
]++;
1149 truncate_pack(&checkpoint
);
1151 } else if (find_sha1_pack(oid
.hash
,
1152 get_all_packs(the_repository
))) {
1154 e
->pack_id
= MAX_PACK_ID
;
1155 e
->idx
.offset
= 1; /* just not zero! */
1156 duplicate_count_by_type
[OBJ_BLOB
]++;
1157 truncate_pack(&checkpoint
);
1162 e
->pack_id
= pack_id
;
1163 e
->idx
.offset
= offset
;
1164 e
->idx
.crc32
= crc32_end(pack_file
);
1166 object_count_by_type
[OBJ_BLOB
]++;
1173 /* All calls must be guarded by find_object() or find_mark() to
1174 * ensure the 'struct object_entry' passed was written by this
1175 * process instance. We unpack the entry by the offset, avoiding
1176 * the need for the corresponding .idx file. This unpacking rule
1177 * works because we only use OBJ_REF_DELTA within the packfiles
1178 * created by fast-import.
1180 * oe must not be NULL. Such an oe usually comes from giving
1181 * an unknown SHA-1 to find_object() or an undefined mark to
1182 * find_mark(). Callers must test for this condition and use
1183 * the standard read_sha1_file() when it happens.
1185 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1186 * find_mark(), where the mark was reloaded from an existing marks
1187 * file and is referencing an object that this fast-import process
1188 * instance did not write out to a packfile. Callers must test for
1189 * this condition and use read_sha1_file() instead.
1191 static void *gfi_unpack_entry(
1192 struct object_entry
*oe
,
1193 unsigned long *sizep
)
1195 enum object_type type
;
1196 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1197 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ the_hash_algo
->rawsz
)) {
1198 /* The object is stored in the packfile we are writing to
1199 * and we have modified it since the last time we scanned
1200 * back to read a previously written object. If an old
1201 * window covered [p->pack_size, p->pack_size + rawsz) its
1202 * data is stale and is not valid. Closing all windows
1203 * and updating the packfile length ensures we can read
1204 * the newly written data.
1206 close_pack_windows(p
);
1207 hashflush(pack_file
);
1209 /* We have to offer rawsz bytes additional on the end of
1210 * the packfile as the core unpacker code assumes the
1211 * footer is present at the file end and must promise
1212 * at least rawsz bytes within any window it maps. But
1213 * we don't actually create the footer here.
1215 p
->pack_size
= pack_size
+ the_hash_algo
->rawsz
;
1217 return unpack_entry(the_repository
, p
, oe
->idx
.offset
, &type
, sizep
);
1220 static const char *get_mode(const char *str
, uint16_t *modep
)
1225 while ((c
= *str
++) != ' ') {
1226 if (c
< '0' || c
> '7')
1228 mode
= (mode
<< 3) + (c
- '0');
1234 static void load_tree(struct tree_entry
*root
)
1236 struct object_id
*oid
= &root
->versions
[1].oid
;
1237 struct object_entry
*myoe
;
1238 struct tree_content
*t
;
1243 root
->tree
= t
= new_tree_content(8);
1244 if (is_null_oid(oid
))
1247 myoe
= find_object(oid
);
1248 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1249 if (myoe
->type
!= OBJ_TREE
)
1250 die("Not a tree: %s", oid_to_hex(oid
));
1251 t
->delta_depth
= myoe
->depth
;
1252 buf
= gfi_unpack_entry(myoe
, &size
);
1254 die("Can't load tree %s", oid_to_hex(oid
));
1256 enum object_type type
;
1257 buf
= read_object_file(oid
, &type
, &size
);
1258 if (!buf
|| type
!= OBJ_TREE
)
1259 die("Can't load tree %s", oid_to_hex(oid
));
1263 while (c
!= (buf
+ size
)) {
1264 struct tree_entry
*e
= new_tree_entry();
1266 if (t
->entry_count
== t
->entry_capacity
)
1267 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1268 t
->entries
[t
->entry_count
++] = e
;
1271 c
= get_mode(c
, &e
->versions
[1].mode
);
1273 die("Corrupt mode in %s", oid_to_hex(oid
));
1274 e
->versions
[0].mode
= e
->versions
[1].mode
;
1275 e
->name
= to_atom(c
, strlen(c
));
1276 c
+= e
->name
->str_len
+ 1;
1277 hashcpy(e
->versions
[0].oid
.hash
, (unsigned char *)c
);
1278 hashcpy(e
->versions
[1].oid
.hash
, (unsigned char *)c
);
1279 c
+= the_hash_algo
->rawsz
;
1284 static int tecmp0 (const void *_a
, const void *_b
)
1286 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1287 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1288 return base_name_compare(
1289 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1290 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1293 static int tecmp1 (const void *_a
, const void *_b
)
1295 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1296 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1297 return base_name_compare(
1298 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1299 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1302 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1308 QSORT(t
->entries
, t
->entry_count
, tecmp0
);
1310 QSORT(t
->entries
, t
->entry_count
, tecmp1
);
1312 for (i
= 0; i
< t
->entry_count
; i
++) {
1313 if (t
->entries
[i
]->versions
[v
].mode
)
1314 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1318 strbuf_grow(b
, maxlen
);
1319 for (i
= 0; i
< t
->entry_count
; i
++) {
1320 struct tree_entry
*e
= t
->entries
[i
];
1321 if (!e
->versions
[v
].mode
)
1323 strbuf_addf(b
, "%o %s%c",
1324 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1325 e
->name
->str_dat
, '\0');
1326 strbuf_add(b
, e
->versions
[v
].oid
.hash
, the_hash_algo
->rawsz
);
1330 static void store_tree(struct tree_entry
*root
)
1332 struct tree_content
*t
;
1333 unsigned int i
, j
, del
;
1334 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1335 struct object_entry
*le
= NULL
;
1337 if (!is_null_oid(&root
->versions
[1].oid
))
1344 for (i
= 0; i
< t
->entry_count
; i
++) {
1345 if (t
->entries
[i
]->tree
)
1346 store_tree(t
->entries
[i
]);
1349 if (!(root
->versions
[0].mode
& NO_DELTA
))
1350 le
= find_object(&root
->versions
[0].oid
);
1351 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1352 mktree(t
, 0, &old_tree
);
1354 lo
.offset
= le
->idx
.offset
;
1355 lo
.depth
= t
->delta_depth
;
1358 mktree(t
, 1, &new_tree
);
1359 store_object(OBJ_TREE
, &new_tree
, &lo
, &root
->versions
[1].oid
, 0);
1361 t
->delta_depth
= lo
.depth
;
1362 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1363 struct tree_entry
*e
= t
->entries
[i
];
1364 if (e
->versions
[1].mode
) {
1365 e
->versions
[0].mode
= e
->versions
[1].mode
;
1366 oidcpy(&e
->versions
[0].oid
, &e
->versions
[1].oid
);
1367 t
->entries
[j
++] = e
;
1369 release_tree_entry(e
);
1373 t
->entry_count
-= del
;
1376 static void tree_content_replace(
1377 struct tree_entry
*root
,
1378 const struct object_id
*oid
,
1379 const uint16_t mode
,
1380 struct tree_content
*newtree
)
1383 die("Root cannot be a non-directory");
1384 oidclr(&root
->versions
[0].oid
);
1385 oidcpy(&root
->versions
[1].oid
, oid
);
1387 release_tree_content_recursive(root
->tree
);
1388 root
->tree
= newtree
;
1391 static int tree_content_set(
1392 struct tree_entry
*root
,
1394 const struct object_id
*oid
,
1395 const uint16_t mode
,
1396 struct tree_content
*subtree
)
1398 struct tree_content
*t
;
1401 struct tree_entry
*e
;
1403 slash1
= strchrnul(p
, '/');
1406 die("Empty path component found in input");
1407 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1408 die("Non-directories cannot have subtrees");
1413 for (i
= 0; i
< t
->entry_count
; i
++) {
1415 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1418 && e
->versions
[1].mode
== mode
1419 && oideq(&e
->versions
[1].oid
, oid
))
1421 e
->versions
[1].mode
= mode
;
1422 oidcpy(&e
->versions
[1].oid
, oid
);
1424 release_tree_content_recursive(e
->tree
);
1428 * We need to leave e->versions[0].sha1 alone
1429 * to avoid modifying the preimage tree used
1430 * when writing out the parent directory.
1431 * But after replacing the subdir with a
1432 * completely different one, it's not a good
1433 * delta base any more, and besides, we've
1434 * thrown away the tree entries needed to
1435 * make a delta against it.
1437 * So let's just explicitly disable deltas
1440 if (S_ISDIR(e
->versions
[0].mode
))
1441 e
->versions
[0].mode
|= NO_DELTA
;
1443 oidclr(&root
->versions
[1].oid
);
1446 if (!S_ISDIR(e
->versions
[1].mode
)) {
1447 e
->tree
= new_tree_content(8);
1448 e
->versions
[1].mode
= S_IFDIR
;
1452 if (tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
)) {
1453 oidclr(&root
->versions
[1].oid
);
1460 if (t
->entry_count
== t
->entry_capacity
)
1461 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1462 e
= new_tree_entry();
1463 e
->name
= to_atom(p
, n
);
1464 e
->versions
[0].mode
= 0;
1465 oidclr(&e
->versions
[0].oid
);
1466 t
->entries
[t
->entry_count
++] = e
;
1468 e
->tree
= new_tree_content(8);
1469 e
->versions
[1].mode
= S_IFDIR
;
1470 tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
);
1473 e
->versions
[1].mode
= mode
;
1474 oidcpy(&e
->versions
[1].oid
, oid
);
1476 oidclr(&root
->versions
[1].oid
);
1480 static int tree_content_remove(
1481 struct tree_entry
*root
,
1483 struct tree_entry
*backup_leaf
,
1486 struct tree_content
*t
;
1489 struct tree_entry
*e
;
1491 slash1
= strchrnul(p
, '/');
1497 if (!*p
&& allow_root
) {
1503 for (i
= 0; i
< t
->entry_count
; i
++) {
1505 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1506 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1508 * If p names a file in some subdirectory, and a
1509 * file or symlink matching the name of the
1510 * parent directory of p exists, then p cannot
1511 * exist and need not be deleted.
1514 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1518 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1519 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1520 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1521 oidclr(&root
->versions
[1].oid
);
1535 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1537 release_tree_content_recursive(e
->tree
);
1539 e
->versions
[1].mode
= 0;
1540 oidclr(&e
->versions
[1].oid
);
1541 oidclr(&root
->versions
[1].oid
);
1545 static int tree_content_get(
1546 struct tree_entry
*root
,
1548 struct tree_entry
*leaf
,
1551 struct tree_content
*t
;
1554 struct tree_entry
*e
;
1556 slash1
= strchrnul(p
, '/');
1558 if (!n
&& !allow_root
)
1559 die("Empty path component found in input");
1570 for (i
= 0; i
< t
->entry_count
; i
++) {
1572 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1575 if (!S_ISDIR(e
->versions
[1].mode
))
1579 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1585 memcpy(leaf
, e
, sizeof(*leaf
));
1586 if (e
->tree
&& is_null_oid(&e
->versions
[1].oid
))
1587 leaf
->tree
= dup_tree_content(e
->tree
);
1593 static int update_branch(struct branch
*b
)
1595 static const char *msg
= "fast-import";
1596 struct ref_transaction
*transaction
;
1597 struct object_id old_oid
;
1598 struct strbuf err
= STRBUF_INIT
;
1600 if (is_null_oid(&b
->oid
)) {
1602 delete_ref(NULL
, b
->name
, NULL
, 0);
1605 if (read_ref(b
->name
, &old_oid
))
1607 if (!force_update
&& !is_null_oid(&old_oid
)) {
1608 struct commit
*old_cmit
, *new_cmit
;
1610 old_cmit
= lookup_commit_reference_gently(the_repository
,
1612 new_cmit
= lookup_commit_reference_gently(the_repository
,
1614 if (!old_cmit
|| !new_cmit
)
1615 return error("Branch %s is missing commits.", b
->name
);
1617 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1618 warning("Not updating %s"
1619 " (new tip %s does not contain %s)",
1620 b
->name
, oid_to_hex(&b
->oid
),
1621 oid_to_hex(&old_oid
));
1625 transaction
= ref_transaction_begin(&err
);
1627 ref_transaction_update(transaction
, b
->name
, &b
->oid
, &old_oid
,
1629 ref_transaction_commit(transaction
, &err
)) {
1630 ref_transaction_free(transaction
);
1631 error("%s", err
.buf
);
1632 strbuf_release(&err
);
1635 ref_transaction_free(transaction
);
1636 strbuf_release(&err
);
1640 static void dump_branches(void)
1645 for (i
= 0; i
< branch_table_sz
; i
++) {
1646 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1647 failure
|= update_branch(b
);
1651 static void dump_tags(void)
1653 static const char *msg
= "fast-import";
1655 struct strbuf ref_name
= STRBUF_INIT
;
1656 struct strbuf err
= STRBUF_INIT
;
1657 struct ref_transaction
*transaction
;
1659 transaction
= ref_transaction_begin(&err
);
1661 failure
|= error("%s", err
.buf
);
1664 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1665 strbuf_reset(&ref_name
);
1666 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1668 if (ref_transaction_update(transaction
, ref_name
.buf
,
1669 &t
->oid
, NULL
, 0, msg
, &err
)) {
1670 failure
|= error("%s", err
.buf
);
1674 if (ref_transaction_commit(transaction
, &err
))
1675 failure
|= error("%s", err
.buf
);
1678 ref_transaction_free(transaction
);
1679 strbuf_release(&ref_name
);
1680 strbuf_release(&err
);
1683 static void dump_marks(void)
1685 struct lock_file mark_lock
= LOCK_INIT
;
1688 if (!export_marks_file
|| (import_marks_file
&& !import_marks_file_done
))
1691 if (safe_create_leading_directories_const(export_marks_file
)) {
1692 failure
|= error_errno("unable to create leading directories of %s",
1697 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1698 failure
|= error_errno("Unable to write marks file %s",
1703 f
= fdopen_lock_file(&mark_lock
, "w");
1705 int saved_errno
= errno
;
1706 rollback_lock_file(&mark_lock
);
1707 failure
|= error("Unable to write marks file %s: %s",
1708 export_marks_file
, strerror(saved_errno
));
1712 for_each_mark(marks
, 0, dump_marks_fn
, f
);
1713 if (commit_lock_file(&mark_lock
)) {
1714 failure
|= error_errno("Unable to write file %s",
1720 static void insert_object_entry(struct mark_set
*s
, struct object_id
*oid
, uintmax_t mark
)
1722 struct object_entry
*e
;
1723 e
= find_object(oid
);
1725 enum object_type type
= oid_object_info(the_repository
,
1728 die("object not found: %s", oid_to_hex(oid
));
1729 e
= insert_object(oid
);
1731 e
->pack_id
= MAX_PACK_ID
;
1732 e
->idx
.offset
= 1; /* just not zero! */
1734 insert_mark(s
, mark
, e
);
1737 static void insert_oid_entry(struct mark_set
*s
, struct object_id
*oid
, uintmax_t mark
)
1739 insert_mark(s
, mark
, xmemdupz(oid
, sizeof(*oid
)));
1742 static void read_mark_file(struct mark_set
*s
, FILE *f
, mark_set_inserter_t inserter
)
1745 while (fgets(line
, sizeof(line
), f
)) {
1748 struct object_id oid
;
1750 /* Ensure SHA-1 objects are padded with zeros. */
1751 memset(oid
.hash
, 0, sizeof(oid
.hash
));
1753 end
= strchr(line
, '\n');
1754 if (line
[0] != ':' || !end
)
1755 die("corrupt mark line: %s", line
);
1757 mark
= strtoumax(line
+ 1, &end
, 10);
1758 if (!mark
|| end
== line
+ 1
1760 || get_oid_hex_any(end
+ 1, &oid
) == GIT_HASH_UNKNOWN
)
1761 die("corrupt mark line: %s", line
);
1762 inserter(s
, &oid
, mark
);
1766 static void read_marks(void)
1768 FILE *f
= fopen(import_marks_file
, "r");
1771 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1772 goto done
; /* Marks file does not exist */
1774 die_errno("cannot read '%s'", import_marks_file
);
1775 read_mark_file(marks
, f
, insert_object_entry
);
1778 import_marks_file_done
= 1;
1782 static int read_next_command(void)
1784 static int stdin_eof
= 0;
1787 unread_command_buf
= 0;
1792 if (unread_command_buf
) {
1793 unread_command_buf
= 0;
1795 struct recent_command
*rc
;
1797 stdin_eof
= strbuf_getline_lf(&command_buf
, stdin
);
1801 if (!seen_data_command
1802 && !starts_with(command_buf
.buf
, "feature ")
1803 && !starts_with(command_buf
.buf
, "option ")) {
1812 cmd_hist
.next
= rc
->next
;
1813 cmd_hist
.next
->prev
= &cmd_hist
;
1817 rc
->buf
= xstrdup(command_buf
.buf
);
1818 rc
->prev
= cmd_tail
;
1819 rc
->next
= cmd_hist
.prev
;
1820 rc
->prev
->next
= rc
;
1823 if (command_buf
.buf
[0] == '#')
1829 static void skip_optional_lf(void)
1831 int term_char
= fgetc(stdin
);
1832 if (term_char
!= '\n' && term_char
!= EOF
)
1833 ungetc(term_char
, stdin
);
1836 static void parse_mark(void)
1839 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1840 next_mark
= strtoumax(v
, NULL
, 10);
1841 read_next_command();
1847 static void parse_original_identifier(void)
1850 if (skip_prefix(command_buf
.buf
, "original-oid ", &v
))
1851 read_next_command();
1854 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1859 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1860 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1862 if (skip_prefix(data
, "<<", &data
)) {
1863 char *term
= xstrdup(data
);
1864 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1867 if (strbuf_getline_lf(&command_buf
, stdin
) == EOF
)
1868 die("EOF in data (terminator '%s' not found)", term
);
1869 if (term_len
== command_buf
.len
1870 && !strcmp(term
, command_buf
.buf
))
1872 strbuf_addbuf(sb
, &command_buf
);
1873 strbuf_addch(sb
, '\n');
1878 uintmax_t len
= strtoumax(data
, NULL
, 10);
1879 size_t n
= 0, length
= (size_t)len
;
1881 if (limit
&& limit
< len
) {
1886 die("data is too large to use in this context");
1888 while (n
< length
) {
1889 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1890 if (!s
&& feof(stdin
))
1891 die("EOF in data (%lu bytes remaining)",
1892 (unsigned long)(length
- n
));
1901 static int validate_raw_date(const char *src
, struct strbuf
*result
, int strict
)
1903 const char *orig_src
= src
;
1909 num
= strtoul(src
, &endp
, 10);
1911 * NEEDSWORK: perhaps check for reasonable values? For example, we
1912 * could error on values representing times more than a
1913 * day in the future.
1915 if (errno
|| endp
== src
|| *endp
!= ' ')
1919 if (*src
!= '-' && *src
!= '+')
1922 num
= strtoul(src
+ 1, &endp
, 10);
1924 * NEEDSWORK: check for brokenness other than num > 1400, such as
1925 * (num % 100) >= 60, or ((num % 100) % 15) != 0 ?
1927 if (errno
|| endp
== src
+ 1 || *endp
|| /* did not parse */
1928 (strict
&& (1400 < num
)) /* parsed a broken timezone */
1932 strbuf_addstr(result
, orig_src
);
1936 static char *parse_ident(const char *buf
)
1940 struct strbuf ident
= STRBUF_INIT
;
1942 /* ensure there is a space delimiter even if there is no name */
1946 ltgt
= buf
+ strcspn(buf
, "<>");
1948 die("Missing < in ident string: %s", buf
);
1949 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
1950 die("Missing space before < in ident string: %s", buf
);
1951 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
1953 die("Missing > in ident string: %s", buf
);
1956 die("Missing space after > in ident string: %s", buf
);
1958 name_len
= ltgt
- buf
;
1959 strbuf_add(&ident
, buf
, name_len
);
1963 if (validate_raw_date(ltgt
, &ident
, 1) < 0)
1964 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1966 case WHENSPEC_RAW_PERMISSIVE
:
1967 if (validate_raw_date(ltgt
, &ident
, 0) < 0)
1968 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1970 case WHENSPEC_RFC2822
:
1971 if (parse_date(ltgt
, &ident
) < 0)
1972 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
1975 if (strcmp("now", ltgt
))
1976 die("Date in ident must be 'now': %s", buf
);
1981 return strbuf_detach(&ident
, NULL
);
1984 static void parse_and_store_blob(
1985 struct last_object
*last
,
1986 struct object_id
*oidout
,
1989 static struct strbuf buf
= STRBUF_INIT
;
1992 if (parse_data(&buf
, big_file_threshold
, &len
))
1993 store_object(OBJ_BLOB
, &buf
, last
, oidout
, mark
);
1996 strbuf_release(&last
->data
);
2000 stream_blob(len
, oidout
, mark
);
2005 static void parse_new_blob(void)
2007 read_next_command();
2009 parse_original_identifier();
2010 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2013 static void unload_one_branch(void)
2015 while (cur_active_branches
2016 && cur_active_branches
>= max_active_branches
) {
2017 uintmax_t min_commit
= ULONG_MAX
;
2018 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2020 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2021 if (e
->last_commit
< min_commit
) {
2023 min_commit
= e
->last_commit
;
2029 e
= p
->active_next_branch
;
2030 p
->active_next_branch
= e
->active_next_branch
;
2032 e
= active_branches
;
2033 active_branches
= e
->active_next_branch
;
2036 e
->active_next_branch
= NULL
;
2037 if (e
->branch_tree
.tree
) {
2038 release_tree_content_recursive(e
->branch_tree
.tree
);
2039 e
->branch_tree
.tree
= NULL
;
2041 cur_active_branches
--;
2045 static void load_branch(struct branch
*b
)
2047 load_tree(&b
->branch_tree
);
2050 b
->active_next_branch
= active_branches
;
2051 active_branches
= b
;
2052 cur_active_branches
++;
2053 branch_load_count
++;
2057 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2059 unsigned char fanout
= 0;
2060 while ((num_notes
>>= 8))
2065 static void construct_path_with_fanout(const char *hex_sha1
,
2066 unsigned char fanout
, char *path
)
2068 unsigned int i
= 0, j
= 0;
2069 if (fanout
>= the_hash_algo
->rawsz
)
2070 die("Too large fanout (%u)", fanout
);
2072 path
[i
++] = hex_sha1
[j
++];
2073 path
[i
++] = hex_sha1
[j
++];
2077 memcpy(path
+ i
, hex_sha1
+ j
, the_hash_algo
->hexsz
- j
);
2078 path
[i
+ the_hash_algo
->hexsz
- j
] = '\0';
2081 static uintmax_t do_change_note_fanout(
2082 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2083 char *hex_oid
, unsigned int hex_oid_len
,
2084 char *fullpath
, unsigned int fullpath_len
,
2085 unsigned char fanout
)
2087 struct tree_content
*t
;
2088 struct tree_entry
*e
, leaf
;
2089 unsigned int i
, tmp_hex_oid_len
, tmp_fullpath_len
;
2090 uintmax_t num_notes
= 0;
2091 struct object_id oid
;
2092 /* hex oid + '/' between each pair of hex digits + NUL */
2093 char realpath
[GIT_MAX_HEXSZ
+ ((GIT_MAX_HEXSZ
/ 2) - 1) + 1];
2094 const unsigned hexsz
= the_hash_algo
->hexsz
;
2100 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2102 tmp_hex_oid_len
= hex_oid_len
+ e
->name
->str_len
;
2103 tmp_fullpath_len
= fullpath_len
;
2106 * We're interested in EITHER existing note entries (entries
2107 * with exactly 40 hex chars in path, not including directory
2108 * separators), OR directory entries that may contain note
2109 * entries (with < 40 hex chars in path).
2110 * Also, each path component in a note entry must be a multiple
2113 if (!e
->versions
[1].mode
||
2114 tmp_hex_oid_len
> hexsz
||
2115 e
->name
->str_len
% 2)
2118 /* This _may_ be a note entry, or a subdir containing notes */
2119 memcpy(hex_oid
+ hex_oid_len
, e
->name
->str_dat
,
2121 if (tmp_fullpath_len
)
2122 fullpath
[tmp_fullpath_len
++] = '/';
2123 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2125 tmp_fullpath_len
+= e
->name
->str_len
;
2126 fullpath
[tmp_fullpath_len
] = '\0';
2128 if (tmp_hex_oid_len
== hexsz
&& !get_oid_hex(hex_oid
, &oid
)) {
2129 /* This is a note entry */
2130 if (fanout
== 0xff) {
2131 /* Counting mode, no rename */
2135 construct_path_with_fanout(hex_oid
, fanout
, realpath
);
2136 if (!strcmp(fullpath
, realpath
)) {
2137 /* Note entry is in correct location */
2142 /* Rename fullpath to realpath */
2143 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2144 die("Failed to remove path %s", fullpath
);
2145 tree_content_set(orig_root
, realpath
,
2146 &leaf
.versions
[1].oid
,
2147 leaf
.versions
[1].mode
,
2149 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2150 /* This is a subdir that may contain note entries */
2151 num_notes
+= do_change_note_fanout(orig_root
, e
,
2152 hex_oid
, tmp_hex_oid_len
,
2153 fullpath
, tmp_fullpath_len
, fanout
);
2156 /* The above may have reallocated the current tree_content */
2162 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2163 unsigned char fanout
)
2166 * The size of path is due to one slash between every two hex digits,
2167 * plus the terminating NUL. Note that there is no slash at the end, so
2168 * the number of slashes is one less than half the number of hex
2171 char hex_oid
[GIT_MAX_HEXSZ
], path
[GIT_MAX_HEXSZ
+ (GIT_MAX_HEXSZ
/ 2) - 1 + 1];
2172 return do_change_note_fanout(root
, root
, hex_oid
, 0, path
, 0, fanout
);
2175 static int parse_mapped_oid_hex(const char *hex
, struct object_id
*oid
, const char **end
)
2180 /* Make SHA-1 object IDs have all-zero padding. */
2181 memset(oid
->hash
, 0, sizeof(oid
->hash
));
2183 algo
= parse_oid_hex_any(hex
, oid
, end
);
2184 if (algo
== GIT_HASH_UNKNOWN
)
2187 it
= kh_get_oid_map(sub_oid_map
, *oid
);
2188 /* No such object? */
2189 if (it
== kh_end(sub_oid_map
)) {
2190 /* If we're using the same algorithm, pass it through. */
2191 if (hash_algos
[algo
].format_id
== the_hash_algo
->format_id
)
2195 oidcpy(oid
, kh_value(sub_oid_map
, it
));
2200 * Given a pointer into a string, parse a mark reference:
2202 * idnum ::= ':' bigint;
2204 * Return the first character after the value in *endptr.
2206 * Complain if the following character is not what is expected,
2207 * either a space or end of the string.
2209 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2215 mark
= strtoumax(p
, endptr
, 10);
2217 die("No value after ':' in mark: %s", command_buf
.buf
);
2222 * Parse the mark reference, and complain if this is not the end of
2225 static uintmax_t parse_mark_ref_eol(const char *p
)
2230 mark
= parse_mark_ref(p
, &end
);
2232 die("Garbage after mark: %s", command_buf
.buf
);
2237 * Parse the mark reference, demanding a trailing space. Return a
2238 * pointer to the space.
2240 static uintmax_t parse_mark_ref_space(const char **p
)
2245 mark
= parse_mark_ref(*p
, &end
);
2247 die("Missing space after mark: %s", command_buf
.buf
);
2252 static void file_change_m(const char *p
, struct branch
*b
)
2254 static struct strbuf uq
= STRBUF_INIT
;
2256 struct object_entry
*oe
;
2257 struct object_id oid
;
2258 uint16_t mode
, inline_data
= 0;
2260 p
= get_mode(p
, &mode
);
2262 die("Corrupt mode: %s", command_buf
.buf
);
2267 case S_IFREG
| 0644:
2268 case S_IFREG
| 0755:
2275 die("Corrupt mode: %s", command_buf
.buf
);
2279 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2280 oidcpy(&oid
, &oe
->idx
.oid
);
2281 } else if (skip_prefix(p
, "inline ", &p
)) {
2283 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2285 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2286 die("Invalid dataref: %s", command_buf
.buf
);
2287 oe
= find_object(&oid
);
2289 die("Missing space after SHA1: %s", command_buf
.buf
);
2293 if (!unquote_c_style(&uq
, p
, &endp
)) {
2295 die("Garbage after path in: %s", command_buf
.buf
);
2299 /* Git does not track empty, non-toplevel directories. */
2300 if (S_ISDIR(mode
) && is_empty_tree_oid(&oid
) && *p
) {
2301 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2305 if (S_ISGITLINK(mode
)) {
2307 die("Git links cannot be specified 'inline': %s",
2310 if (oe
->type
!= OBJ_COMMIT
)
2311 die("Not a commit (actually a %s): %s",
2312 type_name(oe
->type
), command_buf
.buf
);
2315 * Accept the sha1 without checking; it expected to be in
2316 * another repository.
2318 } else if (inline_data
) {
2320 die("Directories cannot be specified 'inline': %s",
2323 strbuf_addstr(&uq
, p
);
2326 while (read_next_command() != EOF
) {
2328 if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2331 parse_and_store_blob(&last_blob
, &oid
, 0);
2336 enum object_type expected
= S_ISDIR(mode
) ?
2338 enum object_type type
= oe
? oe
->type
:
2339 oid_object_info(the_repository
, &oid
,
2342 die("%s not found: %s",
2343 S_ISDIR(mode
) ? "Tree" : "Blob",
2345 if (type
!= expected
)
2346 die("Not a %s (actually a %s): %s",
2347 type_name(expected
), type_name(type
),
2352 tree_content_replace(&b
->branch_tree
, &oid
, mode
, NULL
);
2355 tree_content_set(&b
->branch_tree
, p
, &oid
, mode
, NULL
);
2358 static void file_change_d(const char *p
, struct branch
*b
)
2360 static struct strbuf uq
= STRBUF_INIT
;
2364 if (!unquote_c_style(&uq
, p
, &endp
)) {
2366 die("Garbage after path in: %s", command_buf
.buf
);
2369 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2372 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2375 static struct strbuf s_uq
= STRBUF_INIT
;
2376 static struct strbuf d_uq
= STRBUF_INIT
;
2378 struct tree_entry leaf
;
2380 strbuf_reset(&s_uq
);
2381 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2383 die("Missing space after source: %s", command_buf
.buf
);
2385 endp
= strchr(s
, ' ');
2387 die("Missing space after source: %s", command_buf
.buf
);
2388 strbuf_add(&s_uq
, s
, endp
- s
);
2394 die("Missing dest: %s", command_buf
.buf
);
2397 strbuf_reset(&d_uq
);
2398 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2400 die("Garbage after dest in: %s", command_buf
.buf
);
2404 memset(&leaf
, 0, sizeof(leaf
));
2406 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2408 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2409 if (!leaf
.versions
[1].mode
)
2410 die("Path %s not in branch", s
);
2411 if (!*d
) { /* C "path/to/subdir" "" */
2412 tree_content_replace(&b
->branch_tree
,
2413 &leaf
.versions
[1].oid
,
2414 leaf
.versions
[1].mode
,
2418 tree_content_set(&b
->branch_tree
, d
,
2419 &leaf
.versions
[1].oid
,
2420 leaf
.versions
[1].mode
,
2424 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2426 static struct strbuf uq
= STRBUF_INIT
;
2427 struct object_entry
*oe
;
2429 struct object_id oid
, commit_oid
;
2430 char path
[GIT_MAX_RAWSZ
* 3];
2431 uint16_t inline_data
= 0;
2432 unsigned char new_fanout
;
2435 * When loading a branch, we don't traverse its tree to count the real
2436 * number of notes (too expensive to do this for all non-note refs).
2437 * This means that recently loaded notes refs might incorrectly have
2438 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2440 * Fix this by traversing the tree and counting the number of notes
2441 * when b->num_notes == 0. If the notes tree is truly empty, the
2442 * calculation should not take long.
2444 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2445 /* Invoke change_note_fanout() in "counting mode". */
2446 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2447 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2450 /* Now parse the notemodify command. */
2451 /* <dataref> or 'inline' */
2453 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2454 oidcpy(&oid
, &oe
->idx
.oid
);
2455 } else if (skip_prefix(p
, "inline ", &p
)) {
2457 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2459 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2460 die("Invalid dataref: %s", command_buf
.buf
);
2461 oe
= find_object(&oid
);
2463 die("Missing space after SHA1: %s", command_buf
.buf
);
2467 s
= lookup_branch(p
);
2469 if (is_null_oid(&s
->oid
))
2470 die("Can't add a note on empty branch.");
2471 oidcpy(&commit_oid
, &s
->oid
);
2472 } else if (*p
== ':') {
2473 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2474 struct object_entry
*commit_oe
= find_mark(marks
, commit_mark
);
2475 if (commit_oe
->type
!= OBJ_COMMIT
)
2476 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2477 oidcpy(&commit_oid
, &commit_oe
->idx
.oid
);
2478 } else if (!get_oid(p
, &commit_oid
)) {
2480 char *buf
= read_object_with_reference(the_repository
,
2484 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2485 die("Not a valid commit: %s", p
);
2488 die("Invalid ref name or SHA1 expression: %s", p
);
2492 strbuf_addstr(&uq
, p
);
2495 read_next_command();
2496 parse_and_store_blob(&last_blob
, &oid
, 0);
2498 if (oe
->type
!= OBJ_BLOB
)
2499 die("Not a blob (actually a %s): %s",
2500 type_name(oe
->type
), command_buf
.buf
);
2501 } else if (!is_null_oid(&oid
)) {
2502 enum object_type type
= oid_object_info(the_repository
, &oid
,
2505 die("Blob not found: %s", command_buf
.buf
);
2506 if (type
!= OBJ_BLOB
)
2507 die("Not a blob (actually a %s): %s",
2508 type_name(type
), command_buf
.buf
);
2511 construct_path_with_fanout(oid_to_hex(&commit_oid
), *old_fanout
, path
);
2512 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2515 if (is_null_oid(&oid
))
2516 return; /* nothing to insert */
2519 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2520 construct_path_with_fanout(oid_to_hex(&commit_oid
), new_fanout
, path
);
2521 tree_content_set(&b
->branch_tree
, path
, &oid
, S_IFREG
| 0644, NULL
);
2524 static void file_change_deleteall(struct branch
*b
)
2526 release_tree_content_recursive(b
->branch_tree
.tree
);
2527 oidclr(&b
->branch_tree
.versions
[0].oid
);
2528 oidclr(&b
->branch_tree
.versions
[1].oid
);
2529 load_tree(&b
->branch_tree
);
2533 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2535 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2536 die("Not a valid commit: %s", oid_to_hex(&b
->oid
));
2537 if (memcmp("tree ", buf
, 5)
2538 || get_oid_hex(buf
+ 5, &b
->branch_tree
.versions
[1].oid
))
2539 die("The commit %s is corrupt", oid_to_hex(&b
->oid
));
2540 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2541 &b
->branch_tree
.versions
[1].oid
);
2544 static void parse_from_existing(struct branch
*b
)
2546 if (is_null_oid(&b
->oid
)) {
2547 oidclr(&b
->branch_tree
.versions
[0].oid
);
2548 oidclr(&b
->branch_tree
.versions
[1].oid
);
2553 buf
= read_object_with_reference(the_repository
,
2554 &b
->oid
, commit_type
, &size
,
2556 parse_from_commit(b
, buf
, size
);
2561 static int parse_objectish(struct branch
*b
, const char *objectish
)
2564 struct object_id oid
;
2566 oidcpy(&oid
, &b
->branch_tree
.versions
[1].oid
);
2568 s
= lookup_branch(objectish
);
2570 die("Can't create a branch from itself: %s", b
->name
);
2572 struct object_id
*t
= &s
->branch_tree
.versions
[1].oid
;
2573 oidcpy(&b
->oid
, &s
->oid
);
2574 oidcpy(&b
->branch_tree
.versions
[0].oid
, t
);
2575 oidcpy(&b
->branch_tree
.versions
[1].oid
, t
);
2576 } else if (*objectish
== ':') {
2577 uintmax_t idnum
= parse_mark_ref_eol(objectish
);
2578 struct object_entry
*oe
= find_mark(marks
, idnum
);
2579 if (oe
->type
!= OBJ_COMMIT
)
2580 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2581 if (!oideq(&b
->oid
, &oe
->idx
.oid
)) {
2582 oidcpy(&b
->oid
, &oe
->idx
.oid
);
2583 if (oe
->pack_id
!= MAX_PACK_ID
) {
2585 char *buf
= gfi_unpack_entry(oe
, &size
);
2586 parse_from_commit(b
, buf
, size
);
2589 parse_from_existing(b
);
2591 } else if (!get_oid(objectish
, &b
->oid
)) {
2592 parse_from_existing(b
);
2593 if (is_null_oid(&b
->oid
))
2597 die("Invalid ref name or SHA1 expression: %s", objectish
);
2599 if (b
->branch_tree
.tree
&& !oideq(&oid
, &b
->branch_tree
.versions
[1].oid
)) {
2600 release_tree_content_recursive(b
->branch_tree
.tree
);
2601 b
->branch_tree
.tree
= NULL
;
2604 read_next_command();
2608 static int parse_from(struct branch
*b
)
2612 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2615 return parse_objectish(b
, from
);
2618 static int parse_objectish_with_prefix(struct branch
*b
, const char *prefix
)
2622 if (!skip_prefix(command_buf
.buf
, prefix
, &base
))
2625 return parse_objectish(b
, base
);
2628 static struct hash_list
*parse_merge(unsigned int *count
)
2630 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2635 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2636 n
= xmalloc(sizeof(*n
));
2637 s
= lookup_branch(from
);
2639 oidcpy(&n
->oid
, &s
->oid
);
2640 else if (*from
== ':') {
2641 uintmax_t idnum
= parse_mark_ref_eol(from
);
2642 struct object_entry
*oe
= find_mark(marks
, idnum
);
2643 if (oe
->type
!= OBJ_COMMIT
)
2644 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2645 oidcpy(&n
->oid
, &oe
->idx
.oid
);
2646 } else if (!get_oid(from
, &n
->oid
)) {
2648 char *buf
= read_object_with_reference(the_repository
,
2652 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2653 die("Not a valid commit: %s", from
);
2656 die("Invalid ref name or SHA1 expression: %s", from
);
2663 read_next_command();
2668 static void parse_new_commit(const char *arg
)
2670 static struct strbuf msg
= STRBUF_INIT
;
2672 char *author
= NULL
;
2673 char *committer
= NULL
;
2674 char *encoding
= NULL
;
2675 struct hash_list
*merge_list
= NULL
;
2676 unsigned int merge_count
;
2677 unsigned char prev_fanout
, new_fanout
;
2680 b
= lookup_branch(arg
);
2682 b
= new_branch(arg
);
2684 read_next_command();
2686 parse_original_identifier();
2687 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2688 author
= parse_ident(v
);
2689 read_next_command();
2691 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2692 committer
= parse_ident(v
);
2693 read_next_command();
2696 die("Expected committer but didn't get one");
2697 if (skip_prefix(command_buf
.buf
, "encoding ", &v
)) {
2698 encoding
= xstrdup(v
);
2699 read_next_command();
2701 parse_data(&msg
, 0, NULL
);
2702 read_next_command();
2704 merge_list
= parse_merge(&merge_count
);
2706 /* ensure the branch is active/loaded */
2707 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2708 unload_one_branch();
2712 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2715 while (command_buf
.len
> 0) {
2716 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2717 file_change_m(v
, b
);
2718 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2719 file_change_d(v
, b
);
2720 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2721 file_change_cr(v
, b
, 1);
2722 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2723 file_change_cr(v
, b
, 0);
2724 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2725 note_change_n(v
, b
, &prev_fanout
);
2726 else if (!strcmp("deleteall", command_buf
.buf
))
2727 file_change_deleteall(b
);
2728 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2730 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2733 unread_command_buf
= 1;
2736 if (read_next_command() == EOF
)
2740 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2741 if (new_fanout
!= prev_fanout
)
2742 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2744 /* build the tree and the commit */
2745 store_tree(&b
->branch_tree
);
2746 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2747 &b
->branch_tree
.versions
[1].oid
);
2749 strbuf_reset(&new_data
);
2750 strbuf_addf(&new_data
, "tree %s\n",
2751 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
2752 if (!is_null_oid(&b
->oid
))
2753 strbuf_addf(&new_data
, "parent %s\n",
2754 oid_to_hex(&b
->oid
));
2755 while (merge_list
) {
2756 struct hash_list
*next
= merge_list
->next
;
2757 strbuf_addf(&new_data
, "parent %s\n",
2758 oid_to_hex(&merge_list
->oid
));
2762 strbuf_addf(&new_data
,
2765 author
? author
: committer
, committer
);
2767 strbuf_addf(&new_data
,
2770 strbuf_addch(&new_data
, '\n');
2771 strbuf_addbuf(&new_data
, &msg
);
2776 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, &b
->oid
, next_mark
))
2777 b
->pack_id
= pack_id
;
2778 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2781 static void parse_new_tag(const char *arg
)
2783 static struct strbuf msg
= STRBUF_INIT
;
2788 uintmax_t from_mark
= 0;
2789 struct object_id oid
;
2790 enum object_type type
;
2793 t
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct tag
));
2794 memset(t
, 0, sizeof(struct tag
));
2795 t
->name
= mem_pool_strdup(&fi_mem_pool
, arg
);
2797 last_tag
->next_tag
= t
;
2801 read_next_command();
2805 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2806 die("Expected from command, got %s", command_buf
.buf
);
2807 s
= lookup_branch(from
);
2809 if (is_null_oid(&s
->oid
))
2810 die("Can't tag an empty branch.");
2811 oidcpy(&oid
, &s
->oid
);
2813 } else if (*from
== ':') {
2814 struct object_entry
*oe
;
2815 from_mark
= parse_mark_ref_eol(from
);
2816 oe
= find_mark(marks
, from_mark
);
2818 oidcpy(&oid
, &oe
->idx
.oid
);
2819 } else if (!get_oid(from
, &oid
)) {
2820 struct object_entry
*oe
= find_object(&oid
);
2822 type
= oid_object_info(the_repository
, &oid
, NULL
);
2824 die("Not a valid object: %s", from
);
2828 die("Invalid ref name or SHA1 expression: %s", from
);
2829 read_next_command();
2831 /* original-oid ... */
2832 parse_original_identifier();
2835 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2836 tagger
= parse_ident(v
);
2837 read_next_command();
2841 /* tag payload/message */
2842 parse_data(&msg
, 0, NULL
);
2844 /* build the tag object */
2845 strbuf_reset(&new_data
);
2847 strbuf_addf(&new_data
,
2851 oid_to_hex(&oid
), type_name(type
), t
->name
);
2853 strbuf_addf(&new_data
,
2854 "tagger %s\n", tagger
);
2855 strbuf_addch(&new_data
, '\n');
2856 strbuf_addbuf(&new_data
, &msg
);
2859 if (store_object(OBJ_TAG
, &new_data
, NULL
, &t
->oid
, next_mark
))
2860 t
->pack_id
= MAX_PACK_ID
;
2862 t
->pack_id
= pack_id
;
2865 static void parse_reset_branch(const char *arg
)
2868 const char *tag_name
;
2870 b
= lookup_branch(arg
);
2873 oidclr(&b
->branch_tree
.versions
[0].oid
);
2874 oidclr(&b
->branch_tree
.versions
[1].oid
);
2875 if (b
->branch_tree
.tree
) {
2876 release_tree_content_recursive(b
->branch_tree
.tree
);
2877 b
->branch_tree
.tree
= NULL
;
2881 b
= new_branch(arg
);
2882 read_next_command();
2884 if (b
->delete && skip_prefix(b
->name
, "refs/tags/", &tag_name
)) {
2886 * Elsewhere, we call dump_branches() before dump_tags(),
2887 * and dump_branches() will handle ref deletions first, so
2888 * in order to make sure the deletion actually takes effect,
2889 * we need to remove the tag from our list of tags to update.
2891 * NEEDSWORK: replace list of tags with hashmap for faster
2894 struct tag
*t
, *prev
= NULL
;
2895 for (t
= first_tag
; t
; t
= t
->next_tag
) {
2896 if (!strcmp(t
->name
, tag_name
))
2902 prev
->next_tag
= t
->next_tag
;
2904 first_tag
= t
->next_tag
;
2907 /* There is no mem_pool_free(t) function to call. */
2910 if (command_buf
.len
> 0)
2911 unread_command_buf
= 1;
2914 static void cat_blob_write(const char *buf
, unsigned long size
)
2916 if (write_in_full(cat_blob_fd
, buf
, size
) < 0)
2917 die_errno("Write to frontend failed");
2920 static void cat_blob(struct object_entry
*oe
, struct object_id
*oid
)
2922 struct strbuf line
= STRBUF_INIT
;
2924 enum object_type type
= 0;
2927 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2928 buf
= read_object_file(oid
, &type
, &size
);
2931 buf
= gfi_unpack_entry(oe
, &size
);
2935 * Output based on batch_one_object() from cat-file.c.
2938 strbuf_reset(&line
);
2939 strbuf_addf(&line
, "%s missing\n", oid_to_hex(oid
));
2940 cat_blob_write(line
.buf
, line
.len
);
2941 strbuf_release(&line
);
2946 die("Can't read object %s", oid_to_hex(oid
));
2947 if (type
!= OBJ_BLOB
)
2948 die("Object %s is a %s but a blob was expected.",
2949 oid_to_hex(oid
), type_name(type
));
2950 strbuf_reset(&line
);
2951 strbuf_addf(&line
, "%s %s %"PRIuMAX
"\n", oid_to_hex(oid
),
2952 type_name(type
), (uintmax_t)size
);
2953 cat_blob_write(line
.buf
, line
.len
);
2954 strbuf_release(&line
);
2955 cat_blob_write(buf
, size
);
2956 cat_blob_write("\n", 1);
2957 if (oe
&& oe
->pack_id
== pack_id
) {
2958 last_blob
.offset
= oe
->idx
.offset
;
2959 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2960 last_blob
.depth
= oe
->depth
;
2965 static void parse_get_mark(const char *p
)
2967 struct object_entry
*oe
;
2968 char output
[GIT_MAX_HEXSZ
+ 2];
2970 /* get-mark SP <object> LF */
2972 die("Not a mark: %s", p
);
2974 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
2976 die("Unknown mark: %s", command_buf
.buf
);
2978 xsnprintf(output
, sizeof(output
), "%s\n", oid_to_hex(&oe
->idx
.oid
));
2979 cat_blob_write(output
, the_hash_algo
->hexsz
+ 1);
2982 static void parse_cat_blob(const char *p
)
2984 struct object_entry
*oe
;
2985 struct object_id oid
;
2987 /* cat-blob SP <object> LF */
2989 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
2991 die("Unknown mark: %s", command_buf
.buf
);
2992 oidcpy(&oid
, &oe
->idx
.oid
);
2994 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2995 die("Invalid dataref: %s", command_buf
.buf
);
2997 die("Garbage after SHA1: %s", command_buf
.buf
);
2998 oe
= find_object(&oid
);
3004 static struct object_entry
*dereference(struct object_entry
*oe
,
3005 struct object_id
*oid
)
3009 const unsigned hexsz
= the_hash_algo
->hexsz
;
3012 enum object_type type
= oid_object_info(the_repository
, oid
,
3015 die("object not found: %s", oid_to_hex(oid
));
3017 oe
= insert_object(oid
);
3019 oe
->pack_id
= MAX_PACK_ID
;
3023 case OBJ_TREE
: /* easy case. */
3029 die("Not a tree-ish: %s", command_buf
.buf
);
3032 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
3033 buf
= gfi_unpack_entry(oe
, &size
);
3035 enum object_type unused
;
3036 buf
= read_object_file(oid
, &unused
, &size
);
3039 die("Can't load object %s", oid_to_hex(oid
));
3041 /* Peel one layer. */
3044 if (size
< hexsz
+ strlen("object ") ||
3045 get_oid_hex(buf
+ strlen("object "), oid
))
3046 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
3049 if (size
< hexsz
+ strlen("tree ") ||
3050 get_oid_hex(buf
+ strlen("tree "), oid
))
3051 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
3055 return find_object(oid
);
3058 static void insert_mapped_mark(uintmax_t mark
, void *object
, void *cbp
)
3060 struct object_id
*fromoid
= object
;
3061 struct object_id
*tooid
= find_mark(cbp
, mark
);
3065 it
= kh_put_oid_map(sub_oid_map
, *fromoid
, &ret
);
3066 /* We've already seen this object. */
3069 kh_value(sub_oid_map
, it
) = tooid
;
3072 static void build_mark_map_one(struct mark_set
*from
, struct mark_set
*to
)
3074 for_each_mark(from
, 0, insert_mapped_mark
, to
);
3077 static void build_mark_map(struct string_list
*from
, struct string_list
*to
)
3079 struct string_list_item
*fromp
, *top
;
3081 sub_oid_map
= kh_init_oid_map();
3083 for_each_string_list_item(fromp
, from
) {
3084 top
= string_list_lookup(to
, fromp
->string
);
3086 die(_("Missing from marks for submodule '%s'"), fromp
->string
);
3087 } else if (!top
|| !top
->util
) {
3088 die(_("Missing to marks for submodule '%s'"), fromp
->string
);
3090 build_mark_map_one(fromp
->util
, top
->util
);
3094 static struct object_entry
*parse_treeish_dataref(const char **p
)
3096 struct object_id oid
;
3097 struct object_entry
*e
;
3099 if (**p
== ':') { /* <mark> */
3100 e
= find_mark(marks
, parse_mark_ref_space(p
));
3102 die("Unknown mark: %s", command_buf
.buf
);
3103 oidcpy(&oid
, &e
->idx
.oid
);
3104 } else { /* <sha1> */
3105 if (parse_mapped_oid_hex(*p
, &oid
, p
))
3106 die("Invalid dataref: %s", command_buf
.buf
);
3107 e
= find_object(&oid
);
3109 die("Missing space after tree-ish: %s", command_buf
.buf
);
3112 while (!e
|| e
->type
!= OBJ_TREE
)
3113 e
= dereference(e
, &oid
);
3117 static void print_ls(int mode
, const unsigned char *hash
, const char *path
)
3119 static struct strbuf line
= STRBUF_INIT
;
3121 /* See show_tree(). */
3123 S_ISGITLINK(mode
) ? commit_type
:
3124 S_ISDIR(mode
) ? tree_type
:
3128 /* missing SP path LF */
3129 strbuf_reset(&line
);
3130 strbuf_addstr(&line
, "missing ");
3131 quote_c_style(path
, &line
, NULL
, 0);
3132 strbuf_addch(&line
, '\n');
3134 /* mode SP type SP object_name TAB path LF */
3135 strbuf_reset(&line
);
3136 strbuf_addf(&line
, "%06o %s %s\t",
3137 mode
& ~NO_DELTA
, type
, hash_to_hex(hash
));
3138 quote_c_style(path
, &line
, NULL
, 0);
3139 strbuf_addch(&line
, '\n');
3141 cat_blob_write(line
.buf
, line
.len
);
3144 static void parse_ls(const char *p
, struct branch
*b
)
3146 struct tree_entry
*root
= NULL
;
3147 struct tree_entry leaf
= {NULL
};
3149 /* ls SP (<tree-ish> SP)? <path> */
3152 die("Not in a commit: %s", command_buf
.buf
);
3153 root
= &b
->branch_tree
;
3155 struct object_entry
*e
= parse_treeish_dataref(&p
);
3156 root
= new_tree_entry();
3157 oidcpy(&root
->versions
[1].oid
, &e
->idx
.oid
);
3158 if (!is_null_oid(&root
->versions
[1].oid
))
3159 root
->versions
[1].mode
= S_IFDIR
;
3163 static struct strbuf uq
= STRBUF_INIT
;
3166 if (unquote_c_style(&uq
, p
, &endp
))
3167 die("Invalid path: %s", command_buf
.buf
);
3169 die("Garbage after path in: %s", command_buf
.buf
);
3172 tree_content_get(root
, p
, &leaf
, 1);
3174 * A directory in preparation would have a sha1 of zero
3175 * until it is saved. Save, for simplicity.
3177 if (S_ISDIR(leaf
.versions
[1].mode
))
3180 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].oid
.hash
, p
);
3182 release_tree_content_recursive(leaf
.tree
);
3183 if (!b
|| root
!= &b
->branch_tree
)
3184 release_tree_entry(root
);
3187 static void checkpoint(void)
3189 checkpoint_requested
= 0;
3198 static void parse_checkpoint(void)
3200 checkpoint_requested
= 1;
3204 static void parse_progress(void)
3206 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3207 fputc('\n', stdout
);
3212 static void parse_alias(void)
3214 struct object_entry
*e
;
3218 read_next_command();
3223 die(_("Expected 'mark' command, got %s"), command_buf
.buf
);
3226 memset(&b
, 0, sizeof(b
));
3227 if (!parse_objectish_with_prefix(&b
, "to "))
3228 die(_("Expected 'to' command, got %s"), command_buf
.buf
);
3229 e
= find_object(&b
.oid
);
3231 insert_mark(marks
, next_mark
, e
);
3234 static char* make_fast_import_path(const char *path
)
3236 if (!relative_marks_paths
|| is_absolute_path(path
))
3237 return xstrdup(path
);
3238 return git_pathdup("info/fast-import/%s", path
);
3241 static void option_import_marks(const char *marks
,
3242 int from_stream
, int ignore_missing
)
3244 if (import_marks_file
) {
3246 die("Only one import-marks command allowed per stream");
3248 /* read previous mark file */
3249 if(!import_marks_file_from_stream
)
3253 import_marks_file
= make_fast_import_path(marks
);
3254 import_marks_file_from_stream
= from_stream
;
3255 import_marks_file_ignore_missing
= ignore_missing
;
3258 static void option_date_format(const char *fmt
)
3260 if (!strcmp(fmt
, "raw"))
3261 whenspec
= WHENSPEC_RAW
;
3262 else if (!strcmp(fmt
, "raw-permissive"))
3263 whenspec
= WHENSPEC_RAW_PERMISSIVE
;
3264 else if (!strcmp(fmt
, "rfc2822"))
3265 whenspec
= WHENSPEC_RFC2822
;
3266 else if (!strcmp(fmt
, "now"))
3267 whenspec
= WHENSPEC_NOW
;
3269 die("unknown --date-format argument %s", fmt
);
3272 static unsigned long ulong_arg(const char *option
, const char *arg
)
3275 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3276 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3277 die("%s: argument must be a non-negative integer", option
);
3281 static void option_depth(const char *depth
)
3283 max_depth
= ulong_arg("--depth", depth
);
3284 if (max_depth
> MAX_DEPTH
)
3285 die("--depth cannot exceed %u", MAX_DEPTH
);
3288 static void option_active_branches(const char *branches
)
3290 max_active_branches
= ulong_arg("--active-branches", branches
);
3293 static void option_export_marks(const char *marks
)
3295 export_marks_file
= make_fast_import_path(marks
);
3298 static void option_cat_blob_fd(const char *fd
)
3300 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3301 if (n
> (unsigned long) INT_MAX
)
3302 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3303 cat_blob_fd
= (int) n
;
3306 static void option_export_pack_edges(const char *edges
)
3310 pack_edges
= xfopen(edges
, "a");
3313 static void option_rewrite_submodules(const char *arg
, struct string_list
*list
)
3315 struct mark_set
*ms
;
3317 char *s
= xstrdup(arg
);
3318 char *f
= strchr(s
, ':');
3320 die(_("Expected format name:filename for submodule rewrite option"));
3323 ms
= xcalloc(1, sizeof(*ms
));
3324 string_list_insert(list
, s
)->util
= ms
;
3328 die_errno("cannot read '%s'", f
);
3329 read_mark_file(ms
, fp
, insert_oid_entry
);
3333 static int parse_one_option(const char *option
)
3335 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3337 if (!git_parse_ulong(option
, &v
))
3340 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3342 } else if (v
< 1024 * 1024) {
3343 warning("minimum max-pack-size is 1 MiB");
3347 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3349 if (!git_parse_ulong(option
, &v
))
3351 big_file_threshold
= v
;
3352 } else if (skip_prefix(option
, "depth=", &option
)) {
3353 option_depth(option
);
3354 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3355 option_active_branches(option
);
3356 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3357 option_export_pack_edges(option
);
3358 } else if (!strcmp(option
, "quiet")) {
3360 } else if (!strcmp(option
, "stats")) {
3362 } else if (!strcmp(option
, "allow-unsafe-features")) {
3363 ; /* already handled during early option parsing */
3371 static void check_unsafe_feature(const char *feature
, int from_stream
)
3373 if (from_stream
&& !allow_unsafe_features
)
3374 die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
3378 static int parse_one_feature(const char *feature
, int from_stream
)
3382 if (skip_prefix(feature
, "date-format=", &arg
)) {
3383 option_date_format(arg
);
3384 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3385 check_unsafe_feature("import-marks", from_stream
);
3386 option_import_marks(arg
, from_stream
, 0);
3387 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3388 check_unsafe_feature("import-marks-if-exists", from_stream
);
3389 option_import_marks(arg
, from_stream
, 1);
3390 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3391 check_unsafe_feature(feature
, from_stream
);
3392 option_export_marks(arg
);
3393 } else if (!strcmp(feature
, "alias")) {
3394 ; /* Don't die - this feature is supported */
3395 } else if (skip_prefix(feature
, "rewrite-submodules-to=", &arg
)) {
3396 option_rewrite_submodules(arg
, &sub_marks_to
);
3397 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3398 option_rewrite_submodules(arg
, &sub_marks_from
);
3399 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3400 } else if (!strcmp(feature
, "get-mark")) {
3401 ; /* Don't die - this feature is supported */
3402 } else if (!strcmp(feature
, "cat-blob")) {
3403 ; /* Don't die - this feature is supported */
3404 } else if (!strcmp(feature
, "relative-marks")) {
3405 relative_marks_paths
= 1;
3406 } else if (!strcmp(feature
, "no-relative-marks")) {
3407 relative_marks_paths
= 0;
3408 } else if (!strcmp(feature
, "done")) {
3409 require_explicit_termination
= 1;
3410 } else if (!strcmp(feature
, "force")) {
3412 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3413 ; /* do nothing; we have the feature */
3421 static void parse_feature(const char *feature
)
3423 if (seen_data_command
)
3424 die("Got feature command '%s' after data command", feature
);
3426 if (parse_one_feature(feature
, 1))
3429 die("This version of fast-import does not support feature %s.", feature
);
3432 static void parse_option(const char *option
)
3434 if (seen_data_command
)
3435 die("Got option command '%s' after data command", option
);
3437 if (parse_one_option(option
))
3440 die("This version of fast-import does not support option: %s", option
);
3443 static void git_pack_config(void)
3445 int indexversion_value
;
3447 unsigned long packsizelimit_value
;
3449 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3450 if (max_depth
> MAX_DEPTH
)
3451 max_depth
= MAX_DEPTH
;
3453 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3454 pack_idx_opts
.version
= indexversion_value
;
3455 if (pack_idx_opts
.version
> 2)
3456 git_die_config("pack.indexversion",
3457 "bad pack.indexversion=%"PRIu32
, pack_idx_opts
.version
);
3459 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3460 max_packsize
= packsizelimit_value
;
3462 if (!git_config_get_int("fastimport.unpacklimit", &limit
))
3463 unpack_limit
= limit
;
3464 else if (!git_config_get_int("transfer.unpacklimit", &limit
))
3465 unpack_limit
= limit
;
3467 git_config(git_default_config
, NULL
);
3470 static const char fast_import_usage
[] =
3471 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3473 static void parse_argv(void)
3477 for (i
= 1; i
< global_argc
; i
++) {
3478 const char *a
= global_argv
[i
];
3480 if (*a
!= '-' || !strcmp(a
, "--"))
3483 if (!skip_prefix(a
, "--", &a
))
3484 die("unknown option %s", a
);
3486 if (parse_one_option(a
))
3489 if (parse_one_feature(a
, 0))
3492 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3493 option_cat_blob_fd(a
);
3497 die("unknown option --%s", a
);
3499 if (i
!= global_argc
)
3500 usage(fast_import_usage
);
3502 seen_data_command
= 1;
3503 if (import_marks_file
)
3505 build_mark_map(&sub_marks_from
, &sub_marks_to
);
3508 int cmd_fast_import(int argc
, const char **argv
, const char *prefix
)
3512 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3513 usage(fast_import_usage
);
3515 reset_pack_idx_option(&pack_idx_opts
);
3518 alloc_objects(object_entry_alloc
);
3519 strbuf_init(&command_buf
, 0);
3520 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3521 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3522 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3523 marks
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
3525 hashmap_init(&object_table
, object_entry_hashcmp
, NULL
, 0);
3528 * We don't parse most options until after we've seen the set of
3529 * "feature" lines at the start of the stream (which allows the command
3530 * line to override stream data). But we must do an early parse of any
3531 * command-line options that impact how we interpret the feature lines.
3533 for (i
= 1; i
< argc
; i
++) {
3534 const char *arg
= argv
[i
];
3535 if (*arg
!= '-' || !strcmp(arg
, "--"))
3537 if (!strcmp(arg
, "--allow-unsafe-features"))
3538 allow_unsafe_features
= 1;
3544 rc_free
= mem_pool_alloc(&fi_mem_pool
, cmd_save
* sizeof(*rc_free
));
3545 for (i
= 0; i
< (cmd_save
- 1); i
++)
3546 rc_free
[i
].next
= &rc_free
[i
+ 1];
3547 rc_free
[cmd_save
- 1].next
= NULL
;
3550 set_die_routine(die_nicely
);
3551 set_checkpoint_signal();
3552 while (read_next_command() != EOF
) {
3554 if (!strcmp("blob", command_buf
.buf
))
3556 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3557 parse_new_commit(v
);
3558 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3560 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3561 parse_reset_branch(v
);
3562 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3564 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
3566 else if (skip_prefix(command_buf
.buf
, "get-mark ", &v
))
3568 else if (!strcmp("checkpoint", command_buf
.buf
))
3570 else if (!strcmp("done", command_buf
.buf
))
3572 else if (!strcmp("alias", command_buf
.buf
))
3574 else if (starts_with(command_buf
.buf
, "progress "))
3576 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3578 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3580 else if (starts_with(command_buf
.buf
, "option "))
3581 /* ignore non-git options*/;
3583 die("Unsupported command: %s", command_buf
.buf
);
3585 if (checkpoint_requested
)
3589 /* argv hasn't been parsed yet, do so */
3590 if (!seen_data_command
)
3593 if (require_explicit_termination
&& feof(stdin
))
3594 die("stream ends early");
3607 uintmax_t total_count
= 0, duplicate_count
= 0;
3608 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3609 total_count
+= object_count_by_type
[i
];
3610 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3611 duplicate_count
+= duplicate_count_by_type
[i
];
3613 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3614 fprintf(stderr
, "---------------------------------------------------------------------\n");
3615 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3616 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3617 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
]);
3618 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
]);
3619 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
]);
3620 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
]);
3621 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3622 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3623 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3624 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (tree_entry_allocd
+ fi_mem_pool
.pool_alloc
+ alloc_count
*sizeof(struct object_entry
))/1024);
3625 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd
+ fi_mem_pool
.pool_alloc
) /1024));
3626 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3627 fprintf(stderr
, "---------------------------------------------------------------------\n");
3629 fprintf(stderr
, "---------------------------------------------------------------------\n");
3630 fprintf(stderr
, "\n");
3633 return failure
? 1 : 0;