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
;
742 struct pack_header hdr
;
745 pack_fd
= odb_mkstemp(&tmp_file
, "pack/tmp_pack_XXXXXX");
746 FLEX_ALLOC_STR(p
, pack_name
, tmp_file
.buf
);
747 strbuf_release(&tmp_file
);
749 p
->pack_fd
= pack_fd
;
751 pack_file
= hashfd(pack_fd
, p
->pack_name
);
753 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
754 hdr
.hdr_version
= htonl(2);
756 hashwrite(pack_file
, &hdr
, sizeof(hdr
));
759 pack_size
= sizeof(hdr
);
762 REALLOC_ARRAY(all_packs
, pack_id
+ 1);
763 all_packs
[pack_id
] = p
;
766 static const char *create_index(void)
769 struct pack_idx_entry
**idx
, **c
, **last
;
770 struct object_entry
*e
;
771 struct object_entry_pool
*o
;
773 /* Build the table of object IDs. */
774 ALLOC_ARRAY(idx
, object_count
);
776 for (o
= blocks
; o
; o
= o
->next_pool
)
777 for (e
= o
->next_free
; e
-- != o
->entries
;)
778 if (pack_id
== e
->pack_id
)
780 last
= idx
+ object_count
;
782 die("internal consistency error creating the index");
784 tmpfile
= write_idx_file(NULL
, idx
, object_count
, &pack_idx_opts
,
790 static char *keep_pack(const char *curr_index_name
)
792 static const char *keep_msg
= "fast-import";
793 struct strbuf name
= STRBUF_INIT
;
796 odb_pack_name(&name
, pack_data
->hash
, "keep");
797 keep_fd
= odb_pack_keep(name
.buf
);
799 die_errno("cannot create keep file");
800 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
802 die_errno("failed to write keep file");
804 odb_pack_name(&name
, pack_data
->hash
, "pack");
805 if (finalize_object_file(pack_data
->pack_name
, name
.buf
))
806 die("cannot store pack file");
808 odb_pack_name(&name
, pack_data
->hash
, "idx");
809 if (finalize_object_file(curr_index_name
, name
.buf
))
810 die("cannot store index file");
811 free((void *)curr_index_name
);
812 return strbuf_detach(&name
, NULL
);
815 static void unkeep_all_packs(void)
817 struct strbuf name
= STRBUF_INIT
;
820 for (k
= 0; k
< pack_id
; k
++) {
821 struct packed_git
*p
= all_packs
[k
];
822 odb_pack_name(&name
, p
->hash
, "keep");
823 unlink_or_warn(name
.buf
);
825 strbuf_release(&name
);
828 static int loosen_small_pack(const struct packed_git
*p
)
830 struct child_process unpack
= CHILD_PROCESS_INIT
;
832 if (lseek(p
->pack_fd
, 0, SEEK_SET
) < 0)
833 die_errno("Failed seeking to start of '%s'", p
->pack_name
);
835 unpack
.in
= p
->pack_fd
;
837 unpack
.stdout_to_stderr
= 1;
838 strvec_push(&unpack
.args
, "unpack-objects");
840 strvec_push(&unpack
.args
, "-q");
842 return run_command(&unpack
);
845 static void end_packfile(void)
849 if (running
|| !pack_data
)
853 clear_delta_base_cache();
855 struct packed_git
*new_p
;
856 struct object_id cur_pack_oid
;
862 close_pack_windows(pack_data
);
863 finalize_hashfile(pack_file
, cur_pack_oid
.hash
, 0);
864 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->hash
,
865 pack_data
->pack_name
, object_count
,
866 cur_pack_oid
.hash
, pack_size
);
868 if (object_count
<= unpack_limit
) {
869 if (!loosen_small_pack(pack_data
)) {
870 invalidate_pack_id(pack_id
);
875 close(pack_data
->pack_fd
);
876 idx_name
= keep_pack(create_index());
878 /* Register the packfile with core git's machinery. */
879 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
881 die("core git rejected index %s", idx_name
);
882 all_packs
[pack_id
] = new_p
;
883 install_packed_git(the_repository
, new_p
);
886 /* Print the boundary */
888 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
889 for (i
= 0; i
< branch_table_sz
; i
++) {
890 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
891 if (b
->pack_id
== pack_id
)
892 fprintf(pack_edges
, " %s",
893 oid_to_hex(&b
->oid
));
896 for (t
= first_tag
; t
; t
= t
->next_tag
) {
897 if (t
->pack_id
== pack_id
)
898 fprintf(pack_edges
, " %s",
899 oid_to_hex(&t
->oid
));
901 fputc('\n', pack_edges
);
909 close(pack_data
->pack_fd
);
910 unlink_or_warn(pack_data
->pack_name
);
912 FREE_AND_NULL(pack_data
);
915 /* We can't carry a delta across packfiles. */
916 strbuf_release(&last_blob
.data
);
917 last_blob
.offset
= 0;
921 static void cycle_packfile(void)
927 static int store_object(
928 enum object_type type
,
930 struct last_object
*last
,
931 struct object_id
*oidout
,
935 struct object_entry
*e
;
936 unsigned char hdr
[96];
937 struct object_id oid
;
938 unsigned long hdrlen
, deltalen
;
942 hdrlen
= xsnprintf((char *)hdr
, sizeof(hdr
), "%s %lu",
943 type_name(type
), (unsigned long)dat
->len
) + 1;
944 the_hash_algo
->init_fn(&c
);
945 the_hash_algo
->update_fn(&c
, hdr
, hdrlen
);
946 the_hash_algo
->update_fn(&c
, dat
->buf
, dat
->len
);
947 the_hash_algo
->final_fn(oid
.hash
, &c
);
949 oidcpy(oidout
, &oid
);
951 e
= insert_object(&oid
);
953 insert_mark(marks
, mark
, e
);
955 duplicate_count_by_type
[type
]++;
957 } else if (find_sha1_pack(oid
.hash
,
958 get_all_packs(the_repository
))) {
960 e
->pack_id
= MAX_PACK_ID
;
961 e
->idx
.offset
= 1; /* just not zero! */
962 duplicate_count_by_type
[type
]++;
966 if (last
&& last
->data
.len
&& last
->data
.buf
&& last
->depth
< max_depth
967 && dat
->len
> the_hash_algo
->rawsz
) {
969 delta_count_attempts_by_type
[type
]++;
970 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
972 &deltalen
, dat
->len
- the_hash_algo
->rawsz
);
976 git_deflate_init(&s
, pack_compression_level
);
979 s
.avail_in
= deltalen
;
981 s
.next_in
= (void *)dat
->buf
;
982 s
.avail_in
= dat
->len
;
984 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
985 s
.next_out
= out
= xmalloc(s
.avail_out
);
986 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
990 /* Determine if we should auto-checkpoint. */
992 && (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) > max_packsize
)
993 || (pack_size
+ PACK_SIZE_THRESHOLD
+ s
.total_out
) < pack_size
) {
995 /* This new object needs to *not* have the current pack_id. */
996 e
->pack_id
= pack_id
+ 1;
999 /* We cannot carry a delta into the new pack. */
1001 FREE_AND_NULL(delta
);
1003 git_deflate_init(&s
, pack_compression_level
);
1004 s
.next_in
= (void *)dat
->buf
;
1005 s
.avail_in
= dat
->len
;
1006 s
.avail_out
= git_deflate_bound(&s
, s
.avail_in
);
1007 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1008 while (git_deflate(&s
, Z_FINISH
) == Z_OK
)
1010 git_deflate_end(&s
);
1015 e
->pack_id
= pack_id
;
1016 e
->idx
.offset
= pack_size
;
1018 object_count_by_type
[type
]++;
1020 crc32_begin(pack_file
);
1023 off_t ofs
= e
->idx
.offset
- last
->offset
;
1024 unsigned pos
= sizeof(hdr
) - 1;
1026 delta_count_by_type
[type
]++;
1027 e
->depth
= last
->depth
+ 1;
1029 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1030 OBJ_OFS_DELTA
, deltalen
);
1031 hashwrite(pack_file
, hdr
, hdrlen
);
1032 pack_size
+= hdrlen
;
1034 hdr
[pos
] = ofs
& 127;
1036 hdr
[--pos
] = 128 | (--ofs
& 127);
1037 hashwrite(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1038 pack_size
+= sizeof(hdr
) - pos
;
1041 hdrlen
= encode_in_pack_object_header(hdr
, sizeof(hdr
),
1043 hashwrite(pack_file
, hdr
, hdrlen
);
1044 pack_size
+= hdrlen
;
1047 hashwrite(pack_file
, out
, s
.total_out
);
1048 pack_size
+= s
.total_out
;
1050 e
->idx
.crc32
= crc32_end(pack_file
);
1055 if (last
->no_swap
) {
1058 strbuf_swap(&last
->data
, dat
);
1060 last
->offset
= e
->idx
.offset
;
1061 last
->depth
= e
->depth
;
1066 static void truncate_pack(struct hashfile_checkpoint
*checkpoint
)
1068 if (hashfile_truncate(pack_file
, checkpoint
))
1069 die_errno("cannot truncate pack to skip duplicate");
1070 pack_size
= checkpoint
->offset
;
1073 static void stream_blob(uintmax_t len
, struct object_id
*oidout
, uintmax_t mark
)
1075 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1076 unsigned char *in_buf
= xmalloc(in_sz
);
1077 unsigned char *out_buf
= xmalloc(out_sz
);
1078 struct object_entry
*e
;
1079 struct object_id oid
;
1080 unsigned long hdrlen
;
1084 struct hashfile_checkpoint checkpoint
;
1087 /* Determine if we should auto-checkpoint. */
1089 && (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) > max_packsize
)
1090 || (pack_size
+ PACK_SIZE_THRESHOLD
+ len
) < pack_size
)
1093 hashfile_checkpoint(pack_file
, &checkpoint
);
1094 offset
= checkpoint
.offset
;
1096 hdrlen
= xsnprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1098 the_hash_algo
->init_fn(&c
);
1099 the_hash_algo
->update_fn(&c
, out_buf
, hdrlen
);
1101 crc32_begin(pack_file
);
1103 git_deflate_init(&s
, pack_compression_level
);
1105 hdrlen
= encode_in_pack_object_header(out_buf
, out_sz
, OBJ_BLOB
, len
);
1107 s
.next_out
= out_buf
+ hdrlen
;
1108 s
.avail_out
= out_sz
- hdrlen
;
1110 while (status
!= Z_STREAM_END
) {
1111 if (0 < len
&& !s
.avail_in
) {
1112 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1113 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1114 if (!n
&& feof(stdin
))
1115 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1117 the_hash_algo
->update_fn(&c
, in_buf
, n
);
1123 status
= git_deflate(&s
, len
? 0 : Z_FINISH
);
1125 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1126 size_t n
= s
.next_out
- out_buf
;
1127 hashwrite(pack_file
, out_buf
, n
);
1129 s
.next_out
= out_buf
;
1130 s
.avail_out
= out_sz
;
1139 die("unexpected deflate failure: %d", status
);
1142 git_deflate_end(&s
);
1143 the_hash_algo
->final_fn(oid
.hash
, &c
);
1146 oidcpy(oidout
, &oid
);
1148 e
= insert_object(&oid
);
1151 insert_mark(marks
, mark
, e
);
1153 if (e
->idx
.offset
) {
1154 duplicate_count_by_type
[OBJ_BLOB
]++;
1155 truncate_pack(&checkpoint
);
1157 } else if (find_sha1_pack(oid
.hash
,
1158 get_all_packs(the_repository
))) {
1160 e
->pack_id
= MAX_PACK_ID
;
1161 e
->idx
.offset
= 1; /* just not zero! */
1162 duplicate_count_by_type
[OBJ_BLOB
]++;
1163 truncate_pack(&checkpoint
);
1168 e
->pack_id
= pack_id
;
1169 e
->idx
.offset
= offset
;
1170 e
->idx
.crc32
= crc32_end(pack_file
);
1172 object_count_by_type
[OBJ_BLOB
]++;
1179 /* All calls must be guarded by find_object() or find_mark() to
1180 * ensure the 'struct object_entry' passed was written by this
1181 * process instance. We unpack the entry by the offset, avoiding
1182 * the need for the corresponding .idx file. This unpacking rule
1183 * works because we only use OBJ_REF_DELTA within the packfiles
1184 * created by fast-import.
1186 * oe must not be NULL. Such an oe usually comes from giving
1187 * an unknown SHA-1 to find_object() or an undefined mark to
1188 * find_mark(). Callers must test for this condition and use
1189 * the standard read_sha1_file() when it happens.
1191 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1192 * find_mark(), where the mark was reloaded from an existing marks
1193 * file and is referencing an object that this fast-import process
1194 * instance did not write out to a packfile. Callers must test for
1195 * this condition and use read_sha1_file() instead.
1197 static void *gfi_unpack_entry(
1198 struct object_entry
*oe
,
1199 unsigned long *sizep
)
1201 enum object_type type
;
1202 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1203 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ the_hash_algo
->rawsz
)) {
1204 /* The object is stored in the packfile we are writing to
1205 * and we have modified it since the last time we scanned
1206 * back to read a previously written object. If an old
1207 * window covered [p->pack_size, p->pack_size + rawsz) its
1208 * data is stale and is not valid. Closing all windows
1209 * and updating the packfile length ensures we can read
1210 * the newly written data.
1212 close_pack_windows(p
);
1213 hashflush(pack_file
);
1215 /* We have to offer rawsz bytes additional on the end of
1216 * the packfile as the core unpacker code assumes the
1217 * footer is present at the file end and must promise
1218 * at least rawsz bytes within any window it maps. But
1219 * we don't actually create the footer here.
1221 p
->pack_size
= pack_size
+ the_hash_algo
->rawsz
;
1223 return unpack_entry(the_repository
, p
, oe
->idx
.offset
, &type
, sizep
);
1226 static const char *get_mode(const char *str
, uint16_t *modep
)
1231 while ((c
= *str
++) != ' ') {
1232 if (c
< '0' || c
> '7')
1234 mode
= (mode
<< 3) + (c
- '0');
1240 static void load_tree(struct tree_entry
*root
)
1242 struct object_id
*oid
= &root
->versions
[1].oid
;
1243 struct object_entry
*myoe
;
1244 struct tree_content
*t
;
1249 root
->tree
= t
= new_tree_content(8);
1250 if (is_null_oid(oid
))
1253 myoe
= find_object(oid
);
1254 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1255 if (myoe
->type
!= OBJ_TREE
)
1256 die("Not a tree: %s", oid_to_hex(oid
));
1257 t
->delta_depth
= myoe
->depth
;
1258 buf
= gfi_unpack_entry(myoe
, &size
);
1260 die("Can't load tree %s", oid_to_hex(oid
));
1262 enum object_type type
;
1263 buf
= read_object_file(oid
, &type
, &size
);
1264 if (!buf
|| type
!= OBJ_TREE
)
1265 die("Can't load tree %s", oid_to_hex(oid
));
1269 while (c
!= (buf
+ size
)) {
1270 struct tree_entry
*e
= new_tree_entry();
1272 if (t
->entry_count
== t
->entry_capacity
)
1273 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1274 t
->entries
[t
->entry_count
++] = e
;
1277 c
= get_mode(c
, &e
->versions
[1].mode
);
1279 die("Corrupt mode in %s", oid_to_hex(oid
));
1280 e
->versions
[0].mode
= e
->versions
[1].mode
;
1281 e
->name
= to_atom(c
, strlen(c
));
1282 c
+= e
->name
->str_len
+ 1;
1283 hashcpy(e
->versions
[0].oid
.hash
, (unsigned char *)c
);
1284 hashcpy(e
->versions
[1].oid
.hash
, (unsigned char *)c
);
1285 c
+= the_hash_algo
->rawsz
;
1290 static int tecmp0 (const void *_a
, const void *_b
)
1292 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1293 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1294 return base_name_compare(
1295 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1296 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1299 static int tecmp1 (const void *_a
, const void *_b
)
1301 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1302 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1303 return base_name_compare(
1304 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1305 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1308 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1314 QSORT(t
->entries
, t
->entry_count
, tecmp0
);
1316 QSORT(t
->entries
, t
->entry_count
, tecmp1
);
1318 for (i
= 0; i
< t
->entry_count
; i
++) {
1319 if (t
->entries
[i
]->versions
[v
].mode
)
1320 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1324 strbuf_grow(b
, maxlen
);
1325 for (i
= 0; i
< t
->entry_count
; i
++) {
1326 struct tree_entry
*e
= t
->entries
[i
];
1327 if (!e
->versions
[v
].mode
)
1329 strbuf_addf(b
, "%o %s%c",
1330 (unsigned int)(e
->versions
[v
].mode
& ~NO_DELTA
),
1331 e
->name
->str_dat
, '\0');
1332 strbuf_add(b
, e
->versions
[v
].oid
.hash
, the_hash_algo
->rawsz
);
1336 static void store_tree(struct tree_entry
*root
)
1338 struct tree_content
*t
;
1339 unsigned int i
, j
, del
;
1340 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1341 struct object_entry
*le
= NULL
;
1343 if (!is_null_oid(&root
->versions
[1].oid
))
1350 for (i
= 0; i
< t
->entry_count
; i
++) {
1351 if (t
->entries
[i
]->tree
)
1352 store_tree(t
->entries
[i
]);
1355 if (!(root
->versions
[0].mode
& NO_DELTA
))
1356 le
= find_object(&root
->versions
[0].oid
);
1357 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1358 mktree(t
, 0, &old_tree
);
1360 lo
.offset
= le
->idx
.offset
;
1361 lo
.depth
= t
->delta_depth
;
1364 mktree(t
, 1, &new_tree
);
1365 store_object(OBJ_TREE
, &new_tree
, &lo
, &root
->versions
[1].oid
, 0);
1367 t
->delta_depth
= lo
.depth
;
1368 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1369 struct tree_entry
*e
= t
->entries
[i
];
1370 if (e
->versions
[1].mode
) {
1371 e
->versions
[0].mode
= e
->versions
[1].mode
;
1372 oidcpy(&e
->versions
[0].oid
, &e
->versions
[1].oid
);
1373 t
->entries
[j
++] = e
;
1375 release_tree_entry(e
);
1379 t
->entry_count
-= del
;
1382 static void tree_content_replace(
1383 struct tree_entry
*root
,
1384 const struct object_id
*oid
,
1385 const uint16_t mode
,
1386 struct tree_content
*newtree
)
1389 die("Root cannot be a non-directory");
1390 oidclr(&root
->versions
[0].oid
);
1391 oidcpy(&root
->versions
[1].oid
, oid
);
1393 release_tree_content_recursive(root
->tree
);
1394 root
->tree
= newtree
;
1397 static int tree_content_set(
1398 struct tree_entry
*root
,
1400 const struct object_id
*oid
,
1401 const uint16_t mode
,
1402 struct tree_content
*subtree
)
1404 struct tree_content
*t
;
1407 struct tree_entry
*e
;
1409 slash1
= strchrnul(p
, '/');
1412 die("Empty path component found in input");
1413 if (!*slash1
&& !S_ISDIR(mode
) && subtree
)
1414 die("Non-directories cannot have subtrees");
1419 for (i
= 0; i
< t
->entry_count
; i
++) {
1421 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1424 && e
->versions
[1].mode
== mode
1425 && oideq(&e
->versions
[1].oid
, oid
))
1427 e
->versions
[1].mode
= mode
;
1428 oidcpy(&e
->versions
[1].oid
, oid
);
1430 release_tree_content_recursive(e
->tree
);
1434 * We need to leave e->versions[0].sha1 alone
1435 * to avoid modifying the preimage tree used
1436 * when writing out the parent directory.
1437 * But after replacing the subdir with a
1438 * completely different one, it's not a good
1439 * delta base any more, and besides, we've
1440 * thrown away the tree entries needed to
1441 * make a delta against it.
1443 * So let's just explicitly disable deltas
1446 if (S_ISDIR(e
->versions
[0].mode
))
1447 e
->versions
[0].mode
|= NO_DELTA
;
1449 oidclr(&root
->versions
[1].oid
);
1452 if (!S_ISDIR(e
->versions
[1].mode
)) {
1453 e
->tree
= new_tree_content(8);
1454 e
->versions
[1].mode
= S_IFDIR
;
1458 if (tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
)) {
1459 oidclr(&root
->versions
[1].oid
);
1466 if (t
->entry_count
== t
->entry_capacity
)
1467 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1468 e
= new_tree_entry();
1469 e
->name
= to_atom(p
, n
);
1470 e
->versions
[0].mode
= 0;
1471 oidclr(&e
->versions
[0].oid
);
1472 t
->entries
[t
->entry_count
++] = e
;
1474 e
->tree
= new_tree_content(8);
1475 e
->versions
[1].mode
= S_IFDIR
;
1476 tree_content_set(e
, slash1
+ 1, oid
, mode
, subtree
);
1479 e
->versions
[1].mode
= mode
;
1480 oidcpy(&e
->versions
[1].oid
, oid
);
1482 oidclr(&root
->versions
[1].oid
);
1486 static int tree_content_remove(
1487 struct tree_entry
*root
,
1489 struct tree_entry
*backup_leaf
,
1492 struct tree_content
*t
;
1495 struct tree_entry
*e
;
1497 slash1
= strchrnul(p
, '/');
1503 if (!*p
&& allow_root
) {
1509 for (i
= 0; i
< t
->entry_count
; i
++) {
1511 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1512 if (*slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1514 * If p names a file in some subdirectory, and a
1515 * file or symlink matching the name of the
1516 * parent directory of p exists, then p cannot
1517 * exist and need not be deleted.
1520 if (!*slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1524 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
, 0)) {
1525 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1526 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1527 oidclr(&root
->versions
[1].oid
);
1541 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1543 release_tree_content_recursive(e
->tree
);
1545 e
->versions
[1].mode
= 0;
1546 oidclr(&e
->versions
[1].oid
);
1547 oidclr(&root
->versions
[1].oid
);
1551 static int tree_content_get(
1552 struct tree_entry
*root
,
1554 struct tree_entry
*leaf
,
1557 struct tree_content
*t
;
1560 struct tree_entry
*e
;
1562 slash1
= strchrnul(p
, '/');
1564 if (!n
&& !allow_root
)
1565 die("Empty path component found in input");
1576 for (i
= 0; i
< t
->entry_count
; i
++) {
1578 if (e
->name
->str_len
== n
&& !fspathncmp(p
, e
->name
->str_dat
, n
)) {
1581 if (!S_ISDIR(e
->versions
[1].mode
))
1585 return tree_content_get(e
, slash1
+ 1, leaf
, 0);
1591 memcpy(leaf
, e
, sizeof(*leaf
));
1592 if (e
->tree
&& is_null_oid(&e
->versions
[1].oid
))
1593 leaf
->tree
= dup_tree_content(e
->tree
);
1599 static int update_branch(struct branch
*b
)
1601 static const char *msg
= "fast-import";
1602 struct ref_transaction
*transaction
;
1603 struct object_id old_oid
;
1604 struct strbuf err
= STRBUF_INIT
;
1606 if (is_null_oid(&b
->oid
)) {
1608 delete_ref(NULL
, b
->name
, NULL
, 0);
1611 if (read_ref(b
->name
, &old_oid
))
1613 if (!force_update
&& !is_null_oid(&old_oid
)) {
1614 struct commit
*old_cmit
, *new_cmit
;
1616 old_cmit
= lookup_commit_reference_gently(the_repository
,
1618 new_cmit
= lookup_commit_reference_gently(the_repository
,
1620 if (!old_cmit
|| !new_cmit
)
1621 return error("Branch %s is missing commits.", b
->name
);
1623 if (!in_merge_bases(old_cmit
, new_cmit
)) {
1624 warning("Not updating %s"
1625 " (new tip %s does not contain %s)",
1626 b
->name
, oid_to_hex(&b
->oid
),
1627 oid_to_hex(&old_oid
));
1631 transaction
= ref_transaction_begin(&err
);
1633 ref_transaction_update(transaction
, b
->name
, &b
->oid
, &old_oid
,
1635 ref_transaction_commit(transaction
, &err
)) {
1636 ref_transaction_free(transaction
);
1637 error("%s", err
.buf
);
1638 strbuf_release(&err
);
1641 ref_transaction_free(transaction
);
1642 strbuf_release(&err
);
1646 static void dump_branches(void)
1651 for (i
= 0; i
< branch_table_sz
; i
++) {
1652 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1653 failure
|= update_branch(b
);
1657 static void dump_tags(void)
1659 static const char *msg
= "fast-import";
1661 struct strbuf ref_name
= STRBUF_INIT
;
1662 struct strbuf err
= STRBUF_INIT
;
1663 struct ref_transaction
*transaction
;
1665 transaction
= ref_transaction_begin(&err
);
1667 failure
|= error("%s", err
.buf
);
1670 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1671 strbuf_reset(&ref_name
);
1672 strbuf_addf(&ref_name
, "refs/tags/%s", t
->name
);
1674 if (ref_transaction_update(transaction
, ref_name
.buf
,
1675 &t
->oid
, NULL
, 0, msg
, &err
)) {
1676 failure
|= error("%s", err
.buf
);
1680 if (ref_transaction_commit(transaction
, &err
))
1681 failure
|= error("%s", err
.buf
);
1684 ref_transaction_free(transaction
);
1685 strbuf_release(&ref_name
);
1686 strbuf_release(&err
);
1689 static void dump_marks(void)
1691 struct lock_file mark_lock
= LOCK_INIT
;
1694 if (!export_marks_file
|| (import_marks_file
&& !import_marks_file_done
))
1697 if (safe_create_leading_directories_const(export_marks_file
)) {
1698 failure
|= error_errno("unable to create leading directories of %s",
1703 if (hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0) < 0) {
1704 failure
|= error_errno("Unable to write marks file %s",
1709 f
= fdopen_lock_file(&mark_lock
, "w");
1711 int saved_errno
= errno
;
1712 rollback_lock_file(&mark_lock
);
1713 failure
|= error("Unable to write marks file %s: %s",
1714 export_marks_file
, strerror(saved_errno
));
1718 for_each_mark(marks
, 0, dump_marks_fn
, f
);
1719 if (commit_lock_file(&mark_lock
)) {
1720 failure
|= error_errno("Unable to write file %s",
1726 static void insert_object_entry(struct mark_set
*s
, struct object_id
*oid
, uintmax_t mark
)
1728 struct object_entry
*e
;
1729 e
= find_object(oid
);
1731 enum object_type type
= oid_object_info(the_repository
,
1734 die("object not found: %s", oid_to_hex(oid
));
1735 e
= insert_object(oid
);
1737 e
->pack_id
= MAX_PACK_ID
;
1738 e
->idx
.offset
= 1; /* just not zero! */
1740 insert_mark(s
, mark
, e
);
1743 static void insert_oid_entry(struct mark_set
*s
, struct object_id
*oid
, uintmax_t mark
)
1745 insert_mark(s
, mark
, xmemdupz(oid
, sizeof(*oid
)));
1748 static void read_mark_file(struct mark_set
*s
, FILE *f
, mark_set_inserter_t inserter
)
1751 while (fgets(line
, sizeof(line
), f
)) {
1754 struct object_id oid
;
1756 /* Ensure SHA-1 objects are padded with zeros. */
1757 memset(oid
.hash
, 0, sizeof(oid
.hash
));
1759 end
= strchr(line
, '\n');
1760 if (line
[0] != ':' || !end
)
1761 die("corrupt mark line: %s", line
);
1763 mark
= strtoumax(line
+ 1, &end
, 10);
1764 if (!mark
|| end
== line
+ 1
1766 || get_oid_hex_any(end
+ 1, &oid
) == GIT_HASH_UNKNOWN
)
1767 die("corrupt mark line: %s", line
);
1768 inserter(s
, &oid
, mark
);
1772 static void read_marks(void)
1774 FILE *f
= fopen(import_marks_file
, "r");
1777 else if (import_marks_file_ignore_missing
&& errno
== ENOENT
)
1778 goto done
; /* Marks file does not exist */
1780 die_errno("cannot read '%s'", import_marks_file
);
1781 read_mark_file(marks
, f
, insert_object_entry
);
1784 import_marks_file_done
= 1;
1788 static int read_next_command(void)
1790 static int stdin_eof
= 0;
1793 unread_command_buf
= 0;
1798 if (unread_command_buf
) {
1799 unread_command_buf
= 0;
1801 struct recent_command
*rc
;
1803 stdin_eof
= strbuf_getline_lf(&command_buf
, stdin
);
1807 if (!seen_data_command
1808 && !starts_with(command_buf
.buf
, "feature ")
1809 && !starts_with(command_buf
.buf
, "option ")) {
1818 cmd_hist
.next
= rc
->next
;
1819 cmd_hist
.next
->prev
= &cmd_hist
;
1823 rc
->buf
= xstrdup(command_buf
.buf
);
1824 rc
->prev
= cmd_tail
;
1825 rc
->next
= cmd_hist
.prev
;
1826 rc
->prev
->next
= rc
;
1829 if (command_buf
.buf
[0] == '#')
1835 static void skip_optional_lf(void)
1837 int term_char
= fgetc(stdin
);
1838 if (term_char
!= '\n' && term_char
!= EOF
)
1839 ungetc(term_char
, stdin
);
1842 static void parse_mark(void)
1845 if (skip_prefix(command_buf
.buf
, "mark :", &v
)) {
1846 next_mark
= strtoumax(v
, NULL
, 10);
1847 read_next_command();
1853 static void parse_original_identifier(void)
1856 if (skip_prefix(command_buf
.buf
, "original-oid ", &v
))
1857 read_next_command();
1860 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1865 if (!skip_prefix(command_buf
.buf
, "data ", &data
))
1866 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1868 if (skip_prefix(data
, "<<", &data
)) {
1869 char *term
= xstrdup(data
);
1870 size_t term_len
= command_buf
.len
- (data
- command_buf
.buf
);
1873 if (strbuf_getline_lf(&command_buf
, stdin
) == EOF
)
1874 die("EOF in data (terminator '%s' not found)", term
);
1875 if (term_len
== command_buf
.len
1876 && !strcmp(term
, command_buf
.buf
))
1878 strbuf_addbuf(sb
, &command_buf
);
1879 strbuf_addch(sb
, '\n');
1884 uintmax_t len
= strtoumax(data
, NULL
, 10);
1885 size_t n
= 0, length
= (size_t)len
;
1887 if (limit
&& limit
< len
) {
1892 die("data is too large to use in this context");
1894 while (n
< length
) {
1895 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1896 if (!s
&& feof(stdin
))
1897 die("EOF in data (%lu bytes remaining)",
1898 (unsigned long)(length
- n
));
1907 static int validate_raw_date(const char *src
, struct strbuf
*result
, int strict
)
1909 const char *orig_src
= src
;
1915 num
= strtoul(src
, &endp
, 10);
1917 * NEEDSWORK: perhaps check for reasonable values? For example, we
1918 * could error on values representing times more than a
1919 * day in the future.
1921 if (errno
|| endp
== src
|| *endp
!= ' ')
1925 if (*src
!= '-' && *src
!= '+')
1928 num
= strtoul(src
+ 1, &endp
, 10);
1930 * NEEDSWORK: check for brokenness other than num > 1400, such as
1931 * (num % 100) >= 60, or ((num % 100) % 15) != 0 ?
1933 if (errno
|| endp
== src
+ 1 || *endp
|| /* did not parse */
1934 (strict
&& (1400 < num
)) /* parsed a broken timezone */
1938 strbuf_addstr(result
, orig_src
);
1942 static char *parse_ident(const char *buf
)
1946 struct strbuf ident
= STRBUF_INIT
;
1948 /* ensure there is a space delimiter even if there is no name */
1952 ltgt
= buf
+ strcspn(buf
, "<>");
1954 die("Missing < in ident string: %s", buf
);
1955 if (ltgt
!= buf
&& ltgt
[-1] != ' ')
1956 die("Missing space before < in ident string: %s", buf
);
1957 ltgt
= ltgt
+ 1 + strcspn(ltgt
+ 1, "<>");
1959 die("Missing > in ident string: %s", buf
);
1962 die("Missing space after > in ident string: %s", buf
);
1964 name_len
= ltgt
- buf
;
1965 strbuf_add(&ident
, buf
, name_len
);
1969 if (validate_raw_date(ltgt
, &ident
, 1) < 0)
1970 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1972 case WHENSPEC_RAW_PERMISSIVE
:
1973 if (validate_raw_date(ltgt
, &ident
, 0) < 0)
1974 die("Invalid raw date \"%s\" in ident: %s", ltgt
, buf
);
1976 case WHENSPEC_RFC2822
:
1977 if (parse_date(ltgt
, &ident
) < 0)
1978 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt
, buf
);
1981 if (strcmp("now", ltgt
))
1982 die("Date in ident must be 'now': %s", buf
);
1987 return strbuf_detach(&ident
, NULL
);
1990 static void parse_and_store_blob(
1991 struct last_object
*last
,
1992 struct object_id
*oidout
,
1995 static struct strbuf buf
= STRBUF_INIT
;
1998 if (parse_data(&buf
, big_file_threshold
, &len
))
1999 store_object(OBJ_BLOB
, &buf
, last
, oidout
, mark
);
2002 strbuf_release(&last
->data
);
2006 stream_blob(len
, oidout
, mark
);
2011 static void parse_new_blob(void)
2013 read_next_command();
2015 parse_original_identifier();
2016 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2019 static void unload_one_branch(void)
2021 while (cur_active_branches
2022 && cur_active_branches
>= max_active_branches
) {
2023 uintmax_t min_commit
= ULONG_MAX
;
2024 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2026 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2027 if (e
->last_commit
< min_commit
) {
2029 min_commit
= e
->last_commit
;
2035 e
= p
->active_next_branch
;
2036 p
->active_next_branch
= e
->active_next_branch
;
2038 e
= active_branches
;
2039 active_branches
= e
->active_next_branch
;
2042 e
->active_next_branch
= NULL
;
2043 if (e
->branch_tree
.tree
) {
2044 release_tree_content_recursive(e
->branch_tree
.tree
);
2045 e
->branch_tree
.tree
= NULL
;
2047 cur_active_branches
--;
2051 static void load_branch(struct branch
*b
)
2053 load_tree(&b
->branch_tree
);
2056 b
->active_next_branch
= active_branches
;
2057 active_branches
= b
;
2058 cur_active_branches
++;
2059 branch_load_count
++;
2063 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2065 unsigned char fanout
= 0;
2066 while ((num_notes
>>= 8))
2071 static void construct_path_with_fanout(const char *hex_sha1
,
2072 unsigned char fanout
, char *path
)
2074 unsigned int i
= 0, j
= 0;
2075 if (fanout
>= the_hash_algo
->rawsz
)
2076 die("Too large fanout (%u)", fanout
);
2078 path
[i
++] = hex_sha1
[j
++];
2079 path
[i
++] = hex_sha1
[j
++];
2083 memcpy(path
+ i
, hex_sha1
+ j
, the_hash_algo
->hexsz
- j
);
2084 path
[i
+ the_hash_algo
->hexsz
- j
] = '\0';
2087 static uintmax_t do_change_note_fanout(
2088 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2089 char *hex_oid
, unsigned int hex_oid_len
,
2090 char *fullpath
, unsigned int fullpath_len
,
2091 unsigned char fanout
)
2093 struct tree_content
*t
;
2094 struct tree_entry
*e
, leaf
;
2095 unsigned int i
, tmp_hex_oid_len
, tmp_fullpath_len
;
2096 uintmax_t num_notes
= 0;
2097 struct object_id oid
;
2098 /* hex oid + '/' between each pair of hex digits + NUL */
2099 char realpath
[GIT_MAX_HEXSZ
+ ((GIT_MAX_HEXSZ
/ 2) - 1) + 1];
2100 const unsigned hexsz
= the_hash_algo
->hexsz
;
2106 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2108 tmp_hex_oid_len
= hex_oid_len
+ e
->name
->str_len
;
2109 tmp_fullpath_len
= fullpath_len
;
2112 * We're interested in EITHER existing note entries (entries
2113 * with exactly 40 hex chars in path, not including directory
2114 * separators), OR directory entries that may contain note
2115 * entries (with < 40 hex chars in path).
2116 * Also, each path component in a note entry must be a multiple
2119 if (!e
->versions
[1].mode
||
2120 tmp_hex_oid_len
> hexsz
||
2121 e
->name
->str_len
% 2)
2124 /* This _may_ be a note entry, or a subdir containing notes */
2125 memcpy(hex_oid
+ hex_oid_len
, e
->name
->str_dat
,
2127 if (tmp_fullpath_len
)
2128 fullpath
[tmp_fullpath_len
++] = '/';
2129 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2131 tmp_fullpath_len
+= e
->name
->str_len
;
2132 fullpath
[tmp_fullpath_len
] = '\0';
2134 if (tmp_hex_oid_len
== hexsz
&& !get_oid_hex(hex_oid
, &oid
)) {
2135 /* This is a note entry */
2136 if (fanout
== 0xff) {
2137 /* Counting mode, no rename */
2141 construct_path_with_fanout(hex_oid
, fanout
, realpath
);
2142 if (!strcmp(fullpath
, realpath
)) {
2143 /* Note entry is in correct location */
2148 /* Rename fullpath to realpath */
2149 if (!tree_content_remove(orig_root
, fullpath
, &leaf
, 0))
2150 die("Failed to remove path %s", fullpath
);
2151 tree_content_set(orig_root
, realpath
,
2152 &leaf
.versions
[1].oid
,
2153 leaf
.versions
[1].mode
,
2155 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2156 /* This is a subdir that may contain note entries */
2157 num_notes
+= do_change_note_fanout(orig_root
, e
,
2158 hex_oid
, tmp_hex_oid_len
,
2159 fullpath
, tmp_fullpath_len
, fanout
);
2162 /* The above may have reallocated the current tree_content */
2168 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2169 unsigned char fanout
)
2172 * The size of path is due to one slash between every two hex digits,
2173 * plus the terminating NUL. Note that there is no slash at the end, so
2174 * the number of slashes is one less than half the number of hex
2177 char hex_oid
[GIT_MAX_HEXSZ
], path
[GIT_MAX_HEXSZ
+ (GIT_MAX_HEXSZ
/ 2) - 1 + 1];
2178 return do_change_note_fanout(root
, root
, hex_oid
, 0, path
, 0, fanout
);
2181 static int parse_mapped_oid_hex(const char *hex
, struct object_id
*oid
, const char **end
)
2186 /* Make SHA-1 object IDs have all-zero padding. */
2187 memset(oid
->hash
, 0, sizeof(oid
->hash
));
2189 algo
= parse_oid_hex_any(hex
, oid
, end
);
2190 if (algo
== GIT_HASH_UNKNOWN
)
2193 it
= kh_get_oid_map(sub_oid_map
, *oid
);
2194 /* No such object? */
2195 if (it
== kh_end(sub_oid_map
)) {
2196 /* If we're using the same algorithm, pass it through. */
2197 if (hash_algos
[algo
].format_id
== the_hash_algo
->format_id
)
2201 oidcpy(oid
, kh_value(sub_oid_map
, it
));
2206 * Given a pointer into a string, parse a mark reference:
2208 * idnum ::= ':' bigint;
2210 * Return the first character after the value in *endptr.
2212 * Complain if the following character is not what is expected,
2213 * either a space or end of the string.
2215 static uintmax_t parse_mark_ref(const char *p
, char **endptr
)
2221 mark
= strtoumax(p
, endptr
, 10);
2223 die("No value after ':' in mark: %s", command_buf
.buf
);
2228 * Parse the mark reference, and complain if this is not the end of
2231 static uintmax_t parse_mark_ref_eol(const char *p
)
2236 mark
= parse_mark_ref(p
, &end
);
2238 die("Garbage after mark: %s", command_buf
.buf
);
2243 * Parse the mark reference, demanding a trailing space. Return a
2244 * pointer to the space.
2246 static uintmax_t parse_mark_ref_space(const char **p
)
2251 mark
= parse_mark_ref(*p
, &end
);
2253 die("Missing space after mark: %s", command_buf
.buf
);
2258 static void file_change_m(const char *p
, struct branch
*b
)
2260 static struct strbuf uq
= STRBUF_INIT
;
2262 struct object_entry
*oe
;
2263 struct object_id oid
;
2264 uint16_t mode
, inline_data
= 0;
2266 p
= get_mode(p
, &mode
);
2268 die("Corrupt mode: %s", command_buf
.buf
);
2273 case S_IFREG
| 0644:
2274 case S_IFREG
| 0755:
2281 die("Corrupt mode: %s", command_buf
.buf
);
2285 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2286 oidcpy(&oid
, &oe
->idx
.oid
);
2287 } else if (skip_prefix(p
, "inline ", &p
)) {
2289 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2291 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2292 die("Invalid dataref: %s", command_buf
.buf
);
2293 oe
= find_object(&oid
);
2295 die("Missing space after SHA1: %s", command_buf
.buf
);
2299 if (!unquote_c_style(&uq
, p
, &endp
)) {
2301 die("Garbage after path in: %s", command_buf
.buf
);
2305 /* Git does not track empty, non-toplevel directories. */
2306 if (S_ISDIR(mode
) && is_empty_tree_oid(&oid
) && *p
) {
2307 tree_content_remove(&b
->branch_tree
, p
, NULL
, 0);
2311 if (S_ISGITLINK(mode
)) {
2313 die("Git links cannot be specified 'inline': %s",
2316 if (oe
->type
!= OBJ_COMMIT
)
2317 die("Not a commit (actually a %s): %s",
2318 type_name(oe
->type
), command_buf
.buf
);
2321 * Accept the sha1 without checking; it expected to be in
2322 * another repository.
2324 } else if (inline_data
) {
2326 die("Directories cannot be specified 'inline': %s",
2329 strbuf_addstr(&uq
, p
);
2332 while (read_next_command() != EOF
) {
2334 if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2337 parse_and_store_blob(&last_blob
, &oid
, 0);
2342 enum object_type expected
= S_ISDIR(mode
) ?
2344 enum object_type type
= oe
? oe
->type
:
2345 oid_object_info(the_repository
, &oid
,
2348 die("%s not found: %s",
2349 S_ISDIR(mode
) ? "Tree" : "Blob",
2351 if (type
!= expected
)
2352 die("Not a %s (actually a %s): %s",
2353 type_name(expected
), type_name(type
),
2358 tree_content_replace(&b
->branch_tree
, &oid
, mode
, NULL
);
2361 tree_content_set(&b
->branch_tree
, p
, &oid
, mode
, NULL
);
2364 static void file_change_d(const char *p
, struct branch
*b
)
2366 static struct strbuf uq
= STRBUF_INIT
;
2370 if (!unquote_c_style(&uq
, p
, &endp
)) {
2372 die("Garbage after path in: %s", command_buf
.buf
);
2375 tree_content_remove(&b
->branch_tree
, p
, NULL
, 1);
2378 static void file_change_cr(const char *s
, struct branch
*b
, int rename
)
2381 static struct strbuf s_uq
= STRBUF_INIT
;
2382 static struct strbuf d_uq
= STRBUF_INIT
;
2384 struct tree_entry leaf
;
2386 strbuf_reset(&s_uq
);
2387 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2389 die("Missing space after source: %s", command_buf
.buf
);
2391 endp
= strchr(s
, ' ');
2393 die("Missing space after source: %s", command_buf
.buf
);
2394 strbuf_add(&s_uq
, s
, endp
- s
);
2400 die("Missing dest: %s", command_buf
.buf
);
2403 strbuf_reset(&d_uq
);
2404 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2406 die("Garbage after dest in: %s", command_buf
.buf
);
2410 memset(&leaf
, 0, sizeof(leaf
));
2412 tree_content_remove(&b
->branch_tree
, s
, &leaf
, 1);
2414 tree_content_get(&b
->branch_tree
, s
, &leaf
, 1);
2415 if (!leaf
.versions
[1].mode
)
2416 die("Path %s not in branch", s
);
2417 if (!*d
) { /* C "path/to/subdir" "" */
2418 tree_content_replace(&b
->branch_tree
,
2419 &leaf
.versions
[1].oid
,
2420 leaf
.versions
[1].mode
,
2424 tree_content_set(&b
->branch_tree
, d
,
2425 &leaf
.versions
[1].oid
,
2426 leaf
.versions
[1].mode
,
2430 static void note_change_n(const char *p
, struct branch
*b
, unsigned char *old_fanout
)
2432 static struct strbuf uq
= STRBUF_INIT
;
2433 struct object_entry
*oe
;
2435 struct object_id oid
, commit_oid
;
2436 char path
[GIT_MAX_RAWSZ
* 3];
2437 uint16_t inline_data
= 0;
2438 unsigned char new_fanout
;
2441 * When loading a branch, we don't traverse its tree to count the real
2442 * number of notes (too expensive to do this for all non-note refs).
2443 * This means that recently loaded notes refs might incorrectly have
2444 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2446 * Fix this by traversing the tree and counting the number of notes
2447 * when b->num_notes == 0. If the notes tree is truly empty, the
2448 * calculation should not take long.
2450 if (b
->num_notes
== 0 && *old_fanout
== 0) {
2451 /* Invoke change_note_fanout() in "counting mode". */
2452 b
->num_notes
= change_note_fanout(&b
->branch_tree
, 0xff);
2453 *old_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2456 /* Now parse the notemodify command. */
2457 /* <dataref> or 'inline' */
2459 oe
= find_mark(marks
, parse_mark_ref_space(&p
));
2460 oidcpy(&oid
, &oe
->idx
.oid
);
2461 } else if (skip_prefix(p
, "inline ", &p
)) {
2463 oe
= NULL
; /* not used with inline_data, but makes gcc happy */
2465 if (parse_mapped_oid_hex(p
, &oid
, &p
))
2466 die("Invalid dataref: %s", command_buf
.buf
);
2467 oe
= find_object(&oid
);
2469 die("Missing space after SHA1: %s", command_buf
.buf
);
2473 s
= lookup_branch(p
);
2475 if (is_null_oid(&s
->oid
))
2476 die("Can't add a note on empty branch.");
2477 oidcpy(&commit_oid
, &s
->oid
);
2478 } else if (*p
== ':') {
2479 uintmax_t commit_mark
= parse_mark_ref_eol(p
);
2480 struct object_entry
*commit_oe
= find_mark(marks
, commit_mark
);
2481 if (commit_oe
->type
!= OBJ_COMMIT
)
2482 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2483 oidcpy(&commit_oid
, &commit_oe
->idx
.oid
);
2484 } else if (!get_oid(p
, &commit_oid
)) {
2486 char *buf
= read_object_with_reference(the_repository
,
2490 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2491 die("Not a valid commit: %s", p
);
2494 die("Invalid ref name or SHA1 expression: %s", p
);
2498 strbuf_addstr(&uq
, p
);
2501 read_next_command();
2502 parse_and_store_blob(&last_blob
, &oid
, 0);
2504 if (oe
->type
!= OBJ_BLOB
)
2505 die("Not a blob (actually a %s): %s",
2506 type_name(oe
->type
), command_buf
.buf
);
2507 } else if (!is_null_oid(&oid
)) {
2508 enum object_type type
= oid_object_info(the_repository
, &oid
,
2511 die("Blob not found: %s", command_buf
.buf
);
2512 if (type
!= OBJ_BLOB
)
2513 die("Not a blob (actually a %s): %s",
2514 type_name(type
), command_buf
.buf
);
2517 construct_path_with_fanout(oid_to_hex(&commit_oid
), *old_fanout
, path
);
2518 if (tree_content_remove(&b
->branch_tree
, path
, NULL
, 0))
2521 if (is_null_oid(&oid
))
2522 return; /* nothing to insert */
2525 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2526 construct_path_with_fanout(oid_to_hex(&commit_oid
), new_fanout
, path
);
2527 tree_content_set(&b
->branch_tree
, path
, &oid
, S_IFREG
| 0644, NULL
);
2530 static void file_change_deleteall(struct branch
*b
)
2532 release_tree_content_recursive(b
->branch_tree
.tree
);
2533 oidclr(&b
->branch_tree
.versions
[0].oid
);
2534 oidclr(&b
->branch_tree
.versions
[1].oid
);
2535 load_tree(&b
->branch_tree
);
2539 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2541 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2542 die("Not a valid commit: %s", oid_to_hex(&b
->oid
));
2543 if (memcmp("tree ", buf
, 5)
2544 || get_oid_hex(buf
+ 5, &b
->branch_tree
.versions
[1].oid
))
2545 die("The commit %s is corrupt", oid_to_hex(&b
->oid
));
2546 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2547 &b
->branch_tree
.versions
[1].oid
);
2550 static void parse_from_existing(struct branch
*b
)
2552 if (is_null_oid(&b
->oid
)) {
2553 oidclr(&b
->branch_tree
.versions
[0].oid
);
2554 oidclr(&b
->branch_tree
.versions
[1].oid
);
2559 buf
= read_object_with_reference(the_repository
,
2560 &b
->oid
, commit_type
, &size
,
2562 parse_from_commit(b
, buf
, size
);
2567 static int parse_objectish(struct branch
*b
, const char *objectish
)
2570 struct object_id oid
;
2572 oidcpy(&oid
, &b
->branch_tree
.versions
[1].oid
);
2574 s
= lookup_branch(objectish
);
2576 die("Can't create a branch from itself: %s", b
->name
);
2578 struct object_id
*t
= &s
->branch_tree
.versions
[1].oid
;
2579 oidcpy(&b
->oid
, &s
->oid
);
2580 oidcpy(&b
->branch_tree
.versions
[0].oid
, t
);
2581 oidcpy(&b
->branch_tree
.versions
[1].oid
, t
);
2582 } else if (*objectish
== ':') {
2583 uintmax_t idnum
= parse_mark_ref_eol(objectish
);
2584 struct object_entry
*oe
= find_mark(marks
, idnum
);
2585 if (oe
->type
!= OBJ_COMMIT
)
2586 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2587 if (!oideq(&b
->oid
, &oe
->idx
.oid
)) {
2588 oidcpy(&b
->oid
, &oe
->idx
.oid
);
2589 if (oe
->pack_id
!= MAX_PACK_ID
) {
2591 char *buf
= gfi_unpack_entry(oe
, &size
);
2592 parse_from_commit(b
, buf
, size
);
2595 parse_from_existing(b
);
2597 } else if (!get_oid(objectish
, &b
->oid
)) {
2598 parse_from_existing(b
);
2599 if (is_null_oid(&b
->oid
))
2603 die("Invalid ref name or SHA1 expression: %s", objectish
);
2605 if (b
->branch_tree
.tree
&& !oideq(&oid
, &b
->branch_tree
.versions
[1].oid
)) {
2606 release_tree_content_recursive(b
->branch_tree
.tree
);
2607 b
->branch_tree
.tree
= NULL
;
2610 read_next_command();
2614 static int parse_from(struct branch
*b
)
2618 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2621 return parse_objectish(b
, from
);
2624 static int parse_objectish_with_prefix(struct branch
*b
, const char *prefix
)
2628 if (!skip_prefix(command_buf
.buf
, prefix
, &base
))
2631 return parse_objectish(b
, base
);
2634 static struct hash_list
*parse_merge(unsigned int *count
)
2636 struct hash_list
*list
= NULL
, **tail
= &list
, *n
;
2641 while (skip_prefix(command_buf
.buf
, "merge ", &from
)) {
2642 n
= xmalloc(sizeof(*n
));
2643 s
= lookup_branch(from
);
2645 oidcpy(&n
->oid
, &s
->oid
);
2646 else if (*from
== ':') {
2647 uintmax_t idnum
= parse_mark_ref_eol(from
);
2648 struct object_entry
*oe
= find_mark(marks
, idnum
);
2649 if (oe
->type
!= OBJ_COMMIT
)
2650 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2651 oidcpy(&n
->oid
, &oe
->idx
.oid
);
2652 } else if (!get_oid(from
, &n
->oid
)) {
2654 char *buf
= read_object_with_reference(the_repository
,
2658 if (!buf
|| size
< the_hash_algo
->hexsz
+ 6)
2659 die("Not a valid commit: %s", from
);
2662 die("Invalid ref name or SHA1 expression: %s", from
);
2669 read_next_command();
2674 static void parse_new_commit(const char *arg
)
2676 static struct strbuf msg
= STRBUF_INIT
;
2678 char *author
= NULL
;
2679 char *committer
= NULL
;
2680 char *encoding
= NULL
;
2681 struct hash_list
*merge_list
= NULL
;
2682 unsigned int merge_count
;
2683 unsigned char prev_fanout
, new_fanout
;
2686 b
= lookup_branch(arg
);
2688 b
= new_branch(arg
);
2690 read_next_command();
2692 parse_original_identifier();
2693 if (skip_prefix(command_buf
.buf
, "author ", &v
)) {
2694 author
= parse_ident(v
);
2695 read_next_command();
2697 if (skip_prefix(command_buf
.buf
, "committer ", &v
)) {
2698 committer
= parse_ident(v
);
2699 read_next_command();
2702 die("Expected committer but didn't get one");
2703 if (skip_prefix(command_buf
.buf
, "encoding ", &v
)) {
2704 encoding
= xstrdup(v
);
2705 read_next_command();
2707 parse_data(&msg
, 0, NULL
);
2708 read_next_command();
2710 merge_list
= parse_merge(&merge_count
);
2712 /* ensure the branch is active/loaded */
2713 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2714 unload_one_branch();
2718 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2721 while (command_buf
.len
> 0) {
2722 if (skip_prefix(command_buf
.buf
, "M ", &v
))
2723 file_change_m(v
, b
);
2724 else if (skip_prefix(command_buf
.buf
, "D ", &v
))
2725 file_change_d(v
, b
);
2726 else if (skip_prefix(command_buf
.buf
, "R ", &v
))
2727 file_change_cr(v
, b
, 1);
2728 else if (skip_prefix(command_buf
.buf
, "C ", &v
))
2729 file_change_cr(v
, b
, 0);
2730 else if (skip_prefix(command_buf
.buf
, "N ", &v
))
2731 note_change_n(v
, b
, &prev_fanout
);
2732 else if (!strcmp("deleteall", command_buf
.buf
))
2733 file_change_deleteall(b
);
2734 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
2736 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
2739 unread_command_buf
= 1;
2742 if (read_next_command() == EOF
)
2746 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2747 if (new_fanout
!= prev_fanout
)
2748 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2750 /* build the tree and the commit */
2751 store_tree(&b
->branch_tree
);
2752 oidcpy(&b
->branch_tree
.versions
[0].oid
,
2753 &b
->branch_tree
.versions
[1].oid
);
2755 strbuf_reset(&new_data
);
2756 strbuf_addf(&new_data
, "tree %s\n",
2757 oid_to_hex(&b
->branch_tree
.versions
[1].oid
));
2758 if (!is_null_oid(&b
->oid
))
2759 strbuf_addf(&new_data
, "parent %s\n",
2760 oid_to_hex(&b
->oid
));
2761 while (merge_list
) {
2762 struct hash_list
*next
= merge_list
->next
;
2763 strbuf_addf(&new_data
, "parent %s\n",
2764 oid_to_hex(&merge_list
->oid
));
2768 strbuf_addf(&new_data
,
2771 author
? author
: committer
, committer
);
2773 strbuf_addf(&new_data
,
2776 strbuf_addch(&new_data
, '\n');
2777 strbuf_addbuf(&new_data
, &msg
);
2782 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, &b
->oid
, next_mark
))
2783 b
->pack_id
= pack_id
;
2784 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2787 static void parse_new_tag(const char *arg
)
2789 static struct strbuf msg
= STRBUF_INIT
;
2794 uintmax_t from_mark
= 0;
2795 struct object_id oid
;
2796 enum object_type type
;
2799 t
= mem_pool_alloc(&fi_mem_pool
, sizeof(struct tag
));
2800 memset(t
, 0, sizeof(struct tag
));
2801 t
->name
= mem_pool_strdup(&fi_mem_pool
, arg
);
2803 last_tag
->next_tag
= t
;
2807 read_next_command();
2811 if (!skip_prefix(command_buf
.buf
, "from ", &from
))
2812 die("Expected from command, got %s", command_buf
.buf
);
2813 s
= lookup_branch(from
);
2815 if (is_null_oid(&s
->oid
))
2816 die("Can't tag an empty branch.");
2817 oidcpy(&oid
, &s
->oid
);
2819 } else if (*from
== ':') {
2820 struct object_entry
*oe
;
2821 from_mark
= parse_mark_ref_eol(from
);
2822 oe
= find_mark(marks
, from_mark
);
2824 oidcpy(&oid
, &oe
->idx
.oid
);
2825 } else if (!get_oid(from
, &oid
)) {
2826 struct object_entry
*oe
= find_object(&oid
);
2828 type
= oid_object_info(the_repository
, &oid
, NULL
);
2830 die("Not a valid object: %s", from
);
2834 die("Invalid ref name or SHA1 expression: %s", from
);
2835 read_next_command();
2837 /* original-oid ... */
2838 parse_original_identifier();
2841 if (skip_prefix(command_buf
.buf
, "tagger ", &v
)) {
2842 tagger
= parse_ident(v
);
2843 read_next_command();
2847 /* tag payload/message */
2848 parse_data(&msg
, 0, NULL
);
2850 /* build the tag object */
2851 strbuf_reset(&new_data
);
2853 strbuf_addf(&new_data
,
2857 oid_to_hex(&oid
), type_name(type
), t
->name
);
2859 strbuf_addf(&new_data
,
2860 "tagger %s\n", tagger
);
2861 strbuf_addch(&new_data
, '\n');
2862 strbuf_addbuf(&new_data
, &msg
);
2865 if (store_object(OBJ_TAG
, &new_data
, NULL
, &t
->oid
, next_mark
))
2866 t
->pack_id
= MAX_PACK_ID
;
2868 t
->pack_id
= pack_id
;
2871 static void parse_reset_branch(const char *arg
)
2874 const char *tag_name
;
2876 b
= lookup_branch(arg
);
2879 oidclr(&b
->branch_tree
.versions
[0].oid
);
2880 oidclr(&b
->branch_tree
.versions
[1].oid
);
2881 if (b
->branch_tree
.tree
) {
2882 release_tree_content_recursive(b
->branch_tree
.tree
);
2883 b
->branch_tree
.tree
= NULL
;
2887 b
= new_branch(arg
);
2888 read_next_command();
2890 if (b
->delete && skip_prefix(b
->name
, "refs/tags/", &tag_name
)) {
2892 * Elsewhere, we call dump_branches() before dump_tags(),
2893 * and dump_branches() will handle ref deletions first, so
2894 * in order to make sure the deletion actually takes effect,
2895 * we need to remove the tag from our list of tags to update.
2897 * NEEDSWORK: replace list of tags with hashmap for faster
2900 struct tag
*t
, *prev
= NULL
;
2901 for (t
= first_tag
; t
; t
= t
->next_tag
) {
2902 if (!strcmp(t
->name
, tag_name
))
2908 prev
->next_tag
= t
->next_tag
;
2910 first_tag
= t
->next_tag
;
2913 /* There is no mem_pool_free(t) function to call. */
2916 if (command_buf
.len
> 0)
2917 unread_command_buf
= 1;
2920 static void cat_blob_write(const char *buf
, unsigned long size
)
2922 if (write_in_full(cat_blob_fd
, buf
, size
) < 0)
2923 die_errno("Write to frontend failed");
2926 static void cat_blob(struct object_entry
*oe
, struct object_id
*oid
)
2928 struct strbuf line
= STRBUF_INIT
;
2930 enum object_type type
= 0;
2933 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2934 buf
= read_object_file(oid
, &type
, &size
);
2937 buf
= gfi_unpack_entry(oe
, &size
);
2941 * Output based on batch_one_object() from cat-file.c.
2944 strbuf_reset(&line
);
2945 strbuf_addf(&line
, "%s missing\n", oid_to_hex(oid
));
2946 cat_blob_write(line
.buf
, line
.len
);
2947 strbuf_release(&line
);
2952 die("Can't read object %s", oid_to_hex(oid
));
2953 if (type
!= OBJ_BLOB
)
2954 die("Object %s is a %s but a blob was expected.",
2955 oid_to_hex(oid
), type_name(type
));
2956 strbuf_reset(&line
);
2957 strbuf_addf(&line
, "%s %s %"PRIuMAX
"\n", oid_to_hex(oid
),
2958 type_name(type
), (uintmax_t)size
);
2959 cat_blob_write(line
.buf
, line
.len
);
2960 strbuf_release(&line
);
2961 cat_blob_write(buf
, size
);
2962 cat_blob_write("\n", 1);
2963 if (oe
&& oe
->pack_id
== pack_id
) {
2964 last_blob
.offset
= oe
->idx
.offset
;
2965 strbuf_attach(&last_blob
.data
, buf
, size
, size
);
2966 last_blob
.depth
= oe
->depth
;
2971 static void parse_get_mark(const char *p
)
2973 struct object_entry
*oe
;
2974 char output
[GIT_MAX_HEXSZ
+ 2];
2976 /* get-mark SP <object> LF */
2978 die("Not a mark: %s", p
);
2980 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
2982 die("Unknown mark: %s", command_buf
.buf
);
2984 xsnprintf(output
, sizeof(output
), "%s\n", oid_to_hex(&oe
->idx
.oid
));
2985 cat_blob_write(output
, the_hash_algo
->hexsz
+ 1);
2988 static void parse_cat_blob(const char *p
)
2990 struct object_entry
*oe
;
2991 struct object_id oid
;
2993 /* cat-blob SP <object> LF */
2995 oe
= find_mark(marks
, parse_mark_ref_eol(p
));
2997 die("Unknown mark: %s", command_buf
.buf
);
2998 oidcpy(&oid
, &oe
->idx
.oid
);
3000 if (parse_mapped_oid_hex(p
, &oid
, &p
))
3001 die("Invalid dataref: %s", command_buf
.buf
);
3003 die("Garbage after SHA1: %s", command_buf
.buf
);
3004 oe
= find_object(&oid
);
3010 static struct object_entry
*dereference(struct object_entry
*oe
,
3011 struct object_id
*oid
)
3015 const unsigned hexsz
= the_hash_algo
->hexsz
;
3018 enum object_type type
= oid_object_info(the_repository
, oid
,
3021 die("object not found: %s", oid_to_hex(oid
));
3023 oe
= insert_object(oid
);
3025 oe
->pack_id
= MAX_PACK_ID
;
3029 case OBJ_TREE
: /* easy case. */
3035 die("Not a tree-ish: %s", command_buf
.buf
);
3038 if (oe
->pack_id
!= MAX_PACK_ID
) { /* in a pack being written */
3039 buf
= gfi_unpack_entry(oe
, &size
);
3041 enum object_type unused
;
3042 buf
= read_object_file(oid
, &unused
, &size
);
3045 die("Can't load object %s", oid_to_hex(oid
));
3047 /* Peel one layer. */
3050 if (size
< hexsz
+ strlen("object ") ||
3051 get_oid_hex(buf
+ strlen("object "), oid
))
3052 die("Invalid SHA1 in tag: %s", command_buf
.buf
);
3055 if (size
< hexsz
+ strlen("tree ") ||
3056 get_oid_hex(buf
+ strlen("tree "), oid
))
3057 die("Invalid SHA1 in commit: %s", command_buf
.buf
);
3061 return find_object(oid
);
3064 static void insert_mapped_mark(uintmax_t mark
, void *object
, void *cbp
)
3066 struct object_id
*fromoid
= object
;
3067 struct object_id
*tooid
= find_mark(cbp
, mark
);
3071 it
= kh_put_oid_map(sub_oid_map
, *fromoid
, &ret
);
3072 /* We've already seen this object. */
3075 kh_value(sub_oid_map
, it
) = tooid
;
3078 static void build_mark_map_one(struct mark_set
*from
, struct mark_set
*to
)
3080 for_each_mark(from
, 0, insert_mapped_mark
, to
);
3083 static void build_mark_map(struct string_list
*from
, struct string_list
*to
)
3085 struct string_list_item
*fromp
, *top
;
3087 sub_oid_map
= kh_init_oid_map();
3089 for_each_string_list_item(fromp
, from
) {
3090 top
= string_list_lookup(to
, fromp
->string
);
3092 die(_("Missing from marks for submodule '%s'"), fromp
->string
);
3093 } else if (!top
|| !top
->util
) {
3094 die(_("Missing to marks for submodule '%s'"), fromp
->string
);
3096 build_mark_map_one(fromp
->util
, top
->util
);
3100 static struct object_entry
*parse_treeish_dataref(const char **p
)
3102 struct object_id oid
;
3103 struct object_entry
*e
;
3105 if (**p
== ':') { /* <mark> */
3106 e
= find_mark(marks
, parse_mark_ref_space(p
));
3108 die("Unknown mark: %s", command_buf
.buf
);
3109 oidcpy(&oid
, &e
->idx
.oid
);
3110 } else { /* <sha1> */
3111 if (parse_mapped_oid_hex(*p
, &oid
, p
))
3112 die("Invalid dataref: %s", command_buf
.buf
);
3113 e
= find_object(&oid
);
3115 die("Missing space after tree-ish: %s", command_buf
.buf
);
3118 while (!e
|| e
->type
!= OBJ_TREE
)
3119 e
= dereference(e
, &oid
);
3123 static void print_ls(int mode
, const unsigned char *hash
, const char *path
)
3125 static struct strbuf line
= STRBUF_INIT
;
3127 /* See show_tree(). */
3129 S_ISGITLINK(mode
) ? commit_type
:
3130 S_ISDIR(mode
) ? tree_type
:
3134 /* missing SP path LF */
3135 strbuf_reset(&line
);
3136 strbuf_addstr(&line
, "missing ");
3137 quote_c_style(path
, &line
, NULL
, 0);
3138 strbuf_addch(&line
, '\n');
3140 /* mode SP type SP object_name TAB path LF */
3141 strbuf_reset(&line
);
3142 strbuf_addf(&line
, "%06o %s %s\t",
3143 mode
& ~NO_DELTA
, type
, hash_to_hex(hash
));
3144 quote_c_style(path
, &line
, NULL
, 0);
3145 strbuf_addch(&line
, '\n');
3147 cat_blob_write(line
.buf
, line
.len
);
3150 static void parse_ls(const char *p
, struct branch
*b
)
3152 struct tree_entry
*root
= NULL
;
3153 struct tree_entry leaf
= {NULL
};
3155 /* ls SP (<tree-ish> SP)? <path> */
3158 die("Not in a commit: %s", command_buf
.buf
);
3159 root
= &b
->branch_tree
;
3161 struct object_entry
*e
= parse_treeish_dataref(&p
);
3162 root
= new_tree_entry();
3163 oidcpy(&root
->versions
[1].oid
, &e
->idx
.oid
);
3164 if (!is_null_oid(&root
->versions
[1].oid
))
3165 root
->versions
[1].mode
= S_IFDIR
;
3169 static struct strbuf uq
= STRBUF_INIT
;
3172 if (unquote_c_style(&uq
, p
, &endp
))
3173 die("Invalid path: %s", command_buf
.buf
);
3175 die("Garbage after path in: %s", command_buf
.buf
);
3178 tree_content_get(root
, p
, &leaf
, 1);
3180 * A directory in preparation would have a sha1 of zero
3181 * until it is saved. Save, for simplicity.
3183 if (S_ISDIR(leaf
.versions
[1].mode
))
3186 print_ls(leaf
.versions
[1].mode
, leaf
.versions
[1].oid
.hash
, p
);
3188 release_tree_content_recursive(leaf
.tree
);
3189 if (!b
|| root
!= &b
->branch_tree
)
3190 release_tree_entry(root
);
3193 static void checkpoint(void)
3195 checkpoint_requested
= 0;
3204 static void parse_checkpoint(void)
3206 checkpoint_requested
= 1;
3210 static void parse_progress(void)
3212 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
3213 fputc('\n', stdout
);
3218 static void parse_alias(void)
3220 struct object_entry
*e
;
3224 read_next_command();
3229 die(_("Expected 'mark' command, got %s"), command_buf
.buf
);
3232 memset(&b
, 0, sizeof(b
));
3233 if (!parse_objectish_with_prefix(&b
, "to "))
3234 die(_("Expected 'to' command, got %s"), command_buf
.buf
);
3235 e
= find_object(&b
.oid
);
3237 insert_mark(marks
, next_mark
, e
);
3240 static char* make_fast_import_path(const char *path
)
3242 if (!relative_marks_paths
|| is_absolute_path(path
))
3243 return xstrdup(path
);
3244 return git_pathdup("info/fast-import/%s", path
);
3247 static void option_import_marks(const char *marks
,
3248 int from_stream
, int ignore_missing
)
3250 if (import_marks_file
) {
3252 die("Only one import-marks command allowed per stream");
3254 /* read previous mark file */
3255 if(!import_marks_file_from_stream
)
3259 import_marks_file
= make_fast_import_path(marks
);
3260 import_marks_file_from_stream
= from_stream
;
3261 import_marks_file_ignore_missing
= ignore_missing
;
3264 static void option_date_format(const char *fmt
)
3266 if (!strcmp(fmt
, "raw"))
3267 whenspec
= WHENSPEC_RAW
;
3268 else if (!strcmp(fmt
, "raw-permissive"))
3269 whenspec
= WHENSPEC_RAW_PERMISSIVE
;
3270 else if (!strcmp(fmt
, "rfc2822"))
3271 whenspec
= WHENSPEC_RFC2822
;
3272 else if (!strcmp(fmt
, "now"))
3273 whenspec
= WHENSPEC_NOW
;
3275 die("unknown --date-format argument %s", fmt
);
3278 static unsigned long ulong_arg(const char *option
, const char *arg
)
3281 unsigned long rv
= strtoul(arg
, &endptr
, 0);
3282 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
3283 die("%s: argument must be a non-negative integer", option
);
3287 static void option_depth(const char *depth
)
3289 max_depth
= ulong_arg("--depth", depth
);
3290 if (max_depth
> MAX_DEPTH
)
3291 die("--depth cannot exceed %u", MAX_DEPTH
);
3294 static void option_active_branches(const char *branches
)
3296 max_active_branches
= ulong_arg("--active-branches", branches
);
3299 static void option_export_marks(const char *marks
)
3301 export_marks_file
= make_fast_import_path(marks
);
3304 static void option_cat_blob_fd(const char *fd
)
3306 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
3307 if (n
> (unsigned long) INT_MAX
)
3308 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
3309 cat_blob_fd
= (int) n
;
3312 static void option_export_pack_edges(const char *edges
)
3316 pack_edges
= xfopen(edges
, "a");
3319 static void option_rewrite_submodules(const char *arg
, struct string_list
*list
)
3321 struct mark_set
*ms
;
3323 char *s
= xstrdup(arg
);
3324 char *f
= strchr(s
, ':');
3326 die(_("Expected format name:filename for submodule rewrite option"));
3329 ms
= xcalloc(1, sizeof(*ms
));
3330 string_list_insert(list
, s
)->util
= ms
;
3334 die_errno("cannot read '%s'", f
);
3335 read_mark_file(ms
, fp
, insert_oid_entry
);
3339 static int parse_one_option(const char *option
)
3341 if (skip_prefix(option
, "max-pack-size=", &option
)) {
3343 if (!git_parse_ulong(option
, &v
))
3346 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
3348 } else if (v
< 1024 * 1024) {
3349 warning("minimum max-pack-size is 1 MiB");
3353 } else if (skip_prefix(option
, "big-file-threshold=", &option
)) {
3355 if (!git_parse_ulong(option
, &v
))
3357 big_file_threshold
= v
;
3358 } else if (skip_prefix(option
, "depth=", &option
)) {
3359 option_depth(option
);
3360 } else if (skip_prefix(option
, "active-branches=", &option
)) {
3361 option_active_branches(option
);
3362 } else if (skip_prefix(option
, "export-pack-edges=", &option
)) {
3363 option_export_pack_edges(option
);
3364 } else if (!strcmp(option
, "quiet")) {
3366 } else if (!strcmp(option
, "stats")) {
3368 } else if (!strcmp(option
, "allow-unsafe-features")) {
3369 ; /* already handled during early option parsing */
3377 static void check_unsafe_feature(const char *feature
, int from_stream
)
3379 if (from_stream
&& !allow_unsafe_features
)
3380 die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
3384 static int parse_one_feature(const char *feature
, int from_stream
)
3388 if (skip_prefix(feature
, "date-format=", &arg
)) {
3389 option_date_format(arg
);
3390 } else if (skip_prefix(feature
, "import-marks=", &arg
)) {
3391 check_unsafe_feature("import-marks", from_stream
);
3392 option_import_marks(arg
, from_stream
, 0);
3393 } else if (skip_prefix(feature
, "import-marks-if-exists=", &arg
)) {
3394 check_unsafe_feature("import-marks-if-exists", from_stream
);
3395 option_import_marks(arg
, from_stream
, 1);
3396 } else if (skip_prefix(feature
, "export-marks=", &arg
)) {
3397 check_unsafe_feature(feature
, from_stream
);
3398 option_export_marks(arg
);
3399 } else if (!strcmp(feature
, "alias")) {
3400 ; /* Don't die - this feature is supported */
3401 } else if (skip_prefix(feature
, "rewrite-submodules-to=", &arg
)) {
3402 option_rewrite_submodules(arg
, &sub_marks_to
);
3403 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3404 option_rewrite_submodules(arg
, &sub_marks_from
);
3405 } else if (skip_prefix(feature
, "rewrite-submodules-from=", &arg
)) {
3406 } else if (!strcmp(feature
, "get-mark")) {
3407 ; /* Don't die - this feature is supported */
3408 } else if (!strcmp(feature
, "cat-blob")) {
3409 ; /* Don't die - this feature is supported */
3410 } else if (!strcmp(feature
, "relative-marks")) {
3411 relative_marks_paths
= 1;
3412 } else if (!strcmp(feature
, "no-relative-marks")) {
3413 relative_marks_paths
= 0;
3414 } else if (!strcmp(feature
, "done")) {
3415 require_explicit_termination
= 1;
3416 } else if (!strcmp(feature
, "force")) {
3418 } else if (!strcmp(feature
, "notes") || !strcmp(feature
, "ls")) {
3419 ; /* do nothing; we have the feature */
3427 static void parse_feature(const char *feature
)
3429 if (seen_data_command
)
3430 die("Got feature command '%s' after data command", feature
);
3432 if (parse_one_feature(feature
, 1))
3435 die("This version of fast-import does not support feature %s.", feature
);
3438 static void parse_option(const char *option
)
3440 if (seen_data_command
)
3441 die("Got option command '%s' after data command", option
);
3443 if (parse_one_option(option
))
3446 die("This version of fast-import does not support option: %s", option
);
3449 static void git_pack_config(void)
3451 int indexversion_value
;
3453 unsigned long packsizelimit_value
;
3455 if (!git_config_get_ulong("pack.depth", &max_depth
)) {
3456 if (max_depth
> MAX_DEPTH
)
3457 max_depth
= MAX_DEPTH
;
3459 if (!git_config_get_int("pack.indexversion", &indexversion_value
)) {
3460 pack_idx_opts
.version
= indexversion_value
;
3461 if (pack_idx_opts
.version
> 2)
3462 git_die_config("pack.indexversion",
3463 "bad pack.indexversion=%"PRIu32
, pack_idx_opts
.version
);
3465 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value
))
3466 max_packsize
= packsizelimit_value
;
3468 if (!git_config_get_int("fastimport.unpacklimit", &limit
))
3469 unpack_limit
= limit
;
3470 else if (!git_config_get_int("transfer.unpacklimit", &limit
))
3471 unpack_limit
= limit
;
3473 git_config(git_default_config
, NULL
);
3476 static const char fast_import_usage
[] =
3477 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3479 static void parse_argv(void)
3483 for (i
= 1; i
< global_argc
; i
++) {
3484 const char *a
= global_argv
[i
];
3486 if (*a
!= '-' || !strcmp(a
, "--"))
3489 if (!skip_prefix(a
, "--", &a
))
3490 die("unknown option %s", a
);
3492 if (parse_one_option(a
))
3495 if (parse_one_feature(a
, 0))
3498 if (skip_prefix(a
, "cat-blob-fd=", &a
)) {
3499 option_cat_blob_fd(a
);
3503 die("unknown option --%s", a
);
3505 if (i
!= global_argc
)
3506 usage(fast_import_usage
);
3508 seen_data_command
= 1;
3509 if (import_marks_file
)
3511 build_mark_map(&sub_marks_from
, &sub_marks_to
);
3514 int cmd_main(int argc
, const char **argv
)
3518 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3519 usage(fast_import_usage
);
3521 setup_git_directory();
3522 reset_pack_idx_option(&pack_idx_opts
);
3525 alloc_objects(object_entry_alloc
);
3526 strbuf_init(&command_buf
, 0);
3527 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3528 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3529 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3530 marks
= mem_pool_calloc(&fi_mem_pool
, 1, sizeof(struct mark_set
));
3532 hashmap_init(&object_table
, object_entry_hashcmp
, NULL
, 0);
3535 * We don't parse most options until after we've seen the set of
3536 * "feature" lines at the start of the stream (which allows the command
3537 * line to override stream data). But we must do an early parse of any
3538 * command-line options that impact how we interpret the feature lines.
3540 for (i
= 1; i
< argc
; i
++) {
3541 const char *arg
= argv
[i
];
3542 if (*arg
!= '-' || !strcmp(arg
, "--"))
3544 if (!strcmp(arg
, "--allow-unsafe-features"))
3545 allow_unsafe_features
= 1;
3551 rc_free
= mem_pool_alloc(&fi_mem_pool
, cmd_save
* sizeof(*rc_free
));
3552 for (i
= 0; i
< (cmd_save
- 1); i
++)
3553 rc_free
[i
].next
= &rc_free
[i
+ 1];
3554 rc_free
[cmd_save
- 1].next
= NULL
;
3557 set_die_routine(die_nicely
);
3558 set_checkpoint_signal();
3559 while (read_next_command() != EOF
) {
3561 if (!strcmp("blob", command_buf
.buf
))
3563 else if (skip_prefix(command_buf
.buf
, "commit ", &v
))
3564 parse_new_commit(v
);
3565 else if (skip_prefix(command_buf
.buf
, "tag ", &v
))
3567 else if (skip_prefix(command_buf
.buf
, "reset ", &v
))
3568 parse_reset_branch(v
);
3569 else if (skip_prefix(command_buf
.buf
, "ls ", &v
))
3571 else if (skip_prefix(command_buf
.buf
, "cat-blob ", &v
))
3573 else if (skip_prefix(command_buf
.buf
, "get-mark ", &v
))
3575 else if (!strcmp("checkpoint", command_buf
.buf
))
3577 else if (!strcmp("done", command_buf
.buf
))
3579 else if (!strcmp("alias", command_buf
.buf
))
3581 else if (starts_with(command_buf
.buf
, "progress "))
3583 else if (skip_prefix(command_buf
.buf
, "feature ", &v
))
3585 else if (skip_prefix(command_buf
.buf
, "option git ", &v
))
3587 else if (starts_with(command_buf
.buf
, "option "))
3588 /* ignore non-git options*/;
3590 die("Unsupported command: %s", command_buf
.buf
);
3592 if (checkpoint_requested
)
3596 /* argv hasn't been parsed yet, do so */
3597 if (!seen_data_command
)
3600 if (require_explicit_termination
&& feof(stdin
))
3601 die("stream ends early");
3614 uintmax_t total_count
= 0, duplicate_count
= 0;
3615 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3616 total_count
+= object_count_by_type
[i
];
3617 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3618 duplicate_count
+= duplicate_count_by_type
[i
];
3620 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3621 fprintf(stderr
, "---------------------------------------------------------------------\n");
3622 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3623 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3624 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
]);
3625 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
]);
3626 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
]);
3627 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
]);
3628 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3629 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3630 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3631 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (tree_entry_allocd
+ fi_mem_pool
.pool_alloc
+ alloc_count
*sizeof(struct object_entry
))/1024);
3632 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd
+ fi_mem_pool
.pool_alloc
) /1024));
3633 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3634 fprintf(stderr
, "---------------------------------------------------------------------\n");
3636 fprintf(stderr
, "---------------------------------------------------------------------\n");
3637 fprintf(stderr
, "\n");
3640 return failure
? 1 : 0;