2 (See Documentation/git-fast-import.txt for maintained documentation.)
3 Format of STDIN stream:
15 new_blob ::= 'blob' lf
18 file_content ::= data;
20 new_commit ::= 'commit' sp ref_str lf
22 ('author' (sp name)? sp '<' email '>' sp when lf)?
23 'committer' (sp name)? sp '<' email '>' sp when lf
25 ('from' sp committish lf)?
26 ('merge' sp committish lf)*
31 file_change ::= file_clr
37 file_clr ::= 'deleteall' lf;
38 file_del ::= 'D' sp path_str lf;
39 file_rnm ::= 'R' sp path_str sp path_str lf;
40 file_cpy ::= 'C' sp path_str sp path_str lf;
41 file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
42 file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
44 note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
45 note_inm ::= 'N' sp 'inline' sp committish lf
48 new_tag ::= 'tag' sp tag_str lf
49 'from' sp committish lf
50 ('tagger' (sp name)? sp '<' email '>' sp when lf)?
54 reset_branch ::= 'reset' sp ref_str lf
55 ('from' sp committish lf)?
58 checkpoint ::= 'checkpoint' lf
61 progress ::= 'progress' sp not_lf* lf
64 # note: the first idnum in a stream should be 1 and subsequent
65 # idnums should not have gaps between values as this will cause
66 # the stream parser to reserve space for the gapped values. An
67 # idnum can be updated in the future to a new object by issuing
68 # a new mark directive with the old idnum.
70 mark ::= 'mark' sp idnum lf;
71 data ::= (delimited_data | exact_data)
74 # note: delim may be any string but must not contain lf.
75 # data_line may contain any data but must not be exactly
77 delimited_data ::= 'data' sp '<<' delim lf
81 # note: declen indicates the length of binary_data in bytes.
82 # declen does not include the lf preceding the binary data.
84 exact_data ::= 'data' sp declen lf
87 # note: quoted strings are C-style quoting supporting \c for
88 # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
89 # is the signed byte value in octal. Note that the only
90 # characters which must actually be escaped to protect the
91 # stream formatting is: \, " and LF. Otherwise these values
94 committish ::= (ref_str | hexsha1 | sha1exp_str | idnum);
96 sha1exp_str ::= sha1exp;
98 path_str ::= path | '"' quoted(path) '"' ;
99 mode ::= '100644' | '644'
104 declen ::= # unsigned 32 bit value, ascii base10 notation;
105 bigint ::= # unsigned integer value, ascii base10 notation;
106 binary_data ::= # file content, not interpreted;
108 when ::= raw_when | rfc2822_when;
109 raw_when ::= ts sp tz;
110 rfc2822_when ::= # Valid RFC 2822 date and time;
112 sp ::= # ASCII space character;
113 lf ::= # ASCII newline (LF) character;
115 # note: a colon (':') must precede the numerical value assigned to
116 # an idnum. This is to distinguish it from a ref or tag name as
117 # GIT does not permit ':' in ref or tag strings.
119 idnum ::= ':' bigint;
120 path ::= # GIT style file path, e.g. "a/b/c";
121 ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
122 tag ::= # GIT tag name, e.g. "FIREFOX_1_5";
123 sha1exp ::= # Any valid GIT SHA1 expression;
124 hexsha1 ::= # SHA1 in hexadecimal format;
126 # note: name and email are UTF8 strings, however name must not
127 # contain '<' or lf and email must not contain any of the
128 # following: '<', '>', lf.
130 name ::= # valid GIT author/committer name;
131 email ::= # valid GIT author/committer email;
132 ts ::= # time since the epoch in seconds, ascii base10 notation;
133 tz ::= # GIT style timezone;
135 # note: comments may appear anywhere in the input, except
136 # within a data command. Any form of the data command
137 # always escapes the related input from comment processing.
139 # In case it is not clear, the '#' that starts the comment
140 # must be the first character on that line (an lf
143 comment ::= '#' not_lf* lf;
144 not_lf ::= # Any byte that is not ASCII newline (LF);
156 #include "csum-file.h"
158 #include "exec_cmd.h"
160 #define PACK_ID_BITS 16
161 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
162 #define DEPTH_BITS 13
163 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
167 struct pack_idx_entry idx
;
168 struct object_entry
*next
;
169 uint32_t type
: TYPE_BITS
,
170 pack_id
: PACK_ID_BITS
,
174 struct object_entry_pool
176 struct object_entry_pool
*next_pool
;
177 struct object_entry
*next_free
;
178 struct object_entry
*end
;
179 struct object_entry entries
[FLEX_ARRAY
]; /* more */
185 struct object_entry
*marked
[1024];
186 struct mark_set
*sets
[1024];
196 unsigned no_swap
: 1;
201 struct mem_pool
*next_pool
;
204 uintmax_t space
[FLEX_ARRAY
]; /* more */
209 struct atom_str
*next_atom
;
210 unsigned short str_len
;
211 char str_dat
[FLEX_ARRAY
]; /* more */
217 struct tree_content
*tree
;
218 struct atom_str
*name
;
222 unsigned char sha1
[20];
228 unsigned int entry_capacity
; /* must match avail_tree_content */
229 unsigned int entry_count
;
230 unsigned int delta_depth
;
231 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
234 struct avail_tree_content
236 unsigned int entry_capacity
; /* must match tree_content */
237 struct avail_tree_content
*next_avail
;
242 struct branch
*table_next_branch
;
243 struct branch
*active_next_branch
;
245 struct tree_entry branch_tree
;
246 uintmax_t last_commit
;
249 unsigned pack_id
: PACK_ID_BITS
;
250 unsigned char sha1
[20];
255 struct tag
*next_tag
;
257 unsigned int pack_id
;
258 unsigned char sha1
[20];
263 struct hash_list
*next
;
264 unsigned char sha1
[20];
273 struct recent_command
275 struct recent_command
*prev
;
276 struct recent_command
*next
;
280 /* Configured limits on output */
281 static unsigned long max_depth
= 10;
282 static off_t max_packsize
;
283 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
284 static int force_update
;
285 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
286 static int pack_compression_seen
;
288 /* Stats and misc. counters */
289 static uintmax_t alloc_count
;
290 static uintmax_t marks_set_count
;
291 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
292 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
293 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
294 static unsigned long object_count
;
295 static unsigned long branch_count
;
296 static unsigned long branch_load_count
;
298 static FILE *pack_edges
;
299 static unsigned int show_stats
= 1;
300 static int global_argc
;
301 static const char **global_argv
;
304 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
305 static size_t total_allocd
;
306 static struct mem_pool
*mem_pool
;
308 /* Atom management */
309 static unsigned int atom_table_sz
= 4451;
310 static unsigned int atom_cnt
;
311 static struct atom_str
**atom_table
;
313 /* The .pack file being generated */
314 static unsigned int pack_id
;
315 static struct sha1file
*pack_file
;
316 static struct packed_git
*pack_data
;
317 static struct packed_git
**all_packs
;
318 static off_t pack_size
;
320 /* Table of objects we've written. */
321 static unsigned int object_entry_alloc
= 5000;
322 static struct object_entry_pool
*blocks
;
323 static struct object_entry
*object_table
[1 << 16];
324 static struct mark_set
*marks
;
325 static const char *export_marks_file
;
326 static const char *import_marks_file
;
327 static int import_marks_file_from_stream
;
328 static int relative_marks_paths
;
331 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
333 /* Tree management */
334 static unsigned int tree_entry_alloc
= 1000;
335 static void *avail_tree_entry
;
336 static unsigned int avail_tree_table_sz
= 100;
337 static struct avail_tree_content
**avail_tree_table
;
338 static struct strbuf old_tree
= STRBUF_INIT
;
339 static struct strbuf new_tree
= STRBUF_INIT
;
342 static unsigned long max_active_branches
= 5;
343 static unsigned long cur_active_branches
;
344 static unsigned long branch_table_sz
= 1039;
345 static struct branch
**branch_table
;
346 static struct branch
*active_branches
;
349 static struct tag
*first_tag
;
350 static struct tag
*last_tag
;
352 /* Input stream parsing */
353 static whenspec_type whenspec
= WHENSPEC_RAW
;
354 static struct strbuf command_buf
= STRBUF_INIT
;
355 static int unread_command_buf
;
356 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
357 static struct recent_command
*cmd_tail
= &cmd_hist
;
358 static struct recent_command
*rc_free
;
359 static unsigned int cmd_save
= 100;
360 static uintmax_t next_mark
;
361 static struct strbuf new_data
= STRBUF_INIT
;
362 static int seen_data_command
;
364 static void parse_argv(void);
366 static void write_branch_report(FILE *rpt
, struct branch
*b
)
368 fprintf(rpt
, "%s:\n", b
->name
);
370 fprintf(rpt
, " status :");
372 fputs(" active", rpt
);
373 if (b
->branch_tree
.tree
)
374 fputs(" loaded", rpt
);
375 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
376 fputs(" dirty", rpt
);
379 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
380 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
381 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
382 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
384 fputs(" last pack : ", rpt
);
385 if (b
->pack_id
< MAX_PACK_ID
)
386 fprintf(rpt
, "%u", b
->pack_id
);
392 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
394 static void write_crash_report(const char *err
)
396 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
397 FILE *rpt
= fopen(loc
, "w");
400 struct recent_command
*rc
;
403 error("can't write crash report %s: %s", loc
, strerror(errno
));
407 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
409 fprintf(rpt
, "fast-import crash report:\n");
410 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
411 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
412 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
415 fputs("fatal: ", rpt
);
420 fputs("Most Recent Commands Before Crash\n", rpt
);
421 fputs("---------------------------------\n", rpt
);
422 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
423 if (rc
->next
== &cmd_hist
)
432 fputs("Active Branch LRU\n", rpt
);
433 fputs("-----------------\n", rpt
);
434 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
436 max_active_branches
);
438 fputs(" pos clock name\n", rpt
);
439 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
440 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
441 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
442 ++lu
, b
->last_commit
, b
->name
);
445 fputs("Inactive Branches\n", rpt
);
446 fputs("-----------------\n", rpt
);
447 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
448 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
449 write_branch_report(rpt
, b
);
455 fputs("Annotated Tags\n", rpt
);
456 fputs("--------------\n", rpt
);
457 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
458 fputs(sha1_to_hex(tg
->sha1
), rpt
);
460 fputs(tg
->name
, rpt
);
466 fputs("Marks\n", rpt
);
467 fputs("-----\n", rpt
);
468 if (export_marks_file
)
469 fprintf(rpt
, " exported to %s\n", export_marks_file
);
471 dump_marks_helper(rpt
, 0, marks
);
474 fputs("-------------------\n", rpt
);
475 fputs("END OF CRASH REPORT\n", rpt
);
479 static void end_packfile(void);
480 static void unkeep_all_packs(void);
481 static void dump_marks(void);
483 static NORETURN
void die_nicely(const char *err
, va_list params
)
486 char message
[2 * PATH_MAX
];
488 vsnprintf(message
, sizeof(message
), err
, params
);
489 fputs("fatal: ", stderr
);
490 fputs(message
, stderr
);
495 write_crash_report(message
);
503 static void alloc_objects(unsigned int cnt
)
505 struct object_entry_pool
*b
;
507 b
= xmalloc(sizeof(struct object_entry_pool
)
508 + cnt
* sizeof(struct object_entry
));
509 b
->next_pool
= blocks
;
510 b
->next_free
= b
->entries
;
511 b
->end
= b
->entries
+ cnt
;
516 static struct object_entry
*new_object(unsigned char *sha1
)
518 struct object_entry
*e
;
520 if (blocks
->next_free
== blocks
->end
)
521 alloc_objects(object_entry_alloc
);
523 e
= blocks
->next_free
++;
524 hashcpy(e
->idx
.sha1
, sha1
);
528 static struct object_entry
*find_object(unsigned char *sha1
)
530 unsigned int h
= sha1
[0] << 8 | sha1
[1];
531 struct object_entry
*e
;
532 for (e
= object_table
[h
]; e
; e
= e
->next
)
533 if (!hashcmp(sha1
, e
->idx
.sha1
))
538 static struct object_entry
*insert_object(unsigned char *sha1
)
540 unsigned int h
= sha1
[0] << 8 | sha1
[1];
541 struct object_entry
*e
= object_table
[h
];
542 struct object_entry
*p
= NULL
;
545 if (!hashcmp(sha1
, e
->idx
.sha1
))
551 e
= new_object(sha1
);
561 static unsigned int hc_str(const char *s
, size_t len
)
569 static void *pool_alloc(size_t len
)
574 /* round up to a 'uintmax_t' alignment */
575 if (len
& (sizeof(uintmax_t) - 1))
576 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
578 for (p
= mem_pool
; p
; p
= p
->next_pool
)
579 if ((p
->end
- p
->next_free
>= len
))
583 if (len
>= (mem_pool_alloc
/2)) {
587 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
588 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
589 p
->next_pool
= mem_pool
;
590 p
->next_free
= (char *) p
->space
;
591 p
->end
= p
->next_free
+ mem_pool_alloc
;
600 static void *pool_calloc(size_t count
, size_t size
)
602 size_t len
= count
* size
;
603 void *r
= pool_alloc(len
);
608 static char *pool_strdup(const char *s
)
610 char *r
= pool_alloc(strlen(s
) + 1);
615 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
617 struct mark_set
*s
= marks
;
618 while ((idnum
>> s
->shift
) >= 1024) {
619 s
= pool_calloc(1, sizeof(struct mark_set
));
620 s
->shift
= marks
->shift
+ 10;
621 s
->data
.sets
[0] = marks
;
625 uintmax_t i
= idnum
>> s
->shift
;
626 idnum
-= i
<< s
->shift
;
627 if (!s
->data
.sets
[i
]) {
628 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
629 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
633 if (!s
->data
.marked
[idnum
])
635 s
->data
.marked
[idnum
] = oe
;
638 static struct object_entry
*find_mark(uintmax_t idnum
)
640 uintmax_t orig_idnum
= idnum
;
641 struct mark_set
*s
= marks
;
642 struct object_entry
*oe
= NULL
;
643 if ((idnum
>> s
->shift
) < 1024) {
644 while (s
&& s
->shift
) {
645 uintmax_t i
= idnum
>> s
->shift
;
646 idnum
-= i
<< s
->shift
;
650 oe
= s
->data
.marked
[idnum
];
653 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
657 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
659 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
662 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
663 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
666 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
668 strncpy(c
->str_dat
, s
, len
);
670 c
->next_atom
= atom_table
[hc
];
676 static struct branch
*lookup_branch(const char *name
)
678 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
681 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
682 if (!strcmp(name
, b
->name
))
687 static struct branch
*new_branch(const char *name
)
689 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
690 struct branch
*b
= lookup_branch(name
);
693 die("Invalid attempt to create duplicate branch: %s", name
);
694 switch (check_ref_format(name
)) {
695 case 0: break; /* its valid */
696 case CHECK_REF_FORMAT_ONELEVEL
:
697 break; /* valid, but too few '/', allow anyway */
699 die("Branch name doesn't conform to GIT standards: %s", name
);
702 b
= pool_calloc(1, sizeof(struct branch
));
703 b
->name
= pool_strdup(name
);
704 b
->table_next_branch
= branch_table
[hc
];
705 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
706 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
709 b
->pack_id
= MAX_PACK_ID
;
710 branch_table
[hc
] = b
;
715 static unsigned int hc_entries(unsigned int cnt
)
717 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
718 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
721 static struct tree_content
*new_tree_content(unsigned int cnt
)
723 struct avail_tree_content
*f
, *l
= NULL
;
724 struct tree_content
*t
;
725 unsigned int hc
= hc_entries(cnt
);
727 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
728 if (f
->entry_capacity
>= cnt
)
733 l
->next_avail
= f
->next_avail
;
735 avail_tree_table
[hc
] = f
->next_avail
;
737 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
738 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
739 f
->entry_capacity
= cnt
;
742 t
= (struct tree_content
*)f
;
748 static void release_tree_entry(struct tree_entry
*e
);
749 static void release_tree_content(struct tree_content
*t
)
751 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
752 unsigned int hc
= hc_entries(f
->entry_capacity
);
753 f
->next_avail
= avail_tree_table
[hc
];
754 avail_tree_table
[hc
] = f
;
757 static void release_tree_content_recursive(struct tree_content
*t
)
760 for (i
= 0; i
< t
->entry_count
; i
++)
761 release_tree_entry(t
->entries
[i
]);
762 release_tree_content(t
);
765 static struct tree_content
*grow_tree_content(
766 struct tree_content
*t
,
769 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
770 r
->entry_count
= t
->entry_count
;
771 r
->delta_depth
= t
->delta_depth
;
772 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
773 release_tree_content(t
);
777 static struct tree_entry
*new_tree_entry(void)
779 struct tree_entry
*e
;
781 if (!avail_tree_entry
) {
782 unsigned int n
= tree_entry_alloc
;
783 total_allocd
+= n
* sizeof(struct tree_entry
);
784 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
786 *((void**)e
) = e
+ 1;
792 e
= avail_tree_entry
;
793 avail_tree_entry
= *((void**)e
);
797 static void release_tree_entry(struct tree_entry
*e
)
800 release_tree_content_recursive(e
->tree
);
801 *((void**)e
) = avail_tree_entry
;
802 avail_tree_entry
= e
;
805 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
807 struct tree_content
*d
;
808 struct tree_entry
*a
, *b
;
813 d
= new_tree_content(s
->entry_count
);
814 for (i
= 0; i
< s
->entry_count
; i
++) {
816 b
= new_tree_entry();
817 memcpy(b
, a
, sizeof(*a
));
818 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
819 b
->tree
= dup_tree_content(a
->tree
);
824 d
->entry_count
= s
->entry_count
;
825 d
->delta_depth
= s
->delta_depth
;
830 static void start_packfile(void)
832 static char tmpfile
[PATH_MAX
];
833 struct packed_git
*p
;
834 struct pack_header hdr
;
837 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
838 "pack/tmp_pack_XXXXXX");
839 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
840 strcpy(p
->pack_name
, tmpfile
);
841 p
->pack_fd
= pack_fd
;
842 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
844 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
845 hdr
.hdr_version
= htonl(2);
847 sha1write(pack_file
, &hdr
, sizeof(hdr
));
850 pack_size
= sizeof(hdr
);
853 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
854 all_packs
[pack_id
] = p
;
857 static const char *create_index(void)
860 struct pack_idx_entry
**idx
, **c
, **last
;
861 struct object_entry
*e
;
862 struct object_entry_pool
*o
;
864 /* Build the table of object IDs. */
865 idx
= xmalloc(object_count
* sizeof(*idx
));
867 for (o
= blocks
; o
; o
= o
->next_pool
)
868 for (e
= o
->next_free
; e
-- != o
->entries
;)
869 if (pack_id
== e
->pack_id
)
871 last
= idx
+ object_count
;
873 die("internal consistency error creating the index");
875 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
880 static char *keep_pack(const char *curr_index_name
)
882 static char name
[PATH_MAX
];
883 static const char *keep_msg
= "fast-import";
886 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
888 die_errno("cannot create keep file");
889 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
891 die_errno("failed to write keep file");
893 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
894 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
895 if (move_temp_to_file(pack_data
->pack_name
, name
))
896 die("cannot store pack file");
898 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
899 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
900 if (move_temp_to_file(curr_index_name
, name
))
901 die("cannot store index file");
902 free((void *)curr_index_name
);
906 static void unkeep_all_packs(void)
908 static char name
[PATH_MAX
];
911 for (k
= 0; k
< pack_id
; k
++) {
912 struct packed_git
*p
= all_packs
[k
];
913 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
914 get_object_directory(), sha1_to_hex(p
->sha1
));
915 unlink_or_warn(name
);
919 static void end_packfile(void)
921 struct packed_git
*old_p
= pack_data
, *new_p
;
923 clear_delta_base_cache();
925 unsigned char cur_pack_sha1
[20];
931 close_pack_windows(pack_data
);
932 sha1close(pack_file
, cur_pack_sha1
, 0);
933 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
934 pack_data
->pack_name
, object_count
,
935 cur_pack_sha1
, pack_size
);
936 close(pack_data
->pack_fd
);
937 idx_name
= keep_pack(create_index());
939 /* Register the packfile with core git's machinery. */
940 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
942 die("core git rejected index %s", idx_name
);
943 all_packs
[pack_id
] = new_p
;
944 install_packed_git(new_p
);
946 /* Print the boundary */
948 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
949 for (i
= 0; i
< branch_table_sz
; i
++) {
950 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
951 if (b
->pack_id
== pack_id
)
952 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
955 for (t
= first_tag
; t
; t
= t
->next_tag
) {
956 if (t
->pack_id
== pack_id
)
957 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
959 fputc('\n', pack_edges
);
966 close(old_p
->pack_fd
);
967 unlink_or_warn(old_p
->pack_name
);
971 /* We can't carry a delta across packfiles. */
972 strbuf_release(&last_blob
.data
);
973 last_blob
.offset
= 0;
977 static void cycle_packfile(void)
983 static int store_object(
984 enum object_type type
,
986 struct last_object
*last
,
987 unsigned char *sha1out
,
991 struct object_entry
*e
;
992 unsigned char hdr
[96];
993 unsigned char sha1
[20];
994 unsigned long hdrlen
, deltalen
;
998 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
999 (unsigned long)dat
->len
) + 1;
1001 git_SHA1_Update(&c
, hdr
, hdrlen
);
1002 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1003 git_SHA1_Final(sha1
, &c
);
1005 hashcpy(sha1out
, sha1
);
1007 e
= insert_object(sha1
);
1009 insert_mark(mark
, e
);
1010 if (e
->idx
.offset
) {
1011 duplicate_count_by_type
[type
]++;
1013 } else if (find_sha1_pack(sha1
, packed_git
)) {
1015 e
->pack_id
= MAX_PACK_ID
;
1016 e
->idx
.offset
= 1; /* just not zero! */
1017 duplicate_count_by_type
[type
]++;
1021 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1022 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1024 &deltalen
, dat
->len
- 20);
1028 memset(&s
, 0, sizeof(s
));
1029 deflateInit(&s
, pack_compression_level
);
1032 s
.avail_in
= deltalen
;
1034 s
.next_in
= (void *)dat
->buf
;
1035 s
.avail_in
= dat
->len
;
1037 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1038 s
.next_out
= out
= xmalloc(s
.avail_out
);
1039 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1043 /* Determine if we should auto-checkpoint. */
1044 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1045 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1047 /* This new object needs to *not* have the current pack_id. */
1048 e
->pack_id
= pack_id
+ 1;
1051 /* We cannot carry a delta into the new pack. */
1056 memset(&s
, 0, sizeof(s
));
1057 deflateInit(&s
, pack_compression_level
);
1058 s
.next_in
= (void *)dat
->buf
;
1059 s
.avail_in
= dat
->len
;
1060 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1061 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1062 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1069 e
->pack_id
= pack_id
;
1070 e
->idx
.offset
= pack_size
;
1072 object_count_by_type
[type
]++;
1074 crc32_begin(pack_file
);
1077 off_t ofs
= e
->idx
.offset
- last
->offset
;
1078 unsigned pos
= sizeof(hdr
) - 1;
1080 delta_count_by_type
[type
]++;
1081 e
->depth
= last
->depth
+ 1;
1083 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1084 sha1write(pack_file
, hdr
, hdrlen
);
1085 pack_size
+= hdrlen
;
1087 hdr
[pos
] = ofs
& 127;
1089 hdr
[--pos
] = 128 | (--ofs
& 127);
1090 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1091 pack_size
+= sizeof(hdr
) - pos
;
1094 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1095 sha1write(pack_file
, hdr
, hdrlen
);
1096 pack_size
+= hdrlen
;
1099 sha1write(pack_file
, out
, s
.total_out
);
1100 pack_size
+= s
.total_out
;
1102 e
->idx
.crc32
= crc32_end(pack_file
);
1107 if (last
->no_swap
) {
1110 strbuf_swap(&last
->data
, dat
);
1112 last
->offset
= e
->idx
.offset
;
1113 last
->depth
= e
->depth
;
1118 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1120 if (ftruncate(pack_data
->pack_fd
, to
)
1121 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1122 die_errno("cannot truncate pack to skip duplicate");
1125 /* yes this is a layering violation */
1126 pack_file
->total
= to
;
1127 pack_file
->offset
= 0;
1128 pack_file
->ctx
= *ctx
;
1131 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1133 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1134 unsigned char *in_buf
= xmalloc(in_sz
);
1135 unsigned char *out_buf
= xmalloc(out_sz
);
1136 struct object_entry
*e
;
1137 unsigned char sha1
[20];
1138 unsigned long hdrlen
;
1141 git_SHA_CTX pack_file_ctx
;
1145 /* Determine if we should auto-checkpoint. */
1146 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1147 || (pack_size
+ 60 + len
) < pack_size
)
1152 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1153 sha1flush(pack_file
);
1154 pack_file_ctx
= pack_file
->ctx
;
1156 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1157 if (out_sz
<= hdrlen
)
1158 die("impossibly large object header");
1161 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1163 crc32_begin(pack_file
);
1165 memset(&s
, 0, sizeof(s
));
1166 deflateInit(&s
, pack_compression_level
);
1168 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1169 if (out_sz
<= hdrlen
)
1170 die("impossibly large object header");
1172 s
.next_out
= out_buf
+ hdrlen
;
1173 s
.avail_out
= out_sz
- hdrlen
;
1175 while (status
!= Z_STREAM_END
) {
1176 if (0 < len
&& !s
.avail_in
) {
1177 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1178 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1179 if (!n
&& feof(stdin
))
1180 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1182 git_SHA1_Update(&c
, in_buf
, n
);
1188 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1190 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1191 size_t n
= s
.next_out
- out_buf
;
1192 sha1write(pack_file
, out_buf
, n
);
1194 s
.next_out
= out_buf
;
1195 s
.avail_out
= out_sz
;
1204 die("unexpected deflate failure: %d", status
);
1208 git_SHA1_Final(sha1
, &c
);
1211 hashcpy(sha1out
, sha1
);
1213 e
= insert_object(sha1
);
1216 insert_mark(mark
, e
);
1218 if (e
->idx
.offset
) {
1219 duplicate_count_by_type
[OBJ_BLOB
]++;
1220 truncate_pack(offset
, &pack_file_ctx
);
1222 } else if (find_sha1_pack(sha1
, packed_git
)) {
1224 e
->pack_id
= MAX_PACK_ID
;
1225 e
->idx
.offset
= 1; /* just not zero! */
1226 duplicate_count_by_type
[OBJ_BLOB
]++;
1227 truncate_pack(offset
, &pack_file_ctx
);
1232 e
->pack_id
= pack_id
;
1233 e
->idx
.offset
= offset
;
1234 e
->idx
.crc32
= crc32_end(pack_file
);
1236 object_count_by_type
[OBJ_BLOB
]++;
1243 /* All calls must be guarded by find_object() or find_mark() to
1244 * ensure the 'struct object_entry' passed was written by this
1245 * process instance. We unpack the entry by the offset, avoiding
1246 * the need for the corresponding .idx file. This unpacking rule
1247 * works because we only use OBJ_REF_DELTA within the packfiles
1248 * created by fast-import.
1250 * oe must not be NULL. Such an oe usually comes from giving
1251 * an unknown SHA-1 to find_object() or an undefined mark to
1252 * find_mark(). Callers must test for this condition and use
1253 * the standard read_sha1_file() when it happens.
1255 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1256 * find_mark(), where the mark was reloaded from an existing marks
1257 * file and is referencing an object that this fast-import process
1258 * instance did not write out to a packfile. Callers must test for
1259 * this condition and use read_sha1_file() instead.
1261 static void *gfi_unpack_entry(
1262 struct object_entry
*oe
,
1263 unsigned long *sizep
)
1265 enum object_type type
;
1266 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1267 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1268 /* The object is stored in the packfile we are writing to
1269 * and we have modified it since the last time we scanned
1270 * back to read a previously written object. If an old
1271 * window covered [p->pack_size, p->pack_size + 20) its
1272 * data is stale and is not valid. Closing all windows
1273 * and updating the packfile length ensures we can read
1274 * the newly written data.
1276 close_pack_windows(p
);
1277 sha1flush(pack_file
);
1279 /* We have to offer 20 bytes additional on the end of
1280 * the packfile as the core unpacker code assumes the
1281 * footer is present at the file end and must promise
1282 * at least 20 bytes within any window it maps. But
1283 * we don't actually create the footer here.
1285 p
->pack_size
= pack_size
+ 20;
1287 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1290 static const char *get_mode(const char *str
, uint16_t *modep
)
1295 while ((c
= *str
++) != ' ') {
1296 if (c
< '0' || c
> '7')
1298 mode
= (mode
<< 3) + (c
- '0');
1304 static void load_tree(struct tree_entry
*root
)
1306 unsigned char *sha1
= root
->versions
[1].sha1
;
1307 struct object_entry
*myoe
;
1308 struct tree_content
*t
;
1313 root
->tree
= t
= new_tree_content(8);
1314 if (is_null_sha1(sha1
))
1317 myoe
= find_object(sha1
);
1318 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1319 if (myoe
->type
!= OBJ_TREE
)
1320 die("Not a tree: %s", sha1_to_hex(sha1
));
1321 t
->delta_depth
= myoe
->depth
;
1322 buf
= gfi_unpack_entry(myoe
, &size
);
1324 die("Can't load tree %s", sha1_to_hex(sha1
));
1326 enum object_type type
;
1327 buf
= read_sha1_file(sha1
, &type
, &size
);
1328 if (!buf
|| type
!= OBJ_TREE
)
1329 die("Can't load tree %s", sha1_to_hex(sha1
));
1333 while (c
!= (buf
+ size
)) {
1334 struct tree_entry
*e
= new_tree_entry();
1336 if (t
->entry_count
== t
->entry_capacity
)
1337 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1338 t
->entries
[t
->entry_count
++] = e
;
1341 c
= get_mode(c
, &e
->versions
[1].mode
);
1343 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1344 e
->versions
[0].mode
= e
->versions
[1].mode
;
1345 e
->name
= to_atom(c
, strlen(c
));
1346 c
+= e
->name
->str_len
+ 1;
1347 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1348 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1354 static int tecmp0 (const void *_a
, const void *_b
)
1356 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1357 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1358 return base_name_compare(
1359 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1360 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1363 static int tecmp1 (const void *_a
, const void *_b
)
1365 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1366 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1367 return base_name_compare(
1368 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1369 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1372 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1378 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1380 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1382 for (i
= 0; i
< t
->entry_count
; i
++) {
1383 if (t
->entries
[i
]->versions
[v
].mode
)
1384 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1388 strbuf_grow(b
, maxlen
);
1389 for (i
= 0; i
< t
->entry_count
; i
++) {
1390 struct tree_entry
*e
= t
->entries
[i
];
1391 if (!e
->versions
[v
].mode
)
1393 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1394 e
->name
->str_dat
, '\0');
1395 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1399 static void store_tree(struct tree_entry
*root
)
1401 struct tree_content
*t
= root
->tree
;
1402 unsigned int i
, j
, del
;
1403 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1404 struct object_entry
*le
;
1406 if (!is_null_sha1(root
->versions
[1].sha1
))
1409 for (i
= 0; i
< t
->entry_count
; i
++) {
1410 if (t
->entries
[i
]->tree
)
1411 store_tree(t
->entries
[i
]);
1414 le
= find_object(root
->versions
[0].sha1
);
1415 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1416 mktree(t
, 0, &old_tree
);
1418 lo
.offset
= le
->idx
.offset
;
1419 lo
.depth
= t
->delta_depth
;
1422 mktree(t
, 1, &new_tree
);
1423 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1425 t
->delta_depth
= lo
.depth
;
1426 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1427 struct tree_entry
*e
= t
->entries
[i
];
1428 if (e
->versions
[1].mode
) {
1429 e
->versions
[0].mode
= e
->versions
[1].mode
;
1430 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1431 t
->entries
[j
++] = e
;
1433 release_tree_entry(e
);
1437 t
->entry_count
-= del
;
1440 static void tree_content_replace(
1441 struct tree_entry
*root
,
1442 const unsigned char *sha1
,
1443 const uint16_t mode
,
1444 struct tree_content
*newtree
)
1447 die("Root cannot be a non-directory");
1448 hashcpy(root
->versions
[1].sha1
, sha1
);
1450 release_tree_content_recursive(root
->tree
);
1451 root
->tree
= newtree
;
1454 static int tree_content_set(
1455 struct tree_entry
*root
,
1457 const unsigned char *sha1
,
1458 const uint16_t mode
,
1459 struct tree_content
*subtree
)
1461 struct tree_content
*t
;
1464 struct tree_entry
*e
;
1466 slash1
= strchr(p
, '/');
1472 die("Empty path component found in input");
1473 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1474 die("Non-directories cannot have subtrees");
1479 for (i
= 0; i
< t
->entry_count
; i
++) {
1481 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1484 && e
->versions
[1].mode
== mode
1485 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1487 e
->versions
[1].mode
= mode
;
1488 hashcpy(e
->versions
[1].sha1
, sha1
);
1490 release_tree_content_recursive(e
->tree
);
1492 hashclr(root
->versions
[1].sha1
);
1495 if (!S_ISDIR(e
->versions
[1].mode
)) {
1496 e
->tree
= new_tree_content(8);
1497 e
->versions
[1].mode
= S_IFDIR
;
1501 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1502 hashclr(root
->versions
[1].sha1
);
1509 if (t
->entry_count
== t
->entry_capacity
)
1510 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1511 e
= new_tree_entry();
1512 e
->name
= to_atom(p
, n
);
1513 e
->versions
[0].mode
= 0;
1514 hashclr(e
->versions
[0].sha1
);
1515 t
->entries
[t
->entry_count
++] = e
;
1517 e
->tree
= new_tree_content(8);
1518 e
->versions
[1].mode
= S_IFDIR
;
1519 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1522 e
->versions
[1].mode
= mode
;
1523 hashcpy(e
->versions
[1].sha1
, sha1
);
1525 hashclr(root
->versions
[1].sha1
);
1529 static int tree_content_remove(
1530 struct tree_entry
*root
,
1532 struct tree_entry
*backup_leaf
)
1534 struct tree_content
*t
;
1537 struct tree_entry
*e
;
1539 slash1
= strchr(p
, '/');
1548 for (i
= 0; i
< t
->entry_count
; i
++) {
1550 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1551 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1553 * If p names a file in some subdirectory, and a
1554 * file or symlink matching the name of the
1555 * parent directory of p exists, then p cannot
1556 * exist and need not be deleted.
1559 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1563 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1564 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1565 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1566 hashclr(root
->versions
[1].sha1
);
1580 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1582 release_tree_content_recursive(e
->tree
);
1584 e
->versions
[1].mode
= 0;
1585 hashclr(e
->versions
[1].sha1
);
1586 hashclr(root
->versions
[1].sha1
);
1590 static int tree_content_get(
1591 struct tree_entry
*root
,
1593 struct tree_entry
*leaf
)
1595 struct tree_content
*t
;
1598 struct tree_entry
*e
;
1600 slash1
= strchr(p
, '/');
1609 for (i
= 0; i
< t
->entry_count
; i
++) {
1611 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1613 memcpy(leaf
, e
, sizeof(*leaf
));
1614 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1615 leaf
->tree
= dup_tree_content(e
->tree
);
1620 if (!S_ISDIR(e
->versions
[1].mode
))
1624 return tree_content_get(e
, slash1
+ 1, leaf
);
1630 static int update_branch(struct branch
*b
)
1632 static const char *msg
= "fast-import";
1633 struct ref_lock
*lock
;
1634 unsigned char old_sha1
[20];
1636 if (is_null_sha1(b
->sha1
))
1638 if (read_ref(b
->name
, old_sha1
))
1640 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1642 return error("Unable to lock %s", b
->name
);
1643 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1644 struct commit
*old_cmit
, *new_cmit
;
1646 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1647 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1648 if (!old_cmit
|| !new_cmit
) {
1650 return error("Branch %s is missing commits.", b
->name
);
1653 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1655 warning("Not updating %s"
1656 " (new tip %s does not contain %s)",
1657 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1661 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1662 return error("Unable to update %s", b
->name
);
1666 static void dump_branches(void)
1671 for (i
= 0; i
< branch_table_sz
; i
++) {
1672 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1673 failure
|= update_branch(b
);
1677 static void dump_tags(void)
1679 static const char *msg
= "fast-import";
1681 struct ref_lock
*lock
;
1682 char ref_name
[PATH_MAX
];
1684 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1685 sprintf(ref_name
, "tags/%s", t
->name
);
1686 lock
= lock_ref_sha1(ref_name
, NULL
);
1687 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1688 failure
|= error("Unable to update %s", ref_name
);
1692 static void dump_marks_helper(FILE *f
,
1698 for (k
= 0; k
< 1024; k
++) {
1699 if (m
->data
.sets
[k
])
1700 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1704 for (k
= 0; k
< 1024; k
++) {
1705 if (m
->data
.marked
[k
])
1706 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1707 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1712 static void dump_marks(void)
1714 static struct lock_file mark_lock
;
1718 if (!export_marks_file
)
1721 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1723 failure
|= error("Unable to write marks file %s: %s",
1724 export_marks_file
, strerror(errno
));
1728 f
= fdopen(mark_fd
, "w");
1730 int saved_errno
= errno
;
1731 rollback_lock_file(&mark_lock
);
1732 failure
|= error("Unable to write marks file %s: %s",
1733 export_marks_file
, strerror(saved_errno
));
1738 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1739 * Assign -1 to the lock file descriptor so that commit_lock_file()
1740 * won't try to close() it.
1744 dump_marks_helper(f
, 0, marks
);
1745 if (ferror(f
) || fclose(f
)) {
1746 int saved_errno
= errno
;
1747 rollback_lock_file(&mark_lock
);
1748 failure
|= error("Unable to write marks file %s: %s",
1749 export_marks_file
, strerror(saved_errno
));
1753 if (commit_lock_file(&mark_lock
)) {
1754 int saved_errno
= errno
;
1755 rollback_lock_file(&mark_lock
);
1756 failure
|= error("Unable to commit marks file %s: %s",
1757 export_marks_file
, strerror(saved_errno
));
1762 static void read_marks(void)
1765 FILE *f
= fopen(import_marks_file
, "r");
1767 die_errno("cannot read '%s'", import_marks_file
);
1768 while (fgets(line
, sizeof(line
), f
)) {
1771 unsigned char sha1
[20];
1772 struct object_entry
*e
;
1774 end
= strchr(line
, '\n');
1775 if (line
[0] != ':' || !end
)
1776 die("corrupt mark line: %s", line
);
1778 mark
= strtoumax(line
+ 1, &end
, 10);
1779 if (!mark
|| end
== line
+ 1
1780 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1781 die("corrupt mark line: %s", line
);
1782 e
= find_object(sha1
);
1784 enum object_type type
= sha1_object_info(sha1
, NULL
);
1786 die("object not found: %s", sha1_to_hex(sha1
));
1787 e
= insert_object(sha1
);
1789 e
->pack_id
= MAX_PACK_ID
;
1790 e
->idx
.offset
= 1; /* just not zero! */
1792 insert_mark(mark
, e
);
1798 static int read_next_command(void)
1800 static int stdin_eof
= 0;
1803 unread_command_buf
= 0;
1808 if (unread_command_buf
) {
1809 unread_command_buf
= 0;
1811 struct recent_command
*rc
;
1813 strbuf_detach(&command_buf
, NULL
);
1814 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1818 if (!seen_data_command
1819 && prefixcmp(command_buf
.buf
, "feature ")
1820 && prefixcmp(command_buf
.buf
, "option ")) {
1829 cmd_hist
.next
= rc
->next
;
1830 cmd_hist
.next
->prev
= &cmd_hist
;
1834 rc
->buf
= command_buf
.buf
;
1835 rc
->prev
= cmd_tail
;
1836 rc
->next
= cmd_hist
.prev
;
1837 rc
->prev
->next
= rc
;
1840 } while (command_buf
.buf
[0] == '#');
1845 static void skip_optional_lf(void)
1847 int term_char
= fgetc(stdin
);
1848 if (term_char
!= '\n' && term_char
!= EOF
)
1849 ungetc(term_char
, stdin
);
1852 static void parse_mark(void)
1854 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1855 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1856 read_next_command();
1862 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1866 if (prefixcmp(command_buf
.buf
, "data "))
1867 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1869 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1870 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1871 size_t term_len
= command_buf
.len
- 5 - 2;
1873 strbuf_detach(&command_buf
, NULL
);
1875 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1876 die("EOF in data (terminator '%s' not found)", term
);
1877 if (term_len
== command_buf
.len
1878 && !strcmp(term
, command_buf
.buf
))
1880 strbuf_addbuf(sb
, &command_buf
);
1881 strbuf_addch(sb
, '\n');
1886 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1887 size_t n
= 0, length
= (size_t)len
;
1889 if (limit
&& limit
< len
) {
1894 die("data is too large to use in this context");
1896 while (n
< length
) {
1897 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1898 if (!s
&& feof(stdin
))
1899 die("EOF in data (%lu bytes remaining)",
1900 (unsigned long)(length
- n
));
1909 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1911 const char *orig_src
= src
;
1917 num
= strtoul(src
, &endp
, 10);
1918 /* NEEDSWORK: perhaps check for reasonable values? */
1919 if (errno
|| endp
== src
|| *endp
!= ' ')
1923 if (*src
!= '-' && *src
!= '+')
1926 num
= strtoul(src
+ 1, &endp
, 10);
1927 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1931 strcpy(result
, orig_src
);
1935 static char *parse_ident(const char *buf
)
1941 gt
= strrchr(buf
, '>');
1943 die("Missing > in ident string: %s", buf
);
1946 die("Missing space after > in ident string: %s", buf
);
1948 name_len
= gt
- buf
;
1949 ident
= xmalloc(name_len
+ 24);
1950 strncpy(ident
, buf
, name_len
);
1954 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1955 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1957 case WHENSPEC_RFC2822
:
1958 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1959 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1962 if (strcmp("now", gt
))
1963 die("Date in ident must be 'now': %s", buf
);
1964 datestamp(ident
+ name_len
, 24);
1971 static void parse_and_store_blob(
1972 struct last_object
*last
,
1973 unsigned char *sha1out
,
1976 static struct strbuf buf
= STRBUF_INIT
;
1979 if (parse_data(&buf
, big_file_threshold
, &len
))
1980 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
1983 strbuf_release(&last
->data
);
1987 stream_blob(len
, sha1out
, mark
);
1992 static void parse_new_blob(void)
1994 read_next_command();
1996 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
1999 static void unload_one_branch(void)
2001 while (cur_active_branches
2002 && cur_active_branches
>= max_active_branches
) {
2003 uintmax_t min_commit
= ULONG_MAX
;
2004 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2006 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2007 if (e
->last_commit
< min_commit
) {
2009 min_commit
= e
->last_commit
;
2015 e
= p
->active_next_branch
;
2016 p
->active_next_branch
= e
->active_next_branch
;
2018 e
= active_branches
;
2019 active_branches
= e
->active_next_branch
;
2022 e
->active_next_branch
= NULL
;
2023 if (e
->branch_tree
.tree
) {
2024 release_tree_content_recursive(e
->branch_tree
.tree
);
2025 e
->branch_tree
.tree
= NULL
;
2027 cur_active_branches
--;
2031 static void load_branch(struct branch
*b
)
2033 load_tree(&b
->branch_tree
);
2036 b
->active_next_branch
= active_branches
;
2037 active_branches
= b
;
2038 cur_active_branches
++;
2039 branch_load_count
++;
2043 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2045 unsigned char fanout
= 0;
2046 while ((num_notes
>>= 8))
2051 static void construct_path_with_fanout(const char *hex_sha1
,
2052 unsigned char fanout
, char *path
)
2054 unsigned int i
= 0, j
= 0;
2056 die("Too large fanout (%u)", fanout
);
2058 path
[i
++] = hex_sha1
[j
++];
2059 path
[i
++] = hex_sha1
[j
++];
2063 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2064 path
[i
+ 40 - j
] = '\0';
2067 static uintmax_t do_change_note_fanout(
2068 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2069 char *hex_sha1
, unsigned int hex_sha1_len
,
2070 char *fullpath
, unsigned int fullpath_len
,
2071 unsigned char fanout
)
2073 struct tree_content
*t
= root
->tree
;
2074 struct tree_entry
*e
, leaf
;
2075 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2076 uintmax_t num_notes
= 0;
2077 unsigned char sha1
[20];
2080 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2082 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2083 tmp_fullpath_len
= fullpath_len
;
2086 * We're interested in EITHER existing note entries (entries
2087 * with exactly 40 hex chars in path, not including directory
2088 * separators), OR directory entries that may contain note
2089 * entries (with < 40 hex chars in path).
2090 * Also, each path component in a note entry must be a multiple
2093 if (!e
->versions
[1].mode
||
2094 tmp_hex_sha1_len
> 40 ||
2095 e
->name
->str_len
% 2)
2098 /* This _may_ be a note entry, or a subdir containing notes */
2099 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2101 if (tmp_fullpath_len
)
2102 fullpath
[tmp_fullpath_len
++] = '/';
2103 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2105 tmp_fullpath_len
+= e
->name
->str_len
;
2106 fullpath
[tmp_fullpath_len
] = '\0';
2108 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2109 /* This is a note entry */
2110 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2111 if (!strcmp(fullpath
, realpath
)) {
2112 /* Note entry is in correct location */
2117 /* Rename fullpath to realpath */
2118 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2119 die("Failed to remove path %s", fullpath
);
2120 tree_content_set(orig_root
, realpath
,
2121 leaf
.versions
[1].sha1
,
2122 leaf
.versions
[1].mode
,
2124 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2125 /* This is a subdir that may contain note entries */
2128 num_notes
+= do_change_note_fanout(orig_root
, e
,
2129 hex_sha1
, tmp_hex_sha1_len
,
2130 fullpath
, tmp_fullpath_len
, fanout
);
2133 /* The above may have reallocated the current tree_content */
2139 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2140 unsigned char fanout
)
2142 char hex_sha1
[40], path
[60];
2143 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2146 static void file_change_m(struct branch
*b
)
2148 const char *p
= command_buf
.buf
+ 2;
2149 static struct strbuf uq
= STRBUF_INIT
;
2151 struct object_entry
*oe
= oe
;
2152 unsigned char sha1
[20];
2153 uint16_t mode
, inline_data
= 0;
2155 p
= get_mode(p
, &mode
);
2157 die("Corrupt mode: %s", command_buf
.buf
);
2162 case S_IFREG
| 0644:
2163 case S_IFREG
| 0755:
2170 die("Corrupt mode: %s", command_buf
.buf
);
2175 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2176 hashcpy(sha1
, oe
->idx
.sha1
);
2178 } else if (!prefixcmp(p
, "inline")) {
2182 if (get_sha1_hex(p
, sha1
))
2183 die("Invalid SHA1: %s", command_buf
.buf
);
2184 oe
= find_object(sha1
);
2188 die("Missing space after SHA1: %s", command_buf
.buf
);
2191 if (!unquote_c_style(&uq
, p
, &endp
)) {
2193 die("Garbage after path in: %s", command_buf
.buf
);
2197 if (S_ISGITLINK(mode
)) {
2199 die("Git links cannot be specified 'inline': %s",
2202 if (oe
->type
!= OBJ_COMMIT
)
2203 die("Not a commit (actually a %s): %s",
2204 typename(oe
->type
), command_buf
.buf
);
2207 * Accept the sha1 without checking; it expected to be in
2208 * another repository.
2210 } else if (inline_data
) {
2212 die("Directories cannot be specified 'inline': %s",
2215 strbuf_addstr(&uq
, p
);
2218 read_next_command();
2219 parse_and_store_blob(&last_blob
, sha1
, 0);
2221 enum object_type expected
= S_ISDIR(mode
) ?
2223 enum object_type type
= oe
? oe
->type
:
2224 sha1_object_info(sha1
, NULL
);
2226 die("%s not found: %s",
2227 S_ISDIR(mode
) ? "Tree" : "Blob",
2229 if (type
!= expected
)
2230 die("Not a %s (actually a %s): %s",
2231 typename(expected
), typename(type
),
2236 tree_content_replace(&b
->branch_tree
, sha1
, mode
, NULL
);
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 if (!*d
) { /* C "path/to/subdir" "" */
2298 tree_content_replace(&b
->branch_tree
,
2299 leaf
.versions
[1].sha1
,
2300 leaf
.versions
[1].mode
,
2304 tree_content_set(&b
->branch_tree
, d
,
2305 leaf
.versions
[1].sha1
,
2306 leaf
.versions
[1].mode
,
2310 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2312 const char *p
= command_buf
.buf
+ 2;
2313 static struct strbuf uq
= STRBUF_INIT
;
2314 struct object_entry
*oe
= oe
;
2316 unsigned char sha1
[20], commit_sha1
[20];
2318 uint16_t inline_data
= 0;
2319 unsigned char new_fanout
;
2321 /* <dataref> or 'inline' */
2324 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2325 hashcpy(sha1
, oe
->idx
.sha1
);
2327 } else if (!prefixcmp(p
, "inline")) {
2331 if (get_sha1_hex(p
, sha1
))
2332 die("Invalid SHA1: %s", command_buf
.buf
);
2333 oe
= find_object(sha1
);
2337 die("Missing space after SHA1: %s", command_buf
.buf
);
2340 s
= lookup_branch(p
);
2342 hashcpy(commit_sha1
, s
->sha1
);
2343 } else if (*p
== ':') {
2344 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2345 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2346 if (commit_oe
->type
!= OBJ_COMMIT
)
2347 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2348 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2349 } else if (!get_sha1(p
, commit_sha1
)) {
2351 char *buf
= read_object_with_reference(commit_sha1
,
2352 commit_type
, &size
, commit_sha1
);
2353 if (!buf
|| size
< 46)
2354 die("Not a valid commit: %s", p
);
2357 die("Invalid ref name or SHA1 expression: %s", p
);
2361 strbuf_addstr(&uq
, p
);
2364 read_next_command();
2365 parse_and_store_blob(&last_blob
, sha1
, 0);
2367 if (oe
->type
!= OBJ_BLOB
)
2368 die("Not a blob (actually a %s): %s",
2369 typename(oe
->type
), command_buf
.buf
);
2370 } else if (!is_null_sha1(sha1
)) {
2371 enum object_type type
= sha1_object_info(sha1
, NULL
);
2373 die("Blob not found: %s", command_buf
.buf
);
2374 if (type
!= OBJ_BLOB
)
2375 die("Not a blob (actually a %s): %s",
2376 typename(type
), command_buf
.buf
);
2379 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2380 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2383 if (is_null_sha1(sha1
))
2384 return; /* nothing to insert */
2387 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2388 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2389 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2392 static void file_change_deleteall(struct branch
*b
)
2394 release_tree_content_recursive(b
->branch_tree
.tree
);
2395 hashclr(b
->branch_tree
.versions
[0].sha1
);
2396 hashclr(b
->branch_tree
.versions
[1].sha1
);
2397 load_tree(&b
->branch_tree
);
2401 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2403 if (!buf
|| size
< 46)
2404 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2405 if (memcmp("tree ", buf
, 5)
2406 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2407 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2408 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2409 b
->branch_tree
.versions
[1].sha1
);
2412 static void parse_from_existing(struct branch
*b
)
2414 if (is_null_sha1(b
->sha1
)) {
2415 hashclr(b
->branch_tree
.versions
[0].sha1
);
2416 hashclr(b
->branch_tree
.versions
[1].sha1
);
2421 buf
= read_object_with_reference(b
->sha1
,
2422 commit_type
, &size
, b
->sha1
);
2423 parse_from_commit(b
, buf
, size
);
2428 static int parse_from(struct branch
*b
)
2433 if (prefixcmp(command_buf
.buf
, "from "))
2436 if (b
->branch_tree
.tree
) {
2437 release_tree_content_recursive(b
->branch_tree
.tree
);
2438 b
->branch_tree
.tree
= NULL
;
2441 from
= strchr(command_buf
.buf
, ' ') + 1;
2442 s
= lookup_branch(from
);
2444 die("Can't create a branch from itself: %s", b
->name
);
2446 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2447 hashcpy(b
->sha1
, s
->sha1
);
2448 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2449 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2450 } else if (*from
== ':') {
2451 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2452 struct object_entry
*oe
= find_mark(idnum
);
2453 if (oe
->type
!= OBJ_COMMIT
)
2454 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2455 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2456 if (oe
->pack_id
!= MAX_PACK_ID
) {
2458 char *buf
= gfi_unpack_entry(oe
, &size
);
2459 parse_from_commit(b
, buf
, size
);
2462 parse_from_existing(b
);
2463 } else if (!get_sha1(from
, b
->sha1
))
2464 parse_from_existing(b
);
2466 die("Invalid ref name or SHA1 expression: %s", from
);
2468 read_next_command();
2472 static struct hash_list
*parse_merge(unsigned int *count
)
2474 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2479 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2480 from
= strchr(command_buf
.buf
, ' ') + 1;
2481 n
= xmalloc(sizeof(*n
));
2482 s
= lookup_branch(from
);
2484 hashcpy(n
->sha1
, s
->sha1
);
2485 else if (*from
== ':') {
2486 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2487 struct object_entry
*oe
= find_mark(idnum
);
2488 if (oe
->type
!= OBJ_COMMIT
)
2489 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2490 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2491 } else if (!get_sha1(from
, n
->sha1
)) {
2493 char *buf
= read_object_with_reference(n
->sha1
,
2494 commit_type
, &size
, n
->sha1
);
2495 if (!buf
|| size
< 46)
2496 die("Not a valid commit: %s", from
);
2499 die("Invalid ref name or SHA1 expression: %s", from
);
2508 read_next_command();
2513 static void parse_new_commit(void)
2515 static struct strbuf msg
= STRBUF_INIT
;
2518 char *author
= NULL
;
2519 char *committer
= NULL
;
2520 struct hash_list
*merge_list
= NULL
;
2521 unsigned int merge_count
;
2522 unsigned char prev_fanout
, new_fanout
;
2524 /* Obtain the branch name from the rest of our command */
2525 sp
= strchr(command_buf
.buf
, ' ') + 1;
2526 b
= lookup_branch(sp
);
2530 read_next_command();
2532 if (!prefixcmp(command_buf
.buf
, "author ")) {
2533 author
= parse_ident(command_buf
.buf
+ 7);
2534 read_next_command();
2536 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2537 committer
= parse_ident(command_buf
.buf
+ 10);
2538 read_next_command();
2541 die("Expected committer but didn't get one");
2542 parse_data(&msg
, 0, NULL
);
2543 read_next_command();
2545 merge_list
= parse_merge(&merge_count
);
2547 /* ensure the branch is active/loaded */
2548 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2549 unload_one_branch();
2553 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2556 while (command_buf
.len
> 0) {
2557 if (!prefixcmp(command_buf
.buf
, "M "))
2559 else if (!prefixcmp(command_buf
.buf
, "D "))
2561 else if (!prefixcmp(command_buf
.buf
, "R "))
2562 file_change_cr(b
, 1);
2563 else if (!prefixcmp(command_buf
.buf
, "C "))
2564 file_change_cr(b
, 0);
2565 else if (!prefixcmp(command_buf
.buf
, "N "))
2566 note_change_n(b
, prev_fanout
);
2567 else if (!strcmp("deleteall", command_buf
.buf
))
2568 file_change_deleteall(b
);
2570 unread_command_buf
= 1;
2573 if (read_next_command() == EOF
)
2577 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2578 if (new_fanout
!= prev_fanout
)
2579 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2581 /* build the tree and the commit */
2582 store_tree(&b
->branch_tree
);
2583 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2584 b
->branch_tree
.versions
[1].sha1
);
2586 strbuf_reset(&new_data
);
2587 strbuf_addf(&new_data
, "tree %s\n",
2588 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2589 if (!is_null_sha1(b
->sha1
))
2590 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2591 while (merge_list
) {
2592 struct hash_list
*next
= merge_list
->next
;
2593 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2597 strbuf_addf(&new_data
,
2601 author
? author
: committer
, committer
);
2602 strbuf_addbuf(&new_data
, &msg
);
2606 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2607 b
->pack_id
= pack_id
;
2608 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2611 static void parse_new_tag(void)
2613 static struct strbuf msg
= STRBUF_INIT
;
2619 uintmax_t from_mark
= 0;
2620 unsigned char sha1
[20];
2621 enum object_type type
;
2623 /* Obtain the new tag name from the rest of our command */
2624 sp
= strchr(command_buf
.buf
, ' ') + 1;
2625 t
= pool_alloc(sizeof(struct tag
));
2627 t
->name
= pool_strdup(sp
);
2629 last_tag
->next_tag
= t
;
2633 read_next_command();
2636 if (prefixcmp(command_buf
.buf
, "from "))
2637 die("Expected from command, got %s", command_buf
.buf
);
2638 from
= strchr(command_buf
.buf
, ' ') + 1;
2639 s
= lookup_branch(from
);
2641 hashcpy(sha1
, s
->sha1
);
2643 } else if (*from
== ':') {
2644 struct object_entry
*oe
;
2645 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2646 oe
= find_mark(from_mark
);
2648 hashcpy(sha1
, oe
->idx
.sha1
);
2649 } else if (!get_sha1(from
, sha1
)) {
2653 buf
= read_sha1_file(sha1
, &type
, &size
);
2654 if (!buf
|| size
< 46)
2655 die("Not a valid commit: %s", from
);
2658 die("Invalid ref name or SHA1 expression: %s", from
);
2659 read_next_command();
2662 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2663 tagger
= parse_ident(command_buf
.buf
+ 7);
2664 read_next_command();
2668 /* tag payload/message */
2669 parse_data(&msg
, 0, NULL
);
2671 /* build the tag object */
2672 strbuf_reset(&new_data
);
2674 strbuf_addf(&new_data
,
2678 sha1_to_hex(sha1
), typename(type
), t
->name
);
2680 strbuf_addf(&new_data
,
2681 "tagger %s\n", tagger
);
2682 strbuf_addch(&new_data
, '\n');
2683 strbuf_addbuf(&new_data
, &msg
);
2686 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2687 t
->pack_id
= MAX_PACK_ID
;
2689 t
->pack_id
= pack_id
;
2692 static void parse_reset_branch(void)
2697 /* Obtain the branch name from the rest of our command */
2698 sp
= strchr(command_buf
.buf
, ' ') + 1;
2699 b
= lookup_branch(sp
);
2702 hashclr(b
->branch_tree
.versions
[0].sha1
);
2703 hashclr(b
->branch_tree
.versions
[1].sha1
);
2704 if (b
->branch_tree
.tree
) {
2705 release_tree_content_recursive(b
->branch_tree
.tree
);
2706 b
->branch_tree
.tree
= NULL
;
2711 read_next_command();
2713 if (command_buf
.len
> 0)
2714 unread_command_buf
= 1;
2717 static void parse_checkpoint(void)
2728 static void parse_progress(void)
2730 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2731 fputc('\n', stdout
);
2736 static char* make_fast_import_path(const char *path
)
2738 struct strbuf abs_path
= STRBUF_INIT
;
2740 if (!relative_marks_paths
|| is_absolute_path(path
))
2741 return xstrdup(path
);
2742 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2743 return strbuf_detach(&abs_path
, NULL
);
2746 static void option_import_marks(const char *marks
, int from_stream
)
2748 if (import_marks_file
) {
2750 die("Only one import-marks command allowed per stream");
2752 /* read previous mark file */
2753 if(!import_marks_file_from_stream
)
2757 import_marks_file
= make_fast_import_path(marks
);
2758 safe_create_leading_directories_const(import_marks_file
);
2759 import_marks_file_from_stream
= from_stream
;
2762 static void option_date_format(const char *fmt
)
2764 if (!strcmp(fmt
, "raw"))
2765 whenspec
= WHENSPEC_RAW
;
2766 else if (!strcmp(fmt
, "rfc2822"))
2767 whenspec
= WHENSPEC_RFC2822
;
2768 else if (!strcmp(fmt
, "now"))
2769 whenspec
= WHENSPEC_NOW
;
2771 die("unknown --date-format argument %s", fmt
);
2774 static void option_depth(const char *depth
)
2776 max_depth
= strtoul(depth
, NULL
, 0);
2777 if (max_depth
> MAX_DEPTH
)
2778 die("--depth cannot exceed %u", MAX_DEPTH
);
2781 static void option_active_branches(const char *branches
)
2783 max_active_branches
= strtoul(branches
, NULL
, 0);
2786 static void option_export_marks(const char *marks
)
2788 export_marks_file
= make_fast_import_path(marks
);
2789 safe_create_leading_directories_const(export_marks_file
);
2792 static void option_export_pack_edges(const char *edges
)
2796 pack_edges
= fopen(edges
, "a");
2798 die_errno("Cannot open '%s'", edges
);
2801 static int parse_one_option(const char *option
)
2803 if (!prefixcmp(option
, "max-pack-size=")) {
2805 if (!git_parse_ulong(option
+ 14, &v
))
2808 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2810 } else if (v
< 1024 * 1024) {
2811 warning("minimum max-pack-size is 1 MiB");
2815 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2817 if (!git_parse_ulong(option
+ 19, &v
))
2819 big_file_threshold
= v
;
2820 } else if (!prefixcmp(option
, "depth=")) {
2821 option_depth(option
+ 6);
2822 } else if (!prefixcmp(option
, "active-branches=")) {
2823 option_active_branches(option
+ 16);
2824 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2825 option_export_pack_edges(option
+ 18);
2826 } else if (!prefixcmp(option
, "quiet")) {
2828 } else if (!prefixcmp(option
, "stats")) {
2837 static int parse_one_feature(const char *feature
, int from_stream
)
2839 if (!prefixcmp(feature
, "date-format=")) {
2840 option_date_format(feature
+ 12);
2841 } else if (!prefixcmp(feature
, "import-marks=")) {
2842 option_import_marks(feature
+ 13, from_stream
);
2843 } else if (!prefixcmp(feature
, "export-marks=")) {
2844 option_export_marks(feature
+ 13);
2845 } else if (!prefixcmp(feature
, "relative-marks")) {
2846 relative_marks_paths
= 1;
2847 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2848 relative_marks_paths
= 0;
2849 } else if (!prefixcmp(feature
, "force")) {
2858 static void parse_feature(void)
2860 char *feature
= command_buf
.buf
+ 8;
2862 if (seen_data_command
)
2863 die("Got feature command '%s' after data command", feature
);
2865 if (parse_one_feature(feature
, 1))
2868 die("This version of fast-import does not support feature %s.", feature
);
2871 static void parse_option(void)
2873 char *option
= command_buf
.buf
+ 11;
2875 if (seen_data_command
)
2876 die("Got option command '%s' after data command", option
);
2878 if (parse_one_option(option
))
2881 die("This version of fast-import does not support option: %s", option
);
2884 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2886 if (!strcmp(k
, "pack.depth")) {
2887 max_depth
= git_config_int(k
, v
);
2888 if (max_depth
> MAX_DEPTH
)
2889 max_depth
= MAX_DEPTH
;
2892 if (!strcmp(k
, "pack.compression")) {
2893 int level
= git_config_int(k
, v
);
2895 level
= Z_DEFAULT_COMPRESSION
;
2896 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2897 die("bad pack compression level %d", level
);
2898 pack_compression_level
= level
;
2899 pack_compression_seen
= 1;
2902 if (!strcmp(k
, "pack.indexversion")) {
2903 pack_idx_default_version
= git_config_int(k
, v
);
2904 if (pack_idx_default_version
> 2)
2905 die("bad pack.indexversion=%"PRIu32
,
2906 pack_idx_default_version
);
2909 if (!strcmp(k
, "pack.packsizelimit")) {
2910 max_packsize
= git_config_ulong(k
, v
);
2913 if (!strcmp(k
, "core.bigfilethreshold")) {
2914 long n
= git_config_int(k
, v
);
2915 big_file_threshold
= 0 < n
? n
: 0;
2917 return git_default_config(k
, v
, cb
);
2920 static const char fast_import_usage
[] =
2921 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
2923 static void parse_argv(void)
2927 for (i
= 1; i
< global_argc
; i
++) {
2928 const char *a
= global_argv
[i
];
2930 if (*a
!= '-' || !strcmp(a
, "--"))
2933 if (parse_one_option(a
+ 2))
2936 if (parse_one_feature(a
+ 2, 0))
2939 die("unknown option %s", a
);
2941 if (i
!= global_argc
)
2942 usage(fast_import_usage
);
2944 seen_data_command
= 1;
2945 if (import_marks_file
)
2949 int main(int argc
, const char **argv
)
2953 git_extract_argv0_path(argv
[0]);
2955 if (argc
== 2 && !strcmp(argv
[1], "-h"))
2956 usage(fast_import_usage
);
2958 setup_git_directory();
2959 git_config(git_pack_config
, NULL
);
2960 if (!pack_compression_seen
&& core_compression_seen
)
2961 pack_compression_level
= core_compression_level
;
2963 alloc_objects(object_entry_alloc
);
2964 strbuf_init(&command_buf
, 0);
2965 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
2966 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
2967 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
2968 marks
= pool_calloc(1, sizeof(struct mark_set
));
2973 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
2974 for (i
= 0; i
< (cmd_save
- 1); i
++)
2975 rc_free
[i
].next
= &rc_free
[i
+ 1];
2976 rc_free
[cmd_save
- 1].next
= NULL
;
2978 prepare_packed_git();
2980 set_die_routine(die_nicely
);
2981 while (read_next_command() != EOF
) {
2982 if (!strcmp("blob", command_buf
.buf
))
2984 else if (!prefixcmp(command_buf
.buf
, "commit "))
2986 else if (!prefixcmp(command_buf
.buf
, "tag "))
2988 else if (!prefixcmp(command_buf
.buf
, "reset "))
2989 parse_reset_branch();
2990 else if (!strcmp("checkpoint", command_buf
.buf
))
2992 else if (!prefixcmp(command_buf
.buf
, "progress "))
2994 else if (!prefixcmp(command_buf
.buf
, "feature "))
2996 else if (!prefixcmp(command_buf
.buf
, "option git "))
2998 else if (!prefixcmp(command_buf
.buf
, "option "))
2999 /* ignore non-git options*/;
3001 die("Unsupported command: %s", command_buf
.buf
);
3004 /* argv hasn't been parsed yet, do so */
3005 if (!seen_data_command
)
3019 uintmax_t total_count
= 0, duplicate_count
= 0;
3020 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3021 total_count
+= object_count_by_type
[i
];
3022 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3023 duplicate_count
+= duplicate_count_by_type
[i
];
3025 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3026 fprintf(stderr
, "---------------------------------------------------------------------\n");
3027 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3028 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3029 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
]);
3030 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
]);
3031 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
]);
3032 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
]);
3033 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3034 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3035 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3036 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3037 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3038 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3039 fprintf(stderr
, "---------------------------------------------------------------------\n");
3041 fprintf(stderr
, "---------------------------------------------------------------------\n");
3042 fprintf(stderr
, "\n");
3045 return failure
? 1 : 0;