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 cat_request ::= 'cat' sp (hexsha1 | idnum) lf
59 | 'cat' sp hexsha1 sp path_str lf;
61 checkpoint ::= 'checkpoint' lf
64 progress ::= 'progress' sp not_lf* lf
67 # note: the first idnum in a stream should be 1 and subsequent
68 # idnums should not have gaps between values as this will cause
69 # the stream parser to reserve space for the gapped values. An
70 # idnum can be updated in the future to a new object by issuing
71 # a new mark directive with the old idnum.
73 mark ::= 'mark' sp idnum lf;
74 data ::= (delimited_data | exact_data)
77 # note: delim may be any string but must not contain lf.
78 # data_line may contain any data but must not be exactly
80 delimited_data ::= 'data' sp '<<' delim lf
84 # note: declen indicates the length of binary_data in bytes.
85 # declen does not include the lf preceding the binary data.
87 exact_data ::= 'data' sp declen lf
90 # note: quoted strings are C-style quoting supporting \c for
91 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
92 # is the signed byte value in octal. Note that the only
93 # characters which must actually be escaped to protect the
94 # stream formatting is: \, " and LF. Otherwise these values
97 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
99 sha1exp_str ::= sha1exp;
101 path_str ::= path | '"' quoted(path) '"' ;
102 mode ::= '100644' | '644'
107 declen ::= # unsigned 32 bit value, ascii base10 notation;
108 bigint ::= # unsigned integer value, ascii base10 notation;
109 binary_data ::= # file content, not interpreted;
111 when ::= raw_when | rfc2822_when;
112 raw_when ::= ts sp tz;
113 rfc2822_when ::= # Valid RFC 2822 date and time;
115 sp ::= # ASCII space character;
116 lf ::= # ASCII newline (LF) character;
118 # note: a colon (':') must precede the numerical value assigned to
119 # an idnum. This is to distinguish it from a ref or tag name as
120 # GIT does not permit ':' in ref or tag strings.
122 idnum ::= ':' bigint;
123 path ::= # GIT style file path, e.g. "a/b/c";
124 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
125 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
126 sha1exp ::= # Any valid GIT SHA1 expression;
127 hexsha1 ::= # SHA1 in hexadecimal format;
129 # note: name and email are UTF8 strings, however name must not
130 # contain '<' or lf and email must not contain any of the
131 # following: '<', '>', lf.
133 name ::= # valid GIT author/committer name;
134 email ::= # valid GIT author/committer email;
135 ts ::= # time since the epoch in seconds, ascii base10 notation;
136 tz ::= # GIT style timezone;
138 # note: comments may appear anywhere in the input, except
139 # within a data command. Any form of the data command
140 # always escapes the related input from comment processing.
142 # In case it is not clear, the '#' that starts the comment
143 # must be the first character on that line (an 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"
163 #define PACK_ID_BITS 16
164 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
165 #define DEPTH_BITS 13
166 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
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
179 struct object_entry_pool
*next_pool
;
180 struct object_entry
*next_free
;
181 struct object_entry
*end
;
182 struct object_entry entries
[FLEX_ARRAY
]; /* more */
188 struct object_entry
*marked
[1024];
189 struct mark_set
*sets
[1024];
199 unsigned no_swap
: 1;
204 struct mem_pool
*next_pool
;
207 uintmax_t space
[FLEX_ARRAY
]; /* more */
212 struct atom_str
*next_atom
;
213 unsigned short str_len
;
214 char str_dat
[FLEX_ARRAY
]; /* more */
220 struct tree_content
*tree
;
221 struct atom_str
*name
;
225 unsigned char sha1
[20];
231 unsigned int entry_capacity
; /* must match avail_tree_content */
232 unsigned int entry_count
;
233 unsigned int delta_depth
;
234 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
237 struct avail_tree_content
239 unsigned int entry_capacity
; /* must match tree_content */
240 struct avail_tree_content
*next_avail
;
245 struct branch
*table_next_branch
;
246 struct branch
*active_next_branch
;
248 struct tree_entry branch_tree
;
249 uintmax_t last_commit
;
252 unsigned pack_id
: PACK_ID_BITS
;
253 unsigned char sha1
[20];
258 struct tag
*next_tag
;
260 unsigned int pack_id
;
261 unsigned char sha1
[20];
266 struct hash_list
*next
;
267 unsigned char sha1
[20];
276 struct recent_command
278 struct recent_command
*prev
;
279 struct recent_command
*next
;
283 /* Configured limits on output */
284 static unsigned long max_depth
= 10;
285 static off_t max_packsize
;
286 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
287 static int force_update
;
288 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
289 static int pack_compression_seen
;
291 /* Stats and misc. counters */
292 static uintmax_t alloc_count
;
293 static uintmax_t marks_set_count
;
294 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
295 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
296 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
297 static unsigned long object_count
;
298 static unsigned long branch_count
;
299 static unsigned long branch_load_count
;
301 static FILE *pack_edges
;
302 static unsigned int show_stats
= 1;
303 static int global_argc
;
304 static const char **global_argv
;
307 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
308 static size_t total_allocd
;
309 static struct mem_pool
*mem_pool
;
311 /* Atom management */
312 static unsigned int atom_table_sz
= 4451;
313 static unsigned int atom_cnt
;
314 static struct atom_str
**atom_table
;
316 /* The .pack file being generated */
317 static unsigned int pack_id
;
318 static struct sha1file
*pack_file
;
319 static struct packed_git
*pack_data
;
320 static struct packed_git
**all_packs
;
321 static off_t pack_size
;
323 /* Table of objects we've written. */
324 static unsigned int object_entry_alloc
= 5000;
325 static struct object_entry_pool
*blocks
;
326 static struct object_entry
*object_table
[1 << 16];
327 static struct mark_set
*marks
;
328 static const char *export_marks_file
;
329 static const char *import_marks_file
;
330 static int import_marks_file_from_stream
;
331 static int relative_marks_paths
;
334 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
336 /* Tree management */
337 static unsigned int tree_entry_alloc
= 1000;
338 static void *avail_tree_entry
;
339 static unsigned int avail_tree_table_sz
= 100;
340 static struct avail_tree_content
**avail_tree_table
;
341 static struct strbuf old_tree
= STRBUF_INIT
;
342 static struct strbuf new_tree
= STRBUF_INIT
;
345 static unsigned long max_active_branches
= 5;
346 static unsigned long cur_active_branches
;
347 static unsigned long branch_table_sz
= 1039;
348 static struct branch
**branch_table
;
349 static struct branch
*active_branches
;
352 static struct tag
*first_tag
;
353 static struct tag
*last_tag
;
355 /* Input stream parsing */
356 static whenspec_type whenspec
= WHENSPEC_RAW
;
357 static struct strbuf command_buf
= STRBUF_INIT
;
358 static int unread_command_buf
;
359 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
360 static struct recent_command
*cmd_tail
= &cmd_hist
;
361 static struct recent_command
*rc_free
;
362 static unsigned int cmd_save
= 100;
363 static uintmax_t next_mark
;
364 static struct strbuf new_data
= STRBUF_INIT
;
365 static int seen_data_command
;
367 /* Where to report commits */
368 static int report_fd
= -1;
370 static void parse_argv(void);
372 static void write_branch_report(FILE *rpt
, struct branch
*b
)
374 fprintf(rpt
, "%s:\n", b
->name
);
376 fprintf(rpt
, " status :");
378 fputs(" active", rpt
);
379 if (b
->branch_tree
.tree
)
380 fputs(" loaded", rpt
);
381 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
382 fputs(" dirty", rpt
);
385 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
386 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
387 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
388 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
390 fputs(" last pack : ", rpt
);
391 if (b
->pack_id
< MAX_PACK_ID
)
392 fprintf(rpt
, "%u", b
->pack_id
);
398 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
400 static void write_crash_report(const char *err
)
402 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
403 FILE *rpt
= fopen(loc
, "w");
406 struct recent_command
*rc
;
409 error("can't write crash report %s: %s", loc
, strerror(errno
));
413 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
415 fprintf(rpt
, "fast-import crash report:\n");
416 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
417 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
418 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
421 fputs("fatal: ", rpt
);
426 fputs("Most Recent Commands Before Crash\n", rpt
);
427 fputs("---------------------------------\n", rpt
);
428 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
429 if (rc
->next
== &cmd_hist
)
438 fputs("Active Branch LRU\n", rpt
);
439 fputs("-----------------\n", rpt
);
440 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
442 max_active_branches
);
444 fputs(" pos clock name\n", rpt
);
445 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
446 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
447 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
448 ++lu
, b
->last_commit
, b
->name
);
451 fputs("Inactive Branches\n", rpt
);
452 fputs("-----------------\n", rpt
);
453 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
454 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
455 write_branch_report(rpt
, b
);
461 fputs("Annotated Tags\n", rpt
);
462 fputs("--------------\n", rpt
);
463 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
464 fputs(sha1_to_hex(tg
->sha1
), rpt
);
466 fputs(tg
->name
, rpt
);
472 fputs("Marks\n", rpt
);
473 fputs("-----\n", rpt
);
474 if (export_marks_file
)
475 fprintf(rpt
, " exported to %s\n", export_marks_file
);
477 dump_marks_helper(rpt
, 0, marks
);
480 fputs("-------------------\n", rpt
);
481 fputs("END OF CRASH REPORT\n", rpt
);
485 static void end_packfile(void);
486 static void unkeep_all_packs(void);
487 static void dump_marks(void);
489 static NORETURN
void die_nicely(const char *err
, va_list params
)
492 char message
[2 * PATH_MAX
];
494 vsnprintf(message
, sizeof(message
), err
, params
);
495 fputs("fatal: ", stderr
);
496 fputs(message
, stderr
);
501 write_crash_report(message
);
509 static void alloc_objects(unsigned int cnt
)
511 struct object_entry_pool
*b
;
513 b
= xmalloc(sizeof(struct object_entry_pool
)
514 + cnt
* sizeof(struct object_entry
));
515 b
->next_pool
= blocks
;
516 b
->next_free
= b
->entries
;
517 b
->end
= b
->entries
+ cnt
;
522 static struct object_entry
*new_object(unsigned char *sha1
)
524 struct object_entry
*e
;
526 if (blocks
->next_free
== blocks
->end
)
527 alloc_objects(object_entry_alloc
);
529 e
= blocks
->next_free
++;
530 hashcpy(e
->idx
.sha1
, sha1
);
534 static struct object_entry
*find_object(unsigned char *sha1
)
536 unsigned int h
= sha1
[0] << 8 | sha1
[1];
537 struct object_entry
*e
;
538 for (e
= object_table
[h
]; e
; e
= e
->next
)
539 if (!hashcmp(sha1
, e
->idx
.sha1
))
544 static struct object_entry
*insert_object(unsigned char *sha1
)
546 unsigned int h
= sha1
[0] << 8 | sha1
[1];
547 struct object_entry
*e
= object_table
[h
];
548 struct object_entry
*p
= NULL
;
551 if (!hashcmp(sha1
, e
->idx
.sha1
))
557 e
= new_object(sha1
);
567 static unsigned int hc_str(const char *s
, size_t len
)
575 static void *pool_alloc(size_t len
)
580 /* round up to a 'uintmax_t' alignment */
581 if (len
& (sizeof(uintmax_t) - 1))
582 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
584 for (p
= mem_pool
; p
; p
= p
->next_pool
)
585 if ((p
->end
- p
->next_free
>= len
))
589 if (len
>= (mem_pool_alloc
/2)) {
593 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
594 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
595 p
->next_pool
= mem_pool
;
596 p
->next_free
= (char *) p
->space
;
597 p
->end
= p
->next_free
+ mem_pool_alloc
;
606 static void *pool_calloc(size_t count
, size_t size
)
608 size_t len
= count
* size
;
609 void *r
= pool_alloc(len
);
614 static char *pool_strdup(const char *s
)
616 char *r
= pool_alloc(strlen(s
) + 1);
621 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
623 struct mark_set
*s
= marks
;
624 while ((idnum
>> s
->shift
) >= 1024) {
625 s
= pool_calloc(1, sizeof(struct mark_set
));
626 s
->shift
= marks
->shift
+ 10;
627 s
->data
.sets
[0] = marks
;
631 uintmax_t i
= idnum
>> s
->shift
;
632 idnum
-= i
<< s
->shift
;
633 if (!s
->data
.sets
[i
]) {
634 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
635 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
639 if (!s
->data
.marked
[idnum
])
641 s
->data
.marked
[idnum
] = oe
;
644 static struct object_entry
*find_mark(uintmax_t idnum
)
646 uintmax_t orig_idnum
= idnum
;
647 struct mark_set
*s
= marks
;
648 struct object_entry
*oe
= NULL
;
649 if ((idnum
>> s
->shift
) < 1024) {
650 while (s
&& s
->shift
) {
651 uintmax_t i
= idnum
>> s
->shift
;
652 idnum
-= i
<< s
->shift
;
656 oe
= s
->data
.marked
[idnum
];
659 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
663 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
665 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
668 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
669 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
672 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
674 strncpy(c
->str_dat
, s
, len
);
676 c
->next_atom
= atom_table
[hc
];
682 static struct branch
*lookup_branch(const char *name
)
684 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
687 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
688 if (!strcmp(name
, b
->name
))
693 static struct branch
*new_branch(const char *name
)
695 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
696 struct branch
*b
= lookup_branch(name
);
699 die("Invalid attempt to create duplicate branch: %s", name
);
700 switch (check_ref_format(name
)) {
701 case 0: break; /* its valid */
702 case CHECK_REF_FORMAT_ONELEVEL
:
703 break; /* valid, but too few '/', allow anyway */
705 die("Branch name doesn't conform to GIT standards: %s", name
);
708 b
= pool_calloc(1, sizeof(struct branch
));
709 b
->name
= pool_strdup(name
);
710 b
->table_next_branch
= branch_table
[hc
];
711 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
712 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
715 b
->pack_id
= MAX_PACK_ID
;
716 branch_table
[hc
] = b
;
721 static unsigned int hc_entries(unsigned int cnt
)
723 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
724 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
727 static struct tree_content
*new_tree_content(unsigned int cnt
)
729 struct avail_tree_content
*f
, *l
= NULL
;
730 struct tree_content
*t
;
731 unsigned int hc
= hc_entries(cnt
);
733 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
734 if (f
->entry_capacity
>= cnt
)
739 l
->next_avail
= f
->next_avail
;
741 avail_tree_table
[hc
] = f
->next_avail
;
743 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
744 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
745 f
->entry_capacity
= cnt
;
748 t
= (struct tree_content
*)f
;
754 static void release_tree_entry(struct tree_entry
*e
);
755 static void release_tree_content(struct tree_content
*t
)
757 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
758 unsigned int hc
= hc_entries(f
->entry_capacity
);
759 f
->next_avail
= avail_tree_table
[hc
];
760 avail_tree_table
[hc
] = f
;
763 static void release_tree_content_recursive(struct tree_content
*t
)
766 for (i
= 0; i
< t
->entry_count
; i
++)
767 release_tree_entry(t
->entries
[i
]);
768 release_tree_content(t
);
771 static struct tree_content
*grow_tree_content(
772 struct tree_content
*t
,
775 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
776 r
->entry_count
= t
->entry_count
;
777 r
->delta_depth
= t
->delta_depth
;
778 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
779 release_tree_content(t
);
783 static struct tree_entry
*new_tree_entry(void)
785 struct tree_entry
*e
;
787 if (!avail_tree_entry
) {
788 unsigned int n
= tree_entry_alloc
;
789 total_allocd
+= n
* sizeof(struct tree_entry
);
790 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
792 *((void**)e
) = e
+ 1;
798 e
= avail_tree_entry
;
799 avail_tree_entry
= *((void**)e
);
803 static void release_tree_entry(struct tree_entry
*e
)
806 release_tree_content_recursive(e
->tree
);
807 *((void**)e
) = avail_tree_entry
;
808 avail_tree_entry
= e
;
811 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
813 struct tree_content
*d
;
814 struct tree_entry
*a
, *b
;
819 d
= new_tree_content(s
->entry_count
);
820 for (i
= 0; i
< s
->entry_count
; i
++) {
822 b
= new_tree_entry();
823 memcpy(b
, a
, sizeof(*a
));
824 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
825 b
->tree
= dup_tree_content(a
->tree
);
830 d
->entry_count
= s
->entry_count
;
831 d
->delta_depth
= s
->delta_depth
;
836 static void start_packfile(void)
838 static char tmpfile
[PATH_MAX
];
839 struct packed_git
*p
;
840 struct pack_header hdr
;
843 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
844 "pack/tmp_pack_XXXXXX");
845 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
846 strcpy(p
->pack_name
, tmpfile
);
847 p
->pack_fd
= pack_fd
;
848 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
850 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
851 hdr
.hdr_version
= htonl(2);
853 sha1write(pack_file
, &hdr
, sizeof(hdr
));
856 pack_size
= sizeof(hdr
);
859 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
860 all_packs
[pack_id
] = p
;
863 static const char *create_index(void)
866 struct pack_idx_entry
**idx
, **c
, **last
;
867 struct object_entry
*e
;
868 struct object_entry_pool
*o
;
870 /* Build the table of object IDs. */
871 idx
= xmalloc(object_count
* sizeof(*idx
));
873 for (o
= blocks
; o
; o
= o
->next_pool
)
874 for (e
= o
->next_free
; e
-- != o
->entries
;)
875 if (pack_id
== e
->pack_id
)
877 last
= idx
+ object_count
;
879 die("internal consistency error creating the index");
881 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
886 static char *keep_pack(const char *curr_index_name
)
888 static char name
[PATH_MAX
];
889 static const char *keep_msg
= "fast-import";
892 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
894 die_errno("cannot create keep file");
895 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
897 die_errno("failed to write keep file");
899 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
900 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
901 if (move_temp_to_file(pack_data
->pack_name
, name
))
902 die("cannot store pack file");
904 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
905 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
906 if (move_temp_to_file(curr_index_name
, name
))
907 die("cannot store index file");
908 free((void *)curr_index_name
);
912 static void unkeep_all_packs(void)
914 static char name
[PATH_MAX
];
917 for (k
= 0; k
< pack_id
; k
++) {
918 struct packed_git
*p
= all_packs
[k
];
919 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
920 get_object_directory(), sha1_to_hex(p
->sha1
));
921 unlink_or_warn(name
);
925 static void end_packfile(void)
927 struct packed_git
*old_p
= pack_data
, *new_p
;
929 clear_delta_base_cache();
931 unsigned char cur_pack_sha1
[20];
937 close_pack_windows(pack_data
);
938 sha1close(pack_file
, cur_pack_sha1
, 0);
939 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
940 pack_data
->pack_name
, object_count
,
941 cur_pack_sha1
, pack_size
);
942 close(pack_data
->pack_fd
);
943 idx_name
= keep_pack(create_index());
945 /* Register the packfile with core git's machinery. */
946 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
948 die("core git rejected index %s", idx_name
);
949 all_packs
[pack_id
] = new_p
;
950 install_packed_git(new_p
);
952 /* Print the boundary */
954 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
955 for (i
= 0; i
< branch_table_sz
; i
++) {
956 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
957 if (b
->pack_id
== pack_id
)
958 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
961 for (t
= first_tag
; t
; t
= t
->next_tag
) {
962 if (t
->pack_id
== pack_id
)
963 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
965 fputc('\n', pack_edges
);
972 close(old_p
->pack_fd
);
973 unlink_or_warn(old_p
->pack_name
);
977 /* We can't carry a delta across packfiles. */
978 strbuf_release(&last_blob
.data
);
979 last_blob
.offset
= 0;
983 static void cycle_packfile(void)
989 static int store_object(
990 enum object_type type
,
992 struct last_object
*last
,
993 unsigned char *sha1out
,
997 struct object_entry
*e
;
998 unsigned char hdr
[96];
999 unsigned char sha1
[20];
1000 unsigned long hdrlen
, deltalen
;
1004 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1005 (unsigned long)dat
->len
) + 1;
1007 git_SHA1_Update(&c
, hdr
, hdrlen
);
1008 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1009 git_SHA1_Final(sha1
, &c
);
1011 hashcpy(sha1out
, sha1
);
1013 e
= insert_object(sha1
);
1015 insert_mark(mark
, e
);
1016 if (e
->idx
.offset
) {
1017 duplicate_count_by_type
[type
]++;
1019 } else if (find_sha1_pack(sha1
, packed_git
)) {
1021 e
->pack_id
= MAX_PACK_ID
;
1022 e
->idx
.offset
= 1; /* just not zero! */
1023 duplicate_count_by_type
[type
]++;
1027 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1028 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1030 &deltalen
, dat
->len
- 20);
1034 memset(&s
, 0, sizeof(s
));
1035 deflateInit(&s
, pack_compression_level
);
1038 s
.avail_in
= deltalen
;
1040 s
.next_in
= (void *)dat
->buf
;
1041 s
.avail_in
= dat
->len
;
1043 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1044 s
.next_out
= out
= xmalloc(s
.avail_out
);
1045 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1049 /* Determine if we should auto-checkpoint. */
1050 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1051 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1053 /* This new object needs to *not* have the current pack_id. */
1054 e
->pack_id
= pack_id
+ 1;
1057 /* We cannot carry a delta into the new pack. */
1062 memset(&s
, 0, sizeof(s
));
1063 deflateInit(&s
, pack_compression_level
);
1064 s
.next_in
= (void *)dat
->buf
;
1065 s
.avail_in
= dat
->len
;
1066 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1067 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1068 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1075 e
->pack_id
= pack_id
;
1076 e
->idx
.offset
= pack_size
;
1078 object_count_by_type
[type
]++;
1080 crc32_begin(pack_file
);
1083 off_t ofs
= e
->idx
.offset
- last
->offset
;
1084 unsigned pos
= sizeof(hdr
) - 1;
1086 delta_count_by_type
[type
]++;
1087 e
->depth
= last
->depth
+ 1;
1089 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1090 sha1write(pack_file
, hdr
, hdrlen
);
1091 pack_size
+= hdrlen
;
1093 hdr
[pos
] = ofs
& 127;
1095 hdr
[--pos
] = 128 | (--ofs
& 127);
1096 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1097 pack_size
+= sizeof(hdr
) - pos
;
1100 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1101 sha1write(pack_file
, hdr
, hdrlen
);
1102 pack_size
+= hdrlen
;
1105 sha1write(pack_file
, out
, s
.total_out
);
1106 pack_size
+= s
.total_out
;
1108 e
->idx
.crc32
= crc32_end(pack_file
);
1113 if (last
->no_swap
) {
1116 strbuf_swap(&last
->data
, dat
);
1118 last
->offset
= e
->idx
.offset
;
1119 last
->depth
= e
->depth
;
1124 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1126 if (ftruncate(pack_data
->pack_fd
, to
)
1127 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1128 die_errno("cannot truncate pack to skip duplicate");
1131 /* yes this is a layering violation */
1132 pack_file
->total
= to
;
1133 pack_file
->offset
= 0;
1134 pack_file
->ctx
= *ctx
;
1137 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1139 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1140 unsigned char *in_buf
= xmalloc(in_sz
);
1141 unsigned char *out_buf
= xmalloc(out_sz
);
1142 struct object_entry
*e
;
1143 unsigned char sha1
[20];
1144 unsigned long hdrlen
;
1147 git_SHA_CTX pack_file_ctx
;
1151 /* Determine if we should auto-checkpoint. */
1152 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1153 || (pack_size
+ 60 + len
) < pack_size
)
1158 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1159 sha1flush(pack_file
);
1160 pack_file_ctx
= pack_file
->ctx
;
1162 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1163 if (out_sz
<= hdrlen
)
1164 die("impossibly large object header");
1167 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1169 crc32_begin(pack_file
);
1171 memset(&s
, 0, sizeof(s
));
1172 deflateInit(&s
, pack_compression_level
);
1174 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1175 if (out_sz
<= hdrlen
)
1176 die("impossibly large object header");
1178 s
.next_out
= out_buf
+ hdrlen
;
1179 s
.avail_out
= out_sz
- hdrlen
;
1181 while (status
!= Z_STREAM_END
) {
1182 if (0 < len
&& !s
.avail_in
) {
1183 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1184 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1185 if (!n
&& feof(stdin
))
1186 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1188 git_SHA1_Update(&c
, in_buf
, n
);
1194 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1196 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1197 size_t n
= s
.next_out
- out_buf
;
1198 sha1write(pack_file
, out_buf
, n
);
1200 s
.next_out
= out_buf
;
1201 s
.avail_out
= out_sz
;
1210 die("unexpected deflate failure: %d", status
);
1214 git_SHA1_Final(sha1
, &c
);
1217 hashcpy(sha1out
, sha1
);
1219 e
= insert_object(sha1
);
1222 insert_mark(mark
, e
);
1224 if (e
->idx
.offset
) {
1225 duplicate_count_by_type
[OBJ_BLOB
]++;
1226 truncate_pack(offset
, &pack_file_ctx
);
1228 } else if (find_sha1_pack(sha1
, packed_git
)) {
1230 e
->pack_id
= MAX_PACK_ID
;
1231 e
->idx
.offset
= 1; /* just not zero! */
1232 duplicate_count_by_type
[OBJ_BLOB
]++;
1233 truncate_pack(offset
, &pack_file_ctx
);
1238 e
->pack_id
= pack_id
;
1239 e
->idx
.offset
= offset
;
1240 e
->idx
.crc32
= crc32_end(pack_file
);
1242 object_count_by_type
[OBJ_BLOB
]++;
1249 /* All calls must be guarded by find_object() or find_mark() to
1250 * ensure the 'struct object_entry' passed was written by this
1251 * process instance. We unpack the entry by the offset, avoiding
1252 * the need for the corresponding .idx file. This unpacking rule
1253 * works because we only use OBJ_REF_DELTA within the packfiles
1254 * created by fast-import.
1256 * oe must not be NULL. Such an oe usually comes from giving
1257 * an unknown SHA-1 to find_object() or an undefined mark to
1258 * find_mark(). Callers must test for this condition and use
1259 * the standard read_sha1_file() when it happens.
1261 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1262 * find_mark(), where the mark was reloaded from an existing marks
1263 * file and is referencing an object that this fast-import process
1264 * instance did not write out to a packfile. Callers must test for
1265 * this condition and use read_sha1_file() instead.
1267 static void *gfi_unpack_entry(
1268 struct object_entry
*oe
,
1269 unsigned long *sizep
)
1271 enum object_type type
;
1272 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1273 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1274 /* The object is stored in the packfile we are writing to
1275 * and we have modified it since the last time we scanned
1276 * back to read a previously written object. If an old
1277 * window covered [p->pack_size, p->pack_size + 20) its
1278 * data is stale and is not valid. Closing all windows
1279 * and updating the packfile length ensures we can read
1280 * the newly written data.
1282 close_pack_windows(p
);
1283 sha1flush(pack_file
);
1285 /* We have to offer 20 bytes additional on the end of
1286 * the packfile as the core unpacker code assumes the
1287 * footer is present at the file end and must promise
1288 * at least 20 bytes within any window it maps. But
1289 * we don't actually create the footer here.
1291 p
->pack_size
= pack_size
+ 20;
1293 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1296 static const char *get_mode(const char *str
, uint16_t *modep
)
1301 while ((c
= *str
++) != ' ') {
1302 if (c
< '0' || c
> '7')
1304 mode
= (mode
<< 3) + (c
- '0');
1310 static void load_tree(struct tree_entry
*root
)
1312 unsigned char *sha1
= root
->versions
[1].sha1
;
1313 struct object_entry
*myoe
;
1314 struct tree_content
*t
;
1319 root
->tree
= t
= new_tree_content(8);
1320 if (is_null_sha1(sha1
))
1323 myoe
= find_object(sha1
);
1324 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1325 if (myoe
->type
!= OBJ_TREE
)
1326 die("Not a tree: %s", sha1_to_hex(sha1
));
1327 t
->delta_depth
= myoe
->depth
;
1328 buf
= gfi_unpack_entry(myoe
, &size
);
1330 die("Can't load tree %s", sha1_to_hex(sha1
));
1332 enum object_type type
;
1333 buf
= read_sha1_file(sha1
, &type
, &size
);
1334 if (!buf
|| type
!= OBJ_TREE
)
1335 die("Can't load tree %s", sha1_to_hex(sha1
));
1339 while (c
!= (buf
+ size
)) {
1340 struct tree_entry
*e
= new_tree_entry();
1342 if (t
->entry_count
== t
->entry_capacity
)
1343 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1344 t
->entries
[t
->entry_count
++] = e
;
1347 c
= get_mode(c
, &e
->versions
[1].mode
);
1349 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1350 e
->versions
[0].mode
= e
->versions
[1].mode
;
1351 e
->name
= to_atom(c
, strlen(c
));
1352 c
+= e
->name
->str_len
+ 1;
1353 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1354 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1360 static int tecmp0 (const void *_a
, const void *_b
)
1362 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1363 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1364 return base_name_compare(
1365 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1366 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1369 static int tecmp1 (const void *_a
, const void *_b
)
1371 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1372 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1373 return base_name_compare(
1374 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1375 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1378 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1384 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1386 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1388 for (i
= 0; i
< t
->entry_count
; i
++) {
1389 if (t
->entries
[i
]->versions
[v
].mode
)
1390 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1394 strbuf_grow(b
, maxlen
);
1395 for (i
= 0; i
< t
->entry_count
; i
++) {
1396 struct tree_entry
*e
= t
->entries
[i
];
1397 if (!e
->versions
[v
].mode
)
1399 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1400 e
->name
->str_dat
, '\0');
1401 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1405 static void store_tree(struct tree_entry
*root
)
1407 struct tree_content
*t
= root
->tree
;
1408 unsigned int i
, j
, del
;
1409 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1410 struct object_entry
*le
;
1412 if (!is_null_sha1(root
->versions
[1].sha1
))
1415 for (i
= 0; i
< t
->entry_count
; i
++) {
1416 if (t
->entries
[i
]->tree
)
1417 store_tree(t
->entries
[i
]);
1420 le
= find_object(root
->versions
[0].sha1
);
1421 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1422 mktree(t
, 0, &old_tree
);
1424 lo
.offset
= le
->idx
.offset
;
1425 lo
.depth
= t
->delta_depth
;
1428 mktree(t
, 1, &new_tree
);
1429 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1431 t
->delta_depth
= lo
.depth
;
1432 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1433 struct tree_entry
*e
= t
->entries
[i
];
1434 if (e
->versions
[1].mode
) {
1435 e
->versions
[0].mode
= e
->versions
[1].mode
;
1436 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1437 t
->entries
[j
++] = e
;
1439 release_tree_entry(e
);
1443 t
->entry_count
-= del
;
1446 static int tree_content_set(
1447 struct tree_entry
*root
,
1449 const unsigned char *sha1
,
1450 const uint16_t mode
,
1451 struct tree_content
*subtree
)
1453 struct tree_content
*t
= root
->tree
;
1456 struct tree_entry
*e
;
1458 slash1
= strchr(p
, '/');
1464 die("Empty path component found in input");
1465 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1466 die("Non-directories cannot have subtrees");
1468 for (i
= 0; i
< t
->entry_count
; i
++) {
1470 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1473 && e
->versions
[1].mode
== mode
1474 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1476 e
->versions
[1].mode
= mode
;
1477 hashcpy(e
->versions
[1].sha1
, sha1
);
1479 release_tree_content_recursive(e
->tree
);
1481 hashclr(root
->versions
[1].sha1
);
1484 if (!S_ISDIR(e
->versions
[1].mode
)) {
1485 e
->tree
= new_tree_content(8);
1486 e
->versions
[1].mode
= S_IFDIR
;
1490 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1491 hashclr(root
->versions
[1].sha1
);
1498 if (t
->entry_count
== t
->entry_capacity
)
1499 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1500 e
= new_tree_entry();
1501 e
->name
= to_atom(p
, n
);
1502 e
->versions
[0].mode
= 0;
1503 hashclr(e
->versions
[0].sha1
);
1504 t
->entries
[t
->entry_count
++] = e
;
1506 e
->tree
= new_tree_content(8);
1507 e
->versions
[1].mode
= S_IFDIR
;
1508 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1511 e
->versions
[1].mode
= mode
;
1512 hashcpy(e
->versions
[1].sha1
, sha1
);
1514 hashclr(root
->versions
[1].sha1
);
1518 static int tree_content_remove(
1519 struct tree_entry
*root
,
1521 struct tree_entry
*backup_leaf
)
1523 struct tree_content
*t
= root
->tree
;
1526 struct tree_entry
*e
;
1528 slash1
= strchr(p
, '/');
1534 for (i
= 0; i
< t
->entry_count
; i
++) {
1536 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1537 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1539 * If p names a file in some subdirectory, and a
1540 * file or symlink matching the name of the
1541 * parent directory of p exists, then p cannot
1542 * exist and need not be deleted.
1545 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1549 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1550 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1551 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1552 hashclr(root
->versions
[1].sha1
);
1566 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1568 release_tree_content_recursive(e
->tree
);
1570 e
->versions
[1].mode
= 0;
1571 hashclr(e
->versions
[1].sha1
);
1572 hashclr(root
->versions
[1].sha1
);
1576 static int tree_content_get(
1577 struct tree_entry
*root
,
1579 struct tree_entry
*leaf
)
1581 struct tree_content
*t
= root
->tree
;
1584 struct tree_entry
*e
;
1586 slash1
= strchr(p
, '/');
1592 for (i
= 0; i
< t
->entry_count
; i
++) {
1594 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1596 memcpy(leaf
, e
, sizeof(*leaf
));
1597 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1598 leaf
->tree
= dup_tree_content(e
->tree
);
1603 if (!S_ISDIR(e
->versions
[1].mode
))
1607 return tree_content_get(e
, slash1
+ 1, leaf
);
1613 static int update_branch(struct branch
*b
)
1615 static const char *msg
= "fast-import";
1616 struct ref_lock
*lock
;
1617 unsigned char old_sha1
[20];
1619 if (is_null_sha1(b
->sha1
))
1621 if (read_ref(b
->name
, old_sha1
))
1623 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1625 return error("Unable to lock %s", b
->name
);
1626 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1627 struct commit
*old_cmit
, *new_cmit
;
1629 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1630 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1631 if (!old_cmit
|| !new_cmit
) {
1633 return error("Branch %s is missing commits.", b
->name
);
1636 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1638 warning("Not updating %s"
1639 " (new tip %s does not contain %s)",
1640 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1644 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1645 return error("Unable to update %s", b
->name
);
1649 static void dump_branches(void)
1654 for (i
= 0; i
< branch_table_sz
; i
++) {
1655 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1656 failure
|= update_branch(b
);
1660 static void dump_tags(void)
1662 static const char *msg
= "fast-import";
1664 struct ref_lock
*lock
;
1665 char ref_name
[PATH_MAX
];
1667 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1668 sprintf(ref_name
, "tags/%s", t
->name
);
1669 lock
= lock_ref_sha1(ref_name
, NULL
);
1670 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1671 failure
|= error("Unable to update %s", ref_name
);
1675 static void dump_marks_helper(FILE *f
,
1681 for (k
= 0; k
< 1024; k
++) {
1682 if (m
->data
.sets
[k
])
1683 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1687 for (k
= 0; k
< 1024; k
++) {
1688 if (m
->data
.marked
[k
])
1689 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1690 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1695 static void dump_marks(void)
1697 static struct lock_file mark_lock
;
1701 if (!export_marks_file
)
1704 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1706 failure
|= error("Unable to write marks file %s: %s",
1707 export_marks_file
, strerror(errno
));
1711 f
= fdopen(mark_fd
, "w");
1713 int saved_errno
= errno
;
1714 rollback_lock_file(&mark_lock
);
1715 failure
|= error("Unable to write marks file %s: %s",
1716 export_marks_file
, strerror(saved_errno
));
1721 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1722 * Assign -1 to the lock file descriptor so that commit_lock_file()
1723 * won't try to close() it.
1727 dump_marks_helper(f
, 0, marks
);
1728 if (ferror(f
) || fclose(f
)) {
1729 int saved_errno
= errno
;
1730 rollback_lock_file(&mark_lock
);
1731 failure
|= error("Unable to write marks file %s: %s",
1732 export_marks_file
, strerror(saved_errno
));
1736 if (commit_lock_file(&mark_lock
)) {
1737 int saved_errno
= errno
;
1738 rollback_lock_file(&mark_lock
);
1739 failure
|= error("Unable to commit marks file %s: %s",
1740 export_marks_file
, strerror(saved_errno
));
1745 static void read_marks(void)
1748 FILE *f
= fopen(import_marks_file
, "r");
1750 die_errno("cannot read '%s'", import_marks_file
);
1751 while (fgets(line
, sizeof(line
), f
)) {
1754 unsigned char sha1
[20];
1755 struct object_entry
*e
;
1757 end
= strchr(line
, '\n');
1758 if (line
[0] != ':' || !end
)
1759 die("corrupt mark line: %s", line
);
1761 mark
= strtoumax(line
+ 1, &end
, 10);
1762 if (!mark
|| end
== line
+ 1
1763 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1764 die("corrupt mark line: %s", line
);
1765 e
= find_object(sha1
);
1767 enum object_type type
= sha1_object_info(sha1
, NULL
);
1769 die("object not found: %s", sha1_to_hex(sha1
));
1770 e
= insert_object(sha1
);
1772 e
->pack_id
= MAX_PACK_ID
;
1773 e
->idx
.offset
= 1; /* just not zero! */
1775 insert_mark(mark
, e
);
1781 static int read_next_command(void)
1783 static int stdin_eof
= 0;
1786 unread_command_buf
= 0;
1791 if (unread_command_buf
) {
1792 unread_command_buf
= 0;
1794 struct recent_command
*rc
;
1796 strbuf_detach(&command_buf
, NULL
);
1797 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1801 if (!seen_data_command
1802 && prefixcmp(command_buf
.buf
, "feature ")
1803 && prefixcmp(command_buf
.buf
, "option ")) {
1812 cmd_hist
.next
= rc
->next
;
1813 cmd_hist
.next
->prev
= &cmd_hist
;
1817 rc
->buf
= command_buf
.buf
;
1818 rc
->prev
= cmd_tail
;
1819 rc
->next
= cmd_hist
.prev
;
1820 rc
->prev
->next
= rc
;
1823 } while (command_buf
.buf
[0] == '#');
1828 static void skip_optional_lf(void)
1830 int term_char
= fgetc(stdin
);
1831 if (term_char
!= '\n' && term_char
!= EOF
)
1832 ungetc(term_char
, stdin
);
1835 static void parse_mark(void)
1837 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1838 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1839 read_next_command();
1845 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1849 if (prefixcmp(command_buf
.buf
, "data "))
1850 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1852 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1853 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1854 size_t term_len
= command_buf
.len
- 5 - 2;
1856 strbuf_detach(&command_buf
, NULL
);
1858 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1859 die("EOF in data (terminator '%s' not found)", term
);
1860 if (term_len
== command_buf
.len
1861 && !strcmp(term
, command_buf
.buf
))
1863 strbuf_addbuf(sb
, &command_buf
);
1864 strbuf_addch(sb
, '\n');
1869 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1870 size_t n
= 0, length
= (size_t)len
;
1872 if (limit
&& limit
< len
) {
1877 die("data is too large to use in this context");
1879 while (n
< length
) {
1880 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1881 if (!s
&& feof(stdin
))
1882 die("EOF in data (%lu bytes remaining)",
1883 (unsigned long)(length
- n
));
1892 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1894 const char *orig_src
= src
;
1900 num
= strtoul(src
, &endp
, 10);
1901 /* NEEDSWORK: perhaps check for reasonable values? */
1902 if (errno
|| endp
== src
|| *endp
!= ' ')
1906 if (*src
!= '-' && *src
!= '+')
1909 num
= strtoul(src
+ 1, &endp
, 10);
1910 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1914 strcpy(result
, orig_src
);
1918 static char *parse_ident(const char *buf
)
1924 gt
= strrchr(buf
, '>');
1926 die("Missing > in ident string: %s", buf
);
1929 die("Missing space after > in ident string: %s", buf
);
1931 name_len
= gt
- buf
;
1932 ident
= xmalloc(name_len
+ 24);
1933 strncpy(ident
, buf
, name_len
);
1937 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1938 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1940 case WHENSPEC_RFC2822
:
1941 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1942 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1945 if (strcmp("now", gt
))
1946 die("Date in ident must be 'now': %s", buf
);
1947 datestamp(ident
+ name_len
, 24);
1954 static void parse_and_store_blob(
1955 struct last_object
*last
,
1956 unsigned char *sha1out
,
1959 static struct strbuf buf
= STRBUF_INIT
;
1962 if (parse_data(&buf
, big_file_threshold
, &len
))
1963 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
1966 strbuf_release(&last
->data
);
1970 stream_blob(len
, sha1out
, mark
);
1975 static void parse_new_blob(void)
1977 read_next_command();
1979 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
1982 static void unload_one_branch(void)
1984 while (cur_active_branches
1985 && cur_active_branches
>= max_active_branches
) {
1986 uintmax_t min_commit
= ULONG_MAX
;
1987 struct branch
*e
, *l
= NULL
, *p
= NULL
;
1989 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
1990 if (e
->last_commit
< min_commit
) {
1992 min_commit
= e
->last_commit
;
1998 e
= p
->active_next_branch
;
1999 p
->active_next_branch
= e
->active_next_branch
;
2001 e
= active_branches
;
2002 active_branches
= e
->active_next_branch
;
2005 e
->active_next_branch
= NULL
;
2006 if (e
->branch_tree
.tree
) {
2007 release_tree_content_recursive(e
->branch_tree
.tree
);
2008 e
->branch_tree
.tree
= NULL
;
2010 cur_active_branches
--;
2014 static void load_branch(struct branch
*b
)
2016 load_tree(&b
->branch_tree
);
2019 b
->active_next_branch
= active_branches
;
2020 active_branches
= b
;
2021 cur_active_branches
++;
2022 branch_load_count
++;
2026 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2028 unsigned char fanout
= 0;
2029 while ((num_notes
>>= 8))
2034 static void construct_path_with_fanout(const char *hex_sha1
,
2035 unsigned char fanout
, char *path
)
2037 unsigned int i
= 0, j
= 0;
2039 die("Too large fanout (%u)", fanout
);
2041 path
[i
++] = hex_sha1
[j
++];
2042 path
[i
++] = hex_sha1
[j
++];
2046 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2047 path
[i
+ 40 - j
] = '\0';
2050 static uintmax_t do_change_note_fanout(
2051 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2052 char *hex_sha1
, unsigned int hex_sha1_len
,
2053 char *fullpath
, unsigned int fullpath_len
,
2054 unsigned char fanout
)
2056 struct tree_content
*t
= root
->tree
;
2057 struct tree_entry
*e
, leaf
;
2058 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2059 uintmax_t num_notes
= 0;
2060 unsigned char sha1
[20];
2063 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2065 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2066 tmp_fullpath_len
= fullpath_len
;
2069 * We're interested in EITHER existing note entries (entries
2070 * with exactly 40 hex chars in path, not including directory
2071 * separators), OR directory entries that may contain note
2072 * entries (with < 40 hex chars in path).
2073 * Also, each path component in a note entry must be a multiple
2076 if (!e
->versions
[1].mode
||
2077 tmp_hex_sha1_len
> 40 ||
2078 e
->name
->str_len
% 2)
2081 /* This _may_ be a note entry, or a subdir containing notes */
2082 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2084 if (tmp_fullpath_len
)
2085 fullpath
[tmp_fullpath_len
++] = '/';
2086 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2088 tmp_fullpath_len
+= e
->name
->str_len
;
2089 fullpath
[tmp_fullpath_len
] = '\0';
2091 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2092 /* This is a note entry */
2093 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2094 if (!strcmp(fullpath
, realpath
)) {
2095 /* Note entry is in correct location */
2100 /* Rename fullpath to realpath */
2101 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2102 die("Failed to remove path %s", fullpath
);
2103 tree_content_set(orig_root
, realpath
,
2104 leaf
.versions
[1].sha1
,
2105 leaf
.versions
[1].mode
,
2107 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2108 /* This is a subdir that may contain note entries */
2111 num_notes
+= do_change_note_fanout(orig_root
, e
,
2112 hex_sha1
, tmp_hex_sha1_len
,
2113 fullpath
, tmp_fullpath_len
, fanout
);
2116 /* The above may have reallocated the current tree_content */
2122 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2123 unsigned char fanout
)
2125 char hex_sha1
[40], path
[60];
2126 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2129 static void file_change_m(struct branch
*b
)
2131 const char *p
= command_buf
.buf
+ 2;
2132 static struct strbuf uq
= STRBUF_INIT
;
2134 struct object_entry
*oe
= oe
;
2135 unsigned char sha1
[20];
2136 uint16_t mode
, inline_data
= 0;
2138 p
= get_mode(p
, &mode
);
2140 die("Corrupt mode: %s", command_buf
.buf
);
2145 case S_IFREG
| 0644:
2146 case S_IFREG
| 0755:
2153 die("Corrupt mode: %s", command_buf
.buf
);
2158 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2159 hashcpy(sha1
, oe
->idx
.sha1
);
2161 } else if (!prefixcmp(p
, "inline")) {
2165 if (get_sha1_hex(p
, sha1
))
2166 die("Invalid SHA1: %s", command_buf
.buf
);
2167 oe
= find_object(sha1
);
2171 die("Missing space after SHA1: %s", command_buf
.buf
);
2174 if (!unquote_c_style(&uq
, p
, &endp
)) {
2176 die("Garbage after path in: %s", command_buf
.buf
);
2180 if (S_ISGITLINK(mode
)) {
2182 die("Git links cannot be specified 'inline': %s",
2185 if (oe
->type
!= OBJ_COMMIT
)
2186 die("Not a commit (actually a %s): %s",
2187 typename(oe
->type
), command_buf
.buf
);
2190 * Accept the sha1 without checking; it expected to be in
2191 * another repository.
2193 } else if (inline_data
) {
2195 die("Directories cannot be specified 'inline': %s",
2198 strbuf_addstr(&uq
, p
);
2201 read_next_command();
2202 parse_and_store_blob(&last_blob
, sha1
, 0);
2204 enum object_type expected
= S_ISDIR(mode
) ?
2206 enum object_type type
= oe
? oe
->type
:
2207 sha1_object_info(sha1
, NULL
);
2209 die("%s not found: %s",
2210 S_ISDIR(mode
) ? "Tree" : "Blob",
2212 if (type
!= expected
)
2213 die("Not a %s (actually a %s): %s",
2214 typename(expected
), typename(type
),
2218 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2221 static void file_change_d(struct branch
*b
)
2223 const char *p
= command_buf
.buf
+ 2;
2224 static struct strbuf uq
= STRBUF_INIT
;
2228 if (!unquote_c_style(&uq
, p
, &endp
)) {
2230 die("Garbage after path in: %s", command_buf
.buf
);
2233 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2236 static void file_change_cr(struct branch
*b
, int rename
)
2239 static struct strbuf s_uq
= STRBUF_INIT
;
2240 static struct strbuf d_uq
= STRBUF_INIT
;
2242 struct tree_entry leaf
;
2244 s
= command_buf
.buf
+ 2;
2245 strbuf_reset(&s_uq
);
2246 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2248 die("Missing space after source: %s", command_buf
.buf
);
2250 endp
= strchr(s
, ' ');
2252 die("Missing space after source: %s", command_buf
.buf
);
2253 strbuf_add(&s_uq
, s
, endp
- s
);
2259 die("Missing dest: %s", command_buf
.buf
);
2262 strbuf_reset(&d_uq
);
2263 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2265 die("Garbage after dest in: %s", command_buf
.buf
);
2269 memset(&leaf
, 0, sizeof(leaf
));
2271 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2273 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2274 if (!leaf
.versions
[1].mode
)
2275 die("Path %s not in branch", s
);
2276 tree_content_set(&b
->branch_tree
, d
,
2277 leaf
.versions
[1].sha1
,
2278 leaf
.versions
[1].mode
,
2282 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2284 const char *p
= command_buf
.buf
+ 2;
2285 static struct strbuf uq
= STRBUF_INIT
;
2286 struct object_entry
*oe
= oe
;
2288 unsigned char sha1
[20], commit_sha1
[20];
2290 uint16_t inline_data
= 0;
2291 unsigned char new_fanout
;
2293 /* <dataref> or 'inline' */
2296 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2297 hashcpy(sha1
, oe
->idx
.sha1
);
2299 } else if (!prefixcmp(p
, "inline")) {
2303 if (get_sha1_hex(p
, sha1
))
2304 die("Invalid SHA1: %s", command_buf
.buf
);
2305 oe
= find_object(sha1
);
2309 die("Missing space after SHA1: %s", command_buf
.buf
);
2312 s
= lookup_branch(p
);
2314 hashcpy(commit_sha1
, s
->sha1
);
2315 } else if (*p
== ':') {
2316 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2317 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2318 if (commit_oe
->type
!= OBJ_COMMIT
)
2319 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2320 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2321 } else if (!get_sha1(p
, commit_sha1
)) {
2323 char *buf
= read_object_with_reference(commit_sha1
,
2324 commit_type
, &size
, commit_sha1
);
2325 if (!buf
|| size
< 46)
2326 die("Not a valid commit: %s", p
);
2329 die("Invalid ref name or SHA1 expression: %s", p
);
2333 strbuf_addstr(&uq
, p
);
2336 read_next_command();
2337 parse_and_store_blob(&last_blob
, sha1
, 0);
2339 if (oe
->type
!= OBJ_BLOB
)
2340 die("Not a blob (actually a %s): %s",
2341 typename(oe
->type
), command_buf
.buf
);
2342 } else if (!is_null_sha1(sha1
)) {
2343 enum object_type type
= sha1_object_info(sha1
, NULL
);
2345 die("Blob not found: %s", command_buf
.buf
);
2346 if (type
!= OBJ_BLOB
)
2347 die("Not a blob (actually a %s): %s",
2348 typename(type
), command_buf
.buf
);
2351 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2352 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2355 if (is_null_sha1(sha1
))
2356 return; /* nothing to insert */
2359 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2360 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2361 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2364 static void file_change_deleteall(struct branch
*b
)
2366 release_tree_content_recursive(b
->branch_tree
.tree
);
2367 hashclr(b
->branch_tree
.versions
[0].sha1
);
2368 hashclr(b
->branch_tree
.versions
[1].sha1
);
2369 load_tree(&b
->branch_tree
);
2373 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2375 if (!buf
|| size
< 46)
2376 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2377 if (memcmp("tree ", buf
, 5)
2378 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2379 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2380 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2381 b
->branch_tree
.versions
[1].sha1
);
2384 static void parse_from_existing(struct branch
*b
)
2386 if (is_null_sha1(b
->sha1
)) {
2387 hashclr(b
->branch_tree
.versions
[0].sha1
);
2388 hashclr(b
->branch_tree
.versions
[1].sha1
);
2393 buf
= read_object_with_reference(b
->sha1
,
2394 commit_type
, &size
, b
->sha1
);
2395 parse_from_commit(b
, buf
, size
);
2400 static int parse_from(struct branch
*b
)
2405 if (prefixcmp(command_buf
.buf
, "from "))
2408 if (b
->branch_tree
.tree
) {
2409 release_tree_content_recursive(b
->branch_tree
.tree
);
2410 b
->branch_tree
.tree
= NULL
;
2413 from
= strchr(command_buf
.buf
, ' ') + 1;
2414 s
= lookup_branch(from
);
2416 die("Can't create a branch from itself: %s", b
->name
);
2418 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2419 hashcpy(b
->sha1
, s
->sha1
);
2420 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2421 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2422 } else if (*from
== ':') {
2423 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2424 struct object_entry
*oe
= find_mark(idnum
);
2425 if (oe
->type
!= OBJ_COMMIT
)
2426 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2427 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2428 if (oe
->pack_id
!= MAX_PACK_ID
) {
2430 char *buf
= gfi_unpack_entry(oe
, &size
);
2431 parse_from_commit(b
, buf
, size
);
2434 parse_from_existing(b
);
2435 } else if (!get_sha1(from
, b
->sha1
))
2436 parse_from_existing(b
);
2438 die("Invalid ref name or SHA1 expression: %s", from
);
2440 read_next_command();
2444 static struct hash_list
*parse_merge(unsigned int *count
)
2446 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2451 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2452 from
= strchr(command_buf
.buf
, ' ') + 1;
2453 n
= xmalloc(sizeof(*n
));
2454 s
= lookup_branch(from
);
2456 hashcpy(n
->sha1
, s
->sha1
);
2457 else if (*from
== ':') {
2458 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2459 struct object_entry
*oe
= find_mark(idnum
);
2460 if (oe
->type
!= OBJ_COMMIT
)
2461 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2462 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2463 } else if (!get_sha1(from
, n
->sha1
)) {
2465 char *buf
= read_object_with_reference(n
->sha1
,
2466 commit_type
, &size
, n
->sha1
);
2467 if (!buf
|| size
< 46)
2468 die("Not a valid commit: %s", from
);
2471 die("Invalid ref name or SHA1 expression: %s", from
);
2480 read_next_command();
2485 static void parse_new_commit(void)
2487 static struct strbuf msg
= STRBUF_INIT
;
2490 char *author
= NULL
;
2491 char *committer
= NULL
;
2492 struct hash_list
*merge_list
= NULL
;
2493 unsigned int merge_count
;
2494 unsigned char prev_fanout
, new_fanout
;
2496 /* Obtain the branch name from the rest of our command */
2497 sp
= strchr(command_buf
.buf
, ' ') + 1;
2498 b
= lookup_branch(sp
);
2502 read_next_command();
2504 if (!prefixcmp(command_buf
.buf
, "author ")) {
2505 author
= parse_ident(command_buf
.buf
+ 7);
2506 read_next_command();
2508 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2509 committer
= parse_ident(command_buf
.buf
+ 10);
2510 read_next_command();
2513 die("Expected committer but didn't get one");
2514 parse_data(&msg
, 0, NULL
);
2515 read_next_command();
2517 merge_list
= parse_merge(&merge_count
);
2519 /* ensure the branch is active/loaded */
2520 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2521 unload_one_branch();
2525 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2528 while (command_buf
.len
> 0) {
2529 if (!prefixcmp(command_buf
.buf
, "M "))
2531 else if (!prefixcmp(command_buf
.buf
, "D "))
2533 else if (!prefixcmp(command_buf
.buf
, "R "))
2534 file_change_cr(b
, 1);
2535 else if (!prefixcmp(command_buf
.buf
, "C "))
2536 file_change_cr(b
, 0);
2537 else if (!prefixcmp(command_buf
.buf
, "N "))
2538 note_change_n(b
, prev_fanout
);
2539 else if (!strcmp("deleteall", command_buf
.buf
))
2540 file_change_deleteall(b
);
2542 unread_command_buf
= 1;
2545 if (read_next_command() == EOF
)
2549 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2550 if (new_fanout
!= prev_fanout
)
2551 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2553 /* build the tree and the commit */
2554 store_tree(&b
->branch_tree
);
2555 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2556 b
->branch_tree
.versions
[1].sha1
);
2558 strbuf_reset(&new_data
);
2559 strbuf_addf(&new_data
, "tree %s\n",
2560 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2561 if (!is_null_sha1(b
->sha1
))
2562 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2563 while (merge_list
) {
2564 struct hash_list
*next
= merge_list
->next
;
2565 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2569 strbuf_addf(&new_data
,
2573 author
? author
: committer
, committer
);
2574 strbuf_addbuf(&new_data
, &msg
);
2578 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2579 b
->pack_id
= pack_id
;
2580 if (report_fd
!= -1) {
2581 char *buf
= sha1_to_hex(b
->sha1
);
2583 write_or_die(report_fd
, buf
, 41);
2585 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2588 static void parse_new_tag(void)
2590 static struct strbuf msg
= STRBUF_INIT
;
2596 uintmax_t from_mark
= 0;
2597 unsigned char sha1
[20];
2598 enum object_type type
;
2600 /* Obtain the new tag name from the rest of our command */
2601 sp
= strchr(command_buf
.buf
, ' ') + 1;
2602 t
= pool_alloc(sizeof(struct tag
));
2604 t
->name
= pool_strdup(sp
);
2606 last_tag
->next_tag
= t
;
2610 read_next_command();
2613 if (prefixcmp(command_buf
.buf
, "from "))
2614 die("Expected from command, got %s", command_buf
.buf
);
2615 from
= strchr(command_buf
.buf
, ' ') + 1;
2616 s
= lookup_branch(from
);
2618 hashcpy(sha1
, s
->sha1
);
2620 } else if (*from
== ':') {
2621 struct object_entry
*oe
;
2622 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2623 oe
= find_mark(from_mark
);
2625 hashcpy(sha1
, oe
->idx
.sha1
);
2626 } else if (!get_sha1(from
, sha1
)) {
2630 buf
= read_sha1_file(sha1
, &type
, &size
);
2631 if (!buf
|| size
< 46)
2632 die("Not a valid commit: %s", from
);
2635 die("Invalid ref name or SHA1 expression: %s", from
);
2636 read_next_command();
2639 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2640 tagger
= parse_ident(command_buf
.buf
+ 7);
2641 read_next_command();
2645 /* tag payload/message */
2646 parse_data(&msg
, 0, NULL
);
2648 /* build the tag object */
2649 strbuf_reset(&new_data
);
2651 strbuf_addf(&new_data
,
2655 sha1_to_hex(sha1
), typename(type
), t
->name
);
2657 strbuf_addf(&new_data
,
2658 "tagger %s\n", tagger
);
2659 strbuf_addch(&new_data
, '\n');
2660 strbuf_addbuf(&new_data
, &msg
);
2663 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2664 t
->pack_id
= MAX_PACK_ID
;
2666 t
->pack_id
= pack_id
;
2669 static void parse_reset_branch(void)
2674 /* Obtain the branch name from the rest of our command */
2675 sp
= strchr(command_buf
.buf
, ' ') + 1;
2676 b
= lookup_branch(sp
);
2679 hashclr(b
->branch_tree
.versions
[0].sha1
);
2680 hashclr(b
->branch_tree
.versions
[1].sha1
);
2681 if (b
->branch_tree
.tree
) {
2682 release_tree_content_recursive(b
->branch_tree
.tree
);
2683 b
->branch_tree
.tree
= NULL
;
2688 read_next_command();
2690 if (command_buf
.len
> 0)
2691 unread_command_buf
= 1;
2694 static void quoted_path_sha1(unsigned char sha1
[20], struct tree_entry
*root
,
2695 const char *path
, const char *line
)
2697 struct strbuf uq
= STRBUF_INIT
;
2698 struct tree_entry leaf
= {0};
2701 if (unquote_c_style(&uq
, path
, &x
))
2702 die("Invalid path: %s", line
);
2704 die("Garbage after path: %s", line
);
2705 tree_content_get(root
, uq
.buf
, &leaf
);
2706 if (!leaf
.versions
[1].mode
)
2707 die("Path %s not in branch", uq
.buf
);
2708 hashcpy(sha1
, leaf
.versions
[1].sha1
);
2711 static void sendreport(const char *buf
, unsigned long size
)
2713 if (write_in_full(report_fd
, buf
, size
) != size
)
2714 die_errno("Write to frontend failed");
2717 static void cat_object(struct object_entry
*oe
, unsigned char sha1
[20])
2719 struct strbuf line
= STRBUF_INIT
;
2721 enum object_type type
= 0;
2725 die("Internal error: bad report_fd %d", report_fd
);
2726 if (oe
&& oe
->pack_id
!= MAX_PACK_ID
) {
2728 buf
= gfi_unpack_entry(oe
, &size
);
2730 buf
= read_sha1_file(sha1
, &type
, &size
);
2733 die("Can't read object %s", sha1_to_hex(sha1
));
2736 * Output based on batch_one_object() from cat-file.c.
2739 strbuf_reset(&line
);
2740 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2741 if (write_in_full(report_fd
, line
.buf
, line
.len
) != line
.len
)
2742 die_errno("Write to frontend failed 1");
2744 strbuf_reset(&line
);
2745 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2746 typename(type
), size
);
2747 sendreport(line
.buf
, line
.len
);
2748 sendreport(buf
, size
);
2749 sendreport("\n", 1);
2754 static void parse_cat_request(void)
2757 struct object_entry
*oe
= oe
;
2758 unsigned char sha1
[20];
2759 struct tree_entry root
= {0};
2761 /* cat SP <object> */
2762 p
= command_buf
.buf
+ strlen("cat ");
2764 die("The cat command features the report-fd feature.");
2767 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2769 die("Invalid mark: %s", command_buf
.buf
);
2771 die("Unknown mark: %s", command_buf
.buf
);
2773 hashcpy(sha1
, oe
->idx
.sha1
);
2775 if (get_sha1_hex(p
, sha1
))
2776 die("Invalid SHA1: %s", command_buf
.buf
);
2779 oe
= find_object(sha1
);
2782 /* [ SP "<path>" ] */
2785 die("Missing space after SHA1: %s", command_buf
.buf
);
2787 /* cat <tree> "<path>" form. */
2788 hashcpy(root
.versions
[1].sha1
, sha1
);
2790 quoted_path_sha1(sha1
, &root
, p
, command_buf
.buf
);
2791 oe
= find_object(sha1
);
2794 cat_object(oe
, sha1
);
2797 static void parse_checkpoint(void)
2808 static void parse_progress(void)
2810 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2811 fputc('\n', stdout
);
2816 static char* make_fast_import_path(const char *path
)
2818 struct strbuf abs_path
= STRBUF_INIT
;
2820 if (!relative_marks_paths
|| is_absolute_path(path
))
2821 return xstrdup(path
);
2822 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2823 return strbuf_detach(&abs_path
, NULL
);
2826 static void option_import_marks(const char *marks
, int from_stream
)
2828 if (import_marks_file
) {
2830 die("Only one import-marks command allowed per stream");
2832 /* read previous mark file */
2833 if(!import_marks_file_from_stream
)
2837 import_marks_file
= make_fast_import_path(marks
);
2838 safe_create_leading_directories_const(import_marks_file
);
2839 import_marks_file_from_stream
= from_stream
;
2842 static void option_date_format(const char *fmt
)
2844 if (!strcmp(fmt
, "raw"))
2845 whenspec
= WHENSPEC_RAW
;
2846 else if (!strcmp(fmt
, "rfc2822"))
2847 whenspec
= WHENSPEC_RFC2822
;
2848 else if (!strcmp(fmt
, "now"))
2849 whenspec
= WHENSPEC_NOW
;
2851 die("unknown --date-format argument %s", fmt
);
2854 static void option_depth(const char *depth
)
2856 max_depth
= strtoul(depth
, NULL
, 0);
2857 if (max_depth
> MAX_DEPTH
)
2858 die("--depth cannot exceed %u", MAX_DEPTH
);
2861 static void option_active_branches(const char *branches
)
2863 max_active_branches
= strtoul(branches
, NULL
, 0);
2866 static void option_export_marks(const char *marks
)
2868 export_marks_file
= make_fast_import_path(marks
);
2869 safe_create_leading_directories_const(export_marks_file
);
2872 static void option_report_fd(const char *fd
)
2874 unsigned long n
= strtoul(fd
, NULL
, 0);
2875 if (n
> (unsigned long) INT_MAX
)
2876 die("--report-fd cannot exceed %d", INT_MAX
);
2877 report_fd
= (int) n
;
2880 static void option_export_pack_edges(const char *edges
)
2884 pack_edges
= fopen(edges
, "a");
2886 die_errno("Cannot open '%s'", edges
);
2889 static int parse_one_option(const char *option
)
2891 if (!prefixcmp(option
, "max-pack-size=")) {
2893 if (!git_parse_ulong(option
+ 14, &v
))
2896 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2898 } else if (v
< 1024 * 1024) {
2899 warning("minimum max-pack-size is 1 MiB");
2903 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2905 if (!git_parse_ulong(option
+ 19, &v
))
2907 big_file_threshold
= v
;
2908 } else if (!prefixcmp(option
, "depth=")) {
2909 option_depth(option
+ 6);
2910 } else if (!prefixcmp(option
, "active-branches=")) {
2911 option_active_branches(option
+ 16);
2912 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2913 option_export_pack_edges(option
+ 18);
2914 } else if (!prefixcmp(option
, "quiet")) {
2916 } else if (!prefixcmp(option
, "stats")) {
2925 static int parse_one_feature(const char *feature
, int from_stream
)
2927 if (!prefixcmp(feature
, "date-format=")) {
2928 option_date_format(feature
+ 12);
2929 } else if (!prefixcmp(feature
, "import-marks=")) {
2930 option_import_marks(feature
+ 13, from_stream
);
2931 } else if (!prefixcmp(feature
, "export-marks=")) {
2932 option_export_marks(feature
+ 13);
2933 } else if (!prefixcmp(feature
, "report-fd=")) {
2934 option_report_fd(feature
+ strlen("report-fd="));
2935 } else if (!prefixcmp(feature
, "relative-marks")) {
2936 relative_marks_paths
= 1;
2937 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2938 relative_marks_paths
= 0;
2939 } else if (!prefixcmp(feature
, "force")) {
2948 static void parse_feature(void)
2950 char *feature
= command_buf
.buf
+ 8;
2952 if (seen_data_command
)
2953 die("Got feature command '%s' after data command", feature
);
2955 if (parse_one_feature(feature
, 1))
2958 die("This version of fast-import does not support feature %s.", feature
);
2961 static void parse_option(void)
2963 char *option
= command_buf
.buf
+ 11;
2965 if (seen_data_command
)
2966 die("Got option command '%s' after data command", option
);
2968 if (parse_one_option(option
))
2971 die("This version of fast-import does not support option: %s", option
);
2974 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2976 if (!strcmp(k
, "pack.depth")) {
2977 max_depth
= git_config_int(k
, v
);
2978 if (max_depth
> MAX_DEPTH
)
2979 max_depth
= MAX_DEPTH
;
2982 if (!strcmp(k
, "pack.compression")) {
2983 int level
= git_config_int(k
, v
);
2985 level
= Z_DEFAULT_COMPRESSION
;
2986 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2987 die("bad pack compression level %d", level
);
2988 pack_compression_level
= level
;
2989 pack_compression_seen
= 1;
2992 if (!strcmp(k
, "pack.indexversion")) {
2993 pack_idx_default_version
= git_config_int(k
, v
);
2994 if (pack_idx_default_version
> 2)
2995 die("bad pack.indexversion=%"PRIu32
,
2996 pack_idx_default_version
);
2999 if (!strcmp(k
, "pack.packsizelimit")) {
3000 max_packsize
= git_config_ulong(k
, v
);
3003 if (!strcmp(k
, "core.bigfilethreshold")) {
3004 long n
= git_config_int(k
, v
);
3005 big_file_threshold
= 0 < n
? n
: 0;
3007 return git_default_config(k
, v
, cb
);
3010 static const char fast_import_usage
[] =
3011 "git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
3013 static void parse_argv(void)
3017 for (i
= 1; i
< global_argc
; i
++) {
3018 const char *a
= global_argv
[i
];
3020 if (*a
!= '-' || !strcmp(a
, "--"))
3023 if (parse_one_option(a
+ 2))
3026 if (parse_one_feature(a
+ 2, 0))
3029 die("unknown option %s", a
);
3031 if (i
!= global_argc
)
3032 usage(fast_import_usage
);
3034 seen_data_command
= 1;
3035 if (import_marks_file
)
3039 int main(int argc
, const char **argv
)
3043 git_extract_argv0_path(argv
[0]);
3045 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3046 usage(fast_import_usage
);
3048 setup_git_directory();
3049 git_config(git_pack_config
, NULL
);
3050 if (!pack_compression_seen
&& core_compression_seen
)
3051 pack_compression_level
= core_compression_level
;
3053 alloc_objects(object_entry_alloc
);
3054 strbuf_init(&command_buf
, 0);
3055 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3056 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3057 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3058 marks
= pool_calloc(1, sizeof(struct mark_set
));
3063 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3064 for (i
= 0; i
< (cmd_save
- 1); i
++)
3065 rc_free
[i
].next
= &rc_free
[i
+ 1];
3066 rc_free
[cmd_save
- 1].next
= NULL
;
3068 prepare_packed_git();
3070 set_die_routine(die_nicely
);
3071 while (read_next_command() != EOF
) {
3072 if (!strcmp("blob", command_buf
.buf
))
3074 else if (!prefixcmp(command_buf
.buf
, "commit "))
3076 else if (!prefixcmp(command_buf
.buf
, "tag "))
3078 else if (!prefixcmp(command_buf
.buf
, "reset "))
3079 parse_reset_branch();
3080 else if (!prefixcmp(command_buf
.buf
, "cat "))
3081 parse_cat_request();
3082 else if (!strcmp("checkpoint", command_buf
.buf
))
3084 else if (!prefixcmp(command_buf
.buf
, "progress "))
3086 else if (!prefixcmp(command_buf
.buf
, "feature "))
3088 else if (!prefixcmp(command_buf
.buf
, "option git "))
3090 else if (!prefixcmp(command_buf
.buf
, "option "))
3091 /* ignore non-git options*/;
3093 die("Unsupported command: %s", command_buf
.buf
);
3096 /* argv hasn't been parsed yet, do so */
3097 if (!seen_data_command
)
3111 uintmax_t total_count
= 0, duplicate_count
= 0;
3112 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3113 total_count
+= object_count_by_type
[i
];
3114 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3115 duplicate_count
+= duplicate_count_by_type
[i
];
3117 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3118 fprintf(stderr
, "---------------------------------------------------------------------\n");
3119 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3120 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3121 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
]);
3122 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
]);
3123 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
]);
3124 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
]);
3125 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3126 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3127 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3128 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3129 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3130 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3131 fprintf(stderr
, "---------------------------------------------------------------------\n");
3133 fprintf(stderr
, "---------------------------------------------------------------------\n");
3134 fprintf(stderr
, "\n");
3137 return failure
? 1 : 0;