2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
31 file_change ::= file_clr
37 file_clr ::= 'deleteall' lf;
38 file_del ::= 'D' sp path_str lf;
39 file_rnm ::= 'R' sp path_str sp path_str lf;
40 file_cpy ::= 'C' sp path_str sp path_str lf;
41 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
42 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
44 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
45 note_inm ::= 'N' sp 'inline' sp committish lf
48 new_tag ::= 'tag' sp tag_str lf
49 'from' sp committish lf
50 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
54 reset_branch ::= 'reset' sp ref_str lf
55 ('from' sp committish lf)?
58 checkpoint ::= 'checkpoint' lf
61 progress ::= 'progress' sp not_lf* lf
64 # note: the first idnum in a stream should be 1 and subsequent
65 # idnums should not have gaps between values as this will cause
66 # the stream parser to reserve space for the gapped values. An
67 # idnum can be updated in the future to a new object by issuing
68 # a new mark directive with the old idnum.
70 mark ::= 'mark' sp idnum lf;
71 data ::= (delimited_data | exact_data)
74 # note: delim may be any string but must not contain lf.
75 # data_line may contain any data but must not be exactly
77 delimited_data ::= 'data' sp '<<' delim lf
81 # note: declen indicates the length of binary_data in bytes.
82 # declen does not include the lf preceding the binary data.
84 exact_data ::= 'data' sp declen lf
87 # note: quoted strings are C-style quoting supporting \c for
88 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
89 # is the signed byte value in octal. Note that the only
90 # characters which must actually be escaped to protect the
91 # stream formatting is: \, " and LF. Otherwise these values
94 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
96 sha1exp_str ::= sha1exp;
98 path_str ::= path | '"' quoted(path) '"' ;
99 mode ::= '100644' | '644'
104 declen ::= # unsigned 32 bit value, ascii base10 notation;
105 bigint ::= # unsigned integer value, ascii base10 notation;
106 binary_data ::= # file content, not interpreted;
108 when ::= raw_when | rfc2822_when;
109 raw_when ::= ts sp tz;
110 rfc2822_when ::= # Valid RFC 2822 date and time;
112 sp ::= # ASCII space character;
113 lf ::= # ASCII newline (LF) character;
115 # note: a colon (':') must precede the numerical value assigned to
116 # an idnum. This is to distinguish it from a ref or tag name as
117 # GIT does not permit ':' in ref or tag strings.
119 idnum ::= ':' bigint;
120 path ::= # GIT style file path, e.g. "a/b/c";
121 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
122 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
123 sha1exp ::= # Any valid GIT SHA1 expression;
124 hexsha1 ::= # SHA1 in hexadecimal format;
126 # note: name and email are UTF8 strings, however name must not
127 # contain '<' or lf and email must not contain any of the
128 # following: '<', '>', lf.
130 name ::= # valid GIT author/committer name;
131 email ::= # valid GIT author/committer email;
132 ts ::= # time since the epoch in seconds, ascii base10 notation;
133 tz ::= # GIT style timezone;
135 # note: comments may appear anywhere in the input, except
136 # within a data command. Any form of the data command
137 # always escapes the related input from comment processing.
139 # In case it is not clear, the '#' that starts the comment
140 # must be the first character on that line (an lf
143 comment ::= '#' not_lf* lf;
144 not_lf ::= # Any byte that is not ASCII newline (LF);
156 #include "csum-file.h"
158 #include "exec_cmd.h"
160 #define PACK_ID_BITS 16
161 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
162 #define DEPTH_BITS 13
163 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
167 struct pack_idx_entry idx
;
168 struct object_entry
*next
;
169 uint32_t type
: TYPE_BITS
,
170 pack_id
: PACK_ID_BITS
,
174 struct object_entry_pool
176 struct object_entry_pool
*next_pool
;
177 struct object_entry
*next_free
;
178 struct object_entry
*end
;
179 struct object_entry entries
[FLEX_ARRAY
]; /* more */
185 struct object_entry
*marked
[1024];
186 struct mark_set
*sets
[1024];
196 unsigned no_swap
: 1;
201 struct mem_pool
*next_pool
;
204 uintmax_t space
[FLEX_ARRAY
]; /* more */
209 struct atom_str
*next_atom
;
210 unsigned short str_len
;
211 char str_dat
[FLEX_ARRAY
]; /* more */
217 struct tree_content
*tree
;
218 struct atom_str
*name
;
222 unsigned char sha1
[20];
228 unsigned int entry_capacity
; /* must match avail_tree_content */
229 unsigned int entry_count
;
230 unsigned int delta_depth
;
231 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
234 struct avail_tree_content
236 unsigned int entry_capacity
; /* must match tree_content */
237 struct avail_tree_content
*next_avail
;
242 struct branch
*table_next_branch
;
243 struct branch
*active_next_branch
;
245 struct tree_entry branch_tree
;
246 uintmax_t last_commit
;
249 unsigned pack_id
: PACK_ID_BITS
;
250 unsigned char sha1
[20];
255 struct tag
*next_tag
;
257 unsigned int pack_id
;
258 unsigned char sha1
[20];
263 struct hash_list
*next
;
264 unsigned char sha1
[20];
273 struct recent_command
275 struct recent_command
*prev
;
276 struct recent_command
*next
;
280 /* Configured limits on output */
281 static unsigned long max_depth
= 10;
282 static off_t max_packsize
= (1LL << 32) - 1;
283 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
284 static int force_update
;
285 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
286 static int pack_compression_seen
;
288 /* Stats and misc. counters */
289 static uintmax_t alloc_count
;
290 static uintmax_t marks_set_count
;
291 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
292 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
294 static unsigned long object_count
;
295 static unsigned long branch_count
;
296 static unsigned long branch_load_count
;
298 static FILE *pack_edges
;
299 static unsigned int show_stats
= 1;
300 static int global_argc
;
301 static const char **global_argv
;
304 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
305 static size_t total_allocd
;
306 static struct mem_pool
*mem_pool
;
308 /* Atom management */
309 static unsigned int atom_table_sz
= 4451;
310 static unsigned int atom_cnt
;
311 static struct atom_str
**atom_table
;
313 /* The .pack file being generated */
314 static unsigned int pack_id
;
315 static struct packed_git
*pack_data
;
316 static struct packed_git
**all_packs
;
317 static unsigned long pack_size
;
319 /* Table of objects we've written. */
320 static unsigned int object_entry_alloc
= 5000;
321 static struct object_entry_pool
*blocks
;
322 static struct object_entry
*object_table
[1 << 16];
323 static struct mark_set
*marks
;
324 static const char *export_marks_file
;
325 static const char *import_marks_file
;
326 static int import_marks_file_from_stream
;
327 static int relative_marks_paths
;
330 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
332 /* Tree management */
333 static unsigned int tree_entry_alloc
= 1000;
334 static void *avail_tree_entry
;
335 static unsigned int avail_tree_table_sz
= 100;
336 static struct avail_tree_content
**avail_tree_table
;
337 static struct strbuf old_tree
= STRBUF_INIT
;
338 static struct strbuf new_tree
= STRBUF_INIT
;
341 static unsigned long max_active_branches
= 5;
342 static unsigned long cur_active_branches
;
343 static unsigned long branch_table_sz
= 1039;
344 static struct branch
**branch_table
;
345 static struct branch
*active_branches
;
348 static struct tag
*first_tag
;
349 static struct tag
*last_tag
;
351 /* Input stream parsing */
352 static whenspec_type whenspec
= WHENSPEC_RAW
;
353 static struct strbuf command_buf
= STRBUF_INIT
;
354 static int unread_command_buf
;
355 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
356 static struct recent_command
*cmd_tail
= &cmd_hist
;
357 static struct recent_command
*rc_free
;
358 static unsigned int cmd_save
= 100;
359 static uintmax_t next_mark
;
360 static struct strbuf new_data
= STRBUF_INIT
;
361 static int seen_data_command
;
363 static void parse_argv(void);
365 static void write_branch_report(FILE *rpt
, struct branch
*b
)
367 fprintf(rpt
, "%s:\n", b
->name
);
369 fprintf(rpt
, " status :");
371 fputs(" active", rpt
);
372 if (b
->branch_tree
.tree
)
373 fputs(" loaded", rpt
);
374 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
375 fputs(" dirty", rpt
);
378 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
379 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
380 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
381 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
383 fputs(" last pack : ", rpt
);
384 if (b
->pack_id
< MAX_PACK_ID
)
385 fprintf(rpt
, "%u", b
->pack_id
);
391 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
393 static void write_crash_report(const char *err
)
395 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
396 FILE *rpt
= fopen(loc
, "w");
399 struct recent_command
*rc
;
402 error("can't write crash report %s: %s", loc
, strerror(errno
));
406 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
408 fprintf(rpt
, "fast-import crash report:\n");
409 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
410 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
411 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
414 fputs("fatal: ", rpt
);
419 fputs("Most Recent Commands Before Crash\n", rpt
);
420 fputs("---------------------------------\n", rpt
);
421 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
422 if (rc
->next
== &cmd_hist
)
431 fputs("Active Branch LRU\n", rpt
);
432 fputs("-----------------\n", rpt
);
433 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
435 max_active_branches
);
437 fputs(" pos clock name\n", rpt
);
438 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
439 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
440 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
441 ++lu
, b
->last_commit
, b
->name
);
444 fputs("Inactive Branches\n", rpt
);
445 fputs("-----------------\n", rpt
);
446 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
447 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
448 write_branch_report(rpt
, b
);
454 fputs("Annotated Tags\n", rpt
);
455 fputs("--------------\n", rpt
);
456 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
457 fputs(sha1_to_hex(tg
->sha1
), rpt
);
459 fputs(tg
->name
, rpt
);
465 fputs("Marks\n", rpt
);
466 fputs("-----\n", rpt
);
467 if (export_marks_file
)
468 fprintf(rpt
, " exported to %s\n", export_marks_file
);
470 dump_marks_helper(rpt
, 0, marks
);
473 fputs("-------------------\n", rpt
);
474 fputs("END OF CRASH REPORT\n", rpt
);
478 static void end_packfile(void);
479 static void unkeep_all_packs(void);
480 static void dump_marks(void);
482 static NORETURN
void die_nicely(const char *err
, va_list params
)
485 char message
[2 * PATH_MAX
];
487 vsnprintf(message
, sizeof(message
), err
, params
);
488 fputs("fatal: ", stderr
);
489 fputs(message
, stderr
);
494 write_crash_report(message
);
502 static void alloc_objects(unsigned int cnt
)
504 struct object_entry_pool
*b
;
506 b
= xmalloc(sizeof(struct object_entry_pool
)
507 + cnt
* sizeof(struct object_entry
));
508 b
->next_pool
= blocks
;
509 b
->next_free
= b
->entries
;
510 b
->end
= b
->entries
+ cnt
;
515 static struct object_entry
*new_object(unsigned char *sha1
)
517 struct object_entry
*e
;
519 if (blocks
->next_free
== blocks
->end
)
520 alloc_objects(object_entry_alloc
);
522 e
= blocks
->next_free
++;
523 hashcpy(e
->idx
.sha1
, sha1
);
527 static struct object_entry
*find_object(unsigned char *sha1
)
529 unsigned int h
= sha1
[0] << 8 | sha1
[1];
530 struct object_entry
*e
;
531 for (e
= object_table
[h
]; e
; e
= e
->next
)
532 if (!hashcmp(sha1
, e
->idx
.sha1
))
537 static struct object_entry
*insert_object(unsigned char *sha1
)
539 unsigned int h
= sha1
[0] << 8 | sha1
[1];
540 struct object_entry
*e
= object_table
[h
];
541 struct object_entry
*p
= NULL
;
544 if (!hashcmp(sha1
, e
->idx
.sha1
))
550 e
= new_object(sha1
);
560 static unsigned int hc_str(const char *s
, size_t len
)
568 static void *pool_alloc(size_t len
)
573 /* round up to a 'uintmax_t' alignment */
574 if (len
& (sizeof(uintmax_t) - 1))
575 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
577 for (p
= mem_pool
; p
; p
= p
->next_pool
)
578 if ((p
->end
- p
->next_free
>= len
))
582 if (len
>= (mem_pool_alloc
/2)) {
586 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
587 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
588 p
->next_pool
= mem_pool
;
589 p
->next_free
= (char *) p
->space
;
590 p
->end
= p
->next_free
+ mem_pool_alloc
;
599 static void *pool_calloc(size_t count
, size_t size
)
601 size_t len
= count
* size
;
602 void *r
= pool_alloc(len
);
607 static char *pool_strdup(const char *s
)
609 char *r
= pool_alloc(strlen(s
) + 1);
614 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
616 struct mark_set
*s
= marks
;
617 while ((idnum
>> s
->shift
) >= 1024) {
618 s
= pool_calloc(1, sizeof(struct mark_set
));
619 s
->shift
= marks
->shift
+ 10;
620 s
->data
.sets
[0] = marks
;
624 uintmax_t i
= idnum
>> s
->shift
;
625 idnum
-= i
<< s
->shift
;
626 if (!s
->data
.sets
[i
]) {
627 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
628 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
632 if (!s
->data
.marked
[idnum
])
634 s
->data
.marked
[idnum
] = oe
;
637 static struct object_entry
*find_mark(uintmax_t idnum
)
639 uintmax_t orig_idnum
= idnum
;
640 struct mark_set
*s
= marks
;
641 struct object_entry
*oe
= NULL
;
642 if ((idnum
>> s
->shift
) < 1024) {
643 while (s
&& s
->shift
) {
644 uintmax_t i
= idnum
>> s
->shift
;
645 idnum
-= i
<< s
->shift
;
649 oe
= s
->data
.marked
[idnum
];
652 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
656 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
658 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
661 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
662 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
665 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
667 strncpy(c
->str_dat
, s
, len
);
669 c
->next_atom
= atom_table
[hc
];
675 static struct branch
*lookup_branch(const char *name
)
677 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
680 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
681 if (!strcmp(name
, b
->name
))
686 static struct branch
*new_branch(const char *name
)
688 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
689 struct branch
*b
= lookup_branch(name
);
692 die("Invalid attempt to create duplicate branch: %s", name
);
693 switch (check_ref_format(name
)) {
694 case 0: break; /* its valid */
695 case CHECK_REF_FORMAT_ONELEVEL
:
696 break; /* valid, but too few '/', allow anyway */
698 die("Branch name doesn't conform to GIT standards: %s", name
);
701 b
= pool_calloc(1, sizeof(struct branch
));
702 b
->name
= pool_strdup(name
);
703 b
->table_next_branch
= branch_table
[hc
];
704 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
705 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
708 b
->pack_id
= MAX_PACK_ID
;
709 branch_table
[hc
] = b
;
714 static unsigned int hc_entries(unsigned int cnt
)
716 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
717 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
720 static struct tree_content
*new_tree_content(unsigned int cnt
)
722 struct avail_tree_content
*f
, *l
= NULL
;
723 struct tree_content
*t
;
724 unsigned int hc
= hc_entries(cnt
);
726 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
727 if (f
->entry_capacity
>= cnt
)
732 l
->next_avail
= f
->next_avail
;
734 avail_tree_table
[hc
] = f
->next_avail
;
736 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
737 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
738 f
->entry_capacity
= cnt
;
741 t
= (struct tree_content
*)f
;
747 static void release_tree_entry(struct tree_entry
*e
);
748 static void release_tree_content(struct tree_content
*t
)
750 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
751 unsigned int hc
= hc_entries(f
->entry_capacity
);
752 f
->next_avail
= avail_tree_table
[hc
];
753 avail_tree_table
[hc
] = f
;
756 static void release_tree_content_recursive(struct tree_content
*t
)
759 for (i
= 0; i
< t
->entry_count
; i
++)
760 release_tree_entry(t
->entries
[i
]);
761 release_tree_content(t
);
764 static struct tree_content
*grow_tree_content(
765 struct tree_content
*t
,
768 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
769 r
->entry_count
= t
->entry_count
;
770 r
->delta_depth
= t
->delta_depth
;
771 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
772 release_tree_content(t
);
776 static struct tree_entry
*new_tree_entry(void)
778 struct tree_entry
*e
;
780 if (!avail_tree_entry
) {
781 unsigned int n
= tree_entry_alloc
;
782 total_allocd
+= n
* sizeof(struct tree_entry
);
783 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
785 *((void**)e
) = e
+ 1;
791 e
= avail_tree_entry
;
792 avail_tree_entry
= *((void**)e
);
796 static void release_tree_entry(struct tree_entry
*e
)
799 release_tree_content_recursive(e
->tree
);
800 *((void**)e
) = avail_tree_entry
;
801 avail_tree_entry
= e
;
804 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
806 struct tree_content
*d
;
807 struct tree_entry
*a
, *b
;
812 d
= new_tree_content(s
->entry_count
);
813 for (i
= 0; i
< s
->entry_count
; i
++) {
815 b
= new_tree_entry();
816 memcpy(b
, a
, sizeof(*a
));
817 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
818 b
->tree
= dup_tree_content(a
->tree
);
823 d
->entry_count
= s
->entry_count
;
824 d
->delta_depth
= s
->delta_depth
;
829 static void start_packfile(void)
831 static char tmpfile
[PATH_MAX
];
832 struct packed_git
*p
;
833 struct pack_header hdr
;
836 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
837 "pack/tmp_pack_XXXXXX");
838 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
839 strcpy(p
->pack_name
, tmpfile
);
840 p
->pack_fd
= pack_fd
;
842 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
843 hdr
.hdr_version
= htonl(2);
845 write_or_die(p
->pack_fd
, &hdr
, sizeof(hdr
));
848 pack_size
= sizeof(hdr
);
851 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
852 all_packs
[pack_id
] = p
;
855 static int oecmp (const void *a_
, const void *b_
)
857 struct object_entry
*a
= *((struct object_entry
**)a_
);
858 struct object_entry
*b
= *((struct object_entry
**)b_
);
859 return hashcmp(a
->idx
.sha1
, b
->idx
.sha1
);
862 static char *create_index(void)
864 static char tmpfile
[PATH_MAX
];
867 struct object_entry
**idx
, **c
, **last
, *e
;
868 struct object_entry_pool
*o
;
872 /* Build the sorted table of object IDs. */
873 idx
= xmalloc(object_count
* sizeof(struct object_entry
*));
875 for (o
= blocks
; o
; o
= o
->next_pool
)
876 for (e
= o
->next_free
; e
-- != o
->entries
;)
877 if (pack_id
== e
->pack_id
)
879 last
= idx
+ object_count
;
881 die("internal consistency error creating the index");
882 qsort(idx
, object_count
, sizeof(struct object_entry
*), oecmp
);
884 /* Generate the fan-out array. */
886 for (i
= 0; i
< 256; i
++) {
887 struct object_entry
**next
= c
;
888 while (next
< last
) {
889 if ((*next
)->idx
.sha1
[0] != i
)
893 array
[i
] = htonl(next
- idx
);
897 idx_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
898 "pack/tmp_idx_XXXXXX");
899 f
= sha1fd(idx_fd
, tmpfile
);
900 sha1write(f
, array
, 256 * sizeof(int));
902 for (c
= idx
; c
!= last
; c
++) {
903 uint32_t offset
= htonl((*c
)->idx
.offset
);
904 sha1write(f
, &offset
, 4);
905 sha1write(f
, (*c
)->idx
.sha1
, sizeof((*c
)->idx
.sha1
));
906 git_SHA1_Update(&ctx
, (*c
)->idx
.sha1
, 20);
908 sha1write(f
, pack_data
->sha1
, sizeof(pack_data
->sha1
));
909 sha1close(f
, NULL
, CSUM_FSYNC
);
911 git_SHA1_Final(pack_data
->sha1
, &ctx
);
915 static char *keep_pack(char *curr_index_name
)
917 static char name
[PATH_MAX
];
918 static const char *keep_msg
= "fast-import";
921 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
923 die_errno("cannot create keep file");
924 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
926 die_errno("failed to write keep file");
928 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
929 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
930 if (move_temp_to_file(pack_data
->pack_name
, name
))
931 die("cannot store pack file");
933 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
934 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
935 if (move_temp_to_file(curr_index_name
, name
))
936 die("cannot store index file");
940 static void unkeep_all_packs(void)
942 static char name
[PATH_MAX
];
945 for (k
= 0; k
< pack_id
; k
++) {
946 struct packed_git
*p
= all_packs
[k
];
947 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
948 get_object_directory(), sha1_to_hex(p
->sha1
));
949 unlink_or_warn(name
);
953 static void end_packfile(void)
955 struct packed_git
*old_p
= pack_data
, *new_p
;
957 clear_delta_base_cache();
964 close_pack_windows(pack_data
);
965 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
966 pack_data
->pack_name
, object_count
,
968 close(pack_data
->pack_fd
);
969 idx_name
= keep_pack(create_index());
971 /* Register the packfile with core git's machinery. */
972 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
974 die("core git rejected index %s", idx_name
);
975 all_packs
[pack_id
] = new_p
;
976 install_packed_git(new_p
);
978 /* Print the boundary */
980 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
981 for (i
= 0; i
< branch_table_sz
; i
++) {
982 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
983 if (b
->pack_id
== pack_id
)
984 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
987 for (t
= first_tag
; t
; t
= t
->next_tag
) {
988 if (t
->pack_id
== pack_id
)
989 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
991 fputc('\n', pack_edges
);
998 close(old_p
->pack_fd
);
999 unlink_or_warn(old_p
->pack_name
);
1003 /* We can't carry a delta across packfiles. */
1004 strbuf_release(&last_blob
.data
);
1005 last_blob
.offset
= 0;
1006 last_blob
.depth
= 0;
1009 static void cycle_packfile(void)
1015 static size_t encode_header(
1016 enum object_type type
,
1023 if (type
< OBJ_COMMIT
|| type
> OBJ_REF_DELTA
)
1024 die("bad type %d", type
);
1026 c
= (type
<< 4) | (size
& 15);
1038 static int store_object(
1039 enum object_type type
,
1041 struct last_object
*last
,
1042 unsigned char *sha1out
,
1046 struct object_entry
*e
;
1047 unsigned char hdr
[96];
1048 unsigned char sha1
[20];
1049 unsigned long hdrlen
, deltalen
;
1053 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1054 (unsigned long)dat
->len
) + 1;
1056 git_SHA1_Update(&c
, hdr
, hdrlen
);
1057 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1058 git_SHA1_Final(sha1
, &c
);
1060 hashcpy(sha1out
, sha1
);
1062 e
= insert_object(sha1
);
1064 insert_mark(mark
, e
);
1065 if (e
->idx
.offset
) {
1066 duplicate_count_by_type
[type
]++;
1068 } else if (find_sha1_pack(sha1
, packed_git
)) {
1070 e
->pack_id
= MAX_PACK_ID
;
1071 e
->idx
.offset
= 1; /* just not zero! */
1072 duplicate_count_by_type
[type
]++;
1076 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
) {
1077 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1080 if (delta
&& deltalen
>= dat
->len
) {
1087 memset(&s
, 0, sizeof(s
));
1088 deflateInit(&s
, pack_compression_level
);
1091 s
.avail_in
= deltalen
;
1093 s
.next_in
= (void *)dat
->buf
;
1094 s
.avail_in
= dat
->len
;
1096 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1097 s
.next_out
= out
= xmalloc(s
.avail_out
);
1098 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1102 /* Determine if we should auto-checkpoint. */
1103 if ((pack_size
+ 60 + s
.total_out
) > max_packsize
1104 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1106 /* This new object needs to *not* have the current pack_id. */
1107 e
->pack_id
= pack_id
+ 1;
1110 /* We cannot carry a delta into the new pack. */
1115 memset(&s
, 0, sizeof(s
));
1116 deflateInit(&s
, pack_compression_level
);
1117 s
.next_in
= (void *)dat
->buf
;
1118 s
.avail_in
= dat
->len
;
1119 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1120 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1121 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1128 e
->pack_id
= pack_id
;
1129 e
->idx
.offset
= pack_size
;
1131 object_count_by_type
[type
]++;
1134 unsigned long ofs
= e
->idx
.offset
- last
->offset
;
1135 unsigned pos
= sizeof(hdr
) - 1;
1137 delta_count_by_type
[type
]++;
1138 e
->depth
= last
->depth
+ 1;
1140 hdrlen
= encode_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1141 write_or_die(pack_data
->pack_fd
, hdr
, hdrlen
);
1142 pack_size
+= hdrlen
;
1144 hdr
[pos
] = ofs
& 127;
1146 hdr
[--pos
] = 128 | (--ofs
& 127);
1147 write_or_die(pack_data
->pack_fd
, hdr
+ pos
, sizeof(hdr
) - pos
);
1148 pack_size
+= sizeof(hdr
) - pos
;
1151 hdrlen
= encode_header(type
, dat
->len
, hdr
);
1152 write_or_die(pack_data
->pack_fd
, hdr
, hdrlen
);
1153 pack_size
+= hdrlen
;
1156 write_or_die(pack_data
->pack_fd
, out
, s
.total_out
);
1157 pack_size
+= s
.total_out
;
1162 if (last
->no_swap
) {
1165 strbuf_swap(&last
->data
, dat
);
1167 last
->offset
= e
->idx
.offset
;
1168 last
->depth
= e
->depth
;
1173 static void truncate_pack(off_t to
)
1175 if (ftruncate(pack_data
->pack_fd
, to
)
1176 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1177 die_errno("cannot truncate pack to skip duplicate");
1181 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1183 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1184 unsigned char *in_buf
= xmalloc(in_sz
);
1185 unsigned char *out_buf
= xmalloc(out_sz
);
1186 struct object_entry
*e
;
1187 unsigned char sha1
[20];
1188 unsigned long hdrlen
;
1194 /* Determine if we should auto-checkpoint. */
1195 if ((pack_size
+ 60 + len
) > max_packsize
1196 || (pack_size
+ 60 + len
) < pack_size
)
1201 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1202 if (out_sz
<= hdrlen
)
1203 die("impossibly large object header");
1206 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1208 memset(&s
, 0, sizeof(s
));
1209 deflateInit(&s
, pack_compression_level
);
1211 hdrlen
= encode_header(OBJ_BLOB
, len
, out_buf
);
1212 if (out_sz
<= hdrlen
)
1213 die("impossibly large object header");
1215 s
.next_out
= out_buf
+ hdrlen
;
1216 s
.avail_out
= out_sz
- hdrlen
;
1218 while (status
!= Z_STREAM_END
) {
1219 if (0 < len
&& !s
.avail_in
) {
1220 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1221 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1222 if (!n
&& feof(stdin
))
1223 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1225 git_SHA1_Update(&c
, in_buf
, n
);
1231 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1233 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1234 size_t n
= s
.next_out
- out_buf
;
1235 write_or_die(pack_data
->pack_fd
, out_buf
, n
);
1237 s
.next_out
= out_buf
;
1238 s
.avail_out
= out_sz
;
1247 die("unexpected deflate failure: %d", status
);
1251 git_SHA1_Final(sha1
, &c
);
1254 hashcpy(sha1out
, sha1
);
1256 e
= insert_object(sha1
);
1259 insert_mark(mark
, e
);
1261 if (e
->idx
.offset
) {
1262 duplicate_count_by_type
[OBJ_BLOB
]++;
1263 truncate_pack(offset
);
1265 } else if (find_sha1_pack(sha1
, packed_git
)) {
1267 e
->pack_id
= MAX_PACK_ID
;
1268 e
->idx
.offset
= 1; /* just not zero! */
1269 duplicate_count_by_type
[OBJ_BLOB
]++;
1270 truncate_pack(offset
);
1275 e
->pack_id
= pack_id
;
1276 e
->idx
.offset
= offset
;
1278 object_count_by_type
[OBJ_BLOB
]++;
1285 /* All calls must be guarded by find_object() or find_mark() to
1286 * ensure the 'struct object_entry' passed was written by this
1287 * process instance. We unpack the entry by the offset, avoiding
1288 * the need for the corresponding .idx file. This unpacking rule
1289 * works because we only use OBJ_REF_DELTA within the packfiles
1290 * created by fast-import.
1292 * oe must not be NULL. Such an oe usually comes from giving
1293 * an unknown SHA-1 to find_object() or an undefined mark to
1294 * find_mark(). Callers must test for this condition and use
1295 * the standard read_sha1_file() when it happens.
1297 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1298 * find_mark(), where the mark was reloaded from an existing marks
1299 * file and is referencing an object that this fast-import process
1300 * instance did not write out to a packfile. Callers must test for
1301 * this condition and use read_sha1_file() instead.
1303 static void *gfi_unpack_entry(
1304 struct object_entry
*oe
,
1305 unsigned long *sizep
)
1307 enum object_type type
;
1308 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1309 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1310 /* The object is stored in the packfile we are writing to
1311 * and we have modified it since the last time we scanned
1312 * back to read a previously written object. If an old
1313 * window covered [p->pack_size, p->pack_size + 20) its
1314 * data is stale and is not valid. Closing all windows
1315 * and updating the packfile length ensures we can read
1316 * the newly written data.
1318 close_pack_windows(p
);
1320 /* We have to offer 20 bytes additional on the end of
1321 * the packfile as the core unpacker code assumes the
1322 * footer is present at the file end and must promise
1323 * at least 20 bytes within any window it maps. But
1324 * we don't actually create the footer here.
1326 p
->pack_size
= pack_size
+ 20;
1328 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1331 static const char *get_mode(const char *str
, uint16_t *modep
)
1336 while ((c
= *str
++) != ' ') {
1337 if (c
< '0' || c
> '7')
1339 mode
= (mode
<< 3) + (c
- '0');
1345 static void load_tree(struct tree_entry
*root
)
1347 unsigned char *sha1
= root
->versions
[1].sha1
;
1348 struct object_entry
*myoe
;
1349 struct tree_content
*t
;
1354 root
->tree
= t
= new_tree_content(8);
1355 if (is_null_sha1(sha1
))
1358 myoe
= find_object(sha1
);
1359 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1360 if (myoe
->type
!= OBJ_TREE
)
1361 die("Not a tree: %s", sha1_to_hex(sha1
));
1362 t
->delta_depth
= myoe
->depth
;
1363 buf
= gfi_unpack_entry(myoe
, &size
);
1365 die("Can't load tree %s", sha1_to_hex(sha1
));
1367 enum object_type type
;
1368 buf
= read_sha1_file(sha1
, &type
, &size
);
1369 if (!buf
|| type
!= OBJ_TREE
)
1370 die("Can't load tree %s", sha1_to_hex(sha1
));
1374 while (c
!= (buf
+ size
)) {
1375 struct tree_entry
*e
= new_tree_entry();
1377 if (t
->entry_count
== t
->entry_capacity
)
1378 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1379 t
->entries
[t
->entry_count
++] = e
;
1382 c
= get_mode(c
, &e
->versions
[1].mode
);
1384 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1385 e
->versions
[0].mode
= e
->versions
[1].mode
;
1386 e
->name
= to_atom(c
, strlen(c
));
1387 c
+= e
->name
->str_len
+ 1;
1388 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1389 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1395 static int tecmp0 (const void *_a
, const void *_b
)
1397 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1398 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1399 return base_name_compare(
1400 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1401 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1404 static int tecmp1 (const void *_a
, const void *_b
)
1406 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1407 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1408 return base_name_compare(
1409 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1410 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1413 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1419 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1421 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1423 for (i
= 0; i
< t
->entry_count
; i
++) {
1424 if (t
->entries
[i
]->versions
[v
].mode
)
1425 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1429 strbuf_grow(b
, maxlen
);
1430 for (i
= 0; i
< t
->entry_count
; i
++) {
1431 struct tree_entry
*e
= t
->entries
[i
];
1432 if (!e
->versions
[v
].mode
)
1434 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1435 e
->name
->str_dat
, '\0');
1436 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1440 static void store_tree(struct tree_entry
*root
)
1442 struct tree_content
*t
= root
->tree
;
1443 unsigned int i
, j
, del
;
1444 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1445 struct object_entry
*le
;
1447 if (!is_null_sha1(root
->versions
[1].sha1
))
1450 for (i
= 0; i
< t
->entry_count
; i
++) {
1451 if (t
->entries
[i
]->tree
)
1452 store_tree(t
->entries
[i
]);
1455 le
= find_object(root
->versions
[0].sha1
);
1456 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1457 mktree(t
, 0, &old_tree
);
1459 lo
.offset
= le
->idx
.offset
;
1460 lo
.depth
= t
->delta_depth
;
1463 mktree(t
, 1, &new_tree
);
1464 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1466 t
->delta_depth
= lo
.depth
;
1467 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1468 struct tree_entry
*e
= t
->entries
[i
];
1469 if (e
->versions
[1].mode
) {
1470 e
->versions
[0].mode
= e
->versions
[1].mode
;
1471 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1472 t
->entries
[j
++] = e
;
1474 release_tree_entry(e
);
1478 t
->entry_count
-= del
;
1481 static int tree_content_set(
1482 struct tree_entry
*root
,
1484 const unsigned char *sha1
,
1485 const uint16_t mode
,
1486 struct tree_content
*subtree
)
1488 struct tree_content
*t
= root
->tree
;
1491 struct tree_entry
*e
;
1493 slash1
= strchr(p
, '/');
1499 die("Empty path component found in input");
1500 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1501 die("Non-directories cannot have subtrees");
1503 for (i
= 0; i
< t
->entry_count
; i
++) {
1505 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1508 && e
->versions
[1].mode
== mode
1509 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1511 e
->versions
[1].mode
= mode
;
1512 hashcpy(e
->versions
[1].sha1
, sha1
);
1514 release_tree_content_recursive(e
->tree
);
1516 hashclr(root
->versions
[1].sha1
);
1519 if (!S_ISDIR(e
->versions
[1].mode
)) {
1520 e
->tree
= new_tree_content(8);
1521 e
->versions
[1].mode
= S_IFDIR
;
1525 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1526 hashclr(root
->versions
[1].sha1
);
1533 if (t
->entry_count
== t
->entry_capacity
)
1534 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1535 e
= new_tree_entry();
1536 e
->name
= to_atom(p
, n
);
1537 e
->versions
[0].mode
= 0;
1538 hashclr(e
->versions
[0].sha1
);
1539 t
->entries
[t
->entry_count
++] = e
;
1541 e
->tree
= new_tree_content(8);
1542 e
->versions
[1].mode
= S_IFDIR
;
1543 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1546 e
->versions
[1].mode
= mode
;
1547 hashcpy(e
->versions
[1].sha1
, sha1
);
1549 hashclr(root
->versions
[1].sha1
);
1553 static int tree_content_remove(
1554 struct tree_entry
*root
,
1556 struct tree_entry
*backup_leaf
)
1558 struct tree_content
*t
= root
->tree
;
1561 struct tree_entry
*e
;
1563 slash1
= strchr(p
, '/');
1569 for (i
= 0; i
< t
->entry_count
; i
++) {
1571 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1572 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1576 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1577 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1578 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1579 hashclr(root
->versions
[1].sha1
);
1593 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1595 release_tree_content_recursive(e
->tree
);
1597 e
->versions
[1].mode
= 0;
1598 hashclr(e
->versions
[1].sha1
);
1599 hashclr(root
->versions
[1].sha1
);
1603 static int tree_content_get(
1604 struct tree_entry
*root
,
1606 struct tree_entry
*leaf
)
1608 struct tree_content
*t
= root
->tree
;
1611 struct tree_entry
*e
;
1613 slash1
= strchr(p
, '/');
1619 for (i
= 0; i
< t
->entry_count
; i
++) {
1621 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1623 memcpy(leaf
, e
, sizeof(*leaf
));
1624 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1625 leaf
->tree
= dup_tree_content(e
->tree
);
1630 if (!S_ISDIR(e
->versions
[1].mode
))
1634 return tree_content_get(e
, slash1
+ 1, leaf
);
1640 static int update_branch(struct branch
*b
)
1642 static const char *msg
= "fast-import";
1643 struct ref_lock
*lock
;
1644 unsigned char old_sha1
[20];
1646 if (is_null_sha1(b
->sha1
))
1648 if (read_ref(b
->name
, old_sha1
))
1650 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1652 return error("Unable to lock %s", b
->name
);
1653 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1654 struct commit
*old_cmit
, *new_cmit
;
1656 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1657 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1658 if (!old_cmit
|| !new_cmit
) {
1660 return error("Branch %s is missing commits.", b
->name
);
1663 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1665 warning("Not updating %s"
1666 " (new tip %s does not contain %s)",
1667 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1671 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1672 return error("Unable to update %s", b
->name
);
1676 static void dump_branches(void)
1681 for (i
= 0; i
< branch_table_sz
; i
++) {
1682 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1683 failure
|= update_branch(b
);
1687 static void dump_tags(void)
1689 static const char *msg
= "fast-import";
1691 struct ref_lock
*lock
;
1692 char ref_name
[PATH_MAX
];
1694 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1695 sprintf(ref_name
, "tags/%s", t
->name
);
1696 lock
= lock_ref_sha1(ref_name
, NULL
);
1697 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1698 failure
|= error("Unable to update %s", ref_name
);
1702 static void dump_marks_helper(FILE *f
,
1708 for (k
= 0; k
< 1024; k
++) {
1709 if (m
->data
.sets
[k
])
1710 dump_marks_helper(f
, (base
+ k
) << m
->shift
,
1714 for (k
= 0; k
< 1024; k
++) {
1715 if (m
->data
.marked
[k
])
1716 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1717 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1722 static void dump_marks(void)
1724 static struct lock_file mark_lock
;
1728 if (!export_marks_file
)
1731 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1733 failure
|= error("Unable to write marks file %s: %s",
1734 export_marks_file
, strerror(errno
));
1738 f
= fdopen(mark_fd
, "w");
1740 int saved_errno
= errno
;
1741 rollback_lock_file(&mark_lock
);
1742 failure
|= error("Unable to write marks file %s: %s",
1743 export_marks_file
, strerror(saved_errno
));
1748 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1749 * Assign -1 to the lock file descriptor so that commit_lock_file()
1750 * won't try to close() it.
1754 dump_marks_helper(f
, 0, marks
);
1755 if (ferror(f
) || fclose(f
)) {
1756 int saved_errno
= errno
;
1757 rollback_lock_file(&mark_lock
);
1758 failure
|= error("Unable to write marks file %s: %s",
1759 export_marks_file
, strerror(saved_errno
));
1763 if (commit_lock_file(&mark_lock
)) {
1764 int saved_errno
= errno
;
1765 rollback_lock_file(&mark_lock
);
1766 failure
|= error("Unable to commit marks file %s: %s",
1767 export_marks_file
, strerror(saved_errno
));
1772 static void read_marks(void)
1775 FILE *f
= fopen(import_marks_file
, "r");
1777 die_errno("cannot read '%s'", import_marks_file
);
1778 while (fgets(line
, sizeof(line
), f
)) {
1781 unsigned char sha1
[20];
1782 struct object_entry
*e
;
1784 end
= strchr(line
, '\n');
1785 if (line
[0] != ':' || !end
)
1786 die("corrupt mark line: %s", line
);
1788 mark
= strtoumax(line
+ 1, &end
, 10);
1789 if (!mark
|| end
== line
+ 1
1790 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1791 die("corrupt mark line: %s", line
);
1792 e
= find_object(sha1
);
1794 enum object_type type
= sha1_object_info(sha1
, NULL
);
1796 die("object not found: %s", sha1_to_hex(sha1
));
1797 e
= insert_object(sha1
);
1799 e
->pack_id
= MAX_PACK_ID
;
1800 e
->idx
.offset
= 1; /* just not zero! */
1802 insert_mark(mark
, e
);
1808 static int read_next_command(void)
1810 static int stdin_eof
= 0;
1813 unread_command_buf
= 0;
1818 if (unread_command_buf
) {
1819 unread_command_buf
= 0;
1821 struct recent_command
*rc
;
1823 strbuf_detach(&command_buf
, NULL
);
1824 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1828 if (!seen_data_command
1829 && prefixcmp(command_buf
.buf
, "feature ")
1830 && prefixcmp(command_buf
.buf
, "option ")) {
1839 cmd_hist
.next
= rc
->next
;
1840 cmd_hist
.next
->prev
= &cmd_hist
;
1844 rc
->buf
= command_buf
.buf
;
1845 rc
->prev
= cmd_tail
;
1846 rc
->next
= cmd_hist
.prev
;
1847 rc
->prev
->next
= rc
;
1850 } while (command_buf
.buf
[0] == '#');
1855 static void skip_optional_lf(void)
1857 int term_char
= fgetc(stdin
);
1858 if (term_char
!= '\n' && term_char
!= EOF
)
1859 ungetc(term_char
, stdin
);
1862 static void parse_mark(void)
1864 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1865 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1866 read_next_command();
1872 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1876 if (prefixcmp(command_buf
.buf
, "data "))
1877 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1879 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1880 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1881 size_t term_len
= command_buf
.len
- 5 - 2;
1883 strbuf_detach(&command_buf
, NULL
);
1885 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1886 die("EOF in data (terminator '%s' not found)", term
);
1887 if (term_len
== command_buf
.len
1888 && !strcmp(term
, command_buf
.buf
))
1890 strbuf_addbuf(sb
, &command_buf
);
1891 strbuf_addch(sb
, '\n');
1896 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1897 size_t n
= 0, length
= (size_t)len
;
1899 if (limit
&& limit
< len
) {
1904 die("data is too large to use in this context");
1906 while (n
< length
) {
1907 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1908 if (!s
&& feof(stdin
))
1909 die("EOF in data (%lu bytes remaining)",
1910 (unsigned long)(length
- n
));
1919 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1921 const char *orig_src
= src
;
1927 num
= strtoul(src
, &endp
, 10);
1928 /* NEEDSWORK: perhaps check for reasonable values? */
1929 if (errno
|| endp
== src
|| *endp
!= ' ')
1933 if (*src
!= '-' && *src
!= '+')
1936 num
= strtoul(src
+ 1, &endp
, 10);
1937 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1941 strcpy(result
, orig_src
);
1945 static char *parse_ident(const char *buf
)
1951 gt
= strrchr(buf
, '>');
1953 die("Missing > in ident string: %s", buf
);
1956 die("Missing space after > in ident string: %s", buf
);
1958 name_len
= gt
- buf
;
1959 ident
= xmalloc(name_len
+ 24);
1960 strncpy(ident
, buf
, name_len
);
1964 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1965 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1967 case WHENSPEC_RFC2822
:
1968 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1969 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1972 if (strcmp("now", gt
))
1973 die("Date in ident must be 'now': %s", buf
);
1974 datestamp(ident
+ name_len
, 24);
1981 static void parse_and_store_blob(
1982 struct last_object
*last
,
1983 unsigned char *sha1out
,
1986 static struct strbuf buf
= STRBUF_INIT
;
1989 if (parse_data(&buf
, big_file_threshold
, &len
))
1990 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
1993 strbuf_release(&last
->data
);
1997 stream_blob(len
, sha1out
, mark
);
2002 static void parse_new_blob(void)
2004 read_next_command();
2006 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
2009 static void unload_one_branch(void)
2011 while (cur_active_branches
2012 && cur_active_branches
>= max_active_branches
) {
2013 uintmax_t min_commit
= ULONG_MAX
;
2014 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2016 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2017 if (e
->last_commit
< min_commit
) {
2019 min_commit
= e
->last_commit
;
2025 e
= p
->active_next_branch
;
2026 p
->active_next_branch
= e
->active_next_branch
;
2028 e
= active_branches
;
2029 active_branches
= e
->active_next_branch
;
2032 e
->active_next_branch
= NULL
;
2033 if (e
->branch_tree
.tree
) {
2034 release_tree_content_recursive(e
->branch_tree
.tree
);
2035 e
->branch_tree
.tree
= NULL
;
2037 cur_active_branches
--;
2041 static void load_branch(struct branch
*b
)
2043 load_tree(&b
->branch_tree
);
2046 b
->active_next_branch
= active_branches
;
2047 active_branches
= b
;
2048 cur_active_branches
++;
2049 branch_load_count
++;
2053 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2055 unsigned char fanout
= 0;
2056 while ((num_notes
>>= 8))
2061 static void construct_path_with_fanout(const char *hex_sha1
,
2062 unsigned char fanout
, char *path
)
2064 unsigned int i
= 0, j
= 0;
2066 die("Too large fanout (%u)", fanout
);
2068 path
[i
++] = hex_sha1
[j
++];
2069 path
[i
++] = hex_sha1
[j
++];
2073 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2074 path
[i
+ 40 - j
] = '\0';
2077 static uintmax_t do_change_note_fanout(
2078 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2079 char *hex_sha1
, unsigned int hex_sha1_len
,
2080 char *fullpath
, unsigned int fullpath_len
,
2081 unsigned char fanout
)
2083 struct tree_content
*t
= root
->tree
;
2084 struct tree_entry
*e
, leaf
;
2085 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2086 uintmax_t num_notes
= 0;
2087 unsigned char sha1
[20];
2090 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2092 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2093 tmp_fullpath_len
= fullpath_len
;
2096 * We're interested in EITHER existing note entries (entries
2097 * with exactly 40 hex chars in path, not including directory
2098 * separators), OR directory entries that may contain note
2099 * entries (with < 40 hex chars in path).
2100 * Also, each path component in a note entry must be a multiple
2103 if (!e
->versions
[1].mode
||
2104 tmp_hex_sha1_len
> 40 ||
2105 e
->name
->str_len
% 2)
2108 /* This _may_ be a note entry, or a subdir containing notes */
2109 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2111 if (tmp_fullpath_len
)
2112 fullpath
[tmp_fullpath_len
++] = '/';
2113 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2115 tmp_fullpath_len
+= e
->name
->str_len
;
2116 fullpath
[tmp_fullpath_len
] = '\0';
2118 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2119 /* This is a note entry */
2120 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2121 if (!strcmp(fullpath
, realpath
)) {
2122 /* Note entry is in correct location */
2127 /* Rename fullpath to realpath */
2128 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2129 die("Failed to remove path %s", fullpath
);
2130 tree_content_set(orig_root
, realpath
,
2131 leaf
.versions
[1].sha1
,
2132 leaf
.versions
[1].mode
,
2134 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2135 /* This is a subdir that may contain note entries */
2138 num_notes
+= do_change_note_fanout(orig_root
, e
,
2139 hex_sha1
, tmp_hex_sha1_len
,
2140 fullpath
, tmp_fullpath_len
, fanout
);
2143 /* The above may have reallocated the current tree_content */
2149 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2150 unsigned char fanout
)
2152 char hex_sha1
[40], path
[60];
2153 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2156 static void file_change_m(struct branch
*b
)
2158 const char *p
= command_buf
.buf
+ 2;
2159 static struct strbuf uq
= STRBUF_INIT
;
2161 struct object_entry
*oe
= oe
;
2162 unsigned char sha1
[20];
2163 uint16_t mode
, inline_data
= 0;
2165 p
= get_mode(p
, &mode
);
2167 die("Corrupt mode: %s", command_buf
.buf
);
2172 case S_IFREG
| 0644:
2173 case S_IFREG
| 0755:
2179 die("Corrupt mode: %s", command_buf
.buf
);
2184 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2185 hashcpy(sha1
, oe
->idx
.sha1
);
2187 } else if (!prefixcmp(p
, "inline")) {
2191 if (get_sha1_hex(p
, sha1
))
2192 die("Invalid SHA1: %s", command_buf
.buf
);
2193 oe
= find_object(sha1
);
2197 die("Missing space after SHA1: %s", command_buf
.buf
);
2200 if (!unquote_c_style(&uq
, p
, &endp
)) {
2202 die("Garbage after path in: %s", command_buf
.buf
);
2206 if (S_ISGITLINK(mode
)) {
2208 die("Git links cannot be specified 'inline': %s",
2211 if (oe
->type
!= OBJ_COMMIT
)
2212 die("Not a commit (actually a %s): %s",
2213 typename(oe
->type
), command_buf
.buf
);
2216 * Accept the sha1 without checking; it expected to be in
2217 * another repository.
2219 } else if (inline_data
) {
2221 strbuf_addstr(&uq
, p
);
2224 read_next_command();
2225 parse_and_store_blob(&last_blob
, sha1
, 0);
2227 if (oe
->type
!= OBJ_BLOB
)
2228 die("Not a blob (actually a %s): %s",
2229 typename(oe
->type
), command_buf
.buf
);
2231 enum object_type type
= sha1_object_info(sha1
, NULL
);
2233 die("Blob not found: %s", command_buf
.buf
);
2234 if (type
!= OBJ_BLOB
)
2235 die("Not a blob (actually a %s): %s",
2236 typename(type
), command_buf
.buf
);
2239 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2242 static void file_change_d(struct branch
*b
)
2244 const char *p
= command_buf
.buf
+ 2;
2245 static struct strbuf uq
= STRBUF_INIT
;
2249 if (!unquote_c_style(&uq
, p
, &endp
)) {
2251 die("Garbage after path in: %s", command_buf
.buf
);
2254 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2257 static void file_change_cr(struct branch
*b
, int rename
)
2260 static struct strbuf s_uq
= STRBUF_INIT
;
2261 static struct strbuf d_uq
= STRBUF_INIT
;
2263 struct tree_entry leaf
;
2265 s
= command_buf
.buf
+ 2;
2266 strbuf_reset(&s_uq
);
2267 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2269 die("Missing space after source: %s", command_buf
.buf
);
2271 endp
= strchr(s
, ' ');
2273 die("Missing space after source: %s", command_buf
.buf
);
2274 strbuf_add(&s_uq
, s
, endp
- s
);
2280 die("Missing dest: %s", command_buf
.buf
);
2283 strbuf_reset(&d_uq
);
2284 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2286 die("Garbage after dest in: %s", command_buf
.buf
);
2290 memset(&leaf
, 0, sizeof(leaf
));
2292 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2294 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2295 if (!leaf
.versions
[1].mode
)
2296 die("Path %s not in branch", s
);
2297 tree_content_set(&b
->branch_tree
, d
,
2298 leaf
.versions
[1].sha1
,
2299 leaf
.versions
[1].mode
,
2303 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2305 const char *p
= command_buf
.buf
+ 2;
2306 static struct strbuf uq
= STRBUF_INIT
;
2307 struct object_entry
*oe
= oe
;
2309 unsigned char sha1
[20], commit_sha1
[20];
2311 uint16_t inline_data
= 0;
2312 unsigned char new_fanout
;
2314 /* <dataref> or 'inline' */
2317 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2318 hashcpy(sha1
, oe
->idx
.sha1
);
2320 } else if (!prefixcmp(p
, "inline")) {
2324 if (get_sha1_hex(p
, sha1
))
2325 die("Invalid SHA1: %s", command_buf
.buf
);
2326 oe
= find_object(sha1
);
2330 die("Missing space after SHA1: %s", command_buf
.buf
);
2333 s
= lookup_branch(p
);
2335 hashcpy(commit_sha1
, s
->sha1
);
2336 } else if (*p
== ':') {
2337 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2338 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2339 if (commit_oe
->type
!= OBJ_COMMIT
)
2340 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2341 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2342 } else if (!get_sha1(p
, commit_sha1
)) {
2344 char *buf
= read_object_with_reference(commit_sha1
,
2345 commit_type
, &size
, commit_sha1
);
2346 if (!buf
|| size
< 46)
2347 die("Not a valid commit: %s", p
);
2350 die("Invalid ref name or SHA1 expression: %s", p
);
2354 strbuf_addstr(&uq
, p
);
2357 read_next_command();
2358 parse_and_store_blob(&last_blob
, sha1
, 0);
2360 if (oe
->type
!= OBJ_BLOB
)
2361 die("Not a blob (actually a %s): %s",
2362 typename(oe
->type
), command_buf
.buf
);
2363 } else if (!is_null_sha1(sha1
)) {
2364 enum object_type type
= sha1_object_info(sha1
, NULL
);
2366 die("Blob not found: %s", command_buf
.buf
);
2367 if (type
!= OBJ_BLOB
)
2368 die("Not a blob (actually a %s): %s",
2369 typename(type
), command_buf
.buf
);
2372 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2373 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2376 if (is_null_sha1(sha1
))
2377 return; /* nothing to insert */
2380 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2381 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2382 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2385 static void file_change_deleteall(struct branch
*b
)
2387 release_tree_content_recursive(b
->branch_tree
.tree
);
2388 hashclr(b
->branch_tree
.versions
[0].sha1
);
2389 hashclr(b
->branch_tree
.versions
[1].sha1
);
2390 load_tree(&b
->branch_tree
);
2394 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2396 if (!buf
|| size
< 46)
2397 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2398 if (memcmp("tree ", buf
, 5)
2399 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2400 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2401 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2402 b
->branch_tree
.versions
[1].sha1
);
2405 static void parse_from_existing(struct branch
*b
)
2407 if (is_null_sha1(b
->sha1
)) {
2408 hashclr(b
->branch_tree
.versions
[0].sha1
);
2409 hashclr(b
->branch_tree
.versions
[1].sha1
);
2414 buf
= read_object_with_reference(b
->sha1
,
2415 commit_type
, &size
, b
->sha1
);
2416 parse_from_commit(b
, buf
, size
);
2421 static int parse_from(struct branch
*b
)
2426 if (prefixcmp(command_buf
.buf
, "from "))
2429 if (b
->branch_tree
.tree
) {
2430 release_tree_content_recursive(b
->branch_tree
.tree
);
2431 b
->branch_tree
.tree
= NULL
;
2434 from
= strchr(command_buf
.buf
, ' ') + 1;
2435 s
= lookup_branch(from
);
2437 die("Can't create a branch from itself: %s", b
->name
);
2439 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2440 hashcpy(b
->sha1
, s
->sha1
);
2441 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2442 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2443 } else if (*from
== ':') {
2444 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2445 struct object_entry
*oe
= find_mark(idnum
);
2446 if (oe
->type
!= OBJ_COMMIT
)
2447 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2448 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2449 if (oe
->pack_id
!= MAX_PACK_ID
) {
2451 char *buf
= gfi_unpack_entry(oe
, &size
);
2452 parse_from_commit(b
, buf
, size
);
2455 parse_from_existing(b
);
2456 } else if (!get_sha1(from
, b
->sha1
))
2457 parse_from_existing(b
);
2459 die("Invalid ref name or SHA1 expression: %s", from
);
2461 read_next_command();
2465 static struct hash_list
*parse_merge(unsigned int *count
)
2467 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2472 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2473 from
= strchr(command_buf
.buf
, ' ') + 1;
2474 n
= xmalloc(sizeof(*n
));
2475 s
= lookup_branch(from
);
2477 hashcpy(n
->sha1
, s
->sha1
);
2478 else if (*from
== ':') {
2479 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2480 struct object_entry
*oe
= find_mark(idnum
);
2481 if (oe
->type
!= OBJ_COMMIT
)
2482 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2483 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2484 } else if (!get_sha1(from
, n
->sha1
)) {
2486 char *buf
= read_object_with_reference(n
->sha1
,
2487 commit_type
, &size
, n
->sha1
);
2488 if (!buf
|| size
< 46)
2489 die("Not a valid commit: %s", from
);
2492 die("Invalid ref name or SHA1 expression: %s", from
);
2501 read_next_command();
2506 static void parse_new_commit(void)
2508 static struct strbuf msg
= STRBUF_INIT
;
2511 char *author
= NULL
;
2512 char *committer
= NULL
;
2513 struct hash_list
*merge_list
= NULL
;
2514 unsigned int merge_count
;
2515 unsigned char prev_fanout
, new_fanout
;
2517 /* Obtain the branch name from the rest of our command */
2518 sp
= strchr(command_buf
.buf
, ' ') + 1;
2519 b
= lookup_branch(sp
);
2523 read_next_command();
2525 if (!prefixcmp(command_buf
.buf
, "author ")) {
2526 author
= parse_ident(command_buf
.buf
+ 7);
2527 read_next_command();
2529 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2530 committer
= parse_ident(command_buf
.buf
+ 10);
2531 read_next_command();
2534 die("Expected committer but didn't get one");
2535 parse_data(&msg
, 0, NULL
);
2536 read_next_command();
2538 merge_list
= parse_merge(&merge_count
);
2540 /* ensure the branch is active/loaded */
2541 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2542 unload_one_branch();
2546 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2549 while (command_buf
.len
> 0) {
2550 if (!prefixcmp(command_buf
.buf
, "M "))
2552 else if (!prefixcmp(command_buf
.buf
, "D "))
2554 else if (!prefixcmp(command_buf
.buf
, "R "))
2555 file_change_cr(b
, 1);
2556 else if (!prefixcmp(command_buf
.buf
, "C "))
2557 file_change_cr(b
, 0);
2558 else if (!prefixcmp(command_buf
.buf
, "N "))
2559 note_change_n(b
, prev_fanout
);
2560 else if (!strcmp("deleteall", command_buf
.buf
))
2561 file_change_deleteall(b
);
2563 unread_command_buf
= 1;
2566 if (read_next_command() == EOF
)
2570 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2571 if (new_fanout
!= prev_fanout
)
2572 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2574 /* build the tree and the commit */
2575 store_tree(&b
->branch_tree
);
2576 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2577 b
->branch_tree
.versions
[1].sha1
);
2579 strbuf_reset(&new_data
);
2580 strbuf_addf(&new_data
, "tree %s\n",
2581 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2582 if (!is_null_sha1(b
->sha1
))
2583 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2584 while (merge_list
) {
2585 struct hash_list
*next
= merge_list
->next
;
2586 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2590 strbuf_addf(&new_data
,
2594 author
? author
: committer
, committer
);
2595 strbuf_addbuf(&new_data
, &msg
);
2599 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2600 b
->pack_id
= pack_id
;
2601 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2604 static void parse_new_tag(void)
2606 static struct strbuf msg
= STRBUF_INIT
;
2612 uintmax_t from_mark
= 0;
2613 unsigned char sha1
[20];
2614 enum object_type type
;
2616 /* Obtain the new tag name from the rest of our command */
2617 sp
= strchr(command_buf
.buf
, ' ') + 1;
2618 t
= pool_alloc(sizeof(struct tag
));
2620 t
->name
= pool_strdup(sp
);
2622 last_tag
->next_tag
= t
;
2626 read_next_command();
2629 if (prefixcmp(command_buf
.buf
, "from "))
2630 die("Expected from command, got %s", command_buf
.buf
);
2631 from
= strchr(command_buf
.buf
, ' ') + 1;
2632 s
= lookup_branch(from
);
2634 hashcpy(sha1
, s
->sha1
);
2636 } else if (*from
== ':') {
2637 struct object_entry
*oe
;
2638 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2639 oe
= find_mark(from_mark
);
2641 hashcpy(sha1
, oe
->idx
.sha1
);
2642 } else if (!get_sha1(from
, sha1
)) {
2646 buf
= read_sha1_file(sha1
, &type
, &size
);
2647 if (!buf
|| size
< 46)
2648 die("Not a valid commit: %s", from
);
2651 die("Invalid ref name or SHA1 expression: %s", from
);
2652 read_next_command();
2655 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2656 tagger
= parse_ident(command_buf
.buf
+ 7);
2657 read_next_command();
2661 /* tag payload/message */
2662 parse_data(&msg
, 0, NULL
);
2664 /* build the tag object */
2665 strbuf_reset(&new_data
);
2667 strbuf_addf(&new_data
,
2671 sha1_to_hex(sha1
), typename(type
), t
->name
);
2673 strbuf_addf(&new_data
,
2674 "tagger %s\n", tagger
);
2675 strbuf_addch(&new_data
, '\n');
2676 strbuf_addbuf(&new_data
, &msg
);
2679 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2680 t
->pack_id
= MAX_PACK_ID
;
2682 t
->pack_id
= pack_id
;
2685 static void parse_reset_branch(void)
2690 /* Obtain the branch name from the rest of our command */
2691 sp
= strchr(command_buf
.buf
, ' ') + 1;
2692 b
= lookup_branch(sp
);
2695 hashclr(b
->branch_tree
.versions
[0].sha1
);
2696 hashclr(b
->branch_tree
.versions
[1].sha1
);
2697 if (b
->branch_tree
.tree
) {
2698 release_tree_content_recursive(b
->branch_tree
.tree
);
2699 b
->branch_tree
.tree
= NULL
;
2704 read_next_command();
2706 if (command_buf
.len
> 0)
2707 unread_command_buf
= 1;
2710 static void parse_checkpoint(void)
2721 static void parse_progress(void)
2723 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2724 fputc('\n', stdout
);
2729 static char* make_fast_import_path(const char *path
)
2731 struct strbuf abs_path
= STRBUF_INIT
;
2733 if (!relative_marks_paths
|| is_absolute_path(path
))
2734 return xstrdup(path
);
2735 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2736 return strbuf_detach(&abs_path
, NULL
);
2739 static void option_import_marks(const char *marks
, int from_stream
)
2741 if (import_marks_file
) {
2743 die("Only one import-marks command allowed per stream");
2745 /* read previous mark file */
2746 if(!import_marks_file_from_stream
)
2750 import_marks_file
= make_fast_import_path(marks
);
2751 import_marks_file_from_stream
= from_stream
;
2754 static void option_date_format(const char *fmt
)
2756 if (!strcmp(fmt
, "raw"))
2757 whenspec
= WHENSPEC_RAW
;
2758 else if (!strcmp(fmt
, "rfc2822"))
2759 whenspec
= WHENSPEC_RFC2822
;
2760 else if (!strcmp(fmt
, "now"))
2761 whenspec
= WHENSPEC_NOW
;
2763 die("unknown --date-format argument %s", fmt
);
2766 static void option_depth(const char *depth
)
2768 max_depth
= strtoul(depth
, NULL
, 0);
2769 if (max_depth
> MAX_DEPTH
)
2770 die("--depth cannot exceed %u", MAX_DEPTH
);
2773 static void option_active_branches(const char *branches
)
2775 max_active_branches
= strtoul(branches
, NULL
, 0);
2778 static void option_export_marks(const char *marks
)
2780 export_marks_file
= make_fast_import_path(marks
);
2783 static void option_export_pack_edges(const char *edges
)
2787 pack_edges
= fopen(edges
, "a");
2789 die_errno("Cannot open '%s'", edges
);
2792 static int parse_one_option(const char *option
)
2794 if (!prefixcmp(option
, "max-pack-size=")) {
2796 if (!git_parse_ulong(option
+ 14, &v
))
2799 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2801 } else if (v
< 1024 * 1024) {
2802 warning("minimum max-pack-size is 1 MiB");
2806 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2808 if (!git_parse_ulong(option
+ 19, &v
))
2810 big_file_threshold
= v
;
2811 } else if (!prefixcmp(option
, "depth=")) {
2812 option_depth(option
+ 6);
2813 } else if (!prefixcmp(option
, "active-branches=")) {
2814 option_active_branches(option
+ 16);
2815 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2816 option_export_pack_edges(option
+ 18);
2817 } else if (!prefixcmp(option
, "quiet")) {
2819 } else if (!prefixcmp(option
, "stats")) {
2828 static int parse_one_feature(const char *feature
, int from_stream
)
2830 if (!prefixcmp(feature
, "date-format=")) {
2831 option_date_format(feature
+ 12);
2832 } else if (!prefixcmp(feature
, "import-marks=")) {
2833 option_import_marks(feature
+ 13, from_stream
);
2834 } else if (!prefixcmp(feature
, "export-marks=")) {
2835 option_export_marks(feature
+ 13);
2836 } else if (!prefixcmp(feature
, "relative-marks")) {
2837 relative_marks_paths
= 1;
2838 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2839 relative_marks_paths
= 0;
2840 } else if (!prefixcmp(feature
, "force")) {
2849 static void parse_feature(void)
2851 char *feature
= command_buf
.buf
+ 8;
2853 if (seen_data_command
)
2854 die("Got feature command '%s' after data command", feature
);
2856 if (parse_one_feature(feature
, 1))
2859 die("This version of fast-import does not support feature %s.", feature
);
2862 static void parse_option(void)
2864 char *option
= command_buf
.buf
+ 11;
2866 if (seen_data_command
)
2867 die("Got option command '%s' after data command", option
);
2869 if (parse_one_option(option
))
2872 die("This version of fast-import does not support option: %s", option
);
2875 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2877 if (!strcmp(k
, "pack.depth")) {
2878 max_depth
= git_config_int(k
, v
);
2879 if (max_depth
> MAX_DEPTH
)
2880 max_depth
= MAX_DEPTH
;
2883 if (!strcmp(k
, "pack.compression")) {
2884 int level
= git_config_int(k
, v
);
2886 level
= Z_DEFAULT_COMPRESSION
;
2887 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2888 die("bad pack compression level %d", level
);
2889 pack_compression_level
= level
;
2890 pack_compression_seen
= 1;
2893 if (!strcmp(k
, "core.bigfilethreshold")) {
2894 long n
= git_config_int(k
, v
);
2895 big_file_threshold
= 0 < n
? n
: 0;
2897 return git_default_config(k
, v
, cb
);
2900 static const char fast_import_usage
[] =
2901 "git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2903 static void parse_argv(void)
2907 for (i
= 1; i
< global_argc
; i
++) {
2908 const char *a
= global_argv
[i
];
2910 if (*a
!= '-' || !strcmp(a
, "--"))
2913 if (parse_one_option(a
+ 2))
2916 if (parse_one_feature(a
+ 2, 0))
2919 die("unknown option %s", a
);
2921 if (i
!= global_argc
)
2922 usage(fast_import_usage
);
2924 seen_data_command
= 1;
2925 if (import_marks_file
)
2929 int main(int argc
, const char **argv
)
2933 git_extract_argv0_path(argv
[0]);
2935 if (argc
== 2 && !strcmp(argv
[1], "-h"))
2936 usage(fast_import_usage
);
2938 setup_git_directory();
2939 git_config(git_pack_config
, NULL
);
2940 if (!pack_compression_seen
&& core_compression_seen
)
2941 pack_compression_level
= core_compression_level
;
2943 alloc_objects(object_entry_alloc
);
2944 strbuf_init(&command_buf
, 0);
2945 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
2946 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
2947 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
2948 marks
= pool_calloc(1, sizeof(struct mark_set
));
2953 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
2954 for (i
= 0; i
< (cmd_save
- 1); i
++)
2955 rc_free
[i
].next
= &rc_free
[i
+ 1];
2956 rc_free
[cmd_save
- 1].next
= NULL
;
2958 prepare_packed_git();
2960 set_die_routine(die_nicely
);
2961 while (read_next_command() != EOF
) {
2962 if (!strcmp("blob", command_buf
.buf
))
2964 else if (!prefixcmp(command_buf
.buf
, "commit "))
2966 else if (!prefixcmp(command_buf
.buf
, "tag "))
2968 else if (!prefixcmp(command_buf
.buf
, "reset "))
2969 parse_reset_branch();
2970 else if (!strcmp("checkpoint", command_buf
.buf
))
2972 else if (!prefixcmp(command_buf
.buf
, "progress "))
2974 else if (!prefixcmp(command_buf
.buf
, "feature "))
2976 else if (!prefixcmp(command_buf
.buf
, "option git "))
2978 else if (!prefixcmp(command_buf
.buf
, "option "))
2979 /* ignore non-git options*/;
2981 die("Unsupported command: %s", command_buf
.buf
);
2984 /* argv hasn't been parsed yet, do so */
2985 if (!seen_data_command
)
2999 uintmax_t total_count
= 0, duplicate_count
= 0;
3000 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3001 total_count
+= object_count_by_type
[i
];
3002 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3003 duplicate_count
+= duplicate_count_by_type
[i
];
3005 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3006 fprintf(stderr
, "---------------------------------------------------------------------\n");
3007 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3008 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3009 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
]);
3010 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
]);
3011 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
]);
3012 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
]);
3013 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3014 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3015 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3016 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3017 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3018 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3019 fprintf(stderr
, "---------------------------------------------------------------------\n");
3021 fprintf(stderr
, "---------------------------------------------------------------------\n");
3022 fprintf(stderr
, "\n");
3025 return failure
? 1 : 0;