2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
31 file_change ::= file_clr
37 file_clr ::= 'deleteall' lf;
38 file_del ::= 'D' sp path_str lf;
39 file_rnm ::= 'R' sp path_str sp path_str lf;
40 file_cpy ::= 'C' sp path_str sp path_str lf;
41 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
42 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
44 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
45 note_inm ::= 'N' sp 'inline' sp committish lf
48 new_tag ::= 'tag' sp tag_str lf
49 'from' sp committish lf
50 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
54 reset_branch ::= 'reset' sp ref_str lf
55 ('from' sp committish lf)?
58 checkpoint ::= 'checkpoint' lf
61 progress ::= 'progress' sp not_lf* lf
64 # note: the first idnum in a stream should be 1 and subsequent
65 # idnums should not have gaps between values as this will cause
66 # the stream parser to reserve space for the gapped values. An
67 # idnum can be updated in the future to a new object by issuing
68 # a new mark directive with the old idnum.
70 mark ::= 'mark' sp idnum lf;
71 data ::= (delimited_data | exact_data)
74 # note: delim may be any string but must not contain lf.
75 # data_line may contain any data but must not be exactly
77 delimited_data ::= 'data' sp '<<' delim lf
81 # note: declen indicates the length of binary_data in bytes.
82 # declen does not include the lf preceding the binary data.
84 exact_data ::= 'data' sp declen lf
87 # note: quoted strings are C-style quoting supporting \c for
88 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
89 # is the signed byte value in octal. Note that the only
90 # characters which must actually be escaped to protect the
91 # stream formatting is: \, " and LF. Otherwise these values
94 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
96 sha1exp_str ::= sha1exp;
98 path_str ::= path | '"' quoted(path) '"' ;
99 mode ::= '100644' | '644'
104 declen ::= # unsigned 32 bit value, ascii base10 notation;
105 bigint ::= # unsigned integer value, ascii base10 notation;
106 binary_data ::= # file content, not interpreted;
108 when ::= raw_when | rfc2822_when;
109 raw_when ::= ts sp tz;
110 rfc2822_when ::= # Valid RFC 2822 date and time;
112 sp ::= # ASCII space character;
113 lf ::= # ASCII newline (LF) character;
115 # note: a colon (':') must precede the numerical value assigned to
116 # an idnum. This is to distinguish it from a ref or tag name as
117 # GIT does not permit ':' in ref or tag strings.
119 idnum ::= ':' bigint;
120 path ::= # GIT style file path, e.g. "a/b/c";
121 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
122 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
123 sha1exp ::= # Any valid GIT SHA1 expression;
124 hexsha1 ::= # SHA1 in hexadecimal format;
126 # note: name and email are UTF8 strings, however name must not
127 # contain '<' or lf and email must not contain any of the
128 # following: '<', '>', lf.
130 name ::= # valid GIT author/committer name;
131 email ::= # valid GIT author/committer email;
132 ts ::= # time since the epoch in seconds, ascii base10 notation;
133 tz ::= # GIT style timezone;
135 # note: comments and cat requests may appear anywhere
136 # in the input, except within a data command. Any form
137 # of the data command always escapes the related input
138 # from comment processing.
140 # In case it is not clear, the '#' that starts the comment
141 # must be the first character on that line (an lf
144 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
146 comment ::= '#' not_lf* lf;
147 not_lf ::= # Any byte that is not ASCII newline (LF);
159 #include "csum-file.h"
161 #include "exec_cmd.h"
164 #define PACK_ID_BITS 16
165 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
166 #define DEPTH_BITS 13
167 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
169 struct object_entry
{
170 struct pack_idx_entry idx
;
171 struct object_entry
*next
;
172 uint32_t type
: TYPE_BITS
,
173 pack_id
: PACK_ID_BITS
,
177 struct object_entry_pool
{
178 struct object_entry_pool
*next_pool
;
179 struct object_entry
*next_free
;
180 struct object_entry
*end
;
181 struct object_entry entries
[FLEX_ARRAY
]; /* more */
186 struct object_entry
*marked
[1024];
187 struct mark_set
*sets
[1024];
196 unsigned no_swap
: 1;
200 struct mem_pool
*next_pool
;
203 uintmax_t space
[FLEX_ARRAY
]; /* more */
207 struct atom_str
*next_atom
;
208 unsigned short str_len
;
209 char str_dat
[FLEX_ARRAY
]; /* more */
214 struct tree_content
*tree
;
215 struct atom_str
*name
;
216 struct tree_entry_ms
{
218 unsigned char sha1
[20];
222 struct tree_content
{
223 unsigned int entry_capacity
; /* must match avail_tree_content */
224 unsigned int entry_count
;
225 unsigned int delta_depth
;
226 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
229 struct avail_tree_content
{
230 unsigned int entry_capacity
; /* must match tree_content */
231 struct avail_tree_content
*next_avail
;
235 struct branch
*table_next_branch
;
236 struct branch
*active_next_branch
;
238 struct tree_entry branch_tree
;
239 uintmax_t last_commit
;
242 unsigned pack_id
: PACK_ID_BITS
;
243 unsigned char sha1
[20];
247 struct tag
*next_tag
;
249 unsigned int pack_id
;
250 unsigned char sha1
[20];
254 struct hash_list
*next
;
255 unsigned char sha1
[20];
264 struct recent_command
{
265 struct recent_command
*prev
;
266 struct recent_command
*next
;
270 /* Configured limits on output */
271 static unsigned long max_depth
= 10;
272 static off_t max_packsize
;
273 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
274 static int force_update
;
275 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
276 static int pack_compression_seen
;
278 /* Stats and misc. counters */
279 static uintmax_t alloc_count
;
280 static uintmax_t marks_set_count
;
281 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
282 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
283 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
284 static unsigned long object_count
;
285 static unsigned long branch_count
;
286 static unsigned long branch_load_count
;
288 static FILE *pack_edges
;
289 static unsigned int show_stats
= 1;
290 static int global_argc
;
291 static const char **global_argv
;
294 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
295 static size_t total_allocd
;
296 static struct mem_pool
*mem_pool
;
298 /* Atom management */
299 static unsigned int atom_table_sz
= 4451;
300 static unsigned int atom_cnt
;
301 static struct atom_str
**atom_table
;
303 /* The .pack file being generated */
304 static unsigned int pack_id
;
305 static struct sha1file
*pack_file
;
306 static struct packed_git
*pack_data
;
307 static struct packed_git
**all_packs
;
308 static off_t pack_size
;
310 /* Table of objects we've written. */
311 static unsigned int object_entry_alloc
= 5000;
312 static struct object_entry_pool
*blocks
;
313 static struct object_entry
*object_table
[1 << 16];
314 static struct mark_set
*marks
;
315 static const char *export_marks_file
;
316 static const char *import_marks_file
;
317 static int import_marks_file_from_stream
;
318 static int relative_marks_paths
;
321 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
323 /* Tree management */
324 static unsigned int tree_entry_alloc
= 1000;
325 static void *avail_tree_entry
;
326 static unsigned int avail_tree_table_sz
= 100;
327 static struct avail_tree_content
**avail_tree_table
;
328 static struct strbuf old_tree
= STRBUF_INIT
;
329 static struct strbuf new_tree
= STRBUF_INIT
;
332 static unsigned long max_active_branches
= 5;
333 static unsigned long cur_active_branches
;
334 static unsigned long branch_table_sz
= 1039;
335 static struct branch
**branch_table
;
336 static struct branch
*active_branches
;
339 static struct tag
*first_tag
;
340 static struct tag
*last_tag
;
342 /* Input stream parsing */
343 static whenspec_type whenspec
= WHENSPEC_RAW
;
344 static struct strbuf command_buf
= STRBUF_INIT
;
345 static int unread_command_buf
;
346 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
347 static struct recent_command
*cmd_tail
= &cmd_hist
;
348 static struct recent_command
*rc_free
;
349 static unsigned int cmd_save
= 100;
350 static uintmax_t next_mark
;
351 static struct strbuf new_data
= STRBUF_INIT
;
352 static int seen_data_command
;
354 /* Signal handling */
355 static volatile sig_atomic_t checkpoint_requested
;
357 /* Where to write output of cat-blob commands */
358 static int cat_blob_fd
= STDOUT_FILENO
;
360 static void parse_argv(void);
361 static void parse_cat_blob(void);
363 static void write_branch_report(FILE *rpt
, struct branch
*b
)
365 fprintf(rpt
, "%s:\n", b
->name
);
367 fprintf(rpt
, " status :");
369 fputs(" active", rpt
);
370 if (b
->branch_tree
.tree
)
371 fputs(" loaded", rpt
);
372 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
373 fputs(" dirty", rpt
);
376 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
377 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
378 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
379 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
381 fputs(" last pack : ", rpt
);
382 if (b
->pack_id
< MAX_PACK_ID
)
383 fprintf(rpt
, "%u", b
->pack_id
);
389 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
391 static void write_crash_report(const char *err
)
393 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
394 FILE *rpt
= fopen(loc
, "w");
397 struct recent_command
*rc
;
400 error("can't write crash report %s: %s", loc
, strerror(errno
));
404 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
406 fprintf(rpt
, "fast-import crash report:\n");
407 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
408 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
409 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
412 fputs("fatal: ", rpt
);
417 fputs("Most Recent Commands Before Crash\n", rpt
);
418 fputs("---------------------------------\n", rpt
);
419 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
420 if (rc
->next
== &cmd_hist
)
429 fputs("Active Branch LRU\n", rpt
);
430 fputs("-----------------\n", rpt
);
431 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
433 max_active_branches
);
435 fputs(" pos clock name\n", rpt
);
436 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
437 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
438 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
439 ++lu
, b
->last_commit
, b
->name
);
442 fputs("Inactive Branches\n", rpt
);
443 fputs("-----------------\n", rpt
);
444 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
445 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
446 write_branch_report(rpt
, b
);
452 fputs("Annotated Tags\n", rpt
);
453 fputs("--------------\n", rpt
);
454 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
455 fputs(sha1_to_hex(tg
->sha1
), rpt
);
457 fputs(tg
->name
, rpt
);
463 fputs("Marks\n", rpt
);
464 fputs("-----\n", rpt
);
465 if (export_marks_file
)
466 fprintf(rpt
, " exported to %s\n", export_marks_file
);
468 dump_marks_helper(rpt
, 0, marks
);
471 fputs("-------------------\n", rpt
);
472 fputs("END OF CRASH REPORT\n", rpt
);
476 static void end_packfile(void);
477 static void unkeep_all_packs(void);
478 static void dump_marks(void);
480 static NORETURN
void die_nicely(const char *err
, va_list params
)
483 char message
[2 * PATH_MAX
];
485 vsnprintf(message
, sizeof(message
), err
, params
);
486 fputs("fatal: ", stderr
);
487 fputs(message
, stderr
);
492 write_crash_report(message
);
500 #ifndef SIGUSR1 /* Windows, for example */
502 static void set_checkpoint_signal(void)
508 static void checkpoint_signal(int signo
)
510 checkpoint_requested
= 1;
513 static void set_checkpoint_signal(void)
517 memset(&sa
, 0, sizeof(sa
));
518 sa
.sa_handler
= checkpoint_signal
;
519 sigemptyset(&sa
.sa_mask
);
520 sa
.sa_flags
= SA_RESTART
;
521 sigaction(SIGUSR1
, &sa
, NULL
);
526 static void alloc_objects(unsigned int cnt
)
528 struct object_entry_pool
*b
;
530 b
= xmalloc(sizeof(struct object_entry_pool
)
531 + cnt
* sizeof(struct object_entry
));
532 b
->next_pool
= blocks
;
533 b
->next_free
= b
->entries
;
534 b
->end
= b
->entries
+ cnt
;
539 static struct object_entry
*new_object(unsigned char *sha1
)
541 struct object_entry
*e
;
543 if (blocks
->next_free
== blocks
->end
)
544 alloc_objects(object_entry_alloc
);
546 e
= blocks
->next_free
++;
547 hashcpy(e
->idx
.sha1
, sha1
);
551 static struct object_entry
*find_object(unsigned char *sha1
)
553 unsigned int h
= sha1
[0] << 8 | sha1
[1];
554 struct object_entry
*e
;
555 for (e
= object_table
[h
]; e
; e
= e
->next
)
556 if (!hashcmp(sha1
, e
->idx
.sha1
))
561 static struct object_entry
*insert_object(unsigned char *sha1
)
563 unsigned int h
= sha1
[0] << 8 | sha1
[1];
564 struct object_entry
*e
= object_table
[h
];
567 if (!hashcmp(sha1
, e
->idx
.sha1
))
572 e
= new_object(sha1
);
573 e
->next
= object_table
[h
];
579 static unsigned int hc_str(const char *s
, size_t len
)
587 static void *pool_alloc(size_t len
)
592 /* round up to a 'uintmax_t' alignment */
593 if (len
& (sizeof(uintmax_t) - 1))
594 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
596 for (p
= mem_pool
; p
; p
= p
->next_pool
)
597 if ((p
->end
- p
->next_free
>= len
))
601 if (len
>= (mem_pool_alloc
/2)) {
605 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
606 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
607 p
->next_pool
= mem_pool
;
608 p
->next_free
= (char *) p
->space
;
609 p
->end
= p
->next_free
+ mem_pool_alloc
;
618 static void *pool_calloc(size_t count
, size_t size
)
620 size_t len
= count
* size
;
621 void *r
= pool_alloc(len
);
626 static char *pool_strdup(const char *s
)
628 char *r
= pool_alloc(strlen(s
) + 1);
633 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
635 struct mark_set
*s
= marks
;
636 while ((idnum
>> s
->shift
) >= 1024) {
637 s
= pool_calloc(1, sizeof(struct mark_set
));
638 s
->shift
= marks
->shift
+ 10;
639 s
->data
.sets
[0] = marks
;
643 uintmax_t i
= idnum
>> s
->shift
;
644 idnum
-= i
<< s
->shift
;
645 if (!s
->data
.sets
[i
]) {
646 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
647 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
651 if (!s
->data
.marked
[idnum
])
653 s
->data
.marked
[idnum
] = oe
;
656 static struct object_entry
*find_mark(uintmax_t idnum
)
658 uintmax_t orig_idnum
= idnum
;
659 struct mark_set
*s
= marks
;
660 struct object_entry
*oe
= NULL
;
661 if ((idnum
>> s
->shift
) < 1024) {
662 while (s
&& s
->shift
) {
663 uintmax_t i
= idnum
>> s
->shift
;
664 idnum
-= i
<< s
->shift
;
668 oe
= s
->data
.marked
[idnum
];
671 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
675 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
677 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
680 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
681 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
684 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
686 strncpy(c
->str_dat
, s
, len
);
688 c
->next_atom
= atom_table
[hc
];
694 static struct branch
*lookup_branch(const char *name
)
696 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
699 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
700 if (!strcmp(name
, b
->name
))
705 static struct branch
*new_branch(const char *name
)
707 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
708 struct branch
*b
= lookup_branch(name
);
711 die("Invalid attempt to create duplicate branch: %s", name
);
712 switch (check_ref_format(name
)) {
713 case 0: break; /* its valid */
714 case CHECK_REF_FORMAT_ONELEVEL
:
715 break; /* valid, but too few '/', allow anyway */
717 die("Branch name doesn't conform to GIT standards: %s", name
);
720 b
= pool_calloc(1, sizeof(struct branch
));
721 b
->name
= pool_strdup(name
);
722 b
->table_next_branch
= branch_table
[hc
];
723 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
724 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
727 b
->pack_id
= MAX_PACK_ID
;
728 branch_table
[hc
] = b
;
733 static unsigned int hc_entries(unsigned int cnt
)
735 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
736 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
739 static struct tree_content
*new_tree_content(unsigned int cnt
)
741 struct avail_tree_content
*f
, *l
= NULL
;
742 struct tree_content
*t
;
743 unsigned int hc
= hc_entries(cnt
);
745 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
746 if (f
->entry_capacity
>= cnt
)
751 l
->next_avail
= f
->next_avail
;
753 avail_tree_table
[hc
] = f
->next_avail
;
755 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
756 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
757 f
->entry_capacity
= cnt
;
760 t
= (struct tree_content
*)f
;
766 static void release_tree_entry(struct tree_entry
*e
);
767 static void release_tree_content(struct tree_content
*t
)
769 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
770 unsigned int hc
= hc_entries(f
->entry_capacity
);
771 f
->next_avail
= avail_tree_table
[hc
];
772 avail_tree_table
[hc
] = f
;
775 static void release_tree_content_recursive(struct tree_content
*t
)
778 for (i
= 0; i
< t
->entry_count
; i
++)
779 release_tree_entry(t
->entries
[i
]);
780 release_tree_content(t
);
783 static struct tree_content
*grow_tree_content(
784 struct tree_content
*t
,
787 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
788 r
->entry_count
= t
->entry_count
;
789 r
->delta_depth
= t
->delta_depth
;
790 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
791 release_tree_content(t
);
795 static struct tree_entry
*new_tree_entry(void)
797 struct tree_entry
*e
;
799 if (!avail_tree_entry
) {
800 unsigned int n
= tree_entry_alloc
;
801 total_allocd
+= n
* sizeof(struct tree_entry
);
802 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
804 *((void**)e
) = e
+ 1;
810 e
= avail_tree_entry
;
811 avail_tree_entry
= *((void**)e
);
815 static void release_tree_entry(struct tree_entry
*e
)
818 release_tree_content_recursive(e
->tree
);
819 *((void**)e
) = avail_tree_entry
;
820 avail_tree_entry
= e
;
823 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
825 struct tree_content
*d
;
826 struct tree_entry
*a
, *b
;
831 d
= new_tree_content(s
->entry_count
);
832 for (i
= 0; i
< s
->entry_count
; i
++) {
834 b
= new_tree_entry();
835 memcpy(b
, a
, sizeof(*a
));
836 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
837 b
->tree
= dup_tree_content(a
->tree
);
842 d
->entry_count
= s
->entry_count
;
843 d
->delta_depth
= s
->delta_depth
;
848 static void start_packfile(void)
850 static char tmpfile
[PATH_MAX
];
851 struct packed_git
*p
;
852 struct pack_header hdr
;
855 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
856 "pack/tmp_pack_XXXXXX");
857 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
858 strcpy(p
->pack_name
, tmpfile
);
859 p
->pack_fd
= pack_fd
;
860 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
862 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
863 hdr
.hdr_version
= htonl(2);
865 sha1write(pack_file
, &hdr
, sizeof(hdr
));
868 pack_size
= sizeof(hdr
);
871 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
872 all_packs
[pack_id
] = p
;
875 static const char *create_index(void)
878 struct pack_idx_entry
**idx
, **c
, **last
;
879 struct object_entry
*e
;
880 struct object_entry_pool
*o
;
882 /* Build the table of object IDs. */
883 idx
= xmalloc(object_count
* sizeof(*idx
));
885 for (o
= blocks
; o
; o
= o
->next_pool
)
886 for (e
= o
->next_free
; e
-- != o
->entries
;)
887 if (pack_id
== e
->pack_id
)
889 last
= idx
+ object_count
;
891 die("internal consistency error creating the index");
893 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
898 static char *keep_pack(const char *curr_index_name
)
900 static char name
[PATH_MAX
];
901 static const char *keep_msg
= "fast-import";
904 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
906 die_errno("cannot create keep file");
907 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
909 die_errno("failed to write keep file");
911 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
912 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
913 if (move_temp_to_file(pack_data
->pack_name
, name
))
914 die("cannot store pack file");
916 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
917 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
918 if (move_temp_to_file(curr_index_name
, name
))
919 die("cannot store index file");
920 free((void *)curr_index_name
);
924 static void unkeep_all_packs(void)
926 static char name
[PATH_MAX
];
929 for (k
= 0; k
< pack_id
; k
++) {
930 struct packed_git
*p
= all_packs
[k
];
931 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
932 get_object_directory(), sha1_to_hex(p
->sha1
));
933 unlink_or_warn(name
);
937 static void end_packfile(void)
939 struct packed_git
*old_p
= pack_data
, *new_p
;
941 clear_delta_base_cache();
943 unsigned char cur_pack_sha1
[20];
949 close_pack_windows(pack_data
);
950 sha1close(pack_file
, cur_pack_sha1
, 0);
951 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
952 pack_data
->pack_name
, object_count
,
953 cur_pack_sha1
, pack_size
);
954 close(pack_data
->pack_fd
);
955 idx_name
= keep_pack(create_index());
957 /* Register the packfile with core git's machinery. */
958 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
960 die("core git rejected index %s", idx_name
);
961 all_packs
[pack_id
] = new_p
;
962 install_packed_git(new_p
);
964 /* Print the boundary */
966 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
967 for (i
= 0; i
< branch_table_sz
; i
++) {
968 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
969 if (b
->pack_id
== pack_id
)
970 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
973 for (t
= first_tag
; t
; t
= t
->next_tag
) {
974 if (t
->pack_id
== pack_id
)
975 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
977 fputc('\n', pack_edges
);
984 close(old_p
->pack_fd
);
985 unlink_or_warn(old_p
->pack_name
);
989 /* We can't carry a delta across packfiles. */
990 strbuf_release(&last_blob
.data
);
991 last_blob
.offset
= 0;
995 static void cycle_packfile(void)
1001 static int store_object(
1002 enum object_type type
,
1004 struct last_object
*last
,
1005 unsigned char *sha1out
,
1009 struct object_entry
*e
;
1010 unsigned char hdr
[96];
1011 unsigned char sha1
[20];
1012 unsigned long hdrlen
, deltalen
;
1016 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1017 (unsigned long)dat
->len
) + 1;
1019 git_SHA1_Update(&c
, hdr
, hdrlen
);
1020 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1021 git_SHA1_Final(sha1
, &c
);
1023 hashcpy(sha1out
, sha1
);
1025 e
= insert_object(sha1
);
1027 insert_mark(mark
, e
);
1028 if (e
->idx
.offset
) {
1029 duplicate_count_by_type
[type
]++;
1031 } else if (find_sha1_pack(sha1
, packed_git
)) {
1033 e
->pack_id
= MAX_PACK_ID
;
1034 e
->idx
.offset
= 1; /* just not zero! */
1035 duplicate_count_by_type
[type
]++;
1039 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1040 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1042 &deltalen
, dat
->len
- 20);
1046 memset(&s
, 0, sizeof(s
));
1047 deflateInit(&s
, pack_compression_level
);
1050 s
.avail_in
= deltalen
;
1052 s
.next_in
= (void *)dat
->buf
;
1053 s
.avail_in
= dat
->len
;
1055 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1056 s
.next_out
= out
= xmalloc(s
.avail_out
);
1057 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1061 /* Determine if we should auto-checkpoint. */
1062 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1063 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1065 /* This new object needs to *not* have the current pack_id. */
1066 e
->pack_id
= pack_id
+ 1;
1069 /* We cannot carry a delta into the new pack. */
1074 memset(&s
, 0, sizeof(s
));
1075 deflateInit(&s
, pack_compression_level
);
1076 s
.next_in
= (void *)dat
->buf
;
1077 s
.avail_in
= dat
->len
;
1078 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1079 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1080 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1087 e
->pack_id
= pack_id
;
1088 e
->idx
.offset
= pack_size
;
1090 object_count_by_type
[type
]++;
1092 crc32_begin(pack_file
);
1095 off_t ofs
= e
->idx
.offset
- last
->offset
;
1096 unsigned pos
= sizeof(hdr
) - 1;
1098 delta_count_by_type
[type
]++;
1099 e
->depth
= last
->depth
+ 1;
1101 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1102 sha1write(pack_file
, hdr
, hdrlen
);
1103 pack_size
+= hdrlen
;
1105 hdr
[pos
] = ofs
& 127;
1107 hdr
[--pos
] = 128 | (--ofs
& 127);
1108 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1109 pack_size
+= sizeof(hdr
) - pos
;
1112 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1113 sha1write(pack_file
, hdr
, hdrlen
);
1114 pack_size
+= hdrlen
;
1117 sha1write(pack_file
, out
, s
.total_out
);
1118 pack_size
+= s
.total_out
;
1120 e
->idx
.crc32
= crc32_end(pack_file
);
1125 if (last
->no_swap
) {
1128 strbuf_swap(&last
->data
, dat
);
1130 last
->offset
= e
->idx
.offset
;
1131 last
->depth
= e
->depth
;
1136 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1138 if (ftruncate(pack_data
->pack_fd
, to
)
1139 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1140 die_errno("cannot truncate pack to skip duplicate");
1143 /* yes this is a layering violation */
1144 pack_file
->total
= to
;
1145 pack_file
->offset
= 0;
1146 pack_file
->ctx
= *ctx
;
1149 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1151 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1152 unsigned char *in_buf
= xmalloc(in_sz
);
1153 unsigned char *out_buf
= xmalloc(out_sz
);
1154 struct object_entry
*e
;
1155 unsigned char sha1
[20];
1156 unsigned long hdrlen
;
1159 git_SHA_CTX pack_file_ctx
;
1163 /* Determine if we should auto-checkpoint. */
1164 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1165 || (pack_size
+ 60 + len
) < pack_size
)
1170 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1171 sha1flush(pack_file
);
1172 pack_file_ctx
= pack_file
->ctx
;
1174 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1175 if (out_sz
<= hdrlen
)
1176 die("impossibly large object header");
1179 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1181 crc32_begin(pack_file
);
1183 memset(&s
, 0, sizeof(s
));
1184 deflateInit(&s
, pack_compression_level
);
1186 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1187 if (out_sz
<= hdrlen
)
1188 die("impossibly large object header");
1190 s
.next_out
= out_buf
+ hdrlen
;
1191 s
.avail_out
= out_sz
- hdrlen
;
1193 while (status
!= Z_STREAM_END
) {
1194 if (0 < len
&& !s
.avail_in
) {
1195 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1196 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1197 if (!n
&& feof(stdin
))
1198 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1200 git_SHA1_Update(&c
, in_buf
, n
);
1206 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1208 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1209 size_t n
= s
.next_out
- out_buf
;
1210 sha1write(pack_file
, out_buf
, n
);
1212 s
.next_out
= out_buf
;
1213 s
.avail_out
= out_sz
;
1222 die("unexpected deflate failure: %d", status
);
1226 git_SHA1_Final(sha1
, &c
);
1229 hashcpy(sha1out
, sha1
);
1231 e
= insert_object(sha1
);
1234 insert_mark(mark
, e
);
1236 if (e
->idx
.offset
) {
1237 duplicate_count_by_type
[OBJ_BLOB
]++;
1238 truncate_pack(offset
, &pack_file_ctx
);
1240 } else if (find_sha1_pack(sha1
, packed_git
)) {
1242 e
->pack_id
= MAX_PACK_ID
;
1243 e
->idx
.offset
= 1; /* just not zero! */
1244 duplicate_count_by_type
[OBJ_BLOB
]++;
1245 truncate_pack(offset
, &pack_file_ctx
);
1250 e
->pack_id
= pack_id
;
1251 e
->idx
.offset
= offset
;
1252 e
->idx
.crc32
= crc32_end(pack_file
);
1254 object_count_by_type
[OBJ_BLOB
]++;
1261 /* All calls must be guarded by find_object() or find_mark() to
1262 * ensure the 'struct object_entry' passed was written by this
1263 * process instance. We unpack the entry by the offset, avoiding
1264 * the need for the corresponding .idx file. This unpacking rule
1265 * works because we only use OBJ_REF_DELTA within the packfiles
1266 * created by fast-import.
1268 * oe must not be NULL. Such an oe usually comes from giving
1269 * an unknown SHA-1 to find_object() or an undefined mark to
1270 * find_mark(). Callers must test for this condition and use
1271 * the standard read_sha1_file() when it happens.
1273 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1274 * find_mark(), where the mark was reloaded from an existing marks
1275 * file and is referencing an object that this fast-import process
1276 * instance did not write out to a packfile. Callers must test for
1277 * this condition and use read_sha1_file() instead.
1279 static void *gfi_unpack_entry(
1280 struct object_entry
*oe
,
1281 unsigned long *sizep
)
1283 enum object_type type
;
1284 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1285 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1286 /* The object is stored in the packfile we are writing to
1287 * and we have modified it since the last time we scanned
1288 * back to read a previously written object. If an old
1289 * window covered [p->pack_size, p->pack_size + 20) its
1290 * data is stale and is not valid. Closing all windows
1291 * and updating the packfile length ensures we can read
1292 * the newly written data.
1294 close_pack_windows(p
);
1295 sha1flush(pack_file
);
1297 /* We have to offer 20 bytes additional on the end of
1298 * the packfile as the core unpacker code assumes the
1299 * footer is present at the file end and must promise
1300 * at least 20 bytes within any window it maps. But
1301 * we don't actually create the footer here.
1303 p
->pack_size
= pack_size
+ 20;
1305 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1308 static const char *get_mode(const char *str
, uint16_t *modep
)
1313 while ((c
= *str
++) != ' ') {
1314 if (c
< '0' || c
> '7')
1316 mode
= (mode
<< 3) + (c
- '0');
1322 static void load_tree(struct tree_entry
*root
)
1324 unsigned char *sha1
= root
->versions
[1].sha1
;
1325 struct object_entry
*myoe
;
1326 struct tree_content
*t
;
1331 root
->tree
= t
= new_tree_content(8);
1332 if (is_null_sha1(sha1
))
1335 myoe
= find_object(sha1
);
1336 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1337 if (myoe
->type
!= OBJ_TREE
)
1338 die("Not a tree: %s", sha1_to_hex(sha1
));
1339 t
->delta_depth
= myoe
->depth
;
1340 buf
= gfi_unpack_entry(myoe
, &size
);
1342 die("Can't load tree %s", sha1_to_hex(sha1
));
1344 enum object_type type
;
1345 buf
= read_sha1_file(sha1
, &type
, &size
);
1346 if (!buf
|| type
!= OBJ_TREE
)
1347 die("Can't load tree %s", sha1_to_hex(sha1
));
1351 while (c
!= (buf
+ size
)) {
1352 struct tree_entry
*e
= new_tree_entry();
1354 if (t
->entry_count
== t
->entry_capacity
)
1355 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1356 t
->entries
[t
->entry_count
++] = e
;
1359 c
= get_mode(c
, &e
->versions
[1].mode
);
1361 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1362 e
->versions
[0].mode
= e
->versions
[1].mode
;
1363 e
->name
= to_atom(c
, strlen(c
));
1364 c
+= e
->name
->str_len
+ 1;
1365 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1366 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1372 static int tecmp0 (const void *_a
, const void *_b
)
1374 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1375 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1376 return base_name_compare(
1377 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1378 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1381 static int tecmp1 (const void *_a
, const void *_b
)
1383 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1384 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1385 return base_name_compare(
1386 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1387 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1390 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1396 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1398 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1400 for (i
= 0; i
< t
->entry_count
; i
++) {
1401 if (t
->entries
[i
]->versions
[v
].mode
)
1402 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1406 strbuf_grow(b
, maxlen
);
1407 for (i
= 0; i
< t
->entry_count
; i
++) {
1408 struct tree_entry
*e
= t
->entries
[i
];
1409 if (!e
->versions
[v
].mode
)
1411 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1412 e
->name
->str_dat
, '\0');
1413 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1417 static void store_tree(struct tree_entry
*root
)
1419 struct tree_content
*t
= root
->tree
;
1420 unsigned int i
, j
, del
;
1421 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1422 struct object_entry
*le
;
1424 if (!is_null_sha1(root
->versions
[1].sha1
))
1427 for (i
= 0; i
< t
->entry_count
; i
++) {
1428 if (t
->entries
[i
]->tree
)
1429 store_tree(t
->entries
[i
]);
1432 le
= find_object(root
->versions
[0].sha1
);
1433 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1434 mktree(t
, 0, &old_tree
);
1436 lo
.offset
= le
->idx
.offset
;
1437 lo
.depth
= t
->delta_depth
;
1440 mktree(t
, 1, &new_tree
);
1441 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1443 t
->delta_depth
= lo
.depth
;
1444 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1445 struct tree_entry
*e
= t
->entries
[i
];
1446 if (e
->versions
[1].mode
) {
1447 e
->versions
[0].mode
= e
->versions
[1].mode
;
1448 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1449 t
->entries
[j
++] = e
;
1451 release_tree_entry(e
);
1455 t
->entry_count
-= del
;
1458 static void tree_content_replace(
1459 struct tree_entry
*root
,
1460 const unsigned char *sha1
,
1461 const uint16_t mode
,
1462 struct tree_content
*newtree
)
1465 die("Root cannot be a non-directory");
1466 hashcpy(root
->versions
[1].sha1
, sha1
);
1468 release_tree_content_recursive(root
->tree
);
1469 root
->tree
= newtree
;
1472 static int tree_content_set(
1473 struct tree_entry
*root
,
1475 const unsigned char *sha1
,
1476 const uint16_t mode
,
1477 struct tree_content
*subtree
)
1479 struct tree_content
*t
;
1482 struct tree_entry
*e
;
1484 slash1
= strchr(p
, '/');
1490 die("Empty path component found in input");
1491 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1492 die("Non-directories cannot have subtrees");
1497 for (i
= 0; i
< t
->entry_count
; i
++) {
1499 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1502 && e
->versions
[1].mode
== mode
1503 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1505 e
->versions
[1].mode
= mode
;
1506 hashcpy(e
->versions
[1].sha1
, sha1
);
1508 release_tree_content_recursive(e
->tree
);
1510 hashclr(root
->versions
[1].sha1
);
1513 if (!S_ISDIR(e
->versions
[1].mode
)) {
1514 e
->tree
= new_tree_content(8);
1515 e
->versions
[1].mode
= S_IFDIR
;
1519 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1520 hashclr(root
->versions
[1].sha1
);
1527 if (t
->entry_count
== t
->entry_capacity
)
1528 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1529 e
= new_tree_entry();
1530 e
->name
= to_atom(p
, n
);
1531 e
->versions
[0].mode
= 0;
1532 hashclr(e
->versions
[0].sha1
);
1533 t
->entries
[t
->entry_count
++] = e
;
1535 e
->tree
= new_tree_content(8);
1536 e
->versions
[1].mode
= S_IFDIR
;
1537 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1540 e
->versions
[1].mode
= mode
;
1541 hashcpy(e
->versions
[1].sha1
, sha1
);
1543 hashclr(root
->versions
[1].sha1
);
1547 static int tree_content_remove(
1548 struct tree_entry
*root
,
1550 struct tree_entry
*backup_leaf
)
1552 struct tree_content
*t
;
1555 struct tree_entry
*e
;
1557 slash1
= strchr(p
, '/');
1566 for (i
= 0; i
< t
->entry_count
; i
++) {
1568 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1569 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1571 * If p names a file in some subdirectory, and a
1572 * file or symlink matching the name of the
1573 * parent directory of p exists, then p cannot
1574 * exist and need not be deleted.
1577 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1581 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1582 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1583 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1584 hashclr(root
->versions
[1].sha1
);
1598 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1600 release_tree_content_recursive(e
->tree
);
1602 e
->versions
[1].mode
= 0;
1603 hashclr(e
->versions
[1].sha1
);
1604 hashclr(root
->versions
[1].sha1
);
1608 static int tree_content_get(
1609 struct tree_entry
*root
,
1611 struct tree_entry
*leaf
)
1613 struct tree_content
*t
;
1616 struct tree_entry
*e
;
1618 slash1
= strchr(p
, '/');
1627 for (i
= 0; i
< t
->entry_count
; i
++) {
1629 if (e
->name
->str_len
== n
&& !strncmp_icase(p
, e
->name
->str_dat
, n
)) {
1631 memcpy(leaf
, e
, sizeof(*leaf
));
1632 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1633 leaf
->tree
= dup_tree_content(e
->tree
);
1638 if (!S_ISDIR(e
->versions
[1].mode
))
1642 return tree_content_get(e
, slash1
+ 1, leaf
);
1648 static int update_branch(struct branch
*b
)
1650 static const char *msg
= "fast-import";
1651 struct ref_lock
*lock
;
1652 unsigned char old_sha1
[20];
1654 if (is_null_sha1(b
->sha1
))
1656 if (read_ref(b
->name
, old_sha1
))
1658 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1660 return error("Unable to lock %s", b
->name
);
1661 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1662 struct commit
*old_cmit
, *new_cmit
;
1664 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1665 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1666 if (!old_cmit
|| !new_cmit
) {
1668 return error("Branch %s is missing commits.", b
->name
);
1671 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1673 warning("Not updating %s"
1674 " (new tip %s does not contain %s)",
1675 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1679 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1680 return error("Unable to update %s", b
->name
);
1684 static void dump_branches(void)
1689 for (i
= 0; i
< branch_table_sz
; i
++) {
1690 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1691 failure
|= update_branch(b
);
1695 static void dump_tags(void)
1697 static const char *msg
= "fast-import";
1699 struct ref_lock
*lock
;
1700 char ref_name
[PATH_MAX
];
1702 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1703 sprintf(ref_name
, "tags/%s", t
->name
);
1704 lock
= lock_ref_sha1(ref_name
, NULL
);
1705 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1706 failure
|= error("Unable to update %s", ref_name
);
1710 static void dump_marks_helper(FILE *f
,
1716 for (k
= 0; k
< 1024; k
++) {
1717 if (m
->data
.sets
[k
])
1718 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1722 for (k
= 0; k
< 1024; k
++) {
1723 if (m
->data
.marked
[k
])
1724 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1725 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1730 static void dump_marks(void)
1732 static struct lock_file mark_lock
;
1736 if (!export_marks_file
)
1739 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1741 failure
|= error("Unable to write marks file %s: %s",
1742 export_marks_file
, strerror(errno
));
1746 f
= fdopen(mark_fd
, "w");
1748 int saved_errno
= errno
;
1749 rollback_lock_file(&mark_lock
);
1750 failure
|= error("Unable to write marks file %s: %s",
1751 export_marks_file
, strerror(saved_errno
));
1756 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1757 * Assign -1 to the lock file descriptor so that commit_lock_file()
1758 * won't try to close() it.
1762 dump_marks_helper(f
, 0, marks
);
1763 if (ferror(f
) || fclose(f
)) {
1764 int saved_errno
= errno
;
1765 rollback_lock_file(&mark_lock
);
1766 failure
|= error("Unable to write marks file %s: %s",
1767 export_marks_file
, strerror(saved_errno
));
1771 if (commit_lock_file(&mark_lock
)) {
1772 int saved_errno
= errno
;
1773 rollback_lock_file(&mark_lock
);
1774 failure
|= error("Unable to commit marks file %s: %s",
1775 export_marks_file
, strerror(saved_errno
));
1780 static void read_marks(void)
1783 FILE *f
= fopen(import_marks_file
, "r");
1785 die_errno("cannot read '%s'", import_marks_file
);
1786 while (fgets(line
, sizeof(line
), f
)) {
1789 unsigned char sha1
[20];
1790 struct object_entry
*e
;
1792 end
= strchr(line
, '\n');
1793 if (line
[0] != ':' || !end
)
1794 die("corrupt mark line: %s", line
);
1796 mark
= strtoumax(line
+ 1, &end
, 10);
1797 if (!mark
|| end
== line
+ 1
1798 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1799 die("corrupt mark line: %s", line
);
1800 e
= find_object(sha1
);
1802 enum object_type type
= sha1_object_info(sha1
, NULL
);
1804 die("object not found: %s", sha1_to_hex(sha1
));
1805 e
= insert_object(sha1
);
1807 e
->pack_id
= MAX_PACK_ID
;
1808 e
->idx
.offset
= 1; /* just not zero! */
1810 insert_mark(mark
, e
);
1816 static int read_next_command(void)
1818 static int stdin_eof
= 0;
1821 unread_command_buf
= 0;
1826 if (unread_command_buf
) {
1827 unread_command_buf
= 0;
1829 struct recent_command
*rc
;
1831 strbuf_detach(&command_buf
, NULL
);
1832 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1836 if (!seen_data_command
1837 && prefixcmp(command_buf
.buf
, "feature ")
1838 && prefixcmp(command_buf
.buf
, "option ")) {
1847 cmd_hist
.next
= rc
->next
;
1848 cmd_hist
.next
->prev
= &cmd_hist
;
1852 rc
->buf
= command_buf
.buf
;
1853 rc
->prev
= cmd_tail
;
1854 rc
->next
= cmd_hist
.prev
;
1855 rc
->prev
->next
= rc
;
1858 if (!prefixcmp(command_buf
.buf
, "cat-blob ")) {
1862 if (command_buf
.buf
[0] == '#')
1868 static void skip_optional_lf(void)
1870 int term_char
= fgetc(stdin
);
1871 if (term_char
!= '\n' && term_char
!= EOF
)
1872 ungetc(term_char
, stdin
);
1875 static void parse_mark(void)
1877 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1878 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1879 read_next_command();
1885 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1889 if (prefixcmp(command_buf
.buf
, "data "))
1890 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1892 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1893 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1894 size_t term_len
= command_buf
.len
- 5 - 2;
1896 strbuf_detach(&command_buf
, NULL
);
1898 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1899 die("EOF in data (terminator '%s' not found)", term
);
1900 if (term_len
== command_buf
.len
1901 && !strcmp(term
, command_buf
.buf
))
1903 strbuf_addbuf(sb
, &command_buf
);
1904 strbuf_addch(sb
, '\n');
1909 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1910 size_t n
= 0, length
= (size_t)len
;
1912 if (limit
&& limit
< len
) {
1917 die("data is too large to use in this context");
1919 while (n
< length
) {
1920 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1921 if (!s
&& feof(stdin
))
1922 die("EOF in data (%lu bytes remaining)",
1923 (unsigned long)(length
- n
));
1932 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1934 const char *orig_src
= src
;
1940 num
= strtoul(src
, &endp
, 10);
1941 /* NEEDSWORK: perhaps check for reasonable values? */
1942 if (errno
|| endp
== src
|| *endp
!= ' ')
1946 if (*src
!= '-' && *src
!= '+')
1949 num
= strtoul(src
+ 1, &endp
, 10);
1950 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1954 strcpy(result
, orig_src
);
1958 static char *parse_ident(const char *buf
)
1964 gt
= strrchr(buf
, '>');
1966 die("Missing > in ident string: %s", buf
);
1969 die("Missing space after > in ident string: %s", buf
);
1971 name_len
= gt
- buf
;
1972 ident
= xmalloc(name_len
+ 24);
1973 strncpy(ident
, buf
, name_len
);
1977 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1978 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1980 case WHENSPEC_RFC2822
:
1981 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1982 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1985 if (strcmp("now", gt
))
1986 die("Date in ident must be 'now': %s", buf
);
1987 datestamp(ident
+ name_len
, 24);
1994 static void parse_and_store_blob(
1995 struct last_object
*last
,
1996 unsigned char *sha1out
,
1999 static struct strbuf buf
= STRBUF_INIT
;
2002 if (parse_data(&buf
, big_file_threshold
, &len
))
2003 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
2006 strbuf_release(&last
->data
);
2010 stream_blob(len
, sha1out
, mark
);
2015 static void parse_new_blob(void)
2017 read_next_command();
2019 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2022 static void unload_one_branch(void)
2024 while (cur_active_branches
2025 && cur_active_branches
>= max_active_branches
) {
2026 uintmax_t min_commit
= ULONG_MAX
;
2027 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2029 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2030 if (e
->last_commit
< min_commit
) {
2032 min_commit
= e
->last_commit
;
2038 e
= p
->active_next_branch
;
2039 p
->active_next_branch
= e
->active_next_branch
;
2041 e
= active_branches
;
2042 active_branches
= e
->active_next_branch
;
2045 e
->active_next_branch
= NULL
;
2046 if (e
->branch_tree
.tree
) {
2047 release_tree_content_recursive(e
->branch_tree
.tree
);
2048 e
->branch_tree
.tree
= NULL
;
2050 cur_active_branches
--;
2054 static void load_branch(struct branch
*b
)
2056 load_tree(&b
->branch_tree
);
2059 b
->active_next_branch
= active_branches
;
2060 active_branches
= b
;
2061 cur_active_branches
++;
2062 branch_load_count
++;
2066 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2068 unsigned char fanout
= 0;
2069 while ((num_notes
>>= 8))
2074 static void construct_path_with_fanout(const char *hex_sha1
,
2075 unsigned char fanout
, char *path
)
2077 unsigned int i
= 0, j
= 0;
2079 die("Too large fanout (%u)", fanout
);
2081 path
[i
++] = hex_sha1
[j
++];
2082 path
[i
++] = hex_sha1
[j
++];
2086 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2087 path
[i
+ 40 - j
] = '\0';
2090 static uintmax_t do_change_note_fanout(
2091 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2092 char *hex_sha1
, unsigned int hex_sha1_len
,
2093 char *fullpath
, unsigned int fullpath_len
,
2094 unsigned char fanout
)
2096 struct tree_content
*t
= root
->tree
;
2097 struct tree_entry
*e
, leaf
;
2098 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2099 uintmax_t num_notes
= 0;
2100 unsigned char sha1
[20];
2103 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2105 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2106 tmp_fullpath_len
= fullpath_len
;
2109 * We're interested in EITHER existing note entries (entries
2110 * with exactly 40 hex chars in path, not including directory
2111 * separators), OR directory entries that may contain note
2112 * entries (with < 40 hex chars in path).
2113 * Also, each path component in a note entry must be a multiple
2116 if (!e
->versions
[1].mode
||
2117 tmp_hex_sha1_len
> 40 ||
2118 e
->name
->str_len
% 2)
2121 /* This _may_ be a note entry, or a subdir containing notes */
2122 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2124 if (tmp_fullpath_len
)
2125 fullpath
[tmp_fullpath_len
++] = '/';
2126 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2128 tmp_fullpath_len
+= e
->name
->str_len
;
2129 fullpath
[tmp_fullpath_len
] = '\0';
2131 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2132 /* This is a note entry */
2133 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2134 if (!strcmp(fullpath
, realpath
)) {
2135 /* Note entry is in correct location */
2140 /* Rename fullpath to realpath */
2141 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2142 die("Failed to remove path %s", fullpath
);
2143 tree_content_set(orig_root
, realpath
,
2144 leaf
.versions
[1].sha1
,
2145 leaf
.versions
[1].mode
,
2147 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2148 /* This is a subdir that may contain note entries */
2151 num_notes
+= do_change_note_fanout(orig_root
, e
,
2152 hex_sha1
, tmp_hex_sha1_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
)
2165 char hex_sha1
[40], path
[60];
2166 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2169 static void file_change_m(struct branch
*b
)
2171 const char *p
= command_buf
.buf
+ 2;
2172 static struct strbuf uq
= STRBUF_INIT
;
2174 struct object_entry
*oe
= oe
;
2175 unsigned char sha1
[20];
2176 uint16_t mode
, inline_data
= 0;
2178 p
= get_mode(p
, &mode
);
2180 die("Corrupt mode: %s", command_buf
.buf
);
2185 case S_IFREG
| 0644:
2186 case S_IFREG
| 0755:
2193 die("Corrupt mode: %s", command_buf
.buf
);
2198 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2199 hashcpy(sha1
, oe
->idx
.sha1
);
2201 } else if (!prefixcmp(p
, "inline")) {
2205 if (get_sha1_hex(p
, sha1
))
2206 die("Invalid SHA1: %s", command_buf
.buf
);
2207 oe
= find_object(sha1
);
2211 die("Missing space after SHA1: %s", command_buf
.buf
);
2214 if (!unquote_c_style(&uq
, p
, &endp
)) {
2216 die("Garbage after path in: %s", command_buf
.buf
);
2220 /* Git does not track empty, non-toplevel directories. */
2221 if (S_ISDIR(mode
) && !memcmp(sha1
, EMPTY_TREE_SHA1_BIN
, 20) && *p
) {
2222 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2226 if (S_ISGITLINK(mode
)) {
2228 die("Git links cannot be specified 'inline': %s",
2231 if (oe
->type
!= OBJ_COMMIT
)
2232 die("Not a commit (actually a %s): %s",
2233 typename(oe
->type
), command_buf
.buf
);
2236 * Accept the sha1 without checking; it expected to be in
2237 * another repository.
2239 } else if (inline_data
) {
2241 die("Directories cannot be specified 'inline': %s",
2244 strbuf_addstr(&uq
, p
);
2247 read_next_command();
2248 parse_and_store_blob(&last_blob
, sha1
, 0);
2250 enum object_type expected
= S_ISDIR(mode
) ?
2252 enum object_type type
= oe
? oe
->type
:
2253 sha1_object_info(sha1
, NULL
);
2255 die("%s not found: %s",
2256 S_ISDIR(mode
) ? "Tree" : "Blob",
2258 if (type
!= expected
)
2259 die("Not a %s (actually a %s): %s",
2260 typename(expected
), typename(type
),
2265 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
2268 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2271 static void file_change_d(struct branch
*b
)
2273 const char *p
= command_buf
.buf
+ 2;
2274 static struct strbuf uq
= STRBUF_INIT
;
2278 if (!unquote_c_style(&uq
, p
, &endp
)) {
2280 die("Garbage after path in: %s", command_buf
.buf
);
2283 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2286 static void file_change_cr(struct branch
*b
, int rename
)
2289 static struct strbuf s_uq
= STRBUF_INIT
;
2290 static struct strbuf d_uq
= STRBUF_INIT
;
2292 struct tree_entry leaf
;
2294 s
= command_buf
.buf
+ 2;
2295 strbuf_reset(&s_uq
);
2296 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2298 die("Missing space after source: %s", command_buf
.buf
);
2300 endp
= strchr(s
, ' ');
2302 die("Missing space after source: %s", command_buf
.buf
);
2303 strbuf_add(&s_uq
, s
, endp
- s
);
2309 die("Missing dest: %s", command_buf
.buf
);
2312 strbuf_reset(&d_uq
);
2313 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2315 die("Garbage after dest in: %s", command_buf
.buf
);
2319 memset(&leaf
, 0, sizeof(leaf
));
2321 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2323 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2324 if (!leaf
.versions
[1].mode
)
2325 die("Path %s not in branch", s
);
2326 if (!*d
) { /* C "path/to/subdir" "" */
2327 tree_content_replace(&b
->branch_tree
,
2328 leaf
.versions
[1].sha1
,
2329 leaf
.versions
[1].mode
,
2333 tree_content_set(&b
->branch_tree
, d
,
2334 leaf
.versions
[1].sha1
,
2335 leaf
.versions
[1].mode
,
2339 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2341 const char *p
= command_buf
.buf
+ 2;
2342 static struct strbuf uq
= STRBUF_INIT
;
2343 struct object_entry
*oe
= oe
;
2345 unsigned char sha1
[20], commit_sha1
[20];
2347 uint16_t inline_data
= 0;
2348 unsigned char new_fanout
;
2350 /* <dataref> or 'inline' */
2353 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2354 hashcpy(sha1
, oe
->idx
.sha1
);
2356 } else if (!prefixcmp(p
, "inline")) {
2360 if (get_sha1_hex(p
, sha1
))
2361 die("Invalid SHA1: %s", command_buf
.buf
);
2362 oe
= find_object(sha1
);
2366 die("Missing space after SHA1: %s", command_buf
.buf
);
2369 s
= lookup_branch(p
);
2371 hashcpy(commit_sha1
, s
->sha1
);
2372 } else if (*p
== ':') {
2373 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2374 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2375 if (commit_oe
->type
!= OBJ_COMMIT
)
2376 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2377 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2378 } else if (!get_sha1(p
, commit_sha1
)) {
2380 char *buf
= read_object_with_reference(commit_sha1
,
2381 commit_type
, &size
, commit_sha1
);
2382 if (!buf
|| size
< 46)
2383 die("Not a valid commit: %s", p
);
2386 die("Invalid ref name or SHA1 expression: %s", p
);
2390 strbuf_addstr(&uq
, p
);
2393 read_next_command();
2394 parse_and_store_blob(&last_blob
, sha1
, 0);
2396 if (oe
->type
!= OBJ_BLOB
)
2397 die("Not a blob (actually a %s): %s",
2398 typename(oe
->type
), command_buf
.buf
);
2399 } else if (!is_null_sha1(sha1
)) {
2400 enum object_type type
= sha1_object_info(sha1
, NULL
);
2402 die("Blob not found: %s", command_buf
.buf
);
2403 if (type
!= OBJ_BLOB
)
2404 die("Not a blob (actually a %s): %s",
2405 typename(type
), command_buf
.buf
);
2408 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2409 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2412 if (is_null_sha1(sha1
))
2413 return; /* nothing to insert */
2416 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2417 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2418 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2421 static void file_change_deleteall(struct branch
*b
)
2423 release_tree_content_recursive(b
->branch_tree
.tree
);
2424 hashclr(b
->branch_tree
.versions
[0].sha1
);
2425 hashclr(b
->branch_tree
.versions
[1].sha1
);
2426 load_tree(&b
->branch_tree
);
2430 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2432 if (!buf
|| size
< 46)
2433 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2434 if (memcmp("tree ", buf
, 5)
2435 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2436 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2437 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2438 b
->branch_tree
.versions
[1].sha1
);
2441 static void parse_from_existing(struct branch
*b
)
2443 if (is_null_sha1(b
->sha1
)) {
2444 hashclr(b
->branch_tree
.versions
[0].sha1
);
2445 hashclr(b
->branch_tree
.versions
[1].sha1
);
2450 buf
= read_object_with_reference(b
->sha1
,
2451 commit_type
, &size
, b
->sha1
);
2452 parse_from_commit(b
, buf
, size
);
2457 static int parse_from(struct branch
*b
)
2462 if (prefixcmp(command_buf
.buf
, "from "))
2465 if (b
->branch_tree
.tree
) {
2466 release_tree_content_recursive(b
->branch_tree
.tree
);
2467 b
->branch_tree
.tree
= NULL
;
2470 from
= strchr(command_buf
.buf
, ' ') + 1;
2471 s
= lookup_branch(from
);
2473 die("Can't create a branch from itself: %s", b
->name
);
2475 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2476 hashcpy(b
->sha1
, s
->sha1
);
2477 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2478 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2479 } else if (*from
== ':') {
2480 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2481 struct object_entry
*oe
= find_mark(idnum
);
2482 if (oe
->type
!= OBJ_COMMIT
)
2483 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2484 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2485 if (oe
->pack_id
!= MAX_PACK_ID
) {
2487 char *buf
= gfi_unpack_entry(oe
, &size
);
2488 parse_from_commit(b
, buf
, size
);
2491 parse_from_existing(b
);
2492 } else if (!get_sha1(from
, b
->sha1
))
2493 parse_from_existing(b
);
2495 die("Invalid ref name or SHA1 expression: %s", from
);
2497 read_next_command();
2501 static struct hash_list
*parse_merge(unsigned int *count
)
2503 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2508 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2509 from
= strchr(command_buf
.buf
, ' ') + 1;
2510 n
= xmalloc(sizeof(*n
));
2511 s
= lookup_branch(from
);
2513 hashcpy(n
->sha1
, s
->sha1
);
2514 else if (*from
== ':') {
2515 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2516 struct object_entry
*oe
= find_mark(idnum
);
2517 if (oe
->type
!= OBJ_COMMIT
)
2518 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2519 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2520 } else if (!get_sha1(from
, n
->sha1
)) {
2522 char *buf
= read_object_with_reference(n
->sha1
,
2523 commit_type
, &size
, n
->sha1
);
2524 if (!buf
|| size
< 46)
2525 die("Not a valid commit: %s", from
);
2528 die("Invalid ref name or SHA1 expression: %s", from
);
2537 read_next_command();
2542 static void parse_new_commit(void)
2544 static struct strbuf msg
= STRBUF_INIT
;
2547 char *author
= NULL
;
2548 char *committer
= NULL
;
2549 struct hash_list
*merge_list
= NULL
;
2550 unsigned int merge_count
;
2551 unsigned char prev_fanout
, new_fanout
;
2553 /* Obtain the branch name from the rest of our command */
2554 sp
= strchr(command_buf
.buf
, ' ') + 1;
2555 b
= lookup_branch(sp
);
2559 read_next_command();
2561 if (!prefixcmp(command_buf
.buf
, "author ")) {
2562 author
= parse_ident(command_buf
.buf
+ 7);
2563 read_next_command();
2565 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2566 committer
= parse_ident(command_buf
.buf
+ 10);
2567 read_next_command();
2570 die("Expected committer but didn't get one");
2571 parse_data(&msg
, 0, NULL
);
2572 read_next_command();
2574 merge_list
= parse_merge(&merge_count
);
2576 /* ensure the branch is active/loaded */
2577 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2578 unload_one_branch();
2582 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2585 while (command_buf
.len
> 0) {
2586 if (!prefixcmp(command_buf
.buf
, "M "))
2588 else if (!prefixcmp(command_buf
.buf
, "D "))
2590 else if (!prefixcmp(command_buf
.buf
, "R "))
2591 file_change_cr(b
, 1);
2592 else if (!prefixcmp(command_buf
.buf
, "C "))
2593 file_change_cr(b
, 0);
2594 else if (!prefixcmp(command_buf
.buf
, "N "))
2595 note_change_n(b
, prev_fanout
);
2596 else if (!strcmp("deleteall", command_buf
.buf
))
2597 file_change_deleteall(b
);
2599 unread_command_buf
= 1;
2602 if (read_next_command() == EOF
)
2606 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2607 if (new_fanout
!= prev_fanout
)
2608 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2610 /* build the tree and the commit */
2611 store_tree(&b
->branch_tree
);
2612 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2613 b
->branch_tree
.versions
[1].sha1
);
2615 strbuf_reset(&new_data
);
2616 strbuf_addf(&new_data
, "tree %s\n",
2617 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2618 if (!is_null_sha1(b
->sha1
))
2619 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2620 while (merge_list
) {
2621 struct hash_list
*next
= merge_list
->next
;
2622 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2626 strbuf_addf(&new_data
,
2630 author
? author
: committer
, committer
);
2631 strbuf_addbuf(&new_data
, &msg
);
2635 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2636 b
->pack_id
= pack_id
;
2637 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2640 static void parse_new_tag(void)
2642 static struct strbuf msg
= STRBUF_INIT
;
2648 uintmax_t from_mark
= 0;
2649 unsigned char sha1
[20];
2650 enum object_type type
;
2652 /* Obtain the new tag name from the rest of our command */
2653 sp
= strchr(command_buf
.buf
, ' ') + 1;
2654 t
= pool_alloc(sizeof(struct tag
));
2656 t
->name
= pool_strdup(sp
);
2658 last_tag
->next_tag
= t
;
2662 read_next_command();
2665 if (prefixcmp(command_buf
.buf
, "from "))
2666 die("Expected from command, got %s", command_buf
.buf
);
2667 from
= strchr(command_buf
.buf
, ' ') + 1;
2668 s
= lookup_branch(from
);
2670 hashcpy(sha1
, s
->sha1
);
2672 } else if (*from
== ':') {
2673 struct object_entry
*oe
;
2674 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2675 oe
= find_mark(from_mark
);
2677 hashcpy(sha1
, oe
->idx
.sha1
);
2678 } else if (!get_sha1(from
, sha1
)) {
2682 buf
= read_sha1_file(sha1
, &type
, &size
);
2683 if (!buf
|| size
< 46)
2684 die("Not a valid commit: %s", from
);
2687 die("Invalid ref name or SHA1 expression: %s", from
);
2688 read_next_command();
2691 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2692 tagger
= parse_ident(command_buf
.buf
+ 7);
2693 read_next_command();
2697 /* tag payload/message */
2698 parse_data(&msg
, 0, NULL
);
2700 /* build the tag object */
2701 strbuf_reset(&new_data
);
2703 strbuf_addf(&new_data
,
2707 sha1_to_hex(sha1
), typename(type
), t
->name
);
2709 strbuf_addf(&new_data
,
2710 "tagger %s\n", tagger
);
2711 strbuf_addch(&new_data
, '\n');
2712 strbuf_addbuf(&new_data
, &msg
);
2715 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2716 t
->pack_id
= MAX_PACK_ID
;
2718 t
->pack_id
= pack_id
;
2721 static void parse_reset_branch(void)
2726 /* Obtain the branch name from the rest of our command */
2727 sp
= strchr(command_buf
.buf
, ' ') + 1;
2728 b
= lookup_branch(sp
);
2731 hashclr(b
->branch_tree
.versions
[0].sha1
);
2732 hashclr(b
->branch_tree
.versions
[1].sha1
);
2733 if (b
->branch_tree
.tree
) {
2734 release_tree_content_recursive(b
->branch_tree
.tree
);
2735 b
->branch_tree
.tree
= NULL
;
2740 read_next_command();
2742 if (command_buf
.len
> 0)
2743 unread_command_buf
= 1;
2746 static void cat_blob_write(const char *buf
, unsigned long size
)
2748 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2749 die_errno("Write to frontend failed");
2752 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2754 struct strbuf line
= STRBUF_INIT
;
2756 enum object_type type
= 0;
2759 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2760 buf
= read_sha1_file(sha1
, &type
, &size
);
2763 buf
= gfi_unpack_entry(oe
, &size
);
2767 * Output based on batch_one_object() from cat-file.c.
2770 strbuf_reset(&line
);
2771 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2772 cat_blob_write(line
.buf
, line
.len
);
2773 strbuf_release(&line
);
2778 die("Can't read object %s", sha1_to_hex(sha1
));
2779 if (type
!= OBJ_BLOB
)
2780 die("Object %s is a %s but a blob was expected.",
2781 sha1_to_hex(sha1
), typename(type
));
2782 strbuf_reset(&line
);
2783 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2784 typename(type
), size
);
2785 cat_blob_write(line
.buf
, line
.len
);
2786 strbuf_release(&line
);
2787 cat_blob_write(buf
, size
);
2788 cat_blob_write("\n", 1);
2792 static void parse_cat_blob(void)
2795 struct object_entry
*oe
= oe
;
2796 unsigned char sha1
[20];
2798 /* cat-blob SP <object> LF */
2799 p
= command_buf
.buf
+ strlen("cat-blob ");
2802 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2804 die("Invalid mark: %s", command_buf
.buf
);
2806 die("Unknown mark: %s", command_buf
.buf
);
2808 die("Garbage after mark: %s", command_buf
.buf
);
2809 hashcpy(sha1
, oe
->idx
.sha1
);
2811 if (get_sha1_hex(p
, sha1
))
2812 die("Invalid SHA1: %s", command_buf
.buf
);
2814 die("Garbage after SHA1: %s", command_buf
.buf
);
2815 oe
= find_object(sha1
);
2821 static void checkpoint(void)
2823 checkpoint_requested
= 0;
2832 static void parse_checkpoint(void)
2834 checkpoint_requested
= 1;
2838 static void parse_progress(void)
2840 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2841 fputc('\n', stdout
);
2846 static char* make_fast_import_path(const char *path
)
2848 struct strbuf abs_path
= STRBUF_INIT
;
2850 if (!relative_marks_paths
|| is_absolute_path(path
))
2851 return xstrdup(path
);
2852 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2853 return strbuf_detach(&abs_path
, NULL
);
2856 static void option_import_marks(const char *marks
, int from_stream
)
2858 if (import_marks_file
) {
2860 die("Only one import-marks command allowed per stream");
2862 /* read previous mark file */
2863 if(!import_marks_file_from_stream
)
2867 import_marks_file
= make_fast_import_path(marks
);
2868 safe_create_leading_directories_const(import_marks_file
);
2869 import_marks_file_from_stream
= from_stream
;
2872 static void option_date_format(const char *fmt
)
2874 if (!strcmp(fmt
, "raw"))
2875 whenspec
= WHENSPEC_RAW
;
2876 else if (!strcmp(fmt
, "rfc2822"))
2877 whenspec
= WHENSPEC_RFC2822
;
2878 else if (!strcmp(fmt
, "now"))
2879 whenspec
= WHENSPEC_NOW
;
2881 die("unknown --date-format argument %s", fmt
);
2884 static unsigned long ulong_arg(const char *option
, const char *arg
)
2887 unsigned long rv
= strtoul(arg
, &endptr
, 0);
2888 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
2889 die("%s: argument must be a non-negative integer", option
);
2893 static void option_depth(const char *depth
)
2895 max_depth
= ulong_arg("--depth", depth
);
2896 if (max_depth
> MAX_DEPTH
)
2897 die("--depth cannot exceed %u", MAX_DEPTH
);
2900 static void option_active_branches(const char *branches
)
2902 max_active_branches
= ulong_arg("--active-branches", branches
);
2905 static void option_export_marks(const char *marks
)
2907 export_marks_file
= make_fast_import_path(marks
);
2908 safe_create_leading_directories_const(export_marks_file
);
2911 static void option_cat_blob_fd(const char *fd
)
2913 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
2914 if (n
> (unsigned long) INT_MAX
)
2915 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
2916 cat_blob_fd
= (int) n
;
2919 static void option_export_pack_edges(const char *edges
)
2923 pack_edges
= fopen(edges
, "a");
2925 die_errno("Cannot open '%s'", edges
);
2928 static int parse_one_option(const char *option
)
2930 if (!prefixcmp(option
, "max-pack-size=")) {
2932 if (!git_parse_ulong(option
+ 14, &v
))
2935 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2937 } else if (v
< 1024 * 1024) {
2938 warning("minimum max-pack-size is 1 MiB");
2942 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2944 if (!git_parse_ulong(option
+ 19, &v
))
2946 big_file_threshold
= v
;
2947 } else if (!prefixcmp(option
, "depth=")) {
2948 option_depth(option
+ 6);
2949 } else if (!prefixcmp(option
, "active-branches=")) {
2950 option_active_branches(option
+ 16);
2951 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2952 option_export_pack_edges(option
+ 18);
2953 } else if (!prefixcmp(option
, "quiet")) {
2955 } else if (!prefixcmp(option
, "stats")) {
2964 static int parse_one_feature(const char *feature
, int from_stream
)
2966 if (!prefixcmp(feature
, "date-format=")) {
2967 option_date_format(feature
+ 12);
2968 } else if (!prefixcmp(feature
, "import-marks=")) {
2969 option_import_marks(feature
+ 13, from_stream
);
2970 } else if (!prefixcmp(feature
, "export-marks=")) {
2971 option_export_marks(feature
+ 13);
2972 } else if (!strcmp(feature
, "cat-blob")) {
2973 ; /* Don't die - this feature is supported */
2974 } else if (!prefixcmp(feature
, "relative-marks")) {
2975 relative_marks_paths
= 1;
2976 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2977 relative_marks_paths
= 0;
2978 } else if (!prefixcmp(feature
, "force")) {
2980 } else if (!strcmp(feature
, "notes")) {
2981 ; /* do nothing; we have the feature */
2989 static void parse_feature(void)
2991 char *feature
= command_buf
.buf
+ 8;
2993 if (seen_data_command
)
2994 die("Got feature command '%s' after data command", feature
);
2996 if (parse_one_feature(feature
, 1))
2999 die("This version of fast-import does not support feature %s.", feature
);
3002 static void parse_option(void)
3004 char *option
= command_buf
.buf
+ 11;
3006 if (seen_data_command
)
3007 die("Got option command '%s' after data command", option
);
3009 if (parse_one_option(option
))
3012 die("This version of fast-import does not support option: %s", option
);
3015 static int git_pack_config(const char *k
, const char *v
, void *cb
)
3017 if (!strcmp(k
, "pack.depth")) {
3018 max_depth
= git_config_int(k
, v
);
3019 if (max_depth
> MAX_DEPTH
)
3020 max_depth
= MAX_DEPTH
;
3023 if (!strcmp(k
, "pack.compression")) {
3024 int level
= git_config_int(k
, v
);
3026 level
= Z_DEFAULT_COMPRESSION
;
3027 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
3028 die("bad pack compression level %d", level
);
3029 pack_compression_level
= level
;
3030 pack_compression_seen
= 1;
3033 if (!strcmp(k
, "pack.indexversion")) {
3034 pack_idx_default_version
= git_config_int(k
, v
);
3035 if (pack_idx_default_version
> 2)
3036 die("bad pack.indexversion=%"PRIu32
,
3037 pack_idx_default_version
);
3040 if (!strcmp(k
, "pack.packsizelimit")) {
3041 max_packsize
= git_config_ulong(k
, v
);
3044 if (!strcmp(k
, "core.bigfilethreshold")) {
3045 long n
= git_config_int(k
, v
);
3046 big_file_threshold
= 0 < n
? n
: 0;
3048 return git_default_config(k
, v
, cb
);
3051 static const char fast_import_usage
[] =
3052 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3054 static void parse_argv(void)
3058 for (i
= 1; i
< global_argc
; i
++) {
3059 const char *a
= global_argv
[i
];
3061 if (*a
!= '-' || !strcmp(a
, "--"))
3064 if (parse_one_option(a
+ 2))
3067 if (parse_one_feature(a
+ 2, 0))
3070 if (!prefixcmp(a
+ 2, "cat-blob-fd=")) {
3071 option_cat_blob_fd(a
+ 2 + strlen("cat-blob-fd="));
3075 die("unknown option %s", a
);
3077 if (i
!= global_argc
)
3078 usage(fast_import_usage
);
3080 seen_data_command
= 1;
3081 if (import_marks_file
)
3085 int main(int argc
, const char **argv
)
3089 git_extract_argv0_path(argv
[0]);
3091 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3092 usage(fast_import_usage
);
3094 setup_git_directory();
3095 git_config(git_pack_config
, NULL
);
3096 if (!pack_compression_seen
&& core_compression_seen
)
3097 pack_compression_level
= core_compression_level
;
3099 alloc_objects(object_entry_alloc
);
3100 strbuf_init(&command_buf
, 0);
3101 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3102 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3103 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3104 marks
= pool_calloc(1, sizeof(struct mark_set
));
3109 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3110 for (i
= 0; i
< (cmd_save
- 1); i
++)
3111 rc_free
[i
].next
= &rc_free
[i
+ 1];
3112 rc_free
[cmd_save
- 1].next
= NULL
;
3114 prepare_packed_git();
3116 set_die_routine(die_nicely
);
3117 set_checkpoint_signal();
3118 while (read_next_command() != EOF
) {
3119 if (!strcmp("blob", command_buf
.buf
))
3121 else if (!prefixcmp(command_buf
.buf
, "commit "))
3123 else if (!prefixcmp(command_buf
.buf
, "tag "))
3125 else if (!prefixcmp(command_buf
.buf
, "reset "))
3126 parse_reset_branch();
3127 else if (!strcmp("checkpoint", command_buf
.buf
))
3129 else if (!prefixcmp(command_buf
.buf
, "progress "))
3131 else if (!prefixcmp(command_buf
.buf
, "feature "))
3133 else if (!prefixcmp(command_buf
.buf
, "option git "))
3135 else if (!prefixcmp(command_buf
.buf
, "option "))
3136 /* ignore non-git options*/;
3138 die("Unsupported command: %s", command_buf
.buf
);
3140 if (checkpoint_requested
)
3144 /* argv hasn't been parsed yet, do so */
3145 if (!seen_data_command
)
3159 uintmax_t total_count
= 0, duplicate_count
= 0;
3160 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3161 total_count
+= object_count_by_type
[i
];
3162 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3163 duplicate_count
+= duplicate_count_by_type
[i
];
3165 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3166 fprintf(stderr
, "---------------------------------------------------------------------\n");
3167 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3168 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3169 fprintf(stderr
, " blobs : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_BLOB
], duplicate_count_by_type
[OBJ_BLOB
], delta_count_by_type
[OBJ_BLOB
]);
3170 fprintf(stderr
, " trees : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_TREE
], duplicate_count_by_type
[OBJ_TREE
], delta_count_by_type
[OBJ_TREE
]);
3171 fprintf(stderr
, " commits: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_COMMIT
], duplicate_count_by_type
[OBJ_COMMIT
], delta_count_by_type
[OBJ_COMMIT
]);
3172 fprintf(stderr
, " tags : %10" PRIuMAX
" (%10" PRIuMAX
" duplicates %10" PRIuMAX
" deltas)\n", object_count_by_type
[OBJ_TAG
], duplicate_count_by_type
[OBJ_TAG
], delta_count_by_type
[OBJ_TAG
]);
3173 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3174 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3175 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3176 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3177 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3178 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3179 fprintf(stderr
, "---------------------------------------------------------------------\n");
3181 fprintf(stderr
, "---------------------------------------------------------------------\n");
3182 fprintf(stderr
, "\n");
3185 return failure
? 1 : 0;