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 may appear anywhere in the input, except
136 # within a data command. Any form of the data command
137 # always escapes the related input from comment processing.
139 # In case it is not clear, the '#' that starts the comment
140 # must be the first character on that line (an lf
143 comment ::= '#' not_lf* lf;
144 not_lf ::= # Any byte that is not ASCII newline (LF);
156 #include "csum-file.h"
158 #include "exec_cmd.h"
160 #define PACK_ID_BITS 16
161 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
162 #define DEPTH_BITS 13
163 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
167 struct pack_idx_entry idx
;
168 struct object_entry
*next
;
169 uint32_t type
: TYPE_BITS
,
170 pack_id
: PACK_ID_BITS
,
174 struct object_entry_pool
176 struct object_entry_pool
*next_pool
;
177 struct object_entry
*next_free
;
178 struct object_entry
*end
;
179 struct object_entry entries
[FLEX_ARRAY
]; /* more */
185 struct object_entry
*marked
[1024];
186 struct mark_set
*sets
[1024];
196 unsigned no_swap
: 1;
201 struct mem_pool
*next_pool
;
204 uintmax_t space
[FLEX_ARRAY
]; /* more */
209 struct atom_str
*next_atom
;
210 unsigned short str_len
;
211 char str_dat
[FLEX_ARRAY
]; /* more */
217 struct tree_content
*tree
;
218 struct atom_str
*name
;
222 unsigned char sha1
[20];
228 unsigned int entry_capacity
; /* must match avail_tree_content */
229 unsigned int entry_count
;
230 unsigned int delta_depth
;
231 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
234 struct avail_tree_content
236 unsigned int entry_capacity
; /* must match tree_content */
237 struct avail_tree_content
*next_avail
;
242 struct branch
*table_next_branch
;
243 struct branch
*active_next_branch
;
245 struct tree_entry branch_tree
;
246 uintmax_t last_commit
;
249 unsigned pack_id
: PACK_ID_BITS
;
250 unsigned char sha1
[20];
255 struct tag
*next_tag
;
257 unsigned int pack_id
;
258 unsigned char sha1
[20];
263 struct hash_list
*next
;
264 unsigned char sha1
[20];
273 struct recent_command
275 struct recent_command
*prev
;
276 struct recent_command
*next
;
280 /* Configured limits on output */
281 static unsigned long max_depth
= 10;
282 static off_t max_packsize
;
283 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
284 static int force_update
;
285 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
286 static int pack_compression_seen
;
288 /* Stats and misc. counters */
289 static uintmax_t alloc_count
;
290 static uintmax_t marks_set_count
;
291 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
292 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
294 static unsigned long object_count
;
295 static unsigned long branch_count
;
296 static unsigned long branch_load_count
;
298 static FILE *pack_edges
;
299 static unsigned int show_stats
= 1;
300 static int global_argc
;
301 static const char **global_argv
;
304 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
305 static size_t total_allocd
;
306 static struct mem_pool
*mem_pool
;
308 /* Atom management */
309 static unsigned int atom_table_sz
= 4451;
310 static unsigned int atom_cnt
;
311 static struct atom_str
**atom_table
;
313 /* The .pack file being generated */
314 static unsigned int pack_id
;
315 static struct sha1file
*pack_file
;
316 static struct packed_git
*pack_data
;
317 static struct packed_git
**all_packs
;
318 static off_t pack_size
;
320 /* Table of objects we've written. */
321 static unsigned int object_entry_alloc
= 5000;
322 static struct object_entry_pool
*blocks
;
323 static struct object_entry
*object_table
[1 << 16];
324 static struct mark_set
*marks
;
325 static const char *export_marks_file
;
326 static const char *import_marks_file
;
327 static int import_marks_file_from_stream
;
328 static int relative_marks_paths
;
331 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
333 /* Tree management */
334 static unsigned int tree_entry_alloc
= 1000;
335 static void *avail_tree_entry
;
336 static unsigned int avail_tree_table_sz
= 100;
337 static struct avail_tree_content
**avail_tree_table
;
338 static struct strbuf old_tree
= STRBUF_INIT
;
339 static struct strbuf new_tree
= STRBUF_INIT
;
342 static unsigned long max_active_branches
= 5;
343 static unsigned long cur_active_branches
;
344 static unsigned long branch_table_sz
= 1039;
345 static struct branch
**branch_table
;
346 static struct branch
*active_branches
;
349 static struct tag
*first_tag
;
350 static struct tag
*last_tag
;
352 /* Input stream parsing */
353 static whenspec_type whenspec
= WHENSPEC_RAW
;
354 static struct strbuf command_buf
= STRBUF_INIT
;
355 static int unread_command_buf
;
356 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
357 static struct recent_command
*cmd_tail
= &cmd_hist
;
358 static struct recent_command
*rc_free
;
359 static unsigned int cmd_save
= 100;
360 static uintmax_t next_mark
;
361 static struct strbuf new_data
= STRBUF_INIT
;
362 static int seen_data_command
;
364 /* Signal handling */
365 static volatile sig_atomic_t checkpoint_requested
;
367 static void parse_argv(void);
369 static void write_branch_report(FILE *rpt
, struct branch
*b
)
371 fprintf(rpt
, "%s:\n", b
->name
);
373 fprintf(rpt
, " status :");
375 fputs(" active", rpt
);
376 if (b
->branch_tree
.tree
)
377 fputs(" loaded", rpt
);
378 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
379 fputs(" dirty", rpt
);
382 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
383 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
384 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
385 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
387 fputs(" last pack : ", rpt
);
388 if (b
->pack_id
< MAX_PACK_ID
)
389 fprintf(rpt
, "%u", b
->pack_id
);
395 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
397 static void write_crash_report(const char *err
)
399 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
400 FILE *rpt
= fopen(loc
, "w");
403 struct recent_command
*rc
;
406 error("can't write crash report %s: %s", loc
, strerror(errno
));
410 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
412 fprintf(rpt
, "fast-import crash report:\n");
413 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
414 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
415 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
418 fputs("fatal: ", rpt
);
423 fputs("Most Recent Commands Before Crash\n", rpt
);
424 fputs("---------------------------------\n", rpt
);
425 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
426 if (rc
->next
== &cmd_hist
)
435 fputs("Active Branch LRU\n", rpt
);
436 fputs("-----------------\n", rpt
);
437 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
439 max_active_branches
);
441 fputs(" pos clock name\n", rpt
);
442 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
443 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
444 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
445 ++lu
, b
->last_commit
, b
->name
);
448 fputs("Inactive Branches\n", rpt
);
449 fputs("-----------------\n", rpt
);
450 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
451 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
452 write_branch_report(rpt
, b
);
458 fputs("Annotated Tags\n", rpt
);
459 fputs("--------------\n", rpt
);
460 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
461 fputs(sha1_to_hex(tg
->sha1
), rpt
);
463 fputs(tg
->name
, rpt
);
469 fputs("Marks\n", rpt
);
470 fputs("-----\n", rpt
);
471 if (export_marks_file
)
472 fprintf(rpt
, " exported to %s\n", export_marks_file
);
474 dump_marks_helper(rpt
, 0, marks
);
477 fputs("-------------------\n", rpt
);
478 fputs("END OF CRASH REPORT\n", rpt
);
482 static void end_packfile(void);
483 static void unkeep_all_packs(void);
484 static void dump_marks(void);
486 static NORETURN
void die_nicely(const char *err
, va_list params
)
489 char message
[2 * PATH_MAX
];
491 vsnprintf(message
, sizeof(message
), err
, params
);
492 fputs("fatal: ", stderr
);
493 fputs(message
, stderr
);
498 write_crash_report(message
);
506 #ifndef SIGUSR1 /* Windows, for example */
508 static void set_checkpoint_signal(void)
514 static void checkpoint_signal(int signo
)
516 checkpoint_requested
= 1;
519 static void set_checkpoint_signal(void)
523 memset(&sa
, 0, sizeof(sa
));
524 sa
.sa_handler
= checkpoint_signal
;
525 sigemptyset(&sa
.sa_mask
);
526 sa
.sa_flags
= SA_RESTART
;
527 sigaction(SIGUSR1
, &sa
, NULL
);
532 static void alloc_objects(unsigned int cnt
)
534 struct object_entry_pool
*b
;
536 b
= xmalloc(sizeof(struct object_entry_pool
)
537 + cnt
* sizeof(struct object_entry
));
538 b
->next_pool
= blocks
;
539 b
->next_free
= b
->entries
;
540 b
->end
= b
->entries
+ cnt
;
545 static struct object_entry
*new_object(unsigned char *sha1
)
547 struct object_entry
*e
;
549 if (blocks
->next_free
== blocks
->end
)
550 alloc_objects(object_entry_alloc
);
552 e
= blocks
->next_free
++;
553 hashcpy(e
->idx
.sha1
, sha1
);
557 static struct object_entry
*find_object(unsigned char *sha1
)
559 unsigned int h
= sha1
[0] << 8 | sha1
[1];
560 struct object_entry
*e
;
561 for (e
= object_table
[h
]; e
; e
= e
->next
)
562 if (!hashcmp(sha1
, e
->idx
.sha1
))
567 static struct object_entry
*insert_object(unsigned char *sha1
)
569 unsigned int h
= sha1
[0] << 8 | sha1
[1];
570 struct object_entry
*e
= object_table
[h
];
571 struct object_entry
*p
= NULL
;
574 if (!hashcmp(sha1
, e
->idx
.sha1
))
580 e
= new_object(sha1
);
590 static unsigned int hc_str(const char *s
, size_t len
)
598 static void *pool_alloc(size_t len
)
603 /* round up to a 'uintmax_t' alignment */
604 if (len
& (sizeof(uintmax_t) - 1))
605 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
607 for (p
= mem_pool
; p
; p
= p
->next_pool
)
608 if ((p
->end
- p
->next_free
>= len
))
612 if (len
>= (mem_pool_alloc
/2)) {
616 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
617 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
618 p
->next_pool
= mem_pool
;
619 p
->next_free
= (char *) p
->space
;
620 p
->end
= p
->next_free
+ mem_pool_alloc
;
629 static void *pool_calloc(size_t count
, size_t size
)
631 size_t len
= count
* size
;
632 void *r
= pool_alloc(len
);
637 static char *pool_strdup(const char *s
)
639 char *r
= pool_alloc(strlen(s
) + 1);
644 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
646 struct mark_set
*s
= marks
;
647 while ((idnum
>> s
->shift
) >= 1024) {
648 s
= pool_calloc(1, sizeof(struct mark_set
));
649 s
->shift
= marks
->shift
+ 10;
650 s
->data
.sets
[0] = marks
;
654 uintmax_t i
= idnum
>> s
->shift
;
655 idnum
-= i
<< s
->shift
;
656 if (!s
->data
.sets
[i
]) {
657 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
658 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
662 if (!s
->data
.marked
[idnum
])
664 s
->data
.marked
[idnum
] = oe
;
667 static struct object_entry
*find_mark(uintmax_t idnum
)
669 uintmax_t orig_idnum
= idnum
;
670 struct mark_set
*s
= marks
;
671 struct object_entry
*oe
= NULL
;
672 if ((idnum
>> s
->shift
) < 1024) {
673 while (s
&& s
->shift
) {
674 uintmax_t i
= idnum
>> s
->shift
;
675 idnum
-= i
<< s
->shift
;
679 oe
= s
->data
.marked
[idnum
];
682 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
686 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
688 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
691 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
692 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
695 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
697 strncpy(c
->str_dat
, s
, len
);
699 c
->next_atom
= atom_table
[hc
];
705 static struct branch
*lookup_branch(const char *name
)
707 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
710 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
711 if (!strcmp(name
, b
->name
))
716 static struct branch
*new_branch(const char *name
)
718 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
719 struct branch
*b
= lookup_branch(name
);
722 die("Invalid attempt to create duplicate branch: %s", name
);
723 switch (check_ref_format(name
)) {
724 case 0: break; /* its valid */
725 case CHECK_REF_FORMAT_ONELEVEL
:
726 break; /* valid, but too few '/', allow anyway */
728 die("Branch name doesn't conform to GIT standards: %s", name
);
731 b
= pool_calloc(1, sizeof(struct branch
));
732 b
->name
= pool_strdup(name
);
733 b
->table_next_branch
= branch_table
[hc
];
734 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
735 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
738 b
->pack_id
= MAX_PACK_ID
;
739 branch_table
[hc
] = b
;
744 static unsigned int hc_entries(unsigned int cnt
)
746 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
747 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
750 static struct tree_content
*new_tree_content(unsigned int cnt
)
752 struct avail_tree_content
*f
, *l
= NULL
;
753 struct tree_content
*t
;
754 unsigned int hc
= hc_entries(cnt
);
756 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
757 if (f
->entry_capacity
>= cnt
)
762 l
->next_avail
= f
->next_avail
;
764 avail_tree_table
[hc
] = f
->next_avail
;
766 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
767 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
768 f
->entry_capacity
= cnt
;
771 t
= (struct tree_content
*)f
;
777 static void release_tree_entry(struct tree_entry
*e
);
778 static void release_tree_content(struct tree_content
*t
)
780 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
781 unsigned int hc
= hc_entries(f
->entry_capacity
);
782 f
->next_avail
= avail_tree_table
[hc
];
783 avail_tree_table
[hc
] = f
;
786 static void release_tree_content_recursive(struct tree_content
*t
)
789 for (i
= 0; i
< t
->entry_count
; i
++)
790 release_tree_entry(t
->entries
[i
]);
791 release_tree_content(t
);
794 static struct tree_content
*grow_tree_content(
795 struct tree_content
*t
,
798 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
799 r
->entry_count
= t
->entry_count
;
800 r
->delta_depth
= t
->delta_depth
;
801 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
802 release_tree_content(t
);
806 static struct tree_entry
*new_tree_entry(void)
808 struct tree_entry
*e
;
810 if (!avail_tree_entry
) {
811 unsigned int n
= tree_entry_alloc
;
812 total_allocd
+= n
* sizeof(struct tree_entry
);
813 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
815 *((void**)e
) = e
+ 1;
821 e
= avail_tree_entry
;
822 avail_tree_entry
= *((void**)e
);
826 static void release_tree_entry(struct tree_entry
*e
)
829 release_tree_content_recursive(e
->tree
);
830 *((void**)e
) = avail_tree_entry
;
831 avail_tree_entry
= e
;
834 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
836 struct tree_content
*d
;
837 struct tree_entry
*a
, *b
;
842 d
= new_tree_content(s
->entry_count
);
843 for (i
= 0; i
< s
->entry_count
; i
++) {
845 b
= new_tree_entry();
846 memcpy(b
, a
, sizeof(*a
));
847 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
848 b
->tree
= dup_tree_content(a
->tree
);
853 d
->entry_count
= s
->entry_count
;
854 d
->delta_depth
= s
->delta_depth
;
859 static void start_packfile(void)
861 static char tmpfile
[PATH_MAX
];
862 struct packed_git
*p
;
863 struct pack_header hdr
;
866 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
867 "pack/tmp_pack_XXXXXX");
868 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
869 strcpy(p
->pack_name
, tmpfile
);
870 p
->pack_fd
= pack_fd
;
871 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
873 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
874 hdr
.hdr_version
= htonl(2);
876 sha1write(pack_file
, &hdr
, sizeof(hdr
));
879 pack_size
= sizeof(hdr
);
882 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
883 all_packs
[pack_id
] = p
;
886 static const char *create_index(void)
889 struct pack_idx_entry
**idx
, **c
, **last
;
890 struct object_entry
*e
;
891 struct object_entry_pool
*o
;
893 /* Build the table of object IDs. */
894 idx
= xmalloc(object_count
* sizeof(*idx
));
896 for (o
= blocks
; o
; o
= o
->next_pool
)
897 for (e
= o
->next_free
; e
-- != o
->entries
;)
898 if (pack_id
== e
->pack_id
)
900 last
= idx
+ object_count
;
902 die("internal consistency error creating the index");
904 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
909 static char *keep_pack(const char *curr_index_name
)
911 static char name
[PATH_MAX
];
912 static const char *keep_msg
= "fast-import";
915 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
917 die_errno("cannot create keep file");
918 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
920 die_errno("failed to write keep file");
922 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
923 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
924 if (move_temp_to_file(pack_data
->pack_name
, name
))
925 die("cannot store pack file");
927 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
928 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
929 if (move_temp_to_file(curr_index_name
, name
))
930 die("cannot store index file");
931 free((void *)curr_index_name
);
935 static void unkeep_all_packs(void)
937 static char name
[PATH_MAX
];
940 for (k
= 0; k
< pack_id
; k
++) {
941 struct packed_git
*p
= all_packs
[k
];
942 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
943 get_object_directory(), sha1_to_hex(p
->sha1
));
944 unlink_or_warn(name
);
948 static void end_packfile(void)
950 struct packed_git
*old_p
= pack_data
, *new_p
;
952 clear_delta_base_cache();
954 unsigned char cur_pack_sha1
[20];
960 close_pack_windows(pack_data
);
961 sha1close(pack_file
, cur_pack_sha1
, 0);
962 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
963 pack_data
->pack_name
, object_count
,
964 cur_pack_sha1
, pack_size
);
965 close(pack_data
->pack_fd
);
966 idx_name
= keep_pack(create_index());
968 /* Register the packfile with core git's machinery. */
969 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
971 die("core git rejected index %s", idx_name
);
972 all_packs
[pack_id
] = new_p
;
973 install_packed_git(new_p
);
975 /* Print the boundary */
977 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
978 for (i
= 0; i
< branch_table_sz
; i
++) {
979 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
980 if (b
->pack_id
== pack_id
)
981 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
984 for (t
= first_tag
; t
; t
= t
->next_tag
) {
985 if (t
->pack_id
== pack_id
)
986 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
988 fputc('\n', pack_edges
);
995 close(old_p
->pack_fd
);
996 unlink_or_warn(old_p
->pack_name
);
1000 /* We can't carry a delta across packfiles. */
1001 strbuf_release(&last_blob
.data
);
1002 last_blob
.offset
= 0;
1003 last_blob
.depth
= 0;
1006 static void cycle_packfile(void)
1012 static int store_object(
1013 enum object_type type
,
1015 struct last_object
*last
,
1016 unsigned char *sha1out
,
1020 struct object_entry
*e
;
1021 unsigned char hdr
[96];
1022 unsigned char sha1
[20];
1023 unsigned long hdrlen
, deltalen
;
1027 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1028 (unsigned long)dat
->len
) + 1;
1030 git_SHA1_Update(&c
, hdr
, hdrlen
);
1031 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1032 git_SHA1_Final(sha1
, &c
);
1034 hashcpy(sha1out
, sha1
);
1036 e
= insert_object(sha1
);
1038 insert_mark(mark
, e
);
1039 if (e
->idx
.offset
) {
1040 duplicate_count_by_type
[type
]++;
1042 } else if (find_sha1_pack(sha1
, packed_git
)) {
1044 e
->pack_id
= MAX_PACK_ID
;
1045 e
->idx
.offset
= 1; /* just not zero! */
1046 duplicate_count_by_type
[type
]++;
1050 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1051 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1053 &deltalen
, dat
->len
- 20);
1057 memset(&s
, 0, sizeof(s
));
1058 deflateInit(&s
, pack_compression_level
);
1061 s
.avail_in
= deltalen
;
1063 s
.next_in
= (void *)dat
->buf
;
1064 s
.avail_in
= dat
->len
;
1066 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1067 s
.next_out
= out
= xmalloc(s
.avail_out
);
1068 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1072 /* Determine if we should auto-checkpoint. */
1073 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1074 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1076 /* This new object needs to *not* have the current pack_id. */
1077 e
->pack_id
= pack_id
+ 1;
1080 /* We cannot carry a delta into the new pack. */
1085 memset(&s
, 0, sizeof(s
));
1086 deflateInit(&s
, pack_compression_level
);
1087 s
.next_in
= (void *)dat
->buf
;
1088 s
.avail_in
= dat
->len
;
1089 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1090 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1091 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1098 e
->pack_id
= pack_id
;
1099 e
->idx
.offset
= pack_size
;
1101 object_count_by_type
[type
]++;
1103 crc32_begin(pack_file
);
1106 off_t ofs
= e
->idx
.offset
- last
->offset
;
1107 unsigned pos
= sizeof(hdr
) - 1;
1109 delta_count_by_type
[type
]++;
1110 e
->depth
= last
->depth
+ 1;
1112 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1113 sha1write(pack_file
, hdr
, hdrlen
);
1114 pack_size
+= hdrlen
;
1116 hdr
[pos
] = ofs
& 127;
1118 hdr
[--pos
] = 128 | (--ofs
& 127);
1119 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1120 pack_size
+= sizeof(hdr
) - pos
;
1123 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1124 sha1write(pack_file
, hdr
, hdrlen
);
1125 pack_size
+= hdrlen
;
1128 sha1write(pack_file
, out
, s
.total_out
);
1129 pack_size
+= s
.total_out
;
1131 e
->idx
.crc32
= crc32_end(pack_file
);
1136 if (last
->no_swap
) {
1139 strbuf_swap(&last
->data
, dat
);
1141 last
->offset
= e
->idx
.offset
;
1142 last
->depth
= e
->depth
;
1147 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1149 if (ftruncate(pack_data
->pack_fd
, to
)
1150 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1151 die_errno("cannot truncate pack to skip duplicate");
1154 /* yes this is a layering violation */
1155 pack_file
->total
= to
;
1156 pack_file
->offset
= 0;
1157 pack_file
->ctx
= *ctx
;
1160 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1162 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1163 unsigned char *in_buf
= xmalloc(in_sz
);
1164 unsigned char *out_buf
= xmalloc(out_sz
);
1165 struct object_entry
*e
;
1166 unsigned char sha1
[20];
1167 unsigned long hdrlen
;
1170 git_SHA_CTX pack_file_ctx
;
1174 /* Determine if we should auto-checkpoint. */
1175 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1176 || (pack_size
+ 60 + len
) < pack_size
)
1181 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1182 sha1flush(pack_file
);
1183 pack_file_ctx
= pack_file
->ctx
;
1185 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1186 if (out_sz
<= hdrlen
)
1187 die("impossibly large object header");
1190 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1192 crc32_begin(pack_file
);
1194 memset(&s
, 0, sizeof(s
));
1195 deflateInit(&s
, pack_compression_level
);
1197 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1198 if (out_sz
<= hdrlen
)
1199 die("impossibly large object header");
1201 s
.next_out
= out_buf
+ hdrlen
;
1202 s
.avail_out
= out_sz
- hdrlen
;
1204 while (status
!= Z_STREAM_END
) {
1205 if (0 < len
&& !s
.avail_in
) {
1206 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1207 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1208 if (!n
&& feof(stdin
))
1209 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1211 git_SHA1_Update(&c
, in_buf
, n
);
1217 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1219 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1220 size_t n
= s
.next_out
- out_buf
;
1221 sha1write(pack_file
, out_buf
, n
);
1223 s
.next_out
= out_buf
;
1224 s
.avail_out
= out_sz
;
1233 die("unexpected deflate failure: %d", status
);
1237 git_SHA1_Final(sha1
, &c
);
1240 hashcpy(sha1out
, sha1
);
1242 e
= insert_object(sha1
);
1245 insert_mark(mark
, e
);
1247 if (e
->idx
.offset
) {
1248 duplicate_count_by_type
[OBJ_BLOB
]++;
1249 truncate_pack(offset
, &pack_file_ctx
);
1251 } else if (find_sha1_pack(sha1
, packed_git
)) {
1253 e
->pack_id
= MAX_PACK_ID
;
1254 e
->idx
.offset
= 1; /* just not zero! */
1255 duplicate_count_by_type
[OBJ_BLOB
]++;
1256 truncate_pack(offset
, &pack_file_ctx
);
1261 e
->pack_id
= pack_id
;
1262 e
->idx
.offset
= offset
;
1263 e
->idx
.crc32
= crc32_end(pack_file
);
1265 object_count_by_type
[OBJ_BLOB
]++;
1272 /* All calls must be guarded by find_object() or find_mark() to
1273 * ensure the 'struct object_entry' passed was written by this
1274 * process instance. We unpack the entry by the offset, avoiding
1275 * the need for the corresponding .idx file. This unpacking rule
1276 * works because we only use OBJ_REF_DELTA within the packfiles
1277 * created by fast-import.
1279 * oe must not be NULL. Such an oe usually comes from giving
1280 * an unknown SHA-1 to find_object() or an undefined mark to
1281 * find_mark(). Callers must test for this condition and use
1282 * the standard read_sha1_file() when it happens.
1284 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1285 * find_mark(), where the mark was reloaded from an existing marks
1286 * file and is referencing an object that this fast-import process
1287 * instance did not write out to a packfile. Callers must test for
1288 * this condition and use read_sha1_file() instead.
1290 static void *gfi_unpack_entry(
1291 struct object_entry
*oe
,
1292 unsigned long *sizep
)
1294 enum object_type type
;
1295 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1296 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1297 /* The object is stored in the packfile we are writing to
1298 * and we have modified it since the last time we scanned
1299 * back to read a previously written object. If an old
1300 * window covered [p->pack_size, p->pack_size + 20) its
1301 * data is stale and is not valid. Closing all windows
1302 * and updating the packfile length ensures we can read
1303 * the newly written data.
1305 close_pack_windows(p
);
1306 sha1flush(pack_file
);
1308 /* We have to offer 20 bytes additional on the end of
1309 * the packfile as the core unpacker code assumes the
1310 * footer is present at the file end and must promise
1311 * at least 20 bytes within any window it maps. But
1312 * we don't actually create the footer here.
1314 p
->pack_size
= pack_size
+ 20;
1316 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1319 static const char *get_mode(const char *str
, uint16_t *modep
)
1324 while ((c
= *str
++) != ' ') {
1325 if (c
< '0' || c
> '7')
1327 mode
= (mode
<< 3) + (c
- '0');
1333 static void load_tree(struct tree_entry
*root
)
1335 unsigned char *sha1
= root
->versions
[1].sha1
;
1336 struct object_entry
*myoe
;
1337 struct tree_content
*t
;
1342 root
->tree
= t
= new_tree_content(8);
1343 if (is_null_sha1(sha1
))
1346 myoe
= find_object(sha1
);
1347 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1348 if (myoe
->type
!= OBJ_TREE
)
1349 die("Not a tree: %s", sha1_to_hex(sha1
));
1350 t
->delta_depth
= myoe
->depth
;
1351 buf
= gfi_unpack_entry(myoe
, &size
);
1353 die("Can't load tree %s", sha1_to_hex(sha1
));
1355 enum object_type type
;
1356 buf
= read_sha1_file(sha1
, &type
, &size
);
1357 if (!buf
|| type
!= OBJ_TREE
)
1358 die("Can't load tree %s", sha1_to_hex(sha1
));
1362 while (c
!= (buf
+ size
)) {
1363 struct tree_entry
*e
= new_tree_entry();
1365 if (t
->entry_count
== t
->entry_capacity
)
1366 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1367 t
->entries
[t
->entry_count
++] = e
;
1370 c
= get_mode(c
, &e
->versions
[1].mode
);
1372 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1373 e
->versions
[0].mode
= e
->versions
[1].mode
;
1374 e
->name
= to_atom(c
, strlen(c
));
1375 c
+= e
->name
->str_len
+ 1;
1376 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1377 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1383 static int tecmp0 (const void *_a
, const void *_b
)
1385 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1386 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1387 return base_name_compare(
1388 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1389 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1392 static int tecmp1 (const void *_a
, const void *_b
)
1394 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1395 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1396 return base_name_compare(
1397 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1398 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1401 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1407 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1409 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1411 for (i
= 0; i
< t
->entry_count
; i
++) {
1412 if (t
->entries
[i
]->versions
[v
].mode
)
1413 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1417 strbuf_grow(b
, maxlen
);
1418 for (i
= 0; i
< t
->entry_count
; i
++) {
1419 struct tree_entry
*e
= t
->entries
[i
];
1420 if (!e
->versions
[v
].mode
)
1422 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1423 e
->name
->str_dat
, '\0');
1424 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1428 static void store_tree(struct tree_entry
*root
)
1430 struct tree_content
*t
= root
->tree
;
1431 unsigned int i
, j
, del
;
1432 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1433 struct object_entry
*le
;
1435 if (!is_null_sha1(root
->versions
[1].sha1
))
1438 for (i
= 0; i
< t
->entry_count
; i
++) {
1439 if (t
->entries
[i
]->tree
)
1440 store_tree(t
->entries
[i
]);
1443 le
= find_object(root
->versions
[0].sha1
);
1444 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1445 mktree(t
, 0, &old_tree
);
1447 lo
.offset
= le
->idx
.offset
;
1448 lo
.depth
= t
->delta_depth
;
1451 mktree(t
, 1, &new_tree
);
1452 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1454 t
->delta_depth
= lo
.depth
;
1455 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1456 struct tree_entry
*e
= t
->entries
[i
];
1457 if (e
->versions
[1].mode
) {
1458 e
->versions
[0].mode
= e
->versions
[1].mode
;
1459 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1460 t
->entries
[j
++] = e
;
1462 release_tree_entry(e
);
1466 t
->entry_count
-= del
;
1469 static int tree_content_set(
1470 struct tree_entry
*root
,
1472 const unsigned char *sha1
,
1473 const uint16_t mode
,
1474 struct tree_content
*subtree
)
1476 struct tree_content
*t
= root
->tree
;
1479 struct tree_entry
*e
;
1481 slash1
= strchr(p
, '/');
1486 if (!slash1
&& !n
) {
1488 die("Root cannot be a non-directory");
1489 hashcpy(root
->versions
[1].sha1
, sha1
);
1491 release_tree_content_recursive(root
->tree
);
1492 root
->tree
= subtree
;
1496 die("Empty path component found in input");
1497 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1498 die("Non-directories cannot have subtrees");
1500 for (i
= 0; i
< t
->entry_count
; i
++) {
1502 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1505 && e
->versions
[1].mode
== mode
1506 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1508 e
->versions
[1].mode
= mode
;
1509 hashcpy(e
->versions
[1].sha1
, sha1
);
1511 release_tree_content_recursive(e
->tree
);
1513 hashclr(root
->versions
[1].sha1
);
1516 if (!S_ISDIR(e
->versions
[1].mode
)) {
1517 e
->tree
= new_tree_content(8);
1518 e
->versions
[1].mode
= S_IFDIR
;
1522 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1523 hashclr(root
->versions
[1].sha1
);
1530 if (t
->entry_count
== t
->entry_capacity
)
1531 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1532 e
= new_tree_entry();
1533 e
->name
= to_atom(p
, n
);
1534 e
->versions
[0].mode
= 0;
1535 hashclr(e
->versions
[0].sha1
);
1536 t
->entries
[t
->entry_count
++] = e
;
1538 e
->tree
= new_tree_content(8);
1539 e
->versions
[1].mode
= S_IFDIR
;
1540 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1543 e
->versions
[1].mode
= mode
;
1544 hashcpy(e
->versions
[1].sha1
, sha1
);
1546 hashclr(root
->versions
[1].sha1
);
1550 static int tree_content_remove(
1551 struct tree_entry
*root
,
1553 struct tree_entry
*backup_leaf
)
1555 struct tree_content
*t
= root
->tree
;
1558 struct tree_entry
*e
;
1560 slash1
= strchr(p
, '/');
1566 for (i
= 0; i
< t
->entry_count
; i
++) {
1568 if (e
->name
->str_len
== n
&& !strncmp(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
= root
->tree
;
1616 struct tree_entry
*e
;
1618 slash1
= strchr(p
, '/');
1624 for (i
= 0; i
< t
->entry_count
; i
++) {
1626 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1628 memcpy(leaf
, e
, sizeof(*leaf
));
1629 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1630 leaf
->tree
= dup_tree_content(e
->tree
);
1635 if (!S_ISDIR(e
->versions
[1].mode
))
1639 return tree_content_get(e
, slash1
+ 1, leaf
);
1645 static int update_branch(struct branch
*b
)
1647 static const char *msg
= "fast-import";
1648 struct ref_lock
*lock
;
1649 unsigned char old_sha1
[20];
1651 if (is_null_sha1(b
->sha1
))
1653 if (read_ref(b
->name
, old_sha1
))
1655 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1657 return error("Unable to lock %s", b
->name
);
1658 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1659 struct commit
*old_cmit
, *new_cmit
;
1661 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1662 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1663 if (!old_cmit
|| !new_cmit
) {
1665 return error("Branch %s is missing commits.", b
->name
);
1668 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1670 warning("Not updating %s"
1671 " (new tip %s does not contain %s)",
1672 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1676 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1677 return error("Unable to update %s", b
->name
);
1681 static void dump_branches(void)
1686 for (i
= 0; i
< branch_table_sz
; i
++) {
1687 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1688 failure
|= update_branch(b
);
1692 static void dump_tags(void)
1694 static const char *msg
= "fast-import";
1696 struct ref_lock
*lock
;
1697 char ref_name
[PATH_MAX
];
1699 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1700 sprintf(ref_name
, "tags/%s", t
->name
);
1701 lock
= lock_ref_sha1(ref_name
, NULL
);
1702 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1703 failure
|= error("Unable to update %s", ref_name
);
1707 static void dump_marks_helper(FILE *f
,
1713 for (k
= 0; k
< 1024; k
++) {
1714 if (m
->data
.sets
[k
])
1715 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1719 for (k
= 0; k
< 1024; k
++) {
1720 if (m
->data
.marked
[k
])
1721 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1722 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1727 static void dump_marks(void)
1729 static struct lock_file mark_lock
;
1733 if (!export_marks_file
)
1736 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1738 failure
|= error("Unable to write marks file %s: %s",
1739 export_marks_file
, strerror(errno
));
1743 f
= fdopen(mark_fd
, "w");
1745 int saved_errno
= errno
;
1746 rollback_lock_file(&mark_lock
);
1747 failure
|= error("Unable to write marks file %s: %s",
1748 export_marks_file
, strerror(saved_errno
));
1753 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1754 * Assign -1 to the lock file descriptor so that commit_lock_file()
1755 * won't try to close() it.
1759 dump_marks_helper(f
, 0, marks
);
1760 if (ferror(f
) || fclose(f
)) {
1761 int saved_errno
= errno
;
1762 rollback_lock_file(&mark_lock
);
1763 failure
|= error("Unable to write marks file %s: %s",
1764 export_marks_file
, strerror(saved_errno
));
1768 if (commit_lock_file(&mark_lock
)) {
1769 int saved_errno
= errno
;
1770 rollback_lock_file(&mark_lock
);
1771 failure
|= error("Unable to commit marks file %s: %s",
1772 export_marks_file
, strerror(saved_errno
));
1777 static void read_marks(void)
1780 FILE *f
= fopen(import_marks_file
, "r");
1782 die_errno("cannot read '%s'", import_marks_file
);
1783 while (fgets(line
, sizeof(line
), f
)) {
1786 unsigned char sha1
[20];
1787 struct object_entry
*e
;
1789 end
= strchr(line
, '\n');
1790 if (line
[0] != ':' || !end
)
1791 die("corrupt mark line: %s", line
);
1793 mark
= strtoumax(line
+ 1, &end
, 10);
1794 if (!mark
|| end
== line
+ 1
1795 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1796 die("corrupt mark line: %s", line
);
1797 e
= find_object(sha1
);
1799 enum object_type type
= sha1_object_info(sha1
, NULL
);
1801 die("object not found: %s", sha1_to_hex(sha1
));
1802 e
= insert_object(sha1
);
1804 e
->pack_id
= MAX_PACK_ID
;
1805 e
->idx
.offset
= 1; /* just not zero! */
1807 insert_mark(mark
, e
);
1813 static int read_next_command(void)
1815 static int stdin_eof
= 0;
1818 unread_command_buf
= 0;
1823 if (unread_command_buf
) {
1824 unread_command_buf
= 0;
1826 struct recent_command
*rc
;
1828 strbuf_detach(&command_buf
, NULL
);
1829 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1833 if (!seen_data_command
1834 && prefixcmp(command_buf
.buf
, "feature ")
1835 && prefixcmp(command_buf
.buf
, "option ")) {
1844 cmd_hist
.next
= rc
->next
;
1845 cmd_hist
.next
->prev
= &cmd_hist
;
1849 rc
->buf
= command_buf
.buf
;
1850 rc
->prev
= cmd_tail
;
1851 rc
->next
= cmd_hist
.prev
;
1852 rc
->prev
->next
= rc
;
1855 } while (command_buf
.buf
[0] == '#');
1860 static void skip_optional_lf(void)
1862 int term_char
= fgetc(stdin
);
1863 if (term_char
!= '\n' && term_char
!= EOF
)
1864 ungetc(term_char
, stdin
);
1867 static void parse_mark(void)
1869 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1870 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1871 read_next_command();
1877 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1881 if (prefixcmp(command_buf
.buf
, "data "))
1882 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1884 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1885 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1886 size_t term_len
= command_buf
.len
- 5 - 2;
1888 strbuf_detach(&command_buf
, NULL
);
1890 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1891 die("EOF in data (terminator '%s' not found)", term
);
1892 if (term_len
== command_buf
.len
1893 && !strcmp(term
, command_buf
.buf
))
1895 strbuf_addbuf(sb
, &command_buf
);
1896 strbuf_addch(sb
, '\n');
1901 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1902 size_t n
= 0, length
= (size_t)len
;
1904 if (limit
&& limit
< len
) {
1909 die("data is too large to use in this context");
1911 while (n
< length
) {
1912 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1913 if (!s
&& feof(stdin
))
1914 die("EOF in data (%lu bytes remaining)",
1915 (unsigned long)(length
- n
));
1924 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1926 const char *orig_src
= src
;
1932 num
= strtoul(src
, &endp
, 10);
1933 /* NEEDSWORK: perhaps check for reasonable values? */
1934 if (errno
|| endp
== src
|| *endp
!= ' ')
1938 if (*src
!= '-' && *src
!= '+')
1941 num
= strtoul(src
+ 1, &endp
, 10);
1942 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1946 strcpy(result
, orig_src
);
1950 static char *parse_ident(const char *buf
)
1956 gt
= strrchr(buf
, '>');
1958 die("Missing > in ident string: %s", buf
);
1961 die("Missing space after > in ident string: %s", buf
);
1963 name_len
= gt
- buf
;
1964 ident
= xmalloc(name_len
+ 24);
1965 strncpy(ident
, buf
, name_len
);
1969 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1970 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1972 case WHENSPEC_RFC2822
:
1973 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1974 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1977 if (strcmp("now", gt
))
1978 die("Date in ident must be 'now': %s", buf
);
1979 datestamp(ident
+ name_len
, 24);
1986 static void parse_and_store_blob(
1987 struct last_object
*last
,
1988 unsigned char *sha1out
,
1991 static struct strbuf buf
= STRBUF_INIT
;
1994 if (parse_data(&buf
, big_file_threshold
, &len
))
1995 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
1998 strbuf_release(&last
->data
);
2002 stream_blob(len
, sha1out
, mark
);
2007 static void parse_new_blob(void)
2009 read_next_command();
2011 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2014 static void unload_one_branch(void)
2016 while (cur_active_branches
2017 && cur_active_branches
>= max_active_branches
) {
2018 uintmax_t min_commit
= ULONG_MAX
;
2019 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2021 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2022 if (e
->last_commit
< min_commit
) {
2024 min_commit
= e
->last_commit
;
2030 e
= p
->active_next_branch
;
2031 p
->active_next_branch
= e
->active_next_branch
;
2033 e
= active_branches
;
2034 active_branches
= e
->active_next_branch
;
2037 e
->active_next_branch
= NULL
;
2038 if (e
->branch_tree
.tree
) {
2039 release_tree_content_recursive(e
->branch_tree
.tree
);
2040 e
->branch_tree
.tree
= NULL
;
2042 cur_active_branches
--;
2046 static void load_branch(struct branch
*b
)
2048 load_tree(&b
->branch_tree
);
2051 b
->active_next_branch
= active_branches
;
2052 active_branches
= b
;
2053 cur_active_branches
++;
2054 branch_load_count
++;
2058 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2060 unsigned char fanout
= 0;
2061 while ((num_notes
>>= 8))
2066 static void construct_path_with_fanout(const char *hex_sha1
,
2067 unsigned char fanout
, char *path
)
2069 unsigned int i
= 0, j
= 0;
2071 die("Too large fanout (%u)", fanout
);
2073 path
[i
++] = hex_sha1
[j
++];
2074 path
[i
++] = hex_sha1
[j
++];
2078 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2079 path
[i
+ 40 - j
] = '\0';
2082 static uintmax_t do_change_note_fanout(
2083 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2084 char *hex_sha1
, unsigned int hex_sha1_len
,
2085 char *fullpath
, unsigned int fullpath_len
,
2086 unsigned char fanout
)
2088 struct tree_content
*t
= root
->tree
;
2089 struct tree_entry
*e
, leaf
;
2090 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2091 uintmax_t num_notes
= 0;
2092 unsigned char sha1
[20];
2095 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2097 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2098 tmp_fullpath_len
= fullpath_len
;
2101 * We're interested in EITHER existing note entries (entries
2102 * with exactly 40 hex chars in path, not including directory
2103 * separators), OR directory entries that may contain note
2104 * entries (with < 40 hex chars in path).
2105 * Also, each path component in a note entry must be a multiple
2108 if (!e
->versions
[1].mode
||
2109 tmp_hex_sha1_len
> 40 ||
2110 e
->name
->str_len
% 2)
2113 /* This _may_ be a note entry, or a subdir containing notes */
2114 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2116 if (tmp_fullpath_len
)
2117 fullpath
[tmp_fullpath_len
++] = '/';
2118 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2120 tmp_fullpath_len
+= e
->name
->str_len
;
2121 fullpath
[tmp_fullpath_len
] = '\0';
2123 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2124 /* This is a note entry */
2125 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2126 if (!strcmp(fullpath
, realpath
)) {
2127 /* Note entry is in correct location */
2132 /* Rename fullpath to realpath */
2133 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2134 die("Failed to remove path %s", fullpath
);
2135 tree_content_set(orig_root
, realpath
,
2136 leaf
.versions
[1].sha1
,
2137 leaf
.versions
[1].mode
,
2139 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2140 /* This is a subdir that may contain note entries */
2143 num_notes
+= do_change_note_fanout(orig_root
, e
,
2144 hex_sha1
, tmp_hex_sha1_len
,
2145 fullpath
, tmp_fullpath_len
, fanout
);
2148 /* The above may have reallocated the current tree_content */
2154 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2155 unsigned char fanout
)
2157 char hex_sha1
[40], path
[60];
2158 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2161 static void file_change_m(struct branch
*b
)
2163 const char *p
= command_buf
.buf
+ 2;
2164 static struct strbuf uq
= STRBUF_INIT
;
2166 struct object_entry
*oe
= oe
;
2167 unsigned char sha1
[20];
2168 uint16_t mode
, inline_data
= 0;
2170 p
= get_mode(p
, &mode
);
2172 die("Corrupt mode: %s", command_buf
.buf
);
2177 case S_IFREG
| 0644:
2178 case S_IFREG
| 0755:
2185 die("Corrupt mode: %s", command_buf
.buf
);
2190 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2191 hashcpy(sha1
, oe
->idx
.sha1
);
2193 } else if (!prefixcmp(p
, "inline")) {
2197 if (get_sha1_hex(p
, sha1
))
2198 die("Invalid SHA1: %s", command_buf
.buf
);
2199 oe
= find_object(sha1
);
2203 die("Missing space after SHA1: %s", command_buf
.buf
);
2206 if (!unquote_c_style(&uq
, p
, &endp
)) {
2208 die("Garbage after path in: %s", command_buf
.buf
);
2212 if (S_ISGITLINK(mode
)) {
2214 die("Git links cannot be specified 'inline': %s",
2217 if (oe
->type
!= OBJ_COMMIT
)
2218 die("Not a commit (actually a %s): %s",
2219 typename(oe
->type
), command_buf
.buf
);
2222 * Accept the sha1 without checking; it expected to be in
2223 * another repository.
2225 } else if (inline_data
) {
2227 die("Directories cannot be specified 'inline': %s",
2230 strbuf_addstr(&uq
, p
);
2233 read_next_command();
2234 parse_and_store_blob(&last_blob
, sha1
, 0);
2236 enum object_type expected
= S_ISDIR(mode
) ?
2238 enum object_type type
= oe
? oe
->type
:
2239 sha1_object_info(sha1
, NULL
);
2241 die("%s not found: %s",
2242 S_ISDIR(mode
) ? "Tree" : "Blob",
2244 if (type
!= expected
)
2245 die("Not a %s (actually a %s): %s",
2246 typename(expected
), typename(type
),
2250 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2253 static void file_change_d(struct branch
*b
)
2255 const char *p
= command_buf
.buf
+ 2;
2256 static struct strbuf uq
= STRBUF_INIT
;
2260 if (!unquote_c_style(&uq
, p
, &endp
)) {
2262 die("Garbage after path in: %s", command_buf
.buf
);
2265 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2268 static void file_change_cr(struct branch
*b
, int rename
)
2271 static struct strbuf s_uq
= STRBUF_INIT
;
2272 static struct strbuf d_uq
= STRBUF_INIT
;
2274 struct tree_entry leaf
;
2276 s
= command_buf
.buf
+ 2;
2277 strbuf_reset(&s_uq
);
2278 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2280 die("Missing space after source: %s", command_buf
.buf
);
2282 endp
= strchr(s
, ' ');
2284 die("Missing space after source: %s", command_buf
.buf
);
2285 strbuf_add(&s_uq
, s
, endp
- s
);
2291 die("Missing dest: %s", command_buf
.buf
);
2294 strbuf_reset(&d_uq
);
2295 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2297 die("Garbage after dest in: %s", command_buf
.buf
);
2301 memset(&leaf
, 0, sizeof(leaf
));
2303 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2305 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2306 if (!leaf
.versions
[1].mode
)
2307 die("Path %s not in branch", s
);
2308 tree_content_set(&b
->branch_tree
, d
,
2309 leaf
.versions
[1].sha1
,
2310 leaf
.versions
[1].mode
,
2314 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2316 const char *p
= command_buf
.buf
+ 2;
2317 static struct strbuf uq
= STRBUF_INIT
;
2318 struct object_entry
*oe
= oe
;
2320 unsigned char sha1
[20], commit_sha1
[20];
2322 uint16_t inline_data
= 0;
2323 unsigned char new_fanout
;
2325 /* <dataref> or 'inline' */
2328 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2329 hashcpy(sha1
, oe
->idx
.sha1
);
2331 } else if (!prefixcmp(p
, "inline")) {
2335 if (get_sha1_hex(p
, sha1
))
2336 die("Invalid SHA1: %s", command_buf
.buf
);
2337 oe
= find_object(sha1
);
2341 die("Missing space after SHA1: %s", command_buf
.buf
);
2344 s
= lookup_branch(p
);
2346 hashcpy(commit_sha1
, s
->sha1
);
2347 } else if (*p
== ':') {
2348 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2349 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2350 if (commit_oe
->type
!= OBJ_COMMIT
)
2351 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2352 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2353 } else if (!get_sha1(p
, commit_sha1
)) {
2355 char *buf
= read_object_with_reference(commit_sha1
,
2356 commit_type
, &size
, commit_sha1
);
2357 if (!buf
|| size
< 46)
2358 die("Not a valid commit: %s", p
);
2361 die("Invalid ref name or SHA1 expression: %s", p
);
2365 strbuf_addstr(&uq
, p
);
2368 read_next_command();
2369 parse_and_store_blob(&last_blob
, sha1
, 0);
2371 if (oe
->type
!= OBJ_BLOB
)
2372 die("Not a blob (actually a %s): %s",
2373 typename(oe
->type
), command_buf
.buf
);
2374 } else if (!is_null_sha1(sha1
)) {
2375 enum object_type type
= sha1_object_info(sha1
, NULL
);
2377 die("Blob not found: %s", command_buf
.buf
);
2378 if (type
!= OBJ_BLOB
)
2379 die("Not a blob (actually a %s): %s",
2380 typename(type
), command_buf
.buf
);
2383 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2384 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2387 if (is_null_sha1(sha1
))
2388 return; /* nothing to insert */
2391 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2392 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2393 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2396 static void file_change_deleteall(struct branch
*b
)
2398 release_tree_content_recursive(b
->branch_tree
.tree
);
2399 hashclr(b
->branch_tree
.versions
[0].sha1
);
2400 hashclr(b
->branch_tree
.versions
[1].sha1
);
2401 load_tree(&b
->branch_tree
);
2405 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2407 if (!buf
|| size
< 46)
2408 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2409 if (memcmp("tree ", buf
, 5)
2410 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2411 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2412 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2413 b
->branch_tree
.versions
[1].sha1
);
2416 static void parse_from_existing(struct branch
*b
)
2418 if (is_null_sha1(b
->sha1
)) {
2419 hashclr(b
->branch_tree
.versions
[0].sha1
);
2420 hashclr(b
->branch_tree
.versions
[1].sha1
);
2425 buf
= read_object_with_reference(b
->sha1
,
2426 commit_type
, &size
, b
->sha1
);
2427 parse_from_commit(b
, buf
, size
);
2432 static int parse_from(struct branch
*b
)
2437 if (prefixcmp(command_buf
.buf
, "from "))
2440 if (b
->branch_tree
.tree
) {
2441 release_tree_content_recursive(b
->branch_tree
.tree
);
2442 b
->branch_tree
.tree
= NULL
;
2445 from
= strchr(command_buf
.buf
, ' ') + 1;
2446 s
= lookup_branch(from
);
2448 die("Can't create a branch from itself: %s", b
->name
);
2450 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2451 hashcpy(b
->sha1
, s
->sha1
);
2452 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2453 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2454 } else if (*from
== ':') {
2455 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2456 struct object_entry
*oe
= find_mark(idnum
);
2457 if (oe
->type
!= OBJ_COMMIT
)
2458 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2459 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2460 if (oe
->pack_id
!= MAX_PACK_ID
) {
2462 char *buf
= gfi_unpack_entry(oe
, &size
);
2463 parse_from_commit(b
, buf
, size
);
2466 parse_from_existing(b
);
2467 } else if (!get_sha1(from
, b
->sha1
))
2468 parse_from_existing(b
);
2470 die("Invalid ref name or SHA1 expression: %s", from
);
2472 read_next_command();
2476 static struct hash_list
*parse_merge(unsigned int *count
)
2478 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2483 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2484 from
= strchr(command_buf
.buf
, ' ') + 1;
2485 n
= xmalloc(sizeof(*n
));
2486 s
= lookup_branch(from
);
2488 hashcpy(n
->sha1
, s
->sha1
);
2489 else if (*from
== ':') {
2490 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2491 struct object_entry
*oe
= find_mark(idnum
);
2492 if (oe
->type
!= OBJ_COMMIT
)
2493 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2494 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2495 } else if (!get_sha1(from
, n
->sha1
)) {
2497 char *buf
= read_object_with_reference(n
->sha1
,
2498 commit_type
, &size
, n
->sha1
);
2499 if (!buf
|| size
< 46)
2500 die("Not a valid commit: %s", from
);
2503 die("Invalid ref name or SHA1 expression: %s", from
);
2512 read_next_command();
2517 static void parse_new_commit(void)
2519 static struct strbuf msg
= STRBUF_INIT
;
2522 char *author
= NULL
;
2523 char *committer
= NULL
;
2524 struct hash_list
*merge_list
= NULL
;
2525 unsigned int merge_count
;
2526 unsigned char prev_fanout
, new_fanout
;
2528 /* Obtain the branch name from the rest of our command */
2529 sp
= strchr(command_buf
.buf
, ' ') + 1;
2530 b
= lookup_branch(sp
);
2534 read_next_command();
2536 if (!prefixcmp(command_buf
.buf
, "author ")) {
2537 author
= parse_ident(command_buf
.buf
+ 7);
2538 read_next_command();
2540 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2541 committer
= parse_ident(command_buf
.buf
+ 10);
2542 read_next_command();
2545 die("Expected committer but didn't get one");
2546 parse_data(&msg
, 0, NULL
);
2547 read_next_command();
2549 merge_list
= parse_merge(&merge_count
);
2551 /* ensure the branch is active/loaded */
2552 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2553 unload_one_branch();
2557 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2560 while (command_buf
.len
> 0) {
2561 if (!prefixcmp(command_buf
.buf
, "M "))
2563 else if (!prefixcmp(command_buf
.buf
, "D "))
2565 else if (!prefixcmp(command_buf
.buf
, "R "))
2566 file_change_cr(b
, 1);
2567 else if (!prefixcmp(command_buf
.buf
, "C "))
2568 file_change_cr(b
, 0);
2569 else if (!prefixcmp(command_buf
.buf
, "N "))
2570 note_change_n(b
, prev_fanout
);
2571 else if (!strcmp("deleteall", command_buf
.buf
))
2572 file_change_deleteall(b
);
2574 unread_command_buf
= 1;
2577 if (read_next_command() == EOF
)
2581 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2582 if (new_fanout
!= prev_fanout
)
2583 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2585 /* build the tree and the commit */
2586 store_tree(&b
->branch_tree
);
2587 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2588 b
->branch_tree
.versions
[1].sha1
);
2590 strbuf_reset(&new_data
);
2591 strbuf_addf(&new_data
, "tree %s\n",
2592 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2593 if (!is_null_sha1(b
->sha1
))
2594 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2595 while (merge_list
) {
2596 struct hash_list
*next
= merge_list
->next
;
2597 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2601 strbuf_addf(&new_data
,
2605 author
? author
: committer
, committer
);
2606 strbuf_addbuf(&new_data
, &msg
);
2610 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2611 b
->pack_id
= pack_id
;
2612 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2615 static void parse_new_tag(void)
2617 static struct strbuf msg
= STRBUF_INIT
;
2623 uintmax_t from_mark
= 0;
2624 unsigned char sha1
[20];
2625 enum object_type type
;
2627 /* Obtain the new tag name from the rest of our command */
2628 sp
= strchr(command_buf
.buf
, ' ') + 1;
2629 t
= pool_alloc(sizeof(struct tag
));
2631 t
->name
= pool_strdup(sp
);
2633 last_tag
->next_tag
= t
;
2637 read_next_command();
2640 if (prefixcmp(command_buf
.buf
, "from "))
2641 die("Expected from command, got %s", command_buf
.buf
);
2642 from
= strchr(command_buf
.buf
, ' ') + 1;
2643 s
= lookup_branch(from
);
2645 hashcpy(sha1
, s
->sha1
);
2647 } else if (*from
== ':') {
2648 struct object_entry
*oe
;
2649 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2650 oe
= find_mark(from_mark
);
2652 hashcpy(sha1
, oe
->idx
.sha1
);
2653 } else if (!get_sha1(from
, sha1
)) {
2657 buf
= read_sha1_file(sha1
, &type
, &size
);
2658 if (!buf
|| size
< 46)
2659 die("Not a valid commit: %s", from
);
2662 die("Invalid ref name or SHA1 expression: %s", from
);
2663 read_next_command();
2666 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2667 tagger
= parse_ident(command_buf
.buf
+ 7);
2668 read_next_command();
2672 /* tag payload/message */
2673 parse_data(&msg
, 0, NULL
);
2675 /* build the tag object */
2676 strbuf_reset(&new_data
);
2678 strbuf_addf(&new_data
,
2682 sha1_to_hex(sha1
), typename(type
), t
->name
);
2684 strbuf_addf(&new_data
,
2685 "tagger %s\n", tagger
);
2686 strbuf_addch(&new_data
, '\n');
2687 strbuf_addbuf(&new_data
, &msg
);
2690 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2691 t
->pack_id
= MAX_PACK_ID
;
2693 t
->pack_id
= pack_id
;
2696 static void parse_reset_branch(void)
2701 /* Obtain the branch name from the rest of our command */
2702 sp
= strchr(command_buf
.buf
, ' ') + 1;
2703 b
= lookup_branch(sp
);
2706 hashclr(b
->branch_tree
.versions
[0].sha1
);
2707 hashclr(b
->branch_tree
.versions
[1].sha1
);
2708 if (b
->branch_tree
.tree
) {
2709 release_tree_content_recursive(b
->branch_tree
.tree
);
2710 b
->branch_tree
.tree
= NULL
;
2715 read_next_command();
2717 if (command_buf
.len
> 0)
2718 unread_command_buf
= 1;
2721 static void checkpoint(void)
2723 checkpoint_requested
= 0;
2732 static void parse_checkpoint(void)
2734 checkpoint_requested
= 1;
2738 static void parse_progress(void)
2740 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2741 fputc('\n', stdout
);
2746 static char* make_fast_import_path(const char *path
)
2748 struct strbuf abs_path
= STRBUF_INIT
;
2750 if (!relative_marks_paths
|| is_absolute_path(path
))
2751 return xstrdup(path
);
2752 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2753 return strbuf_detach(&abs_path
, NULL
);
2756 static void option_import_marks(const char *marks
, int from_stream
)
2758 if (import_marks_file
) {
2760 die("Only one import-marks command allowed per stream");
2762 /* read previous mark file */
2763 if(!import_marks_file_from_stream
)
2767 import_marks_file
= make_fast_import_path(marks
);
2768 safe_create_leading_directories_const(import_marks_file
);
2769 import_marks_file_from_stream
= from_stream
;
2772 static void option_date_format(const char *fmt
)
2774 if (!strcmp(fmt
, "raw"))
2775 whenspec
= WHENSPEC_RAW
;
2776 else if (!strcmp(fmt
, "rfc2822"))
2777 whenspec
= WHENSPEC_RFC2822
;
2778 else if (!strcmp(fmt
, "now"))
2779 whenspec
= WHENSPEC_NOW
;
2781 die("unknown --date-format argument %s", fmt
);
2784 static void option_depth(const char *depth
)
2786 max_depth
= strtoul(depth
, NULL
, 0);
2787 if (max_depth
> MAX_DEPTH
)
2788 die("--depth cannot exceed %u", MAX_DEPTH
);
2791 static void option_active_branches(const char *branches
)
2793 max_active_branches
= strtoul(branches
, NULL
, 0);
2796 static void option_export_marks(const char *marks
)
2798 export_marks_file
= make_fast_import_path(marks
);
2799 safe_create_leading_directories_const(export_marks_file
);
2802 static void option_export_pack_edges(const char *edges
)
2806 pack_edges
= fopen(edges
, "a");
2808 die_errno("Cannot open '%s'", edges
);
2811 static int parse_one_option(const char *option
)
2813 if (!prefixcmp(option
, "max-pack-size=")) {
2815 if (!git_parse_ulong(option
+ 14, &v
))
2818 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2820 } else if (v
< 1024 * 1024) {
2821 warning("minimum max-pack-size is 1 MiB");
2825 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2827 if (!git_parse_ulong(option
+ 19, &v
))
2829 big_file_threshold
= v
;
2830 } else if (!prefixcmp(option
, "depth=")) {
2831 option_depth(option
+ 6);
2832 } else if (!prefixcmp(option
, "active-branches=")) {
2833 option_active_branches(option
+ 16);
2834 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2835 option_export_pack_edges(option
+ 18);
2836 } else if (!prefixcmp(option
, "quiet")) {
2838 } else if (!prefixcmp(option
, "stats")) {
2847 static int parse_one_feature(const char *feature
, int from_stream
)
2849 if (!prefixcmp(feature
, "date-format=")) {
2850 option_date_format(feature
+ 12);
2851 } else if (!prefixcmp(feature
, "import-marks=")) {
2852 option_import_marks(feature
+ 13, from_stream
);
2853 } else if (!prefixcmp(feature
, "export-marks=")) {
2854 option_export_marks(feature
+ 13);
2855 } else if (!prefixcmp(feature
, "relative-marks")) {
2856 relative_marks_paths
= 1;
2857 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2858 relative_marks_paths
= 0;
2859 } else if (!prefixcmp(feature
, "force")) {
2868 static void parse_feature(void)
2870 char *feature
= command_buf
.buf
+ 8;
2872 if (seen_data_command
)
2873 die("Got feature command '%s' after data command", feature
);
2875 if (parse_one_feature(feature
, 1))
2878 die("This version of fast-import does not support feature %s.", feature
);
2881 static void parse_option(void)
2883 char *option
= command_buf
.buf
+ 11;
2885 if (seen_data_command
)
2886 die("Got option command '%s' after data command", option
);
2888 if (parse_one_option(option
))
2891 die("This version of fast-import does not support option: %s", option
);
2894 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2896 if (!strcmp(k
, "pack.depth")) {
2897 max_depth
= git_config_int(k
, v
);
2898 if (max_depth
> MAX_DEPTH
)
2899 max_depth
= MAX_DEPTH
;
2902 if (!strcmp(k
, "pack.compression")) {
2903 int level
= git_config_int(k
, v
);
2905 level
= Z_DEFAULT_COMPRESSION
;
2906 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2907 die("bad pack compression level %d", level
);
2908 pack_compression_level
= level
;
2909 pack_compression_seen
= 1;
2912 if (!strcmp(k
, "pack.indexversion")) {
2913 pack_idx_default_version
= git_config_int(k
, v
);
2914 if (pack_idx_default_version
> 2)
2915 die("bad pack.indexversion=%"PRIu32
,
2916 pack_idx_default_version
);
2919 if (!strcmp(k
, "pack.packsizelimit")) {
2920 max_packsize
= git_config_ulong(k
, v
);
2923 if (!strcmp(k
, "core.bigfilethreshold")) {
2924 long n
= git_config_int(k
, v
);
2925 big_file_threshold
= 0 < n
? n
: 0;
2927 return git_default_config(k
, v
, cb
);
2930 static const char fast_import_usage
[] =
2931 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
2933 static void parse_argv(void)
2937 for (i
= 1; i
< global_argc
; i
++) {
2938 const char *a
= global_argv
[i
];
2940 if (*a
!= '-' || !strcmp(a
, "--"))
2943 if (parse_one_option(a
+ 2))
2946 if (parse_one_feature(a
+ 2, 0))
2949 die("unknown option %s", a
);
2951 if (i
!= global_argc
)
2952 usage(fast_import_usage
);
2954 seen_data_command
= 1;
2955 if (import_marks_file
)
2959 int main(int argc
, const char **argv
)
2963 git_extract_argv0_path(argv
[0]);
2965 if (argc
== 2 && !strcmp(argv
[1], "-h"))
2966 usage(fast_import_usage
);
2968 setup_git_directory();
2969 git_config(git_pack_config
, NULL
);
2970 if (!pack_compression_seen
&& core_compression_seen
)
2971 pack_compression_level
= core_compression_level
;
2973 alloc_objects(object_entry_alloc
);
2974 strbuf_init(&command_buf
, 0);
2975 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
2976 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
2977 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
2978 marks
= pool_calloc(1, sizeof(struct mark_set
));
2983 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
2984 for (i
= 0; i
< (cmd_save
- 1); i
++)
2985 rc_free
[i
].next
= &rc_free
[i
+ 1];
2986 rc_free
[cmd_save
- 1].next
= NULL
;
2988 prepare_packed_git();
2990 set_die_routine(die_nicely
);
2991 set_checkpoint_signal();
2992 while (read_next_command() != EOF
) {
2993 if (!strcmp("blob", command_buf
.buf
))
2995 else if (!prefixcmp(command_buf
.buf
, "commit "))
2997 else if (!prefixcmp(command_buf
.buf
, "tag "))
2999 else if (!prefixcmp(command_buf
.buf
, "reset "))
3000 parse_reset_branch();
3001 else if (!strcmp("checkpoint", command_buf
.buf
))
3003 else if (!prefixcmp(command_buf
.buf
, "progress "))
3005 else if (!prefixcmp(command_buf
.buf
, "feature "))
3007 else if (!prefixcmp(command_buf
.buf
, "option git "))
3009 else if (!prefixcmp(command_buf
.buf
, "option "))
3010 /* ignore non-git options*/;
3012 die("Unsupported command: %s", command_buf
.buf
);
3014 if (checkpoint_requested
)
3018 /* argv hasn't been parsed yet, do so */
3019 if (!seen_data_command
)
3033 uintmax_t total_count
= 0, duplicate_count
= 0;
3034 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3035 total_count
+= object_count_by_type
[i
];
3036 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3037 duplicate_count
+= duplicate_count_by_type
[i
];
3039 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3040 fprintf(stderr
, "---------------------------------------------------------------------\n");
3041 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3042 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3043 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
]);
3044 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
]);
3045 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
]);
3046 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
]);
3047 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3048 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3049 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3050 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3051 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3052 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3053 fprintf(stderr
, "---------------------------------------------------------------------\n");
3055 fprintf(stderr
, "---------------------------------------------------------------------\n");
3056 fprintf(stderr
, "\n");
3059 return failure
? 1 : 0;