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 | file_del | file_obm | file_inm;
30 file_clr ::= 'deleteall' lf;
31 file_del ::= 'D' sp path_str lf;
32 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
33 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
36 new_tag ::= 'tag' sp tag_str lf
37 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
38 'tagger' sp name '<' email '>' when lf
42 reset_branch ::= 'reset' sp ref_str lf
43 ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
46 checkpoint ::= 'checkpoint' lf
49 # note: the first idnum in a stream should be 1 and subsequent
50 # idnums should not have gaps between values as this will cause
51 # the stream parser to reserve space for the gapped values. An
52 # idnum can be updated in the future to a new object by issuing
53 # a new mark directive with the old idnum.
55 mark ::= 'mark' sp idnum lf;
56 data ::= (delimited_data | exact_data)
59 # note: delim may be any string but must not contain lf.
60 # data_line may contain any data but must not be exactly
62 delimited_data ::= 'data' sp '<<' delim lf
66 # note: declen indicates the length of binary_data in bytes.
67 # declen does not include the lf preceeding the binary data.
69 exact_data ::= 'data' sp declen lf
72 # note: quoted strings are C-style quoting supporting \c for
73 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
74 # is the signed byte value in octal. Note that the only
75 # characters which must actually be escaped to protect the
76 # stream formatting is: \, " and LF. Otherwise these values
80 sha1exp_str ::= sha1exp;
82 path_str ::= path | '"' quoted(path) '"' ;
83 mode ::= '100644' | '644'
88 declen ::= # unsigned 32 bit value, ascii base10 notation;
89 bigint ::= # unsigned integer value, ascii base10 notation;
90 binary_data ::= # file content, not interpreted;
92 when ::= raw_when | rfc2822_when;
93 raw_when ::= ts sp tz;
94 rfc2822_when ::= # Valid RFC 2822 date and time;
96 sp ::= # ASCII space character;
97 lf ::= # ASCII newline (LF) character;
99 # note: a colon (':') must precede the numerical value assigned to
100 # an idnum. This is to distinguish it from a ref or tag name as
101 # GIT does not permit ':' in ref or tag strings.
103 idnum ::= ':' bigint;
104 path ::= # GIT style file path, e.g. "a/b/c";
105 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
106 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
107 sha1exp ::= # Any valid GIT SHA1 expression;
108 hexsha1 ::= # SHA1 in hexadecimal format;
110 # note: name and email are UTF8 strings, however name must not
111 # contain '<' or lf and email must not contain any of the
112 # following: '<', '>', lf.
114 name ::= # valid GIT author/committer name;
115 email ::= # valid GIT author/committer email;
116 ts ::= # time since the epoch in seconds, ascii base10 notation;
117 tz ::= # GIT style timezone;
129 #include "csum-file.h"
133 #define PACK_ID_BITS 16
134 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
137 #define PRIuMAX "llu"
142 struct object_entry
*next
;
144 unsigned type
: TYPE_BITS
;
145 unsigned pack_id
: PACK_ID_BITS
;
146 unsigned char sha1
[20];
149 struct object_entry_pool
151 struct object_entry_pool
*next_pool
;
152 struct object_entry
*next_free
;
153 struct object_entry
*end
;
154 struct object_entry entries
[FLEX_ARRAY
]; /* more */
160 struct object_entry
*marked
[1024];
161 struct mark_set
*sets
[1024];
177 struct mem_pool
*next_pool
;
180 char space
[FLEX_ARRAY
]; /* more */
185 struct atom_str
*next_atom
;
186 unsigned short str_len
;
187 char str_dat
[FLEX_ARRAY
]; /* more */
193 struct tree_content
*tree
;
194 struct atom_str
* name
;
198 unsigned char sha1
[20];
204 unsigned int entry_capacity
; /* must match avail_tree_content */
205 unsigned int entry_count
;
206 unsigned int delta_depth
;
207 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
210 struct avail_tree_content
212 unsigned int entry_capacity
; /* must match tree_content */
213 struct avail_tree_content
*next_avail
;
218 struct branch
*table_next_branch
;
219 struct branch
*active_next_branch
;
221 struct tree_entry branch_tree
;
222 uintmax_t last_commit
;
224 unsigned pack_id
: PACK_ID_BITS
;
225 unsigned char sha1
[20];
230 struct tag
*next_tag
;
232 unsigned int pack_id
;
233 unsigned char sha1
[20];
244 struct hash_list
*next
;
245 unsigned char sha1
[20];
254 /* Configured limits on output */
255 static unsigned long max_depth
= 10;
256 static unsigned long max_packsize
= (1LL << 32) - 1;
257 static int force_update
;
259 /* Stats and misc. counters */
260 static uintmax_t alloc_count
;
261 static uintmax_t marks_set_count
;
262 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
263 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
264 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
265 static unsigned long object_count
;
266 static unsigned long branch_count
;
267 static unsigned long branch_load_count
;
269 static FILE *pack_edges
;
272 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
273 static size_t total_allocd
;
274 static struct mem_pool
*mem_pool
;
276 /* Atom management */
277 static unsigned int atom_table_sz
= 4451;
278 static unsigned int atom_cnt
;
279 static struct atom_str
**atom_table
;
281 /* The .pack file being generated */
282 static unsigned int pack_id
;
283 static struct packed_git
*pack_data
;
284 static struct packed_git
**all_packs
;
285 static unsigned long pack_size
;
287 /* Table of objects we've written. */
288 static unsigned int object_entry_alloc
= 5000;
289 static struct object_entry_pool
*blocks
;
290 static struct object_entry
*object_table
[1 << 16];
291 static struct mark_set
*marks
;
292 static const char* mark_file
;
295 static struct last_object last_blob
;
297 /* Tree management */
298 static unsigned int tree_entry_alloc
= 1000;
299 static void *avail_tree_entry
;
300 static unsigned int avail_tree_table_sz
= 100;
301 static struct avail_tree_content
**avail_tree_table
;
302 static struct dbuf old_tree
;
303 static struct dbuf new_tree
;
306 static unsigned long max_active_branches
= 5;
307 static unsigned long cur_active_branches
;
308 static unsigned long branch_table_sz
= 1039;
309 static struct branch
**branch_table
;
310 static struct branch
*active_branches
;
313 static struct tag
*first_tag
;
314 static struct tag
*last_tag
;
316 /* Input stream parsing */
317 static whenspec_type whenspec
= WHENSPEC_RAW
;
318 static struct strbuf command_buf
;
319 static uintmax_t next_mark
;
320 static struct dbuf new_data
;
323 static void alloc_objects(unsigned int cnt
)
325 struct object_entry_pool
*b
;
327 b
= xmalloc(sizeof(struct object_entry_pool
)
328 + cnt
* sizeof(struct object_entry
));
329 b
->next_pool
= blocks
;
330 b
->next_free
= b
->entries
;
331 b
->end
= b
->entries
+ cnt
;
336 static struct object_entry
*new_object(unsigned char *sha1
)
338 struct object_entry
*e
;
340 if (blocks
->next_free
== blocks
->end
)
341 alloc_objects(object_entry_alloc
);
343 e
= blocks
->next_free
++;
344 hashcpy(e
->sha1
, sha1
);
348 static struct object_entry
*find_object(unsigned char *sha1
)
350 unsigned int h
= sha1
[0] << 8 | sha1
[1];
351 struct object_entry
*e
;
352 for (e
= object_table
[h
]; e
; e
= e
->next
)
353 if (!hashcmp(sha1
, e
->sha1
))
358 static struct object_entry
*insert_object(unsigned char *sha1
)
360 unsigned int h
= sha1
[0] << 8 | sha1
[1];
361 struct object_entry
*e
= object_table
[h
];
362 struct object_entry
*p
= NULL
;
365 if (!hashcmp(sha1
, e
->sha1
))
371 e
= new_object(sha1
);
381 static unsigned int hc_str(const char *s
, size_t len
)
389 static void *pool_alloc(size_t len
)
394 for (p
= mem_pool
; p
; p
= p
->next_pool
)
395 if ((p
->end
- p
->next_free
>= len
))
399 if (len
>= (mem_pool_alloc
/2)) {
403 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
404 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
405 p
->next_pool
= mem_pool
;
406 p
->next_free
= p
->space
;
407 p
->end
= p
->next_free
+ mem_pool_alloc
;
412 /* round out to a pointer alignment */
413 if (len
& (sizeof(void*) - 1))
414 len
+= sizeof(void*) - (len
& (sizeof(void*) - 1));
419 static void *pool_calloc(size_t count
, size_t size
)
421 size_t len
= count
* size
;
422 void *r
= pool_alloc(len
);
427 static char *pool_strdup(const char *s
)
429 char *r
= pool_alloc(strlen(s
) + 1);
434 static void size_dbuf(struct dbuf
*b
, size_t maxlen
)
437 if (b
->capacity
>= maxlen
)
441 b
->capacity
= ((maxlen
/ 1024) + 1) * 1024;
442 b
->buffer
= xmalloc(b
->capacity
);
445 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
447 struct mark_set
*s
= marks
;
448 while ((idnum
>> s
->shift
) >= 1024) {
449 s
= pool_calloc(1, sizeof(struct mark_set
));
450 s
->shift
= marks
->shift
+ 10;
451 s
->data
.sets
[0] = marks
;
455 uintmax_t i
= idnum
>> s
->shift
;
456 idnum
-= i
<< s
->shift
;
457 if (!s
->data
.sets
[i
]) {
458 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
459 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
463 if (!s
->data
.marked
[idnum
])
465 s
->data
.marked
[idnum
] = oe
;
468 static struct object_entry
*find_mark(uintmax_t idnum
)
470 uintmax_t orig_idnum
= idnum
;
471 struct mark_set
*s
= marks
;
472 struct object_entry
*oe
= NULL
;
473 if ((idnum
>> s
->shift
) < 1024) {
474 while (s
&& s
->shift
) {
475 uintmax_t i
= idnum
>> s
->shift
;
476 idnum
-= i
<< s
->shift
;
480 oe
= s
->data
.marked
[idnum
];
483 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
487 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
489 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
492 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
493 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
496 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
498 strncpy(c
->str_dat
, s
, len
);
500 c
->next_atom
= atom_table
[hc
];
506 static struct branch
*lookup_branch(const char *name
)
508 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
511 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
512 if (!strcmp(name
, b
->name
))
517 static struct branch
*new_branch(const char *name
)
519 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
520 struct branch
* b
= lookup_branch(name
);
523 die("Invalid attempt to create duplicate branch: %s", name
);
524 if (check_ref_format(name
))
525 die("Branch name doesn't conform to GIT standards: %s", name
);
527 b
= pool_calloc(1, sizeof(struct branch
));
528 b
->name
= pool_strdup(name
);
529 b
->table_next_branch
= branch_table
[hc
];
530 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
531 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
533 b
->pack_id
= MAX_PACK_ID
;
534 branch_table
[hc
] = b
;
539 static unsigned int hc_entries(unsigned int cnt
)
541 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
542 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
545 static struct tree_content
*new_tree_content(unsigned int cnt
)
547 struct avail_tree_content
*f
, *l
= NULL
;
548 struct tree_content
*t
;
549 unsigned int hc
= hc_entries(cnt
);
551 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
552 if (f
->entry_capacity
>= cnt
)
557 l
->next_avail
= f
->next_avail
;
559 avail_tree_table
[hc
] = f
->next_avail
;
561 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
562 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
563 f
->entry_capacity
= cnt
;
566 t
= (struct tree_content
*)f
;
572 static void release_tree_entry(struct tree_entry
*e
);
573 static void release_tree_content(struct tree_content
*t
)
575 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
576 unsigned int hc
= hc_entries(f
->entry_capacity
);
577 f
->next_avail
= avail_tree_table
[hc
];
578 avail_tree_table
[hc
] = f
;
581 static void release_tree_content_recursive(struct tree_content
*t
)
584 for (i
= 0; i
< t
->entry_count
; i
++)
585 release_tree_entry(t
->entries
[i
]);
586 release_tree_content(t
);
589 static struct tree_content
*grow_tree_content(
590 struct tree_content
*t
,
593 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
594 r
->entry_count
= t
->entry_count
;
595 r
->delta_depth
= t
->delta_depth
;
596 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
597 release_tree_content(t
);
601 static struct tree_entry
*new_tree_entry(void)
603 struct tree_entry
*e
;
605 if (!avail_tree_entry
) {
606 unsigned int n
= tree_entry_alloc
;
607 total_allocd
+= n
* sizeof(struct tree_entry
);
608 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
610 *((void**)e
) = e
+ 1;
616 e
= avail_tree_entry
;
617 avail_tree_entry
= *((void**)e
);
621 static void release_tree_entry(struct tree_entry
*e
)
624 release_tree_content_recursive(e
->tree
);
625 *((void**)e
) = avail_tree_entry
;
626 avail_tree_entry
= e
;
629 static void start_packfile(void)
631 static char tmpfile
[PATH_MAX
];
632 struct packed_git
*p
;
633 struct pack_header hdr
;
636 snprintf(tmpfile
, sizeof(tmpfile
),
637 "%s/pack_XXXXXX", get_object_directory());
638 pack_fd
= mkstemp(tmpfile
);
640 die("Can't create %s: %s", tmpfile
, strerror(errno
));
641 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
642 strcpy(p
->pack_name
, tmpfile
);
643 p
->pack_fd
= pack_fd
;
645 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
646 hdr
.hdr_version
= htonl(2);
648 write_or_die(p
->pack_fd
, &hdr
, sizeof(hdr
));
651 pack_size
= sizeof(hdr
);
654 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
655 all_packs
[pack_id
] = p
;
658 static void fixup_header_footer(void)
660 static const int buf_sz
= 128 * 1024;
661 int pack_fd
= pack_data
->pack_fd
;
663 struct pack_header hdr
;
666 if (lseek(pack_fd
, 0, SEEK_SET
) != 0)
667 die("Failed seeking to start: %s", strerror(errno
));
668 if (read_in_full(pack_fd
, &hdr
, sizeof(hdr
)) != sizeof(hdr
))
669 die("Unable to reread header of %s", pack_data
->pack_name
);
670 if (lseek(pack_fd
, 0, SEEK_SET
) != 0)
671 die("Failed seeking to start: %s", strerror(errno
));
672 hdr
.hdr_entries
= htonl(object_count
);
673 write_or_die(pack_fd
, &hdr
, sizeof(hdr
));
676 SHA1_Update(&c
, &hdr
, sizeof(hdr
));
678 buf
= xmalloc(buf_sz
);
680 size_t n
= xread(pack_fd
, buf
, buf_sz
);
684 die("Failed to checksum %s", pack_data
->pack_name
);
685 SHA1_Update(&c
, buf
, n
);
689 SHA1_Final(pack_data
->sha1
, &c
);
690 write_or_die(pack_fd
, pack_data
->sha1
, sizeof(pack_data
->sha1
));
694 static int oecmp (const void *a_
, const void *b_
)
696 struct object_entry
*a
= *((struct object_entry
**)a_
);
697 struct object_entry
*b
= *((struct object_entry
**)b_
);
698 return hashcmp(a
->sha1
, b
->sha1
);
701 static char *create_index(void)
703 static char tmpfile
[PATH_MAX
];
706 struct object_entry
**idx
, **c
, **last
, *e
;
707 struct object_entry_pool
*o
;
711 /* Build the sorted table of object IDs. */
712 idx
= xmalloc(object_count
* sizeof(struct object_entry
*));
714 for (o
= blocks
; o
; o
= o
->next_pool
)
715 for (e
= o
->next_free
; e
-- != o
->entries
;)
716 if (pack_id
== e
->pack_id
)
718 last
= idx
+ object_count
;
720 die("internal consistency error creating the index");
721 qsort(idx
, object_count
, sizeof(struct object_entry
*), oecmp
);
723 /* Generate the fan-out array. */
725 for (i
= 0; i
< 256; i
++) {
726 struct object_entry
**next
= c
;;
727 while (next
< last
) {
728 if ((*next
)->sha1
[0] != i
)
732 array
[i
] = htonl(next
- idx
);
736 snprintf(tmpfile
, sizeof(tmpfile
),
737 "%s/index_XXXXXX", get_object_directory());
738 idx_fd
= mkstemp(tmpfile
);
740 die("Can't create %s: %s", tmpfile
, strerror(errno
));
741 f
= sha1fd(idx_fd
, tmpfile
);
742 sha1write(f
, array
, 256 * sizeof(int));
744 for (c
= idx
; c
!= last
; c
++) {
745 uint32_t offset
= htonl((*c
)->offset
);
746 sha1write(f
, &offset
, 4);
747 sha1write(f
, (*c
)->sha1
, sizeof((*c
)->sha1
));
748 SHA1_Update(&ctx
, (*c
)->sha1
, 20);
750 sha1write(f
, pack_data
->sha1
, sizeof(pack_data
->sha1
));
751 sha1close(f
, NULL
, 1);
753 SHA1_Final(pack_data
->sha1
, &ctx
);
757 static char *keep_pack(char *curr_index_name
)
759 static char name
[PATH_MAX
];
760 static char *keep_msg
= "fast-import";
763 chmod(pack_data
->pack_name
, 0444);
764 chmod(curr_index_name
, 0444);
766 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
767 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
768 keep_fd
= open(name
, O_RDWR
|O_CREAT
|O_EXCL
, 0600);
770 die("cannot create keep file");
771 write(keep_fd
, keep_msg
, strlen(keep_msg
));
774 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
775 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
776 if (move_temp_to_file(pack_data
->pack_name
, name
))
777 die("cannot store pack file");
779 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
780 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
781 if (move_temp_to_file(curr_index_name
, name
))
782 die("cannot store index file");
786 static void unkeep_all_packs(void)
788 static char name
[PATH_MAX
];
791 for (k
= 0; k
< pack_id
; k
++) {
792 struct packed_git
*p
= all_packs
[k
];
793 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
794 get_object_directory(), sha1_to_hex(p
->sha1
));
799 static void end_packfile(void)
801 struct packed_git
*old_p
= pack_data
, *new_p
;
809 fixup_header_footer();
810 idx_name
= keep_pack(create_index());
812 /* Register the packfile with core git's machinary. */
813 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
815 die("core git rejected index %s", idx_name
);
816 new_p
->windows
= old_p
->windows
;
817 all_packs
[pack_id
] = new_p
;
818 install_packed_git(new_p
);
820 /* Print the boundary */
822 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
823 for (i
= 0; i
< branch_table_sz
; i
++) {
824 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
825 if (b
->pack_id
== pack_id
)
826 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
829 for (t
= first_tag
; t
; t
= t
->next_tag
) {
830 if (t
->pack_id
== pack_id
)
831 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
833 fputc('\n', pack_edges
);
840 unlink(old_p
->pack_name
);
843 /* We can't carry a delta across packfiles. */
844 free(last_blob
.data
);
845 last_blob
.data
= NULL
;
847 last_blob
.offset
= 0;
851 static void cycle_packfile(void)
857 static size_t encode_header(
858 enum object_type type
,
865 if (type
< OBJ_COMMIT
|| type
> OBJ_REF_DELTA
)
866 die("bad type %d", type
);
868 c
= (type
<< 4) | (size
& 15);
880 static int store_object(
881 enum object_type type
,
884 struct last_object
*last
,
885 unsigned char *sha1out
,
889 struct object_entry
*e
;
890 unsigned char hdr
[96];
891 unsigned char sha1
[20];
892 unsigned long hdrlen
, deltalen
;
896 hdrlen
= sprintf((char*)hdr
,"%s %lu", typename(type
),
897 (unsigned long)datlen
) + 1;
899 SHA1_Update(&c
, hdr
, hdrlen
);
900 SHA1_Update(&c
, dat
, datlen
);
901 SHA1_Final(sha1
, &c
);
903 hashcpy(sha1out
, sha1
);
905 e
= insert_object(sha1
);
907 insert_mark(mark
, e
);
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
);
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
, 8);
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
, (unsigned short)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
) {
1158 mktree(t
, 0, &lo
.len
, &old_tree
);
1159 lo
.data
= old_tree
.buffer
;
1160 lo
.offset
= le
->offset
;
1161 lo
.depth
= t
->delta_depth
;
1165 mktree(t
, 1, &new_len
, &new_tree
);
1166 store_object(OBJ_TREE
, new_tree
.buffer
, new_len
,
1167 &lo
, root
->versions
[1].sha1
, 0);
1169 t
->delta_depth
= lo
.depth
;
1170 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1171 struct tree_entry
*e
= t
->entries
[i
];
1172 if (e
->versions
[1].mode
) {
1173 e
->versions
[0].mode
= e
->versions
[1].mode
;
1174 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1175 t
->entries
[j
++] = e
;
1177 release_tree_entry(e
);
1181 t
->entry_count
-= del
;
1184 static int tree_content_set(
1185 struct tree_entry
*root
,
1187 const unsigned char *sha1
,
1188 const uint16_t mode
)
1190 struct tree_content
*t
= root
->tree
;
1193 struct tree_entry
*e
;
1195 slash1
= strchr(p
, '/');
1201 for (i
= 0; i
< t
->entry_count
; i
++) {
1203 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1205 if (e
->versions
[1].mode
== mode
1206 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1208 e
->versions
[1].mode
= mode
;
1209 hashcpy(e
->versions
[1].sha1
, sha1
);
1211 release_tree_content_recursive(e
->tree
);
1214 hashclr(root
->versions
[1].sha1
);
1217 if (!S_ISDIR(e
->versions
[1].mode
)) {
1218 e
->tree
= new_tree_content(8);
1219 e
->versions
[1].mode
= S_IFDIR
;
1223 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
)) {
1224 hashclr(root
->versions
[1].sha1
);
1231 if (t
->entry_count
== t
->entry_capacity
)
1232 root
->tree
= t
= grow_tree_content(t
, 8);
1233 e
= new_tree_entry();
1234 e
->name
= to_atom(p
, (unsigned short)n
);
1235 e
->versions
[0].mode
= 0;
1236 hashclr(e
->versions
[0].sha1
);
1237 t
->entries
[t
->entry_count
++] = e
;
1239 e
->tree
= new_tree_content(8);
1240 e
->versions
[1].mode
= S_IFDIR
;
1241 tree_content_set(e
, slash1
+ 1, sha1
, mode
);
1244 e
->versions
[1].mode
= mode
;
1245 hashcpy(e
->versions
[1].sha1
, sha1
);
1247 hashclr(root
->versions
[1].sha1
);
1251 static int tree_content_remove(struct tree_entry
*root
, const char *p
)
1253 struct tree_content
*t
= root
->tree
;
1256 struct tree_entry
*e
;
1258 slash1
= strchr(p
, '/');
1264 for (i
= 0; i
< t
->entry_count
; i
++) {
1266 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1267 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1271 if (tree_content_remove(e
, slash1
+ 1)) {
1272 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1273 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1274 hashclr(root
->versions
[1].sha1
);
1287 release_tree_content_recursive(e
->tree
);
1290 e
->versions
[1].mode
= 0;
1291 hashclr(e
->versions
[1].sha1
);
1292 hashclr(root
->versions
[1].sha1
);
1296 static int update_branch(struct branch
*b
)
1298 static const char *msg
= "fast-import";
1299 struct ref_lock
*lock
;
1300 unsigned char old_sha1
[20];
1302 if (read_ref(b
->name
, old_sha1
))
1304 lock
= lock_any_ref_for_update(b
->name
, old_sha1
);
1306 return error("Unable to lock %s", b
->name
);
1307 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1308 struct commit
*old_cmit
, *new_cmit
;
1310 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1311 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1312 if (!old_cmit
|| !new_cmit
) {
1314 return error("Branch %s is missing commits.", b
->name
);
1317 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1319 warn("Not updating %s"
1320 " (new tip %s does not contain %s)",
1321 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1325 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1326 return error("Unable to update %s", b
->name
);
1330 static void dump_branches(void)
1335 for (i
= 0; i
< branch_table_sz
; i
++) {
1336 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1337 failure
|= update_branch(b
);
1341 static void dump_tags(void)
1343 static const char *msg
= "fast-import";
1345 struct ref_lock
*lock
;
1346 char ref_name
[PATH_MAX
];
1348 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1349 sprintf(ref_name
, "tags/%s", t
->name
);
1350 lock
= lock_ref_sha1(ref_name
, NULL
);
1351 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1352 failure
|= error("Unable to update %s", ref_name
);
1356 static void dump_marks_helper(FILE *f
,
1362 for (k
= 0; k
< 1024; k
++) {
1363 if (m
->data
.sets
[k
])
1364 dump_marks_helper(f
, (base
+ k
) << m
->shift
,
1368 for (k
= 0; k
< 1024; k
++) {
1369 if (m
->data
.marked
[k
])
1370 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1371 sha1_to_hex(m
->data
.marked
[k
]->sha1
));
1376 static void dump_marks(void)
1378 static struct lock_file mark_lock
;
1385 mark_fd
= hold_lock_file_for_update(&mark_lock
, mark_file
, 0);
1387 failure
|= error("Unable to write marks file %s: %s",
1388 mark_file
, strerror(errno
));
1392 f
= fdopen(mark_fd
, "w");
1394 rollback_lock_file(&mark_lock
);
1395 failure
|= error("Unable to write marks file %s: %s",
1396 mark_file
, strerror(errno
));
1400 dump_marks_helper(f
, 0, marks
);
1402 if (commit_lock_file(&mark_lock
))
1403 failure
|= error("Unable to write marks file %s: %s",
1404 mark_file
, strerror(errno
));
1407 static void read_next_command(void)
1409 read_line(&command_buf
, stdin
, '\n');
1412 static void cmd_mark(void)
1414 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1415 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1416 read_next_command();
1422 static void *cmd_data (size_t *size
)
1427 if (prefixcmp(command_buf
.buf
, "data "))
1428 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1430 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1431 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1432 size_t sz
= 8192, term_len
= command_buf
.len
- 5 - 2;
1434 buffer
= xmalloc(sz
);
1436 read_next_command();
1437 if (command_buf
.eof
)
1438 die("EOF in data (terminator '%s' not found)", term
);
1439 if (term_len
== command_buf
.len
1440 && !strcmp(term
, command_buf
.buf
))
1442 if (sz
< (length
+ command_buf
.len
)) {
1443 sz
= sz
* 3 / 2 + 16;
1444 if (sz
< (length
+ command_buf
.len
))
1445 sz
= length
+ command_buf
.len
;
1446 buffer
= xrealloc(buffer
, sz
);
1448 memcpy(buffer
+ length
,
1450 command_buf
.len
- 1);
1451 length
+= command_buf
.len
- 1;
1452 buffer
[length
++] = '\n';
1458 length
= strtoul(command_buf
.buf
+ 5, NULL
, 10);
1459 buffer
= xmalloc(length
);
1460 while (n
< length
) {
1461 size_t s
= fread(buffer
+ n
, 1, length
- n
, stdin
);
1462 if (!s
&& feof(stdin
))
1463 die("EOF in data (%lu bytes remaining)",
1464 (unsigned long)(length
- n
));
1469 if (fgetc(stdin
) != '\n')
1470 die("An lf did not trail the binary data as expected.");
1476 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1478 const char *orig_src
= src
;
1481 strtoul(src
, &endp
, 10);
1482 if (endp
== src
|| *endp
!= ' ')
1486 if (*src
!= '-' && *src
!= '+')
1490 strtoul(src
+ 1, &endp
, 10);
1491 if (endp
== src
|| *endp
|| (endp
- orig_src
) >= maxlen
)
1494 strcpy(result
, orig_src
);
1498 static char *parse_ident(const char *buf
)
1504 gt
= strrchr(buf
, '>');
1506 die("Missing > in ident string: %s", buf
);
1509 die("Missing space after > in ident string: %s", buf
);
1511 name_len
= gt
- buf
;
1512 ident
= xmalloc(name_len
+ 24);
1513 strncpy(ident
, buf
, name_len
);
1517 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1518 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1520 case WHENSPEC_RFC2822
:
1521 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1522 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1525 if (strcmp("now", gt
))
1526 die("Date in ident must be 'now': %s", buf
);
1527 datestamp(ident
+ name_len
, 24);
1534 static void cmd_new_blob(void)
1539 read_next_command();
1543 if (store_object(OBJ_BLOB
, d
, l
, &last_blob
, NULL
, next_mark
))
1547 static void unload_one_branch(void)
1549 while (cur_active_branches
1550 && cur_active_branches
>= max_active_branches
) {
1551 unsigned long min_commit
= ULONG_MAX
;
1552 struct branch
*e
, *l
= NULL
, *p
= NULL
;
1554 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
1555 if (e
->last_commit
< min_commit
) {
1557 min_commit
= e
->last_commit
;
1563 e
= p
->active_next_branch
;
1564 p
->active_next_branch
= e
->active_next_branch
;
1566 e
= active_branches
;
1567 active_branches
= e
->active_next_branch
;
1570 e
->active_next_branch
= NULL
;
1571 if (e
->branch_tree
.tree
) {
1572 release_tree_content_recursive(e
->branch_tree
.tree
);
1573 e
->branch_tree
.tree
= NULL
;
1575 cur_active_branches
--;
1579 static void load_branch(struct branch
*b
)
1581 load_tree(&b
->branch_tree
);
1584 b
->active_next_branch
= active_branches
;
1585 active_branches
= b
;
1586 cur_active_branches
++;
1587 branch_load_count
++;
1591 static void file_change_m(struct branch
*b
)
1593 const char *p
= command_buf
.buf
+ 2;
1596 struct object_entry
*oe
= oe
;
1597 unsigned char sha1
[20];
1598 uint16_t mode
, inline_data
= 0;
1600 p
= get_mode(p
, &mode
);
1602 die("Corrupt mode: %s", command_buf
.buf
);
1604 case S_IFREG
| 0644:
1605 case S_IFREG
| 0755:
1612 die("Corrupt mode: %s", command_buf
.buf
);
1617 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
1618 hashcpy(sha1
, oe
->sha1
);
1620 } else if (!prefixcmp(p
, "inline")) {
1624 if (get_sha1_hex(p
, sha1
))
1625 die("Invalid SHA1: %s", command_buf
.buf
);
1626 oe
= find_object(sha1
);
1630 die("Missing space after SHA1: %s", command_buf
.buf
);
1632 p_uq
= unquote_c_style(p
, &endp
);
1635 die("Garbage after path in: %s", command_buf
.buf
);
1643 p
= p_uq
= xstrdup(p
);
1644 read_next_command();
1646 if (store_object(OBJ_BLOB
, d
, l
, &last_blob
, sha1
, 0))
1649 if (oe
->type
!= OBJ_BLOB
)
1650 die("Not a blob (actually a %s): %s",
1651 command_buf
.buf
, typename(oe
->type
));
1653 enum object_type type
= sha1_object_info(sha1
, NULL
);
1655 die("Blob not found: %s", command_buf
.buf
);
1656 if (type
!= OBJ_BLOB
)
1657 die("Not a blob (actually a %s): %s",
1658 typename(type
), command_buf
.buf
);
1661 tree_content_set(&b
->branch_tree
, p
, sha1
, S_IFREG
| mode
);
1665 static void file_change_d(struct branch
*b
)
1667 const char *p
= command_buf
.buf
+ 2;
1671 p_uq
= unquote_c_style(p
, &endp
);
1674 die("Garbage after path in: %s", command_buf
.buf
);
1677 tree_content_remove(&b
->branch_tree
, p
);
1681 static void file_change_deleteall(struct branch
*b
)
1683 release_tree_content_recursive(b
->branch_tree
.tree
);
1684 hashclr(b
->branch_tree
.versions
[0].sha1
);
1685 hashclr(b
->branch_tree
.versions
[1].sha1
);
1686 load_tree(&b
->branch_tree
);
1689 static void cmd_from(struct branch
*b
)
1694 if (prefixcmp(command_buf
.buf
, "from "))
1697 if (b
->branch_tree
.tree
) {
1698 release_tree_content_recursive(b
->branch_tree
.tree
);
1699 b
->branch_tree
.tree
= NULL
;
1702 from
= strchr(command_buf
.buf
, ' ') + 1;
1703 s
= lookup_branch(from
);
1705 die("Can't create a branch from itself: %s", b
->name
);
1707 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
1708 hashcpy(b
->sha1
, s
->sha1
);
1709 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
1710 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
1711 } else if (*from
== ':') {
1712 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
1713 struct object_entry
*oe
= find_mark(idnum
);
1716 if (oe
->type
!= OBJ_COMMIT
)
1717 die("Mark :%" PRIuMAX
" not a commit", idnum
);
1718 hashcpy(b
->sha1
, oe
->sha1
);
1719 buf
= gfi_unpack_entry(oe
, &size
);
1720 if (!buf
|| size
< 46)
1721 die("Not a valid commit: %s", from
);
1722 if (memcmp("tree ", buf
, 5)
1723 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
1724 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
1726 hashcpy(b
->branch_tree
.versions
[0].sha1
,
1727 b
->branch_tree
.versions
[1].sha1
);
1728 } else if (!get_sha1(from
, b
->sha1
)) {
1729 if (is_null_sha1(b
->sha1
)) {
1730 hashclr(b
->branch_tree
.versions
[0].sha1
);
1731 hashclr(b
->branch_tree
.versions
[1].sha1
);
1736 buf
= read_object_with_reference(b
->sha1
,
1737 commit_type
, &size
, b
->sha1
);
1738 if (!buf
|| size
< 46)
1739 die("Not a valid commit: %s", from
);
1740 if (memcmp("tree ", buf
, 5)
1741 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
1742 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
1744 hashcpy(b
->branch_tree
.versions
[0].sha1
,
1745 b
->branch_tree
.versions
[1].sha1
);
1748 die("Invalid ref name or SHA1 expression: %s", from
);
1750 read_next_command();
1753 static struct hash_list
*cmd_merge(unsigned int *count
)
1755 struct hash_list
*list
= NULL
, *n
, *e
= e
;
1760 while (!prefixcmp(command_buf
.buf
, "merge ")) {
1761 from
= strchr(command_buf
.buf
, ' ') + 1;
1762 n
= xmalloc(sizeof(*n
));
1763 s
= lookup_branch(from
);
1765 hashcpy(n
->sha1
, s
->sha1
);
1766 else if (*from
== ':') {
1767 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
1768 struct object_entry
*oe
= find_mark(idnum
);
1769 if (oe
->type
!= OBJ_COMMIT
)
1770 die("Mark :%" PRIuMAX
" not a commit", idnum
);
1771 hashcpy(n
->sha1
, oe
->sha1
);
1772 } else if (!get_sha1(from
, n
->sha1
)) {
1774 char *buf
= read_object_with_reference(n
->sha1
,
1775 commit_type
, &size
, n
->sha1
);
1776 if (!buf
|| size
< 46)
1777 die("Not a valid commit: %s", from
);
1780 die("Invalid ref name or SHA1 expression: %s", from
);
1789 read_next_command();
1794 static void cmd_new_commit(void)
1800 char *author
= NULL
;
1801 char *committer
= NULL
;
1802 struct hash_list
*merge_list
= NULL
;
1803 unsigned int merge_count
;
1805 /* Obtain the branch name from the rest of our command */
1806 sp
= strchr(command_buf
.buf
, ' ') + 1;
1807 b
= lookup_branch(sp
);
1811 read_next_command();
1813 if (!prefixcmp(command_buf
.buf
, "author ")) {
1814 author
= parse_ident(command_buf
.buf
+ 7);
1815 read_next_command();
1817 if (!prefixcmp(command_buf
.buf
, "committer ")) {
1818 committer
= parse_ident(command_buf
.buf
+ 10);
1819 read_next_command();
1822 die("Expected committer but didn't get one");
1823 msg
= cmd_data(&msglen
);
1824 read_next_command();
1826 merge_list
= cmd_merge(&merge_count
);
1828 /* ensure the branch is active/loaded */
1829 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
1830 unload_one_branch();
1836 if (1 == command_buf
.len
)
1838 else if (!prefixcmp(command_buf
.buf
, "M "))
1840 else if (!prefixcmp(command_buf
.buf
, "D "))
1842 else if (!strcmp("deleteall", command_buf
.buf
))
1843 file_change_deleteall(b
);
1845 die("Unsupported file_change: %s", command_buf
.buf
);
1846 read_next_command();
1849 /* build the tree and the commit */
1850 store_tree(&b
->branch_tree
);
1851 hashcpy(b
->branch_tree
.versions
[0].sha1
,
1852 b
->branch_tree
.versions
[1].sha1
);
1853 size_dbuf(&new_data
, 114 + msglen
1856 ? strlen(author
) + strlen(committer
)
1857 : 2 * strlen(committer
)));
1858 sp
= new_data
.buffer
;
1859 sp
+= sprintf(sp
, "tree %s\n",
1860 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
1861 if (!is_null_sha1(b
->sha1
))
1862 sp
+= sprintf(sp
, "parent %s\n", sha1_to_hex(b
->sha1
));
1863 while (merge_list
) {
1864 struct hash_list
*next
= merge_list
->next
;
1865 sp
+= sprintf(sp
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
1869 sp
+= sprintf(sp
, "author %s\n", author
? author
: committer
);
1870 sp
+= sprintf(sp
, "committer %s\n", committer
);
1872 memcpy(sp
, msg
, msglen
);
1878 if (!store_object(OBJ_COMMIT
,
1879 new_data
.buffer
, sp
- (char*)new_data
.buffer
,
1880 NULL
, b
->sha1
, next_mark
))
1881 b
->pack_id
= pack_id
;
1882 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
1885 static void cmd_new_tag(void)
1894 uintmax_t from_mark
= 0;
1895 unsigned char sha1
[20];
1897 /* Obtain the new tag name from the rest of our command */
1898 sp
= strchr(command_buf
.buf
, ' ') + 1;
1899 t
= pool_alloc(sizeof(struct tag
));
1901 t
->name
= pool_strdup(sp
);
1903 last_tag
->next_tag
= t
;
1907 read_next_command();
1910 if (prefixcmp(command_buf
.buf
, "from "))
1911 die("Expected from command, got %s", command_buf
.buf
);
1912 from
= strchr(command_buf
.buf
, ' ') + 1;
1913 s
= lookup_branch(from
);
1915 hashcpy(sha1
, s
->sha1
);
1916 } else if (*from
== ':') {
1917 struct object_entry
*oe
;
1918 from_mark
= strtoumax(from
+ 1, NULL
, 10);
1919 oe
= find_mark(from_mark
);
1920 if (oe
->type
!= OBJ_COMMIT
)
1921 die("Mark :%" PRIuMAX
" not a commit", from_mark
);
1922 hashcpy(sha1
, oe
->sha1
);
1923 } else if (!get_sha1(from
, sha1
)) {
1927 buf
= read_object_with_reference(sha1
,
1928 commit_type
, &size
, sha1
);
1929 if (!buf
|| size
< 46)
1930 die("Not a valid commit: %s", from
);
1933 die("Invalid ref name or SHA1 expression: %s", from
);
1934 read_next_command();
1937 if (prefixcmp(command_buf
.buf
, "tagger "))
1938 die("Expected tagger command, got %s", command_buf
.buf
);
1939 tagger
= parse_ident(command_buf
.buf
+ 7);
1941 /* tag payload/message */
1942 read_next_command();
1943 msg
= cmd_data(&msglen
);
1945 /* build the tag object */
1946 size_dbuf(&new_data
, 67+strlen(t
->name
)+strlen(tagger
)+msglen
);
1947 sp
= new_data
.buffer
;
1948 sp
+= sprintf(sp
, "object %s\n", sha1_to_hex(sha1
));
1949 sp
+= sprintf(sp
, "type %s\n", commit_type
);
1950 sp
+= sprintf(sp
, "tag %s\n", t
->name
);
1951 sp
+= sprintf(sp
, "tagger %s\n", tagger
);
1953 memcpy(sp
, msg
, msglen
);
1958 if (store_object(OBJ_TAG
, new_data
.buffer
,
1959 sp
- (char*)new_data
.buffer
,
1961 t
->pack_id
= MAX_PACK_ID
;
1963 t
->pack_id
= pack_id
;
1966 static void cmd_reset_branch(void)
1971 /* Obtain the branch name from the rest of our command */
1972 sp
= strchr(command_buf
.buf
, ' ') + 1;
1973 b
= lookup_branch(sp
);
1976 hashclr(b
->branch_tree
.versions
[0].sha1
);
1977 hashclr(b
->branch_tree
.versions
[1].sha1
);
1978 if (b
->branch_tree
.tree
) {
1979 release_tree_content_recursive(b
->branch_tree
.tree
);
1980 b
->branch_tree
.tree
= NULL
;
1985 read_next_command();
1989 static void cmd_checkpoint(void)
1997 read_next_command();
2000 static const char fast_import_usage
[] =
2001 "git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2003 int main(int argc
, const char **argv
)
2005 int i
, show_stats
= 1;
2007 git_config(git_default_config
);
2008 alloc_objects(object_entry_alloc
);
2009 strbuf_init(&command_buf
);
2010 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
2011 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
2012 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
2013 marks
= pool_calloc(1, sizeof(struct mark_set
));
2015 for (i
= 1; i
< argc
; i
++) {
2016 const char *a
= argv
[i
];
2018 if (*a
!= '-' || !strcmp(a
, "--"))
2020 else if (!prefixcmp(a
, "--date-format=")) {
2021 const char *fmt
= a
+ 14;
2022 if (!strcmp(fmt
, "raw"))
2023 whenspec
= WHENSPEC_RAW
;
2024 else if (!strcmp(fmt
, "rfc2822"))
2025 whenspec
= WHENSPEC_RFC2822
;
2026 else if (!strcmp(fmt
, "now"))
2027 whenspec
= WHENSPEC_NOW
;
2029 die("unknown --date-format argument %s", fmt
);
2031 else if (!prefixcmp(a
, "--max-pack-size="))
2032 max_packsize
= strtoumax(a
+ 16, NULL
, 0) * 1024 * 1024;
2033 else if (!prefixcmp(a
, "--depth="))
2034 max_depth
= strtoul(a
+ 8, NULL
, 0);
2035 else if (!prefixcmp(a
, "--active-branches="))
2036 max_active_branches
= strtoul(a
+ 18, NULL
, 0);
2037 else if (!prefixcmp(a
, "--export-marks="))
2039 else if (!prefixcmp(a
, "--export-pack-edges=")) {
2042 pack_edges
= fopen(a
+ 20, "a");
2044 die("Cannot open %s: %s", a
+ 20, strerror(errno
));
2045 } else if (!strcmp(a
, "--force"))
2047 else if (!strcmp(a
, "--quiet"))
2049 else if (!strcmp(a
, "--stats"))
2052 die("unknown option %s", a
);
2055 usage(fast_import_usage
);
2059 read_next_command();
2060 if (command_buf
.eof
)
2062 else if (!strcmp("blob", command_buf
.buf
))
2064 else if (!prefixcmp(command_buf
.buf
, "commit "))
2066 else if (!prefixcmp(command_buf
.buf
, "tag "))
2068 else if (!prefixcmp(command_buf
.buf
, "reset "))
2070 else if (!strcmp("checkpoint", command_buf
.buf
))
2073 die("Unsupported command: %s", command_buf
.buf
);
2086 uintmax_t total_count
= 0, duplicate_count
= 0;
2087 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
2088 total_count
+= object_count_by_type
[i
];
2089 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
2090 duplicate_count
+= duplicate_count_by_type
[i
];
2092 fprintf(stderr
, "%s statistics:\n", argv
[0]);
2093 fprintf(stderr
, "---------------------------------------------------------------------\n");
2094 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
2095 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
2096 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
]);
2097 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
]);
2098 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
]);
2099 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
]);
2100 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
2101 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
2102 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
2103 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
2104 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
2105 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
2106 fprintf(stderr
, "---------------------------------------------------------------------\n");
2108 fprintf(stderr
, "---------------------------------------------------------------------\n");
2109 fprintf(stderr
, "\n");
2112 return failure
? 1 : 0;