2 Format of STDIN stream:
13 new_blob ::= 'blob' lf
16 file_content ::= data;
18 new_commit ::= 'commit' sp ref_str lf
20 ('author' sp name '<' email '>' when lf)?
21 'committer' sp name '<' email '>' when lf
23 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
24 ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
29 file_change ::= file_clr
35 file_clr ::= 'deleteall' lf;
36 file_del ::= 'D' sp path_str lf;
37 file_rnm ::= 'R' sp path_str sp path_str lf;
38 file_cpy ::= 'C' sp path_str sp path_str lf;
39 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
40 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
43 new_tag ::= 'tag' sp tag_str lf
44 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
45 'tagger' sp name '<' email '>' when lf
49 reset_branch ::= 'reset' sp ref_str lf
50 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
53 checkpoint ::= 'checkpoint' lf
56 # note: the first idnum in a stream should be 1 and subsequent
57 # idnums should not have gaps between values as this will cause
58 # the stream parser to reserve space for the gapped values. An
59 # idnum can be updated in the future to a new object by issuing
60 # a new mark directive with the old idnum.
62 mark ::= 'mark' sp idnum lf;
63 data ::= (delimited_data | exact_data)
66 # note: delim may be any string but must not contain lf.
67 # data_line may contain any data but must not be exactly
69 delimited_data ::= 'data' sp '<<' delim lf
73 # note: declen indicates the length of binary_data in bytes.
74 # declen does not include the lf preceeding the binary data.
76 exact_data ::= 'data' sp declen lf
79 # note: quoted strings are C-style quoting supporting \c for
80 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
81 # is the signed byte value in octal. Note that the only
82 # characters which must actually be escaped to protect the
83 # stream formatting is: \, " and LF. Otherwise these values
87 sha1exp_str ::= sha1exp;
89 path_str ::= path | '"' quoted(path) '"' ;
90 mode ::= '100644' | '644'
95 declen ::= # unsigned 32 bit value, ascii base10 notation;
96 bigint ::= # unsigned integer value, ascii base10 notation;
97 binary_data ::= # file content, not interpreted;
99 when ::= raw_when | rfc2822_when;
100 raw_when ::= ts sp tz;
101 rfc2822_when ::= # Valid RFC 2822 date and time;
103 sp ::= # ASCII space character;
104 lf ::= # ASCII newline (LF) character;
106 # note: a colon (':') must precede the numerical value assigned to
107 # an idnum. This is to distinguish it from a ref or tag name as
108 # GIT does not permit ':' in ref or tag strings.
110 idnum ::= ':' bigint;
111 path ::= # GIT style file path, e.g. "a/b/c";
112 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
113 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
114 sha1exp ::= # Any valid GIT SHA1 expression;
115 hexsha1 ::= # SHA1 in hexadecimal format;
117 # note: name and email are UTF8 strings, however name must not
118 # contain '<' or lf and email must not contain any of the
119 # following: '<', '>', lf.
121 name ::= # valid GIT author/committer name;
122 email ::= # valid GIT author/committer email;
123 ts ::= # time since the epoch in seconds, ascii base10 notation;
124 tz ::= # GIT style timezone;
136 #include "csum-file.h"
140 #define PACK_ID_BITS 16
141 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
145 struct object_entry
*next
;
147 unsigned type
: TYPE_BITS
;
148 unsigned pack_id
: PACK_ID_BITS
;
149 unsigned char sha1
[20];
152 struct object_entry_pool
154 struct object_entry_pool
*next_pool
;
155 struct object_entry
*next_free
;
156 struct object_entry
*end
;
157 struct object_entry entries
[FLEX_ARRAY
]; /* more */
163 struct object_entry
*marked
[1024];
164 struct mark_set
*sets
[1024];
180 struct mem_pool
*next_pool
;
183 char space
[FLEX_ARRAY
]; /* more */
188 struct atom_str
*next_atom
;
189 unsigned short str_len
;
190 char str_dat
[FLEX_ARRAY
]; /* more */
196 struct tree_content
*tree
;
197 struct atom_str
* name
;
201 unsigned char sha1
[20];
207 unsigned int entry_capacity
; /* must match avail_tree_content */
208 unsigned int entry_count
;
209 unsigned int delta_depth
;
210 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
213 struct avail_tree_content
215 unsigned int entry_capacity
; /* must match tree_content */
216 struct avail_tree_content
*next_avail
;
221 struct branch
*table_next_branch
;
222 struct branch
*active_next_branch
;
224 struct tree_entry branch_tree
;
225 uintmax_t last_commit
;
227 unsigned pack_id
: PACK_ID_BITS
;
228 unsigned char sha1
[20];
233 struct tag
*next_tag
;
235 unsigned int pack_id
;
236 unsigned char sha1
[20];
247 struct hash_list
*next
;
248 unsigned char sha1
[20];
257 /* Configured limits on output */
258 static unsigned long max_depth
= 10;
259 static off_t max_packsize
= (1LL << 32) - 1;
260 static int force_update
;
262 /* Stats and misc. counters */
263 static uintmax_t alloc_count
;
264 static uintmax_t marks_set_count
;
265 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
266 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
267 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
268 static unsigned long object_count
;
269 static unsigned long branch_count
;
270 static unsigned long branch_load_count
;
272 static FILE *pack_edges
;
275 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
276 static size_t total_allocd
;
277 static struct mem_pool
*mem_pool
;
279 /* Atom management */
280 static unsigned int atom_table_sz
= 4451;
281 static unsigned int atom_cnt
;
282 static struct atom_str
**atom_table
;
284 /* The .pack file being generated */
285 static unsigned int pack_id
;
286 static struct packed_git
*pack_data
;
287 static struct packed_git
**all_packs
;
288 static unsigned long pack_size
;
290 /* Table of objects we've written. */
291 static unsigned int object_entry_alloc
= 5000;
292 static struct object_entry_pool
*blocks
;
293 static struct object_entry
*object_table
[1 << 16];
294 static struct mark_set
*marks
;
295 static const char* mark_file
;
298 static struct last_object last_blob
;
300 /* Tree management */
301 static unsigned int tree_entry_alloc
= 1000;
302 static void *avail_tree_entry
;
303 static unsigned int avail_tree_table_sz
= 100;
304 static struct avail_tree_content
**avail_tree_table
;
305 static struct dbuf old_tree
;
306 static struct dbuf new_tree
;
309 static unsigned long max_active_branches
= 5;
310 static unsigned long cur_active_branches
;
311 static unsigned long branch_table_sz
= 1039;
312 static struct branch
**branch_table
;
313 static struct branch
*active_branches
;
316 static struct tag
*first_tag
;
317 static struct tag
*last_tag
;
319 /* Input stream parsing */
320 static whenspec_type whenspec
= WHENSPEC_RAW
;
321 static struct strbuf command_buf
;
322 static uintmax_t next_mark
;
323 static struct dbuf new_data
;
326 static void alloc_objects(unsigned int cnt
)
328 struct object_entry_pool
*b
;
330 b
= xmalloc(sizeof(struct object_entry_pool
)
331 + cnt
* sizeof(struct object_entry
));
332 b
->next_pool
= blocks
;
333 b
->next_free
= b
->entries
;
334 b
->end
= b
->entries
+ cnt
;
339 static struct object_entry
*new_object(unsigned char *sha1
)
341 struct object_entry
*e
;
343 if (blocks
->next_free
== blocks
->end
)
344 alloc_objects(object_entry_alloc
);
346 e
= blocks
->next_free
++;
347 hashcpy(e
->sha1
, sha1
);
351 static struct object_entry
*find_object(unsigned char *sha1
)
353 unsigned int h
= sha1
[0] << 8 | sha1
[1];
354 struct object_entry
*e
;
355 for (e
= object_table
[h
]; e
; e
= e
->next
)
356 if (!hashcmp(sha1
, e
->sha1
))
361 static struct object_entry
*insert_object(unsigned char *sha1
)
363 unsigned int h
= sha1
[0] << 8 | sha1
[1];
364 struct object_entry
*e
= object_table
[h
];
365 struct object_entry
*p
= NULL
;
368 if (!hashcmp(sha1
, e
->sha1
))
374 e
= new_object(sha1
);
384 static unsigned int hc_str(const char *s
, size_t len
)
392 static void *pool_alloc(size_t len
)
397 for (p
= mem_pool
; p
; p
= p
->next_pool
)
398 if ((p
->end
- p
->next_free
>= len
))
402 if (len
>= (mem_pool_alloc
/2)) {
406 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
407 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
408 p
->next_pool
= mem_pool
;
409 p
->next_free
= p
->space
;
410 p
->end
= p
->next_free
+ mem_pool_alloc
;
415 /* round out to a pointer alignment */
416 if (len
& (sizeof(void*) - 1))
417 len
+= sizeof(void*) - (len
& (sizeof(void*) - 1));
422 static void *pool_calloc(size_t count
, size_t size
)
424 size_t len
= count
* size
;
425 void *r
= pool_alloc(len
);
430 static char *pool_strdup(const char *s
)
432 char *r
= pool_alloc(strlen(s
) + 1);
437 static void size_dbuf(struct dbuf
*b
, size_t maxlen
)
440 if (b
->capacity
>= maxlen
)
444 b
->capacity
= ((maxlen
/ 1024) + 1) * 1024;
445 b
->buffer
= xmalloc(b
->capacity
);
448 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
450 struct mark_set
*s
= marks
;
451 while ((idnum
>> s
->shift
) >= 1024) {
452 s
= pool_calloc(1, sizeof(struct mark_set
));
453 s
->shift
= marks
->shift
+ 10;
454 s
->data
.sets
[0] = marks
;
458 uintmax_t i
= idnum
>> s
->shift
;
459 idnum
-= i
<< s
->shift
;
460 if (!s
->data
.sets
[i
]) {
461 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
462 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
466 if (!s
->data
.marked
[idnum
])
468 s
->data
.marked
[idnum
] = oe
;
471 static struct object_entry
*find_mark(uintmax_t idnum
)
473 uintmax_t orig_idnum
= idnum
;
474 struct mark_set
*s
= marks
;
475 struct object_entry
*oe
= NULL
;
476 if ((idnum
>> s
->shift
) < 1024) {
477 while (s
&& s
->shift
) {
478 uintmax_t i
= idnum
>> s
->shift
;
479 idnum
-= i
<< s
->shift
;
483 oe
= s
->data
.marked
[idnum
];
486 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
490 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
492 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
495 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
496 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
499 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
501 strncpy(c
->str_dat
, s
, len
);
503 c
->next_atom
= atom_table
[hc
];
509 static struct branch
*lookup_branch(const char *name
)
511 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
514 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
515 if (!strcmp(name
, b
->name
))
520 static struct branch
*new_branch(const char *name
)
522 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
523 struct branch
* b
= lookup_branch(name
);
526 die("Invalid attempt to create duplicate branch: %s", name
);
527 if (check_ref_format(name
))
528 die("Branch name doesn't conform to GIT standards: %s", name
);
530 b
= pool_calloc(1, sizeof(struct branch
));
531 b
->name
= pool_strdup(name
);
532 b
->table_next_branch
= branch_table
[hc
];
533 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
534 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
536 b
->pack_id
= MAX_PACK_ID
;
537 branch_table
[hc
] = b
;
542 static unsigned int hc_entries(unsigned int cnt
)
544 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
545 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
548 static struct tree_content
*new_tree_content(unsigned int cnt
)
550 struct avail_tree_content
*f
, *l
= NULL
;
551 struct tree_content
*t
;
552 unsigned int hc
= hc_entries(cnt
);
554 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
555 if (f
->entry_capacity
>= cnt
)
560 l
->next_avail
= f
->next_avail
;
562 avail_tree_table
[hc
] = f
->next_avail
;
564 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
565 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
566 f
->entry_capacity
= cnt
;
569 t
= (struct tree_content
*)f
;
575 static void release_tree_entry(struct tree_entry
*e
);
576 static void release_tree_content(struct tree_content
*t
)
578 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
579 unsigned int hc
= hc_entries(f
->entry_capacity
);
580 f
->next_avail
= avail_tree_table
[hc
];
581 avail_tree_table
[hc
] = f
;
584 static void release_tree_content_recursive(struct tree_content
*t
)
587 for (i
= 0; i
< t
->entry_count
; i
++)
588 release_tree_entry(t
->entries
[i
]);
589 release_tree_content(t
);
592 static struct tree_content
*grow_tree_content(
593 struct tree_content
*t
,
596 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
597 r
->entry_count
= t
->entry_count
;
598 r
->delta_depth
= t
->delta_depth
;
599 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
600 release_tree_content(t
);
604 static struct tree_entry
*new_tree_entry(void)
606 struct tree_entry
*e
;
608 if (!avail_tree_entry
) {
609 unsigned int n
= tree_entry_alloc
;
610 total_allocd
+= n
* sizeof(struct tree_entry
);
611 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
613 *((void**)e
) = e
+ 1;
619 e
= avail_tree_entry
;
620 avail_tree_entry
= *((void**)e
);
624 static void release_tree_entry(struct tree_entry
*e
)
627 release_tree_content_recursive(e
->tree
);
628 *((void**)e
) = avail_tree_entry
;
629 avail_tree_entry
= e
;
632 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
634 struct tree_content
*d
;
635 struct tree_entry
*a
, *b
;
640 d
= new_tree_content(s
->entry_count
);
641 for (i
= 0; i
< s
->entry_count
; i
++) {
643 b
= new_tree_entry();
644 memcpy(b
, a
, sizeof(*a
));
645 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
646 b
->tree
= dup_tree_content(a
->tree
);
651 d
->entry_count
= s
->entry_count
;
652 d
->delta_depth
= s
->delta_depth
;
657 static void start_packfile(void)
659 static char tmpfile
[PATH_MAX
];
660 struct packed_git
*p
;
661 struct pack_header hdr
;
664 snprintf(tmpfile
, sizeof(tmpfile
),
665 "%s/tmp_pack_XXXXXX", get_object_directory());
666 pack_fd
= mkstemp(tmpfile
);
668 die("Can't create %s: %s", tmpfile
, strerror(errno
));
669 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
670 strcpy(p
->pack_name
, tmpfile
);
671 p
->pack_fd
= pack_fd
;
673 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
674 hdr
.hdr_version
= htonl(2);
676 write_or_die(p
->pack_fd
, &hdr
, sizeof(hdr
));
679 pack_size
= sizeof(hdr
);
682 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
683 all_packs
[pack_id
] = p
;
686 static int oecmp (const void *a_
, const void *b_
)
688 struct object_entry
*a
= *((struct object_entry
**)a_
);
689 struct object_entry
*b
= *((struct object_entry
**)b_
);
690 return hashcmp(a
->sha1
, b
->sha1
);
693 static char *create_index(void)
695 static char tmpfile
[PATH_MAX
];
698 struct object_entry
**idx
, **c
, **last
, *e
;
699 struct object_entry_pool
*o
;
703 /* Build the sorted table of object IDs. */
704 idx
= xmalloc(object_count
* sizeof(struct object_entry
*));
706 for (o
= blocks
; o
; o
= o
->next_pool
)
707 for (e
= o
->next_free
; e
-- != o
->entries
;)
708 if (pack_id
== e
->pack_id
)
710 last
= idx
+ object_count
;
712 die("internal consistency error creating the index");
713 qsort(idx
, object_count
, sizeof(struct object_entry
*), oecmp
);
715 /* Generate the fan-out array. */
717 for (i
= 0; i
< 256; i
++) {
718 struct object_entry
**next
= c
;;
719 while (next
< last
) {
720 if ((*next
)->sha1
[0] != i
)
724 array
[i
] = htonl(next
- idx
);
728 snprintf(tmpfile
, sizeof(tmpfile
),
729 "%s/tmp_idx_XXXXXX", get_object_directory());
730 idx_fd
= mkstemp(tmpfile
);
732 die("Can't create %s: %s", tmpfile
, strerror(errno
));
733 f
= sha1fd(idx_fd
, tmpfile
);
734 sha1write(f
, array
, 256 * sizeof(int));
736 for (c
= idx
; c
!= last
; c
++) {
737 uint32_t offset
= htonl((*c
)->offset
);
738 sha1write(f
, &offset
, 4);
739 sha1write(f
, (*c
)->sha1
, sizeof((*c
)->sha1
));
740 SHA1_Update(&ctx
, (*c
)->sha1
, 20);
742 sha1write(f
, pack_data
->sha1
, sizeof(pack_data
->sha1
));
743 sha1close(f
, NULL
, 1);
745 SHA1_Final(pack_data
->sha1
, &ctx
);
749 static char *keep_pack(char *curr_index_name
)
751 static char name
[PATH_MAX
];
752 static const char *keep_msg
= "fast-import";
755 chmod(pack_data
->pack_name
, 0444);
756 chmod(curr_index_name
, 0444);
758 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
759 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
760 keep_fd
= open(name
, O_RDWR
|O_CREAT
|O_EXCL
, 0600);
762 die("cannot create keep file");
763 write(keep_fd
, keep_msg
, strlen(keep_msg
));
766 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
767 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
768 if (move_temp_to_file(pack_data
->pack_name
, name
))
769 die("cannot store pack file");
771 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
772 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
773 if (move_temp_to_file(curr_index_name
, name
))
774 die("cannot store index file");
778 static void unkeep_all_packs(void)
780 static char name
[PATH_MAX
];
783 for (k
= 0; k
< pack_id
; k
++) {
784 struct packed_git
*p
= all_packs
[k
];
785 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
786 get_object_directory(), sha1_to_hex(p
->sha1
));
791 static void end_packfile(void)
793 struct packed_git
*old_p
= pack_data
, *new_p
;
801 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
802 pack_data
->pack_name
, object_count
);
803 close(pack_data
->pack_fd
);
804 idx_name
= keep_pack(create_index());
806 /* Register the packfile with core git's machinary. */
807 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
809 die("core git rejected index %s", idx_name
);
810 new_p
->windows
= old_p
->windows
;
811 all_packs
[pack_id
] = new_p
;
812 install_packed_git(new_p
);
814 /* Print the boundary */
816 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
817 for (i
= 0; i
< branch_table_sz
; i
++) {
818 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
819 if (b
->pack_id
== pack_id
)
820 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
823 for (t
= first_tag
; t
; t
= t
->next_tag
) {
824 if (t
->pack_id
== pack_id
)
825 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
827 fputc('\n', pack_edges
);
834 unlink(old_p
->pack_name
);
837 /* We can't carry a delta across packfiles. */
838 free(last_blob
.data
);
839 last_blob
.data
= NULL
;
841 last_blob
.offset
= 0;
845 static void cycle_packfile(void)
851 static size_t encode_header(
852 enum object_type type
,
859 if (type
< OBJ_COMMIT
|| type
> OBJ_REF_DELTA
)
860 die("bad type %d", type
);
862 c
= (type
<< 4) | (size
& 15);
874 static int store_object(
875 enum object_type type
,
878 struct last_object
*last
,
879 unsigned char *sha1out
,
883 struct object_entry
*e
;
884 unsigned char hdr
[96];
885 unsigned char sha1
[20];
886 unsigned long hdrlen
, deltalen
;
890 hdrlen
= sprintf((char*)hdr
,"%s %lu", typename(type
),
891 (unsigned long)datlen
) + 1;
893 SHA1_Update(&c
, hdr
, hdrlen
);
894 SHA1_Update(&c
, dat
, datlen
);
895 SHA1_Final(sha1
, &c
);
897 hashcpy(sha1out
, sha1
);
899 e
= insert_object(sha1
);
901 insert_mark(mark
, e
);
903 duplicate_count_by_type
[type
]++;
905 } else if (find_sha1_pack(sha1
, packed_git
)) {
907 e
->pack_id
= MAX_PACK_ID
;
908 e
->offset
= 1; /* just not zero! */
909 duplicate_count_by_type
[type
]++;
913 if (last
&& last
->data
&& last
->depth
< max_depth
) {
914 delta
= diff_delta(last
->data
, last
->len
,
917 if (delta
&& deltalen
>= datlen
) {
924 memset(&s
, 0, sizeof(s
));
925 deflateInit(&s
, zlib_compression_level
);
928 s
.avail_in
= deltalen
;
933 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
934 s
.next_out
= out
= xmalloc(s
.avail_out
);
935 while (deflate(&s
, Z_FINISH
) == Z_OK
)
939 /* Determine if we should auto-checkpoint. */
940 if ((pack_size
+ 60 + s
.total_out
) > max_packsize
941 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
943 /* This new object needs to *not* have the current pack_id. */
944 e
->pack_id
= pack_id
+ 1;
947 /* We cannot carry a delta into the new pack. */
952 memset(&s
, 0, sizeof(s
));
953 deflateInit(&s
, zlib_compression_level
);
956 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
957 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
958 while (deflate(&s
, Z_FINISH
) == Z_OK
)
965 e
->pack_id
= pack_id
;
966 e
->offset
= pack_size
;
968 object_count_by_type
[type
]++;
971 unsigned long ofs
= e
->offset
- last
->offset
;
972 unsigned pos
= sizeof(hdr
) - 1;
974 delta_count_by_type
[type
]++;
977 hdrlen
= encode_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
978 write_or_die(pack_data
->pack_fd
, hdr
, hdrlen
);
981 hdr
[pos
] = ofs
& 127;
983 hdr
[--pos
] = 128 | (--ofs
& 127);
984 write_or_die(pack_data
->pack_fd
, hdr
+ pos
, sizeof(hdr
) - pos
);
985 pack_size
+= sizeof(hdr
) - pos
;
989 hdrlen
= encode_header(type
, datlen
, hdr
);
990 write_or_die(pack_data
->pack_fd
, hdr
, hdrlen
);
994 write_or_die(pack_data
->pack_fd
, out
, s
.total_out
);
995 pack_size
+= s
.total_out
;
1003 last
->offset
= e
->offset
;
1009 static void *gfi_unpack_entry(
1010 struct object_entry
*oe
,
1011 unsigned long *sizep
)
1013 enum object_type type
;
1014 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1016 p
->pack_size
= pack_size
+ 20;
1017 return unpack_entry(p
, oe
->offset
, &type
, sizep
);
1020 static const char *get_mode(const char *str
, uint16_t *modep
)
1025 while ((c
= *str
++) != ' ') {
1026 if (c
< '0' || c
> '7')
1028 mode
= (mode
<< 3) + (c
- '0');
1034 static void load_tree(struct tree_entry
*root
)
1036 unsigned char* sha1
= root
->versions
[1].sha1
;
1037 struct object_entry
*myoe
;
1038 struct tree_content
*t
;
1043 root
->tree
= t
= new_tree_content(8);
1044 if (is_null_sha1(sha1
))
1047 myoe
= find_object(sha1
);
1048 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1049 if (myoe
->type
!= OBJ_TREE
)
1050 die("Not a tree: %s", sha1_to_hex(sha1
));
1052 buf
= gfi_unpack_entry(myoe
, &size
);
1054 enum object_type type
;
1055 buf
= read_sha1_file(sha1
, &type
, &size
);
1056 if (!buf
|| type
!= OBJ_TREE
)
1057 die("Can't load tree %s", sha1_to_hex(sha1
));
1061 while (c
!= (buf
+ size
)) {
1062 struct tree_entry
*e
= new_tree_entry();
1064 if (t
->entry_count
== t
->entry_capacity
)
1065 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1066 t
->entries
[t
->entry_count
++] = e
;
1069 c
= get_mode(c
, &e
->versions
[1].mode
);
1071 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1072 e
->versions
[0].mode
= e
->versions
[1].mode
;
1073 e
->name
= to_atom(c
, strlen(c
));
1074 c
+= e
->name
->str_len
+ 1;
1075 hashcpy(e
->versions
[0].sha1
, (unsigned char*)c
);
1076 hashcpy(e
->versions
[1].sha1
, (unsigned char*)c
);
1082 static int tecmp0 (const void *_a
, const void *_b
)
1084 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1085 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1086 return base_name_compare(
1087 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1088 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1091 static int tecmp1 (const void *_a
, const void *_b
)
1093 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1094 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1095 return base_name_compare(
1096 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1097 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1100 static void mktree(struct tree_content
*t
,
1110 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1112 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1114 for (i
= 0; i
< t
->entry_count
; i
++) {
1115 if (t
->entries
[i
]->versions
[v
].mode
)
1116 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1119 size_dbuf(b
, maxlen
);
1121 for (i
= 0; i
< t
->entry_count
; i
++) {
1122 struct tree_entry
*e
= t
->entries
[i
];
1123 if (!e
->versions
[v
].mode
)
1125 c
+= sprintf(c
, "%o", (unsigned int)e
->versions
[v
].mode
);
1127 strcpy(c
, e
->name
->str_dat
);
1128 c
+= e
->name
->str_len
+ 1;
1129 hashcpy((unsigned char*)c
, e
->versions
[v
].sha1
);
1132 *szp
= c
- (char*)b
->buffer
;
1135 static void store_tree(struct tree_entry
*root
)
1137 struct tree_content
*t
= root
->tree
;
1138 unsigned int i
, j
, del
;
1139 unsigned long new_len
;
1140 struct last_object lo
;
1141 struct object_entry
*le
;
1143 if (!is_null_sha1(root
->versions
[1].sha1
))
1146 for (i
= 0; i
< t
->entry_count
; i
++) {
1147 if (t
->entries
[i
]->tree
)
1148 store_tree(t
->entries
[i
]);
1151 le
= find_object(root
->versions
[0].sha1
);
1152 if (!S_ISDIR(root
->versions
[0].mode
)
1154 || le
->pack_id
!= pack_id
) {
1159 mktree(t
, 0, &lo
.len
, &old_tree
);
1160 lo
.data
= old_tree
.buffer
;
1161 lo
.offset
= le
->offset
;
1162 lo
.depth
= t
->delta_depth
;
1166 mktree(t
, 1, &new_len
, &new_tree
);
1167 store_object(OBJ_TREE
, new_tree
.buffer
, new_len
,
1168 &lo
, root
->versions
[1].sha1
, 0);
1170 t
->delta_depth
= lo
.depth
;
1171 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1172 struct tree_entry
*e
= t
->entries
[i
];
1173 if (e
->versions
[1].mode
) {
1174 e
->versions
[0].mode
= e
->versions
[1].mode
;
1175 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1176 t
->entries
[j
++] = e
;
1178 release_tree_entry(e
);
1182 t
->entry_count
-= del
;
1185 static int tree_content_set(
1186 struct tree_entry
*root
,
1188 const unsigned char *sha1
,
1189 const uint16_t mode
,
1190 struct tree_content
*subtree
)
1192 struct tree_content
*t
= root
->tree
;
1195 struct tree_entry
*e
;
1197 slash1
= strchr(p
, '/');
1203 die("Empty path component found in input");
1204 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1205 die("Non-directories cannot have subtrees");
1207 for (i
= 0; i
< t
->entry_count
; i
++) {
1209 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1212 && e
->versions
[1].mode
== mode
1213 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1215 e
->versions
[1].mode
= mode
;
1216 hashcpy(e
->versions
[1].sha1
, sha1
);
1218 release_tree_content_recursive(e
->tree
);
1220 hashclr(root
->versions
[1].sha1
);
1223 if (!S_ISDIR(e
->versions
[1].mode
)) {
1224 e
->tree
= new_tree_content(8);
1225 e
->versions
[1].mode
= S_IFDIR
;
1229 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1230 hashclr(root
->versions
[1].sha1
);
1237 if (t
->entry_count
== t
->entry_capacity
)
1238 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1239 e
= new_tree_entry();
1240 e
->name
= to_atom(p
, n
);
1241 e
->versions
[0].mode
= 0;
1242 hashclr(e
->versions
[0].sha1
);
1243 t
->entries
[t
->entry_count
++] = e
;
1245 e
->tree
= new_tree_content(8);
1246 e
->versions
[1].mode
= S_IFDIR
;
1247 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1250 e
->versions
[1].mode
= mode
;
1251 hashcpy(e
->versions
[1].sha1
, sha1
);
1253 hashclr(root
->versions
[1].sha1
);
1257 static int tree_content_remove(
1258 struct tree_entry
*root
,
1260 struct tree_entry
*backup_leaf
)
1262 struct tree_content
*t
= root
->tree
;
1265 struct tree_entry
*e
;
1267 slash1
= strchr(p
, '/');
1273 for (i
= 0; i
< t
->entry_count
; i
++) {
1275 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1276 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1280 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1281 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1282 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1283 hashclr(root
->versions
[1].sha1
);
1297 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1299 release_tree_content_recursive(e
->tree
);
1301 e
->versions
[1].mode
= 0;
1302 hashclr(e
->versions
[1].sha1
);
1303 hashclr(root
->versions
[1].sha1
);
1307 static int tree_content_get(
1308 struct tree_entry
*root
,
1310 struct tree_entry
*leaf
)
1312 struct tree_content
*t
= root
->tree
;
1315 struct tree_entry
*e
;
1317 slash1
= strchr(p
, '/');
1323 for (i
= 0; i
< t
->entry_count
; i
++) {
1325 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1327 memcpy(leaf
, e
, sizeof(*leaf
));
1328 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1329 leaf
->tree
= dup_tree_content(e
->tree
);
1334 if (!S_ISDIR(e
->versions
[1].mode
))
1338 return tree_content_get(e
, slash1
+ 1, leaf
);
1344 static int update_branch(struct branch
*b
)
1346 static const char *msg
= "fast-import";
1347 struct ref_lock
*lock
;
1348 unsigned char old_sha1
[20];
1350 if (read_ref(b
->name
, old_sha1
))
1352 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1354 return error("Unable to lock %s", b
->name
);
1355 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1356 struct commit
*old_cmit
, *new_cmit
;
1358 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1359 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1360 if (!old_cmit
|| !new_cmit
) {
1362 return error("Branch %s is missing commits.", b
->name
);
1365 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1367 warning("Not updating %s"
1368 " (new tip %s does not contain %s)",
1369 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1373 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1374 return error("Unable to update %s", b
->name
);
1378 static void dump_branches(void)
1383 for (i
= 0; i
< branch_table_sz
; i
++) {
1384 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1385 failure
|= update_branch(b
);
1389 static void dump_tags(void)
1391 static const char *msg
= "fast-import";
1393 struct ref_lock
*lock
;
1394 char ref_name
[PATH_MAX
];
1396 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1397 sprintf(ref_name
, "tags/%s", t
->name
);
1398 lock
= lock_ref_sha1(ref_name
, NULL
);
1399 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1400 failure
|= error("Unable to update %s", ref_name
);
1404 static void dump_marks_helper(FILE *f
,
1410 for (k
= 0; k
< 1024; k
++) {
1411 if (m
->data
.sets
[k
])
1412 dump_marks_helper(f
, (base
+ k
) << m
->shift
,
1416 for (k
= 0; k
< 1024; k
++) {
1417 if (m
->data
.marked
[k
])
1418 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1419 sha1_to_hex(m
->data
.marked
[k
]->sha1
));
1424 static void dump_marks(void)
1426 static struct lock_file mark_lock
;
1433 mark_fd
= hold_lock_file_for_update(&mark_lock
, mark_file
, 0);
1435 failure
|= error("Unable to write marks file %s: %s",
1436 mark_file
, strerror(errno
));
1440 f
= fdopen(mark_fd
, "w");
1442 rollback_lock_file(&mark_lock
);
1443 failure
|= error("Unable to write marks file %s: %s",
1444 mark_file
, strerror(errno
));
1448 dump_marks_helper(f
, 0, marks
);
1450 if (commit_lock_file(&mark_lock
))
1451 failure
|= error("Unable to write marks file %s: %s",
1452 mark_file
, strerror(errno
));
1455 static void read_next_command(void)
1457 read_line(&command_buf
, stdin
, '\n');
1460 static void cmd_mark(void)
1462 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1463 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1464 read_next_command();
1470 static void *cmd_data (size_t *size
)
1475 if (prefixcmp(command_buf
.buf
, "data "))
1476 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1478 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1479 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1480 size_t sz
= 8192, term_len
= command_buf
.len
- 5 - 2;
1482 buffer
= xmalloc(sz
);
1484 read_next_command();
1485 if (command_buf
.eof
)
1486 die("EOF in data (terminator '%s' not found)", term
);
1487 if (term_len
== command_buf
.len
1488 && !strcmp(term
, command_buf
.buf
))
1490 if (sz
< (length
+ command_buf
.len
)) {
1491 sz
= sz
* 3 / 2 + 16;
1492 if (sz
< (length
+ command_buf
.len
))
1493 sz
= length
+ command_buf
.len
;
1494 buffer
= xrealloc(buffer
, sz
);
1496 memcpy(buffer
+ length
,
1498 command_buf
.len
- 1);
1499 length
+= command_buf
.len
- 1;
1500 buffer
[length
++] = '\n';
1506 length
= strtoul(command_buf
.buf
+ 5, NULL
, 10);
1507 buffer
= xmalloc(length
);
1508 while (n
< length
) {
1509 size_t s
= fread(buffer
+ n
, 1, length
- n
, stdin
);
1510 if (!s
&& feof(stdin
))
1511 die("EOF in data (%lu bytes remaining)",
1512 (unsigned long)(length
- n
));
1517 if (fgetc(stdin
) != '\n')
1518 die("An lf did not trail the binary data as expected.");
1524 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1526 const char *orig_src
= src
;
1529 strtoul(src
, &endp
, 10);
1530 if (endp
== src
|| *endp
!= ' ')
1534 if (*src
!= '-' && *src
!= '+')
1538 strtoul(src
+ 1, &endp
, 10);
1539 if (endp
== src
|| *endp
|| (endp
- orig_src
) >= maxlen
)
1542 strcpy(result
, orig_src
);
1546 static char *parse_ident(const char *buf
)
1552 gt
= strrchr(buf
, '>');
1554 die("Missing > in ident string: %s", buf
);
1557 die("Missing space after > in ident string: %s", buf
);
1559 name_len
= gt
- buf
;
1560 ident
= xmalloc(name_len
+ 24);
1561 strncpy(ident
, buf
, name_len
);
1565 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1566 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1568 case WHENSPEC_RFC2822
:
1569 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1570 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1573 if (strcmp("now", gt
))
1574 die("Date in ident must be 'now': %s", buf
);
1575 datestamp(ident
+ name_len
, 24);
1582 static void cmd_new_blob(void)
1587 read_next_command();
1591 if (store_object(OBJ_BLOB
, d
, l
, &last_blob
, NULL
, next_mark
))
1595 static void unload_one_branch(void)
1597 while (cur_active_branches
1598 && cur_active_branches
>= max_active_branches
) {
1599 uintmax_t min_commit
= ULONG_MAX
;
1600 struct branch
*e
, *l
= NULL
, *p
= NULL
;
1602 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
1603 if (e
->last_commit
< min_commit
) {
1605 min_commit
= e
->last_commit
;
1611 e
= p
->active_next_branch
;
1612 p
->active_next_branch
= e
->active_next_branch
;
1614 e
= active_branches
;
1615 active_branches
= e
->active_next_branch
;
1618 e
->active_next_branch
= NULL
;
1619 if (e
->branch_tree
.tree
) {
1620 release_tree_content_recursive(e
->branch_tree
.tree
);
1621 e
->branch_tree
.tree
= NULL
;
1623 cur_active_branches
--;
1627 static void load_branch(struct branch
*b
)
1629 load_tree(&b
->branch_tree
);
1632 b
->active_next_branch
= active_branches
;
1633 active_branches
= b
;
1634 cur_active_branches
++;
1635 branch_load_count
++;
1639 static void file_change_m(struct branch
*b
)
1641 const char *p
= command_buf
.buf
+ 2;
1644 struct object_entry
*oe
= oe
;
1645 unsigned char sha1
[20];
1646 uint16_t mode
, inline_data
= 0;
1648 p
= get_mode(p
, &mode
);
1650 die("Corrupt mode: %s", command_buf
.buf
);
1652 case S_IFREG
| 0644:
1653 case S_IFREG
| 0755:
1660 die("Corrupt mode: %s", command_buf
.buf
);
1665 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
1666 hashcpy(sha1
, oe
->sha1
);
1668 } else if (!prefixcmp(p
, "inline")) {
1672 if (get_sha1_hex(p
, sha1
))
1673 die("Invalid SHA1: %s", command_buf
.buf
);
1674 oe
= find_object(sha1
);
1678 die("Missing space after SHA1: %s", command_buf
.buf
);
1680 p_uq
= unquote_c_style(p
, &endp
);
1683 die("Garbage after path in: %s", command_buf
.buf
);
1691 p
= p_uq
= xstrdup(p
);
1692 read_next_command();
1694 if (store_object(OBJ_BLOB
, d
, l
, &last_blob
, sha1
, 0))
1697 if (oe
->type
!= OBJ_BLOB
)
1698 die("Not a blob (actually a %s): %s",
1699 command_buf
.buf
, typename(oe
->type
));
1701 enum object_type type
= sha1_object_info(sha1
, NULL
);
1703 die("Blob not found: %s", command_buf
.buf
);
1704 if (type
!= OBJ_BLOB
)
1705 die("Not a blob (actually a %s): %s",
1706 typename(type
), command_buf
.buf
);
1709 tree_content_set(&b
->branch_tree
, p
, sha1
, S_IFREG
| mode
, NULL
);
1713 static void file_change_d(struct branch
*b
)
1715 const char *p
= command_buf
.buf
+ 2;
1719 p_uq
= unquote_c_style(p
, &endp
);
1722 die("Garbage after path in: %s", command_buf
.buf
);
1725 tree_content_remove(&b
->branch_tree
, p
, NULL
);
1729 static void file_change_cr(struct branch
*b
, int rename
)
1734 struct tree_entry leaf
;
1736 s
= command_buf
.buf
+ 2;
1737 s_uq
= unquote_c_style(s
, &endp
);
1740 die("Missing space after source: %s", command_buf
.buf
);
1743 endp
= strchr(s
, ' ');
1745 die("Missing space after source: %s", command_buf
.buf
);
1746 s_uq
= xmalloc(endp
- s
+ 1);
1747 memcpy(s_uq
, s
, endp
- s
);
1754 die("Missing dest: %s", command_buf
.buf
);
1757 d_uq
= unquote_c_style(d
, &endp
);
1760 die("Garbage after dest in: %s", command_buf
.buf
);
1764 memset(&leaf
, 0, sizeof(leaf
));
1766 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
1768 tree_content_get(&b
->branch_tree
, s
, &leaf
);
1769 if (!leaf
.versions
[1].mode
)
1770 die("Path %s not in branch", s
);
1771 tree_content_set(&b
->branch_tree
, d
,
1772 leaf
.versions
[1].sha1
,
1773 leaf
.versions
[1].mode
,
1780 static void file_change_deleteall(struct branch
*b
)
1782 release_tree_content_recursive(b
->branch_tree
.tree
);
1783 hashclr(b
->branch_tree
.versions
[0].sha1
);
1784 hashclr(b
->branch_tree
.versions
[1].sha1
);
1785 load_tree(&b
->branch_tree
);
1788 static void cmd_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
1790 if (!buf
|| size
< 46)
1791 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
1792 if (memcmp("tree ", buf
, 5)
1793 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
1794 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
1795 hashcpy(b
->branch_tree
.versions
[0].sha1
,
1796 b
->branch_tree
.versions
[1].sha1
);
1799 static void cmd_from_existing(struct branch
*b
)
1801 if (is_null_sha1(b
->sha1
)) {
1802 hashclr(b
->branch_tree
.versions
[0].sha1
);
1803 hashclr(b
->branch_tree
.versions
[1].sha1
);
1808 buf
= read_object_with_reference(b
->sha1
,
1809 commit_type
, &size
, b
->sha1
);
1810 cmd_from_commit(b
, buf
, size
);
1815 static void cmd_from(struct branch
*b
)
1820 if (prefixcmp(command_buf
.buf
, "from "))
1823 if (b
->branch_tree
.tree
) {
1824 release_tree_content_recursive(b
->branch_tree
.tree
);
1825 b
->branch_tree
.tree
= NULL
;
1828 from
= strchr(command_buf
.buf
, ' ') + 1;
1829 s
= lookup_branch(from
);
1831 die("Can't create a branch from itself: %s", b
->name
);
1833 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
1834 hashcpy(b
->sha1
, s
->sha1
);
1835 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
1836 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
1837 } else if (*from
== ':') {
1838 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
1839 struct object_entry
*oe
= find_mark(idnum
);
1840 if (oe
->type
!= OBJ_COMMIT
)
1841 die("Mark :%" PRIuMAX
" not a commit", idnum
);
1842 hashcpy(b
->sha1
, oe
->sha1
);
1843 if (oe
->pack_id
!= MAX_PACK_ID
) {
1845 char *buf
= gfi_unpack_entry(oe
, &size
);
1846 cmd_from_commit(b
, buf
, size
);
1849 cmd_from_existing(b
);
1850 } else if (!get_sha1(from
, b
->sha1
))
1851 cmd_from_existing(b
);
1853 die("Invalid ref name or SHA1 expression: %s", from
);
1855 read_next_command();
1858 static struct hash_list
*cmd_merge(unsigned int *count
)
1860 struct hash_list
*list
= NULL
, *n
, *e
= e
;
1865 while (!prefixcmp(command_buf
.buf
, "merge ")) {
1866 from
= strchr(command_buf
.buf
, ' ') + 1;
1867 n
= xmalloc(sizeof(*n
));
1868 s
= lookup_branch(from
);
1870 hashcpy(n
->sha1
, s
->sha1
);
1871 else if (*from
== ':') {
1872 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
1873 struct object_entry
*oe
= find_mark(idnum
);
1874 if (oe
->type
!= OBJ_COMMIT
)
1875 die("Mark :%" PRIuMAX
" not a commit", idnum
);
1876 hashcpy(n
->sha1
, oe
->sha1
);
1877 } else if (!get_sha1(from
, n
->sha1
)) {
1879 char *buf
= read_object_with_reference(n
->sha1
,
1880 commit_type
, &size
, n
->sha1
);
1881 if (!buf
|| size
< 46)
1882 die("Not a valid commit: %s", from
);
1885 die("Invalid ref name or SHA1 expression: %s", from
);
1894 read_next_command();
1899 static void cmd_new_commit(void)
1905 char *author
= NULL
;
1906 char *committer
= NULL
;
1907 struct hash_list
*merge_list
= NULL
;
1908 unsigned int merge_count
;
1910 /* Obtain the branch name from the rest of our command */
1911 sp
= strchr(command_buf
.buf
, ' ') + 1;
1912 b
= lookup_branch(sp
);
1916 read_next_command();
1918 if (!prefixcmp(command_buf
.buf
, "author ")) {
1919 author
= parse_ident(command_buf
.buf
+ 7);
1920 read_next_command();
1922 if (!prefixcmp(command_buf
.buf
, "committer ")) {
1923 committer
= parse_ident(command_buf
.buf
+ 10);
1924 read_next_command();
1927 die("Expected committer but didn't get one");
1928 msg
= cmd_data(&msglen
);
1929 read_next_command();
1931 merge_list
= cmd_merge(&merge_count
);
1933 /* ensure the branch is active/loaded */
1934 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
1935 unload_one_branch();
1941 if (1 == command_buf
.len
)
1943 else if (!prefixcmp(command_buf
.buf
, "M "))
1945 else if (!prefixcmp(command_buf
.buf
, "D "))
1947 else if (!prefixcmp(command_buf
.buf
, "R "))
1948 file_change_cr(b
, 1);
1949 else if (!prefixcmp(command_buf
.buf
, "C "))
1950 file_change_cr(b
, 0);
1951 else if (!strcmp("deleteall", command_buf
.buf
))
1952 file_change_deleteall(b
);
1954 die("Unsupported file_change: %s", command_buf
.buf
);
1955 read_next_command();
1958 /* build the tree and the commit */
1959 store_tree(&b
->branch_tree
);
1960 hashcpy(b
->branch_tree
.versions
[0].sha1
,
1961 b
->branch_tree
.versions
[1].sha1
);
1962 size_dbuf(&new_data
, 114 + msglen
1965 ? strlen(author
) + strlen(committer
)
1966 : 2 * strlen(committer
)));
1967 sp
= new_data
.buffer
;
1968 sp
+= sprintf(sp
, "tree %s\n",
1969 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
1970 if (!is_null_sha1(b
->sha1
))
1971 sp
+= sprintf(sp
, "parent %s\n", sha1_to_hex(b
->sha1
));
1972 while (merge_list
) {
1973 struct hash_list
*next
= merge_list
->next
;
1974 sp
+= sprintf(sp
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
1978 sp
+= sprintf(sp
, "author %s\n", author
? author
: committer
);
1979 sp
+= sprintf(sp
, "committer %s\n", committer
);
1981 memcpy(sp
, msg
, msglen
);
1987 if (!store_object(OBJ_COMMIT
,
1988 new_data
.buffer
, sp
- (char*)new_data
.buffer
,
1989 NULL
, b
->sha1
, next_mark
))
1990 b
->pack_id
= pack_id
;
1991 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
1994 static void cmd_new_tag(void)
2003 uintmax_t from_mark
= 0;
2004 unsigned char sha1
[20];
2006 /* Obtain the new tag name from the rest of our command */
2007 sp
= strchr(command_buf
.buf
, ' ') + 1;
2008 t
= pool_alloc(sizeof(struct tag
));
2010 t
->name
= pool_strdup(sp
);
2012 last_tag
->next_tag
= t
;
2016 read_next_command();
2019 if (prefixcmp(command_buf
.buf
, "from "))
2020 die("Expected from command, got %s", command_buf
.buf
);
2021 from
= strchr(command_buf
.buf
, ' ') + 1;
2022 s
= lookup_branch(from
);
2024 hashcpy(sha1
, s
->sha1
);
2025 } else if (*from
== ':') {
2026 struct object_entry
*oe
;
2027 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2028 oe
= find_mark(from_mark
);
2029 if (oe
->type
!= OBJ_COMMIT
)
2030 die("Mark :%" PRIuMAX
" not a commit", from_mark
);
2031 hashcpy(sha1
, oe
->sha1
);
2032 } else if (!get_sha1(from
, sha1
)) {
2036 buf
= read_object_with_reference(sha1
,
2037 commit_type
, &size
, sha1
);
2038 if (!buf
|| size
< 46)
2039 die("Not a valid commit: %s", from
);
2042 die("Invalid ref name or SHA1 expression: %s", from
);
2043 read_next_command();
2046 if (prefixcmp(command_buf
.buf
, "tagger "))
2047 die("Expected tagger command, got %s", command_buf
.buf
);
2048 tagger
= parse_ident(command_buf
.buf
+ 7);
2050 /* tag payload/message */
2051 read_next_command();
2052 msg
= cmd_data(&msglen
);
2054 /* build the tag object */
2055 size_dbuf(&new_data
, 67+strlen(t
->name
)+strlen(tagger
)+msglen
);
2056 sp
= new_data
.buffer
;
2057 sp
+= sprintf(sp
, "object %s\n", sha1_to_hex(sha1
));
2058 sp
+= sprintf(sp
, "type %s\n", commit_type
);
2059 sp
+= sprintf(sp
, "tag %s\n", t
->name
);
2060 sp
+= sprintf(sp
, "tagger %s\n", tagger
);
2062 memcpy(sp
, msg
, msglen
);
2067 if (store_object(OBJ_TAG
, new_data
.buffer
,
2068 sp
- (char*)new_data
.buffer
,
2070 t
->pack_id
= MAX_PACK_ID
;
2072 t
->pack_id
= pack_id
;
2075 static void cmd_reset_branch(void)
2080 /* Obtain the branch name from the rest of our command */
2081 sp
= strchr(command_buf
.buf
, ' ') + 1;
2082 b
= lookup_branch(sp
);
2085 hashclr(b
->branch_tree
.versions
[0].sha1
);
2086 hashclr(b
->branch_tree
.versions
[1].sha1
);
2087 if (b
->branch_tree
.tree
) {
2088 release_tree_content_recursive(b
->branch_tree
.tree
);
2089 b
->branch_tree
.tree
= NULL
;
2094 read_next_command();
2098 static void cmd_checkpoint(void)
2106 read_next_command();
2109 static void import_marks(const char *input_file
)
2112 FILE *f
= fopen(input_file
, "r");
2114 die("cannot read %s: %s", input_file
, strerror(errno
));
2115 while (fgets(line
, sizeof(line
), f
)) {
2118 unsigned char sha1
[20];
2119 struct object_entry
*e
;
2121 end
= strchr(line
, '\n');
2122 if (line
[0] != ':' || !end
)
2123 die("corrupt mark line: %s", line
);
2125 mark
= strtoumax(line
+ 1, &end
, 10);
2126 if (!mark
|| end
== line
+ 1
2127 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
2128 die("corrupt mark line: %s", line
);
2129 e
= find_object(sha1
);
2131 enum object_type type
= sha1_object_info(sha1
, NULL
);
2133 die("object not found: %s", sha1_to_hex(sha1
));
2134 e
= insert_object(sha1
);
2136 e
->pack_id
= MAX_PACK_ID
;
2137 e
->offset
= 1; /* just not zero! */
2139 insert_mark(mark
, e
);
2144 static const char fast_import_usage
[] =
2145 "git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2147 int cmd_fast_import(int argc
, const char **argv
, const char *prefix
)
2149 int i
, show_stats
= 1;
2151 git_config(git_default_config
);
2152 alloc_objects(object_entry_alloc
);
2153 strbuf_init(&command_buf
);
2154 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
2155 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
2156 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
2157 marks
= pool_calloc(1, sizeof(struct mark_set
));
2159 for (i
= 1; i
< argc
; i
++) {
2160 const char *a
= argv
[i
];
2162 if (*a
!= '-' || !strcmp(a
, "--"))
2164 else if (!prefixcmp(a
, "--date-format=")) {
2165 const char *fmt
= a
+ 14;
2166 if (!strcmp(fmt
, "raw"))
2167 whenspec
= WHENSPEC_RAW
;
2168 else if (!strcmp(fmt
, "rfc2822"))
2169 whenspec
= WHENSPEC_RFC2822
;
2170 else if (!strcmp(fmt
, "now"))
2171 whenspec
= WHENSPEC_NOW
;
2173 die("unknown --date-format argument %s", fmt
);
2175 else if (!prefixcmp(a
, "--max-pack-size="))
2176 max_packsize
= strtoumax(a
+ 16, NULL
, 0) * 1024 * 1024;
2177 else if (!prefixcmp(a
, "--depth="))
2178 max_depth
= strtoul(a
+ 8, NULL
, 0);
2179 else if (!prefixcmp(a
, "--active-branches="))
2180 max_active_branches
= strtoul(a
+ 18, NULL
, 0);
2181 else if (!prefixcmp(a
, "--import-marks="))
2182 import_marks(a
+ 15);
2183 else if (!prefixcmp(a
, "--export-marks="))
2185 else if (!prefixcmp(a
, "--export-pack-edges=")) {
2188 pack_edges
= fopen(a
+ 20, "a");
2190 die("Cannot open %s: %s", a
+ 20, strerror(errno
));
2191 } else if (!strcmp(a
, "--force"))
2193 else if (!strcmp(a
, "--quiet"))
2195 else if (!strcmp(a
, "--stats"))
2198 die("unknown option %s", a
);
2201 usage(fast_import_usage
);
2203 prepare_packed_git();
2206 read_next_command();
2207 if (command_buf
.eof
)
2209 else if (!strcmp("blob", command_buf
.buf
))
2211 else if (!prefixcmp(command_buf
.buf
, "commit "))
2213 else if (!prefixcmp(command_buf
.buf
, "tag "))
2215 else if (!prefixcmp(command_buf
.buf
, "reset "))
2217 else if (!strcmp("checkpoint", command_buf
.buf
))
2220 die("Unsupported command: %s", command_buf
.buf
);
2233 uintmax_t total_count
= 0, duplicate_count
= 0;
2234 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
2235 total_count
+= object_count_by_type
[i
];
2236 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
2237 duplicate_count
+= duplicate_count_by_type
[i
];
2239 fprintf(stderr
, "%s statistics:\n", argv
[0]);
2240 fprintf(stderr
, "---------------------------------------------------------------------\n");
2241 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
2242 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
2243 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
]);
2244 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
]);
2245 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
]);
2246 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
]);
2247 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
2248 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
2249 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
2250 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
2251 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
2252 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
2253 fprintf(stderr
, "---------------------------------------------------------------------\n");
2255 fprintf(stderr
, "---------------------------------------------------------------------\n");
2256 fprintf(stderr
, "\n");
2259 return failure
? 1 : 0;