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 and cat requests may appear anywhere
136 # in the input, except within a data command. Any form
137 # of the data command always escapes the related input
138 # from comment processing.
140 # In case it is not clear, the '#' that starts the comment
141 # must be the first character on that line (an lf
144 cat_blob ::= 'cat-blob' sp (hexsha1 | idnum) lf;
146 comment ::= '#' not_lf* lf;
147 not_lf ::= # Any byte that is not ASCII newline (LF);
159 #include "csum-file.h"
161 #include "exec_cmd.h"
163 #define PACK_ID_BITS 16
164 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
165 #define DEPTH_BITS 13
166 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
170 struct pack_idx_entry idx
;
171 struct object_entry
*next
;
172 uint32_t type
: TYPE_BITS
,
173 pack_id
: PACK_ID_BITS
,
177 struct object_entry_pool
179 struct object_entry_pool
*next_pool
;
180 struct object_entry
*next_free
;
181 struct object_entry
*end
;
182 struct object_entry entries
[FLEX_ARRAY
]; /* more */
188 struct object_entry
*marked
[1024];
189 struct mark_set
*sets
[1024];
199 unsigned no_swap
: 1;
204 struct mem_pool
*next_pool
;
207 uintmax_t space
[FLEX_ARRAY
]; /* more */
212 struct atom_str
*next_atom
;
213 unsigned short str_len
;
214 char str_dat
[FLEX_ARRAY
]; /* more */
220 struct tree_content
*tree
;
221 struct atom_str
*name
;
225 unsigned char sha1
[20];
231 unsigned int entry_capacity
; /* must match avail_tree_content */
232 unsigned int entry_count
;
233 unsigned int delta_depth
;
234 struct tree_entry
*entries
[FLEX_ARRAY
]; /* more */
237 struct avail_tree_content
239 unsigned int entry_capacity
; /* must match tree_content */
240 struct avail_tree_content
*next_avail
;
245 struct branch
*table_next_branch
;
246 struct branch
*active_next_branch
;
248 struct tree_entry branch_tree
;
249 uintmax_t last_commit
;
252 unsigned pack_id
: PACK_ID_BITS
;
253 unsigned char sha1
[20];
258 struct tag
*next_tag
;
260 unsigned int pack_id
;
261 unsigned char sha1
[20];
266 struct hash_list
*next
;
267 unsigned char sha1
[20];
276 struct recent_command
278 struct recent_command
*prev
;
279 struct recent_command
*next
;
283 /* Configured limits on output */
284 static unsigned long max_depth
= 10;
285 static off_t max_packsize
;
286 static uintmax_t big_file_threshold
= 512 * 1024 * 1024;
287 static int force_update
;
288 static int pack_compression_level
= Z_DEFAULT_COMPRESSION
;
289 static int pack_compression_seen
;
291 /* Stats and misc. counters */
292 static uintmax_t alloc_count
;
293 static uintmax_t marks_set_count
;
294 static uintmax_t object_count_by_type
[1 << TYPE_BITS
];
295 static uintmax_t duplicate_count_by_type
[1 << TYPE_BITS
];
296 static uintmax_t delta_count_by_type
[1 << TYPE_BITS
];
297 static unsigned long object_count
;
298 static unsigned long branch_count
;
299 static unsigned long branch_load_count
;
301 static FILE *pack_edges
;
302 static unsigned int show_stats
= 1;
303 static int global_argc
;
304 static const char **global_argv
;
307 static size_t mem_pool_alloc
= 2*1024*1024 - sizeof(struct mem_pool
);
308 static size_t total_allocd
;
309 static struct mem_pool
*mem_pool
;
311 /* Atom management */
312 static unsigned int atom_table_sz
= 4451;
313 static unsigned int atom_cnt
;
314 static struct atom_str
**atom_table
;
316 /* The .pack file being generated */
317 static unsigned int pack_id
;
318 static struct sha1file
*pack_file
;
319 static struct packed_git
*pack_data
;
320 static struct packed_git
**all_packs
;
321 static off_t pack_size
;
323 /* Table of objects we've written. */
324 static unsigned int object_entry_alloc
= 5000;
325 static struct object_entry_pool
*blocks
;
326 static struct object_entry
*object_table
[1 << 16];
327 static struct mark_set
*marks
;
328 static const char *export_marks_file
;
329 static const char *import_marks_file
;
330 static int import_marks_file_from_stream
;
331 static int relative_marks_paths
;
334 static struct last_object last_blob
= { STRBUF_INIT
, 0, 0, 0 };
336 /* Tree management */
337 static unsigned int tree_entry_alloc
= 1000;
338 static void *avail_tree_entry
;
339 static unsigned int avail_tree_table_sz
= 100;
340 static struct avail_tree_content
**avail_tree_table
;
341 static struct strbuf old_tree
= STRBUF_INIT
;
342 static struct strbuf new_tree
= STRBUF_INIT
;
345 static unsigned long max_active_branches
= 5;
346 static unsigned long cur_active_branches
;
347 static unsigned long branch_table_sz
= 1039;
348 static struct branch
**branch_table
;
349 static struct branch
*active_branches
;
352 static struct tag
*first_tag
;
353 static struct tag
*last_tag
;
355 /* Input stream parsing */
356 static whenspec_type whenspec
= WHENSPEC_RAW
;
357 static struct strbuf command_buf
= STRBUF_INIT
;
358 static int unread_command_buf
;
359 static struct recent_command cmd_hist
= {&cmd_hist
, &cmd_hist
, NULL
};
360 static struct recent_command
*cmd_tail
= &cmd_hist
;
361 static struct recent_command
*rc_free
;
362 static unsigned int cmd_save
= 100;
363 static uintmax_t next_mark
;
364 static struct strbuf new_data
= STRBUF_INIT
;
365 static int seen_data_command
;
367 /* Where to write output of cat-blob commands */
368 static int cat_blob_fd
= STDOUT_FILENO
;
370 static void parse_argv(void);
371 static void parse_cat_blob(void);
373 static void write_branch_report(FILE *rpt
, struct branch
*b
)
375 fprintf(rpt
, "%s:\n", b
->name
);
377 fprintf(rpt
, " status :");
379 fputs(" active", rpt
);
380 if (b
->branch_tree
.tree
)
381 fputs(" loaded", rpt
);
382 if (is_null_sha1(b
->branch_tree
.versions
[1].sha1
))
383 fputs(" dirty", rpt
);
386 fprintf(rpt
, " tip commit : %s\n", sha1_to_hex(b
->sha1
));
387 fprintf(rpt
, " old tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[0].sha1
));
388 fprintf(rpt
, " cur tree : %s\n", sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
389 fprintf(rpt
, " commit clock: %" PRIuMAX
"\n", b
->last_commit
);
391 fputs(" last pack : ", rpt
);
392 if (b
->pack_id
< MAX_PACK_ID
)
393 fprintf(rpt
, "%u", b
->pack_id
);
399 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set
*);
401 static void write_crash_report(const char *err
)
403 char *loc
= git_path("fast_import_crash_%"PRIuMAX
, (uintmax_t) getpid());
404 FILE *rpt
= fopen(loc
, "w");
407 struct recent_command
*rc
;
410 error("can't write crash report %s: %s", loc
, strerror(errno
));
414 fprintf(stderr
, "fast-import: dumping crash report to %s\n", loc
);
416 fprintf(rpt
, "fast-import crash report:\n");
417 fprintf(rpt
, " fast-import process: %"PRIuMAX
"\n", (uintmax_t) getpid());
418 fprintf(rpt
, " parent process : %"PRIuMAX
"\n", (uintmax_t) getppid());
419 fprintf(rpt
, " at %s\n", show_date(time(NULL
), 0, DATE_LOCAL
));
422 fputs("fatal: ", rpt
);
427 fputs("Most Recent Commands Before Crash\n", rpt
);
428 fputs("---------------------------------\n", rpt
);
429 for (rc
= cmd_hist
.next
; rc
!= &cmd_hist
; rc
= rc
->next
) {
430 if (rc
->next
== &cmd_hist
)
439 fputs("Active Branch LRU\n", rpt
);
440 fputs("-----------------\n", rpt
);
441 fprintf(rpt
, " active_branches = %lu cur, %lu max\n",
443 max_active_branches
);
445 fputs(" pos clock name\n", rpt
);
446 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt
);
447 for (b
= active_branches
, lu
= 0; b
; b
= b
->active_next_branch
)
448 fprintf(rpt
, " %2lu) %6" PRIuMAX
" %s\n",
449 ++lu
, b
->last_commit
, b
->name
);
452 fputs("Inactive Branches\n", rpt
);
453 fputs("-----------------\n", rpt
);
454 for (lu
= 0; lu
< branch_table_sz
; lu
++) {
455 for (b
= branch_table
[lu
]; b
; b
= b
->table_next_branch
)
456 write_branch_report(rpt
, b
);
462 fputs("Annotated Tags\n", rpt
);
463 fputs("--------------\n", rpt
);
464 for (tg
= first_tag
; tg
; tg
= tg
->next_tag
) {
465 fputs(sha1_to_hex(tg
->sha1
), rpt
);
467 fputs(tg
->name
, rpt
);
473 fputs("Marks\n", rpt
);
474 fputs("-----\n", rpt
);
475 if (export_marks_file
)
476 fprintf(rpt
, " exported to %s\n", export_marks_file
);
478 dump_marks_helper(rpt
, 0, marks
);
481 fputs("-------------------\n", rpt
);
482 fputs("END OF CRASH REPORT\n", rpt
);
486 static void end_packfile(void);
487 static void unkeep_all_packs(void);
488 static void dump_marks(void);
490 static NORETURN
void die_nicely(const char *err
, va_list params
)
493 char message
[2 * PATH_MAX
];
495 vsnprintf(message
, sizeof(message
), err
, params
);
496 fputs("fatal: ", stderr
);
497 fputs(message
, stderr
);
502 write_crash_report(message
);
510 static void alloc_objects(unsigned int cnt
)
512 struct object_entry_pool
*b
;
514 b
= xmalloc(sizeof(struct object_entry_pool
)
515 + cnt
* sizeof(struct object_entry
));
516 b
->next_pool
= blocks
;
517 b
->next_free
= b
->entries
;
518 b
->end
= b
->entries
+ cnt
;
523 static struct object_entry
*new_object(unsigned char *sha1
)
525 struct object_entry
*e
;
527 if (blocks
->next_free
== blocks
->end
)
528 alloc_objects(object_entry_alloc
);
530 e
= blocks
->next_free
++;
531 hashcpy(e
->idx
.sha1
, sha1
);
535 static struct object_entry
*find_object(unsigned char *sha1
)
537 unsigned int h
= sha1
[0] << 8 | sha1
[1];
538 struct object_entry
*e
;
539 for (e
= object_table
[h
]; e
; e
= e
->next
)
540 if (!hashcmp(sha1
, e
->idx
.sha1
))
545 static struct object_entry
*insert_object(unsigned char *sha1
)
547 unsigned int h
= sha1
[0] << 8 | sha1
[1];
548 struct object_entry
*e
= object_table
[h
];
549 struct object_entry
*p
= NULL
;
552 if (!hashcmp(sha1
, e
->idx
.sha1
))
558 e
= new_object(sha1
);
568 static unsigned int hc_str(const char *s
, size_t len
)
576 static void *pool_alloc(size_t len
)
581 /* round up to a 'uintmax_t' alignment */
582 if (len
& (sizeof(uintmax_t) - 1))
583 len
+= sizeof(uintmax_t) - (len
& (sizeof(uintmax_t) - 1));
585 for (p
= mem_pool
; p
; p
= p
->next_pool
)
586 if ((p
->end
- p
->next_free
>= len
))
590 if (len
>= (mem_pool_alloc
/2)) {
594 total_allocd
+= sizeof(struct mem_pool
) + mem_pool_alloc
;
595 p
= xmalloc(sizeof(struct mem_pool
) + mem_pool_alloc
);
596 p
->next_pool
= mem_pool
;
597 p
->next_free
= (char *) p
->space
;
598 p
->end
= p
->next_free
+ mem_pool_alloc
;
607 static void *pool_calloc(size_t count
, size_t size
)
609 size_t len
= count
* size
;
610 void *r
= pool_alloc(len
);
615 static char *pool_strdup(const char *s
)
617 char *r
= pool_alloc(strlen(s
) + 1);
622 static void insert_mark(uintmax_t idnum
, struct object_entry
*oe
)
624 struct mark_set
*s
= marks
;
625 while ((idnum
>> s
->shift
) >= 1024) {
626 s
= pool_calloc(1, sizeof(struct mark_set
));
627 s
->shift
= marks
->shift
+ 10;
628 s
->data
.sets
[0] = marks
;
632 uintmax_t i
= idnum
>> s
->shift
;
633 idnum
-= i
<< s
->shift
;
634 if (!s
->data
.sets
[i
]) {
635 s
->data
.sets
[i
] = pool_calloc(1, sizeof(struct mark_set
));
636 s
->data
.sets
[i
]->shift
= s
->shift
- 10;
640 if (!s
->data
.marked
[idnum
])
642 s
->data
.marked
[idnum
] = oe
;
645 static struct object_entry
*find_mark(uintmax_t idnum
)
647 uintmax_t orig_idnum
= idnum
;
648 struct mark_set
*s
= marks
;
649 struct object_entry
*oe
= NULL
;
650 if ((idnum
>> s
->shift
) < 1024) {
651 while (s
&& s
->shift
) {
652 uintmax_t i
= idnum
>> s
->shift
;
653 idnum
-= i
<< s
->shift
;
657 oe
= s
->data
.marked
[idnum
];
660 die("mark :%" PRIuMAX
" not declared", orig_idnum
);
664 static struct atom_str
*to_atom(const char *s
, unsigned short len
)
666 unsigned int hc
= hc_str(s
, len
) % atom_table_sz
;
669 for (c
= atom_table
[hc
]; c
; c
= c
->next_atom
)
670 if (c
->str_len
== len
&& !strncmp(s
, c
->str_dat
, len
))
673 c
= pool_alloc(sizeof(struct atom_str
) + len
+ 1);
675 strncpy(c
->str_dat
, s
, len
);
677 c
->next_atom
= atom_table
[hc
];
683 static struct branch
*lookup_branch(const char *name
)
685 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
688 for (b
= branch_table
[hc
]; b
; b
= b
->table_next_branch
)
689 if (!strcmp(name
, b
->name
))
694 static struct branch
*new_branch(const char *name
)
696 unsigned int hc
= hc_str(name
, strlen(name
)) % branch_table_sz
;
697 struct branch
*b
= lookup_branch(name
);
700 die("Invalid attempt to create duplicate branch: %s", name
);
701 switch (check_ref_format(name
)) {
702 case 0: break; /* its valid */
703 case CHECK_REF_FORMAT_ONELEVEL
:
704 break; /* valid, but too few '/', allow anyway */
706 die("Branch name doesn't conform to GIT standards: %s", name
);
709 b
= pool_calloc(1, sizeof(struct branch
));
710 b
->name
= pool_strdup(name
);
711 b
->table_next_branch
= branch_table
[hc
];
712 b
->branch_tree
.versions
[0].mode
= S_IFDIR
;
713 b
->branch_tree
.versions
[1].mode
= S_IFDIR
;
716 b
->pack_id
= MAX_PACK_ID
;
717 branch_table
[hc
] = b
;
722 static unsigned int hc_entries(unsigned int cnt
)
724 cnt
= cnt
& 7 ? (cnt
/ 8) + 1 : cnt
/ 8;
725 return cnt
< avail_tree_table_sz
? cnt
: avail_tree_table_sz
- 1;
728 static struct tree_content
*new_tree_content(unsigned int cnt
)
730 struct avail_tree_content
*f
, *l
= NULL
;
731 struct tree_content
*t
;
732 unsigned int hc
= hc_entries(cnt
);
734 for (f
= avail_tree_table
[hc
]; f
; l
= f
, f
= f
->next_avail
)
735 if (f
->entry_capacity
>= cnt
)
740 l
->next_avail
= f
->next_avail
;
742 avail_tree_table
[hc
] = f
->next_avail
;
744 cnt
= cnt
& 7 ? ((cnt
/ 8) + 1) * 8 : cnt
;
745 f
= pool_alloc(sizeof(*t
) + sizeof(t
->entries
[0]) * cnt
);
746 f
->entry_capacity
= cnt
;
749 t
= (struct tree_content
*)f
;
755 static void release_tree_entry(struct tree_entry
*e
);
756 static void release_tree_content(struct tree_content
*t
)
758 struct avail_tree_content
*f
= (struct avail_tree_content
*)t
;
759 unsigned int hc
= hc_entries(f
->entry_capacity
);
760 f
->next_avail
= avail_tree_table
[hc
];
761 avail_tree_table
[hc
] = f
;
764 static void release_tree_content_recursive(struct tree_content
*t
)
767 for (i
= 0; i
< t
->entry_count
; i
++)
768 release_tree_entry(t
->entries
[i
]);
769 release_tree_content(t
);
772 static struct tree_content
*grow_tree_content(
773 struct tree_content
*t
,
776 struct tree_content
*r
= new_tree_content(t
->entry_count
+ amt
);
777 r
->entry_count
= t
->entry_count
;
778 r
->delta_depth
= t
->delta_depth
;
779 memcpy(r
->entries
,t
->entries
,t
->entry_count
*sizeof(t
->entries
[0]));
780 release_tree_content(t
);
784 static struct tree_entry
*new_tree_entry(void)
786 struct tree_entry
*e
;
788 if (!avail_tree_entry
) {
789 unsigned int n
= tree_entry_alloc
;
790 total_allocd
+= n
* sizeof(struct tree_entry
);
791 avail_tree_entry
= e
= xmalloc(n
* sizeof(struct tree_entry
));
793 *((void**)e
) = e
+ 1;
799 e
= avail_tree_entry
;
800 avail_tree_entry
= *((void**)e
);
804 static void release_tree_entry(struct tree_entry
*e
)
807 release_tree_content_recursive(e
->tree
);
808 *((void**)e
) = avail_tree_entry
;
809 avail_tree_entry
= e
;
812 static struct tree_content
*dup_tree_content(struct tree_content
*s
)
814 struct tree_content
*d
;
815 struct tree_entry
*a
, *b
;
820 d
= new_tree_content(s
->entry_count
);
821 for (i
= 0; i
< s
->entry_count
; i
++) {
823 b
= new_tree_entry();
824 memcpy(b
, a
, sizeof(*a
));
825 if (a
->tree
&& is_null_sha1(b
->versions
[1].sha1
))
826 b
->tree
= dup_tree_content(a
->tree
);
831 d
->entry_count
= s
->entry_count
;
832 d
->delta_depth
= s
->delta_depth
;
837 static void start_packfile(void)
839 static char tmpfile
[PATH_MAX
];
840 struct packed_git
*p
;
841 struct pack_header hdr
;
844 pack_fd
= odb_mkstemp(tmpfile
, sizeof(tmpfile
),
845 "pack/tmp_pack_XXXXXX");
846 p
= xcalloc(1, sizeof(*p
) + strlen(tmpfile
) + 2);
847 strcpy(p
->pack_name
, tmpfile
);
848 p
->pack_fd
= pack_fd
;
849 pack_file
= sha1fd(pack_fd
, p
->pack_name
);
851 hdr
.hdr_signature
= htonl(PACK_SIGNATURE
);
852 hdr
.hdr_version
= htonl(2);
854 sha1write(pack_file
, &hdr
, sizeof(hdr
));
857 pack_size
= sizeof(hdr
);
860 all_packs
= xrealloc(all_packs
, sizeof(*all_packs
) * (pack_id
+ 1));
861 all_packs
[pack_id
] = p
;
864 static const char *create_index(void)
867 struct pack_idx_entry
**idx
, **c
, **last
;
868 struct object_entry
*e
;
869 struct object_entry_pool
*o
;
871 /* Build the table of object IDs. */
872 idx
= xmalloc(object_count
* sizeof(*idx
));
874 for (o
= blocks
; o
; o
= o
->next_pool
)
875 for (e
= o
->next_free
; e
-- != o
->entries
;)
876 if (pack_id
== e
->pack_id
)
878 last
= idx
+ object_count
;
880 die("internal consistency error creating the index");
882 tmpfile
= write_idx_file(NULL
, idx
, object_count
, pack_data
->sha1
);
887 static char *keep_pack(const char *curr_index_name
)
889 static char name
[PATH_MAX
];
890 static const char *keep_msg
= "fast-import";
893 keep_fd
= odb_pack_keep(name
, sizeof(name
), pack_data
->sha1
);
895 die_errno("cannot create keep file");
896 write_or_die(keep_fd
, keep_msg
, strlen(keep_msg
));
898 die_errno("failed to write keep file");
900 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.pack",
901 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
902 if (move_temp_to_file(pack_data
->pack_name
, name
))
903 die("cannot store pack file");
905 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.idx",
906 get_object_directory(), sha1_to_hex(pack_data
->sha1
));
907 if (move_temp_to_file(curr_index_name
, name
))
908 die("cannot store index file");
909 free((void *)curr_index_name
);
913 static void unkeep_all_packs(void)
915 static char name
[PATH_MAX
];
918 for (k
= 0; k
< pack_id
; k
++) {
919 struct packed_git
*p
= all_packs
[k
];
920 snprintf(name
, sizeof(name
), "%s/pack/pack-%s.keep",
921 get_object_directory(), sha1_to_hex(p
->sha1
));
922 unlink_or_warn(name
);
926 static void end_packfile(void)
928 struct packed_git
*old_p
= pack_data
, *new_p
;
930 clear_delta_base_cache();
932 unsigned char cur_pack_sha1
[20];
938 close_pack_windows(pack_data
);
939 sha1close(pack_file
, cur_pack_sha1
, 0);
940 fixup_pack_header_footer(pack_data
->pack_fd
, pack_data
->sha1
,
941 pack_data
->pack_name
, object_count
,
942 cur_pack_sha1
, pack_size
);
943 close(pack_data
->pack_fd
);
944 idx_name
= keep_pack(create_index());
946 /* Register the packfile with core git's machinery. */
947 new_p
= add_packed_git(idx_name
, strlen(idx_name
), 1);
949 die("core git rejected index %s", idx_name
);
950 all_packs
[pack_id
] = new_p
;
951 install_packed_git(new_p
);
953 /* Print the boundary */
955 fprintf(pack_edges
, "%s:", new_p
->pack_name
);
956 for (i
= 0; i
< branch_table_sz
; i
++) {
957 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
) {
958 if (b
->pack_id
== pack_id
)
959 fprintf(pack_edges
, " %s", sha1_to_hex(b
->sha1
));
962 for (t
= first_tag
; t
; t
= t
->next_tag
) {
963 if (t
->pack_id
== pack_id
)
964 fprintf(pack_edges
, " %s", sha1_to_hex(t
->sha1
));
966 fputc('\n', pack_edges
);
973 close(old_p
->pack_fd
);
974 unlink_or_warn(old_p
->pack_name
);
978 /* We can't carry a delta across packfiles. */
979 strbuf_release(&last_blob
.data
);
980 last_blob
.offset
= 0;
984 static void cycle_packfile(void)
990 static int store_object(
991 enum object_type type
,
993 struct last_object
*last
,
994 unsigned char *sha1out
,
998 struct object_entry
*e
;
999 unsigned char hdr
[96];
1000 unsigned char sha1
[20];
1001 unsigned long hdrlen
, deltalen
;
1005 hdrlen
= sprintf((char *)hdr
,"%s %lu", typename(type
),
1006 (unsigned long)dat
->len
) + 1;
1008 git_SHA1_Update(&c
, hdr
, hdrlen
);
1009 git_SHA1_Update(&c
, dat
->buf
, dat
->len
);
1010 git_SHA1_Final(sha1
, &c
);
1012 hashcpy(sha1out
, sha1
);
1014 e
= insert_object(sha1
);
1016 insert_mark(mark
, e
);
1017 if (e
->idx
.offset
) {
1018 duplicate_count_by_type
[type
]++;
1020 } else if (find_sha1_pack(sha1
, packed_git
)) {
1022 e
->pack_id
= MAX_PACK_ID
;
1023 e
->idx
.offset
= 1; /* just not zero! */
1024 duplicate_count_by_type
[type
]++;
1028 if (last
&& last
->data
.buf
&& last
->depth
< max_depth
&& dat
->len
> 20) {
1029 delta
= diff_delta(last
->data
.buf
, last
->data
.len
,
1031 &deltalen
, dat
->len
- 20);
1035 memset(&s
, 0, sizeof(s
));
1036 deflateInit(&s
, pack_compression_level
);
1039 s
.avail_in
= deltalen
;
1041 s
.next_in
= (void *)dat
->buf
;
1042 s
.avail_in
= dat
->len
;
1044 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1045 s
.next_out
= out
= xmalloc(s
.avail_out
);
1046 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1050 /* Determine if we should auto-checkpoint. */
1051 if ((max_packsize
&& (pack_size
+ 60 + s
.total_out
) > max_packsize
)
1052 || (pack_size
+ 60 + s
.total_out
) < pack_size
) {
1054 /* This new object needs to *not* have the current pack_id. */
1055 e
->pack_id
= pack_id
+ 1;
1058 /* We cannot carry a delta into the new pack. */
1063 memset(&s
, 0, sizeof(s
));
1064 deflateInit(&s
, pack_compression_level
);
1065 s
.next_in
= (void *)dat
->buf
;
1066 s
.avail_in
= dat
->len
;
1067 s
.avail_out
= deflateBound(&s
, s
.avail_in
);
1068 s
.next_out
= out
= xrealloc(out
, s
.avail_out
);
1069 while (deflate(&s
, Z_FINISH
) == Z_OK
)
1076 e
->pack_id
= pack_id
;
1077 e
->idx
.offset
= pack_size
;
1079 object_count_by_type
[type
]++;
1081 crc32_begin(pack_file
);
1084 off_t ofs
= e
->idx
.offset
- last
->offset
;
1085 unsigned pos
= sizeof(hdr
) - 1;
1087 delta_count_by_type
[type
]++;
1088 e
->depth
= last
->depth
+ 1;
1090 hdrlen
= encode_in_pack_object_header(OBJ_OFS_DELTA
, deltalen
, hdr
);
1091 sha1write(pack_file
, hdr
, hdrlen
);
1092 pack_size
+= hdrlen
;
1094 hdr
[pos
] = ofs
& 127;
1096 hdr
[--pos
] = 128 | (--ofs
& 127);
1097 sha1write(pack_file
, hdr
+ pos
, sizeof(hdr
) - pos
);
1098 pack_size
+= sizeof(hdr
) - pos
;
1101 hdrlen
= encode_in_pack_object_header(type
, dat
->len
, hdr
);
1102 sha1write(pack_file
, hdr
, hdrlen
);
1103 pack_size
+= hdrlen
;
1106 sha1write(pack_file
, out
, s
.total_out
);
1107 pack_size
+= s
.total_out
;
1109 e
->idx
.crc32
= crc32_end(pack_file
);
1114 if (last
->no_swap
) {
1117 strbuf_swap(&last
->data
, dat
);
1119 last
->offset
= e
->idx
.offset
;
1120 last
->depth
= e
->depth
;
1125 static void truncate_pack(off_t to
, git_SHA_CTX
*ctx
)
1127 if (ftruncate(pack_data
->pack_fd
, to
)
1128 || lseek(pack_data
->pack_fd
, to
, SEEK_SET
) != to
)
1129 die_errno("cannot truncate pack to skip duplicate");
1132 /* yes this is a layering violation */
1133 pack_file
->total
= to
;
1134 pack_file
->offset
= 0;
1135 pack_file
->ctx
= *ctx
;
1138 static void stream_blob(uintmax_t len
, unsigned char *sha1out
, uintmax_t mark
)
1140 size_t in_sz
= 64 * 1024, out_sz
= 64 * 1024;
1141 unsigned char *in_buf
= xmalloc(in_sz
);
1142 unsigned char *out_buf
= xmalloc(out_sz
);
1143 struct object_entry
*e
;
1144 unsigned char sha1
[20];
1145 unsigned long hdrlen
;
1148 git_SHA_CTX pack_file_ctx
;
1152 /* Determine if we should auto-checkpoint. */
1153 if ((max_packsize
&& (pack_size
+ 60 + len
) > max_packsize
)
1154 || (pack_size
+ 60 + len
) < pack_size
)
1159 /* preserve the pack_file SHA1 ctx in case we have to truncate later */
1160 sha1flush(pack_file
);
1161 pack_file_ctx
= pack_file
->ctx
;
1163 hdrlen
= snprintf((char *)out_buf
, out_sz
, "blob %" PRIuMAX
, len
) + 1;
1164 if (out_sz
<= hdrlen
)
1165 die("impossibly large object header");
1168 git_SHA1_Update(&c
, out_buf
, hdrlen
);
1170 crc32_begin(pack_file
);
1172 memset(&s
, 0, sizeof(s
));
1173 deflateInit(&s
, pack_compression_level
);
1175 hdrlen
= encode_in_pack_object_header(OBJ_BLOB
, len
, out_buf
);
1176 if (out_sz
<= hdrlen
)
1177 die("impossibly large object header");
1179 s
.next_out
= out_buf
+ hdrlen
;
1180 s
.avail_out
= out_sz
- hdrlen
;
1182 while (status
!= Z_STREAM_END
) {
1183 if (0 < len
&& !s
.avail_in
) {
1184 size_t cnt
= in_sz
< len
? in_sz
: (size_t)len
;
1185 size_t n
= fread(in_buf
, 1, cnt
, stdin
);
1186 if (!n
&& feof(stdin
))
1187 die("EOF in data (%" PRIuMAX
" bytes remaining)", len
);
1189 git_SHA1_Update(&c
, in_buf
, n
);
1195 status
= deflate(&s
, len
? 0 : Z_FINISH
);
1197 if (!s
.avail_out
|| status
== Z_STREAM_END
) {
1198 size_t n
= s
.next_out
- out_buf
;
1199 sha1write(pack_file
, out_buf
, n
);
1201 s
.next_out
= out_buf
;
1202 s
.avail_out
= out_sz
;
1211 die("unexpected deflate failure: %d", status
);
1215 git_SHA1_Final(sha1
, &c
);
1218 hashcpy(sha1out
, sha1
);
1220 e
= insert_object(sha1
);
1223 insert_mark(mark
, e
);
1225 if (e
->idx
.offset
) {
1226 duplicate_count_by_type
[OBJ_BLOB
]++;
1227 truncate_pack(offset
, &pack_file_ctx
);
1229 } else if (find_sha1_pack(sha1
, packed_git
)) {
1231 e
->pack_id
= MAX_PACK_ID
;
1232 e
->idx
.offset
= 1; /* just not zero! */
1233 duplicate_count_by_type
[OBJ_BLOB
]++;
1234 truncate_pack(offset
, &pack_file_ctx
);
1239 e
->pack_id
= pack_id
;
1240 e
->idx
.offset
= offset
;
1241 e
->idx
.crc32
= crc32_end(pack_file
);
1243 object_count_by_type
[OBJ_BLOB
]++;
1250 /* All calls must be guarded by find_object() or find_mark() to
1251 * ensure the 'struct object_entry' passed was written by this
1252 * process instance. We unpack the entry by the offset, avoiding
1253 * the need for the corresponding .idx file. This unpacking rule
1254 * works because we only use OBJ_REF_DELTA within the packfiles
1255 * created by fast-import.
1257 * oe must not be NULL. Such an oe usually comes from giving
1258 * an unknown SHA-1 to find_object() or an undefined mark to
1259 * find_mark(). Callers must test for this condition and use
1260 * the standard read_sha1_file() when it happens.
1262 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1263 * find_mark(), where the mark was reloaded from an existing marks
1264 * file and is referencing an object that this fast-import process
1265 * instance did not write out to a packfile. Callers must test for
1266 * this condition and use read_sha1_file() instead.
1268 static void *gfi_unpack_entry(
1269 struct object_entry
*oe
,
1270 unsigned long *sizep
)
1272 enum object_type type
;
1273 struct packed_git
*p
= all_packs
[oe
->pack_id
];
1274 if (p
== pack_data
&& p
->pack_size
< (pack_size
+ 20)) {
1275 /* The object is stored in the packfile we are writing to
1276 * and we have modified it since the last time we scanned
1277 * back to read a previously written object. If an old
1278 * window covered [p->pack_size, p->pack_size + 20) its
1279 * data is stale and is not valid. Closing all windows
1280 * and updating the packfile length ensures we can read
1281 * the newly written data.
1283 close_pack_windows(p
);
1284 sha1flush(pack_file
);
1286 /* We have to offer 20 bytes additional on the end of
1287 * the packfile as the core unpacker code assumes the
1288 * footer is present at the file end and must promise
1289 * at least 20 bytes within any window it maps. But
1290 * we don't actually create the footer here.
1292 p
->pack_size
= pack_size
+ 20;
1294 return unpack_entry(p
, oe
->idx
.offset
, &type
, sizep
);
1297 static const char *get_mode(const char *str
, uint16_t *modep
)
1302 while ((c
= *str
++) != ' ') {
1303 if (c
< '0' || c
> '7')
1305 mode
= (mode
<< 3) + (c
- '0');
1311 static void load_tree(struct tree_entry
*root
)
1313 unsigned char *sha1
= root
->versions
[1].sha1
;
1314 struct object_entry
*myoe
;
1315 struct tree_content
*t
;
1320 root
->tree
= t
= new_tree_content(8);
1321 if (is_null_sha1(sha1
))
1324 myoe
= find_object(sha1
);
1325 if (myoe
&& myoe
->pack_id
!= MAX_PACK_ID
) {
1326 if (myoe
->type
!= OBJ_TREE
)
1327 die("Not a tree: %s", sha1_to_hex(sha1
));
1328 t
->delta_depth
= myoe
->depth
;
1329 buf
= gfi_unpack_entry(myoe
, &size
);
1331 die("Can't load tree %s", sha1_to_hex(sha1
));
1333 enum object_type type
;
1334 buf
= read_sha1_file(sha1
, &type
, &size
);
1335 if (!buf
|| type
!= OBJ_TREE
)
1336 die("Can't load tree %s", sha1_to_hex(sha1
));
1340 while (c
!= (buf
+ size
)) {
1341 struct tree_entry
*e
= new_tree_entry();
1343 if (t
->entry_count
== t
->entry_capacity
)
1344 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1345 t
->entries
[t
->entry_count
++] = e
;
1348 c
= get_mode(c
, &e
->versions
[1].mode
);
1350 die("Corrupt mode in %s", sha1_to_hex(sha1
));
1351 e
->versions
[0].mode
= e
->versions
[1].mode
;
1352 e
->name
= to_atom(c
, strlen(c
));
1353 c
+= e
->name
->str_len
+ 1;
1354 hashcpy(e
->versions
[0].sha1
, (unsigned char *)c
);
1355 hashcpy(e
->versions
[1].sha1
, (unsigned char *)c
);
1361 static int tecmp0 (const void *_a
, const void *_b
)
1363 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1364 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1365 return base_name_compare(
1366 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[0].mode
,
1367 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[0].mode
);
1370 static int tecmp1 (const void *_a
, const void *_b
)
1372 struct tree_entry
*a
= *((struct tree_entry
**)_a
);
1373 struct tree_entry
*b
= *((struct tree_entry
**)_b
);
1374 return base_name_compare(
1375 a
->name
->str_dat
, a
->name
->str_len
, a
->versions
[1].mode
,
1376 b
->name
->str_dat
, b
->name
->str_len
, b
->versions
[1].mode
);
1379 static void mktree(struct tree_content
*t
, int v
, struct strbuf
*b
)
1385 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp0
);
1387 qsort(t
->entries
,t
->entry_count
,sizeof(t
->entries
[0]),tecmp1
);
1389 for (i
= 0; i
< t
->entry_count
; i
++) {
1390 if (t
->entries
[i
]->versions
[v
].mode
)
1391 maxlen
+= t
->entries
[i
]->name
->str_len
+ 34;
1395 strbuf_grow(b
, maxlen
);
1396 for (i
= 0; i
< t
->entry_count
; i
++) {
1397 struct tree_entry
*e
= t
->entries
[i
];
1398 if (!e
->versions
[v
].mode
)
1400 strbuf_addf(b
, "%o %s%c", (unsigned int)e
->versions
[v
].mode
,
1401 e
->name
->str_dat
, '\0');
1402 strbuf_add(b
, e
->versions
[v
].sha1
, 20);
1406 static void store_tree(struct tree_entry
*root
)
1408 struct tree_content
*t
= root
->tree
;
1409 unsigned int i
, j
, del
;
1410 struct last_object lo
= { STRBUF_INIT
, 0, 0, /* no_swap */ 1 };
1411 struct object_entry
*le
;
1413 if (!is_null_sha1(root
->versions
[1].sha1
))
1416 for (i
= 0; i
< t
->entry_count
; i
++) {
1417 if (t
->entries
[i
]->tree
)
1418 store_tree(t
->entries
[i
]);
1421 le
= find_object(root
->versions
[0].sha1
);
1422 if (S_ISDIR(root
->versions
[0].mode
) && le
&& le
->pack_id
== pack_id
) {
1423 mktree(t
, 0, &old_tree
);
1425 lo
.offset
= le
->idx
.offset
;
1426 lo
.depth
= t
->delta_depth
;
1429 mktree(t
, 1, &new_tree
);
1430 store_object(OBJ_TREE
, &new_tree
, &lo
, root
->versions
[1].sha1
, 0);
1432 t
->delta_depth
= lo
.depth
;
1433 for (i
= 0, j
= 0, del
= 0; i
< t
->entry_count
; i
++) {
1434 struct tree_entry
*e
= t
->entries
[i
];
1435 if (e
->versions
[1].mode
) {
1436 e
->versions
[0].mode
= e
->versions
[1].mode
;
1437 hashcpy(e
->versions
[0].sha1
, e
->versions
[1].sha1
);
1438 t
->entries
[j
++] = e
;
1440 release_tree_entry(e
);
1444 t
->entry_count
-= del
;
1447 static int tree_content_set(
1448 struct tree_entry
*root
,
1450 const unsigned char *sha1
,
1451 const uint16_t mode
,
1452 struct tree_content
*subtree
)
1454 struct tree_content
*t
= root
->tree
;
1457 struct tree_entry
*e
;
1459 slash1
= strchr(p
, '/');
1464 if (!slash1
&& !n
) {
1466 die("Root cannot be a non-directory");
1467 hashcpy(root
->versions
[1].sha1
, sha1
);
1469 release_tree_content_recursive(root
->tree
);
1470 root
->tree
= subtree
;
1474 die("Empty path component found in input");
1475 if (!slash1
&& !S_ISDIR(mode
) && subtree
)
1476 die("Non-directories cannot have subtrees");
1478 for (i
= 0; i
< t
->entry_count
; i
++) {
1480 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1483 && e
->versions
[1].mode
== mode
1484 && !hashcmp(e
->versions
[1].sha1
, sha1
))
1486 e
->versions
[1].mode
= mode
;
1487 hashcpy(e
->versions
[1].sha1
, sha1
);
1489 release_tree_content_recursive(e
->tree
);
1491 hashclr(root
->versions
[1].sha1
);
1494 if (!S_ISDIR(e
->versions
[1].mode
)) {
1495 e
->tree
= new_tree_content(8);
1496 e
->versions
[1].mode
= S_IFDIR
;
1500 if (tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
)) {
1501 hashclr(root
->versions
[1].sha1
);
1508 if (t
->entry_count
== t
->entry_capacity
)
1509 root
->tree
= t
= grow_tree_content(t
, t
->entry_count
);
1510 e
= new_tree_entry();
1511 e
->name
= to_atom(p
, n
);
1512 e
->versions
[0].mode
= 0;
1513 hashclr(e
->versions
[0].sha1
);
1514 t
->entries
[t
->entry_count
++] = e
;
1516 e
->tree
= new_tree_content(8);
1517 e
->versions
[1].mode
= S_IFDIR
;
1518 tree_content_set(e
, slash1
+ 1, sha1
, mode
, subtree
);
1521 e
->versions
[1].mode
= mode
;
1522 hashcpy(e
->versions
[1].sha1
, sha1
);
1524 hashclr(root
->versions
[1].sha1
);
1528 static int tree_content_remove(
1529 struct tree_entry
*root
,
1531 struct tree_entry
*backup_leaf
)
1533 struct tree_content
*t
= root
->tree
;
1536 struct tree_entry
*e
;
1538 slash1
= strchr(p
, '/');
1544 for (i
= 0; i
< t
->entry_count
; i
++) {
1546 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1547 if (slash1
&& !S_ISDIR(e
->versions
[1].mode
))
1549 * If p names a file in some subdirectory, and a
1550 * file or symlink matching the name of the
1551 * parent directory of p exists, then p cannot
1552 * exist and need not be deleted.
1555 if (!slash1
|| !S_ISDIR(e
->versions
[1].mode
))
1559 if (tree_content_remove(e
, slash1
+ 1, backup_leaf
)) {
1560 for (n
= 0; n
< e
->tree
->entry_count
; n
++) {
1561 if (e
->tree
->entries
[n
]->versions
[1].mode
) {
1562 hashclr(root
->versions
[1].sha1
);
1576 memcpy(backup_leaf
, e
, sizeof(*backup_leaf
));
1578 release_tree_content_recursive(e
->tree
);
1580 e
->versions
[1].mode
= 0;
1581 hashclr(e
->versions
[1].sha1
);
1582 hashclr(root
->versions
[1].sha1
);
1586 static int tree_content_get(
1587 struct tree_entry
*root
,
1589 struct tree_entry
*leaf
)
1591 struct tree_content
*t
= root
->tree
;
1594 struct tree_entry
*e
;
1596 slash1
= strchr(p
, '/');
1602 for (i
= 0; i
< t
->entry_count
; i
++) {
1604 if (e
->name
->str_len
== n
&& !strncmp(p
, e
->name
->str_dat
, n
)) {
1606 memcpy(leaf
, e
, sizeof(*leaf
));
1607 if (e
->tree
&& is_null_sha1(e
->versions
[1].sha1
))
1608 leaf
->tree
= dup_tree_content(e
->tree
);
1613 if (!S_ISDIR(e
->versions
[1].mode
))
1617 return tree_content_get(e
, slash1
+ 1, leaf
);
1623 static int update_branch(struct branch
*b
)
1625 static const char *msg
= "fast-import";
1626 struct ref_lock
*lock
;
1627 unsigned char old_sha1
[20];
1629 if (is_null_sha1(b
->sha1
))
1631 if (read_ref(b
->name
, old_sha1
))
1633 lock
= lock_any_ref_for_update(b
->name
, old_sha1
, 0);
1635 return error("Unable to lock %s", b
->name
);
1636 if (!force_update
&& !is_null_sha1(old_sha1
)) {
1637 struct commit
*old_cmit
, *new_cmit
;
1639 old_cmit
= lookup_commit_reference_gently(old_sha1
, 0);
1640 new_cmit
= lookup_commit_reference_gently(b
->sha1
, 0);
1641 if (!old_cmit
|| !new_cmit
) {
1643 return error("Branch %s is missing commits.", b
->name
);
1646 if (!in_merge_bases(old_cmit
, &new_cmit
, 1)) {
1648 warning("Not updating %s"
1649 " (new tip %s does not contain %s)",
1650 b
->name
, sha1_to_hex(b
->sha1
), sha1_to_hex(old_sha1
));
1654 if (write_ref_sha1(lock
, b
->sha1
, msg
) < 0)
1655 return error("Unable to update %s", b
->name
);
1659 static void dump_branches(void)
1664 for (i
= 0; i
< branch_table_sz
; i
++) {
1665 for (b
= branch_table
[i
]; b
; b
= b
->table_next_branch
)
1666 failure
|= update_branch(b
);
1670 static void dump_tags(void)
1672 static const char *msg
= "fast-import";
1674 struct ref_lock
*lock
;
1675 char ref_name
[PATH_MAX
];
1677 for (t
= first_tag
; t
; t
= t
->next_tag
) {
1678 sprintf(ref_name
, "tags/%s", t
->name
);
1679 lock
= lock_ref_sha1(ref_name
, NULL
);
1680 if (!lock
|| write_ref_sha1(lock
, t
->sha1
, msg
) < 0)
1681 failure
|= error("Unable to update %s", ref_name
);
1685 static void dump_marks_helper(FILE *f
,
1691 for (k
= 0; k
< 1024; k
++) {
1692 if (m
->data
.sets
[k
])
1693 dump_marks_helper(f
, base
+ (k
<< m
->shift
),
1697 for (k
= 0; k
< 1024; k
++) {
1698 if (m
->data
.marked
[k
])
1699 fprintf(f
, ":%" PRIuMAX
" %s\n", base
+ k
,
1700 sha1_to_hex(m
->data
.marked
[k
]->idx
.sha1
));
1705 static void dump_marks(void)
1707 static struct lock_file mark_lock
;
1711 if (!export_marks_file
)
1714 mark_fd
= hold_lock_file_for_update(&mark_lock
, export_marks_file
, 0);
1716 failure
|= error("Unable to write marks file %s: %s",
1717 export_marks_file
, strerror(errno
));
1721 f
= fdopen(mark_fd
, "w");
1723 int saved_errno
= errno
;
1724 rollback_lock_file(&mark_lock
);
1725 failure
|= error("Unable to write marks file %s: %s",
1726 export_marks_file
, strerror(saved_errno
));
1731 * Since the lock file was fdopen()'ed, it should not be close()'ed.
1732 * Assign -1 to the lock file descriptor so that commit_lock_file()
1733 * won't try to close() it.
1737 dump_marks_helper(f
, 0, marks
);
1738 if (ferror(f
) || fclose(f
)) {
1739 int saved_errno
= errno
;
1740 rollback_lock_file(&mark_lock
);
1741 failure
|= error("Unable to write marks file %s: %s",
1742 export_marks_file
, strerror(saved_errno
));
1746 if (commit_lock_file(&mark_lock
)) {
1747 int saved_errno
= errno
;
1748 rollback_lock_file(&mark_lock
);
1749 failure
|= error("Unable to commit marks file %s: %s",
1750 export_marks_file
, strerror(saved_errno
));
1755 static void read_marks(void)
1758 FILE *f
= fopen(import_marks_file
, "r");
1760 die_errno("cannot read '%s'", import_marks_file
);
1761 while (fgets(line
, sizeof(line
), f
)) {
1764 unsigned char sha1
[20];
1765 struct object_entry
*e
;
1767 end
= strchr(line
, '\n');
1768 if (line
[0] != ':' || !end
)
1769 die("corrupt mark line: %s", line
);
1771 mark
= strtoumax(line
+ 1, &end
, 10);
1772 if (!mark
|| end
== line
+ 1
1773 || *end
!= ' ' || get_sha1(end
+ 1, sha1
))
1774 die("corrupt mark line: %s", line
);
1775 e
= find_object(sha1
);
1777 enum object_type type
= sha1_object_info(sha1
, NULL
);
1779 die("object not found: %s", sha1_to_hex(sha1
));
1780 e
= insert_object(sha1
);
1782 e
->pack_id
= MAX_PACK_ID
;
1783 e
->idx
.offset
= 1; /* just not zero! */
1785 insert_mark(mark
, e
);
1790 static int read_next_command(void)
1792 static int stdin_eof
= 0;
1795 unread_command_buf
= 0;
1800 if (unread_command_buf
) {
1801 unread_command_buf
= 0;
1803 struct recent_command
*rc
;
1805 strbuf_detach(&command_buf
, NULL
);
1806 stdin_eof
= strbuf_getline(&command_buf
, stdin
, '\n');
1810 if (!seen_data_command
1811 && prefixcmp(command_buf
.buf
, "feature ")
1812 && prefixcmp(command_buf
.buf
, "option ")) {
1821 cmd_hist
.next
= rc
->next
;
1822 cmd_hist
.next
->prev
= &cmd_hist
;
1826 rc
->buf
= command_buf
.buf
;
1827 rc
->prev
= cmd_tail
;
1828 rc
->next
= cmd_hist
.prev
;
1829 rc
->prev
->next
= rc
;
1832 if (!prefixcmp(command_buf
.buf
, "cat-blob ")) {
1836 if (command_buf
.buf
[0] == '#')
1842 static void skip_optional_lf(void)
1844 int term_char
= fgetc(stdin
);
1845 if (term_char
!= '\n' && term_char
!= EOF
)
1846 ungetc(term_char
, stdin
);
1849 static void parse_mark(void)
1851 if (!prefixcmp(command_buf
.buf
, "mark :")) {
1852 next_mark
= strtoumax(command_buf
.buf
+ 6, NULL
, 10);
1853 read_next_command();
1859 static int parse_data(struct strbuf
*sb
, uintmax_t limit
, uintmax_t *len_res
)
1863 if (prefixcmp(command_buf
.buf
, "data "))
1864 die("Expected 'data n' command, found: %s", command_buf
.buf
);
1866 if (!prefixcmp(command_buf
.buf
+ 5, "<<")) {
1867 char *term
= xstrdup(command_buf
.buf
+ 5 + 2);
1868 size_t term_len
= command_buf
.len
- 5 - 2;
1870 strbuf_detach(&command_buf
, NULL
);
1872 if (strbuf_getline(&command_buf
, stdin
, '\n') == EOF
)
1873 die("EOF in data (terminator '%s' not found)", term
);
1874 if (term_len
== command_buf
.len
1875 && !strcmp(term
, command_buf
.buf
))
1877 strbuf_addbuf(sb
, &command_buf
);
1878 strbuf_addch(sb
, '\n');
1883 uintmax_t len
= strtoumax(command_buf
.buf
+ 5, NULL
, 10);
1884 size_t n
= 0, length
= (size_t)len
;
1886 if (limit
&& limit
< len
) {
1891 die("data is too large to use in this context");
1893 while (n
< length
) {
1894 size_t s
= strbuf_fread(sb
, length
- n
, stdin
);
1895 if (!s
&& feof(stdin
))
1896 die("EOF in data (%lu bytes remaining)",
1897 (unsigned long)(length
- n
));
1906 static int validate_raw_date(const char *src
, char *result
, int maxlen
)
1908 const char *orig_src
= src
;
1914 num
= strtoul(src
, &endp
, 10);
1915 /* NEEDSWORK: perhaps check for reasonable values? */
1916 if (errno
|| endp
== src
|| *endp
!= ' ')
1920 if (*src
!= '-' && *src
!= '+')
1923 num
= strtoul(src
+ 1, &endp
, 10);
1924 if (errno
|| endp
== src
+ 1 || *endp
|| (endp
- orig_src
) >= maxlen
||
1928 strcpy(result
, orig_src
);
1932 static char *parse_ident(const char *buf
)
1938 gt
= strrchr(buf
, '>');
1940 die("Missing > in ident string: %s", buf
);
1943 die("Missing space after > in ident string: %s", buf
);
1945 name_len
= gt
- buf
;
1946 ident
= xmalloc(name_len
+ 24);
1947 strncpy(ident
, buf
, name_len
);
1951 if (validate_raw_date(gt
, ident
+ name_len
, 24) < 0)
1952 die("Invalid raw date \"%s\" in ident: %s", gt
, buf
);
1954 case WHENSPEC_RFC2822
:
1955 if (parse_date(gt
, ident
+ name_len
, 24) < 0)
1956 die("Invalid rfc2822 date \"%s\" in ident: %s", gt
, buf
);
1959 if (strcmp("now", gt
))
1960 die("Date in ident must be 'now': %s", buf
);
1961 datestamp(ident
+ name_len
, 24);
1968 static void parse_and_store_blob(
1969 struct last_object
*last
,
1970 unsigned char *sha1out
,
1973 static struct strbuf buf
= STRBUF_INIT
;
1976 if (parse_data(&buf
, big_file_threshold
, &len
))
1977 store_object(OBJ_BLOB
, &buf
, last
, sha1out
, mark
);
1980 strbuf_release(&last
->data
);
1984 stream_blob(len
, sha1out
, mark
);
1989 static void parse_new_blob(void)
1991 read_next_command();
1993 parse_and_store_blob(&last_blob
, NULL
, next_mark
);
1996 static void unload_one_branch(void)
1998 while (cur_active_branches
1999 && cur_active_branches
>= max_active_branches
) {
2000 uintmax_t min_commit
= ULONG_MAX
;
2001 struct branch
*e
, *l
= NULL
, *p
= NULL
;
2003 for (e
= active_branches
; e
; e
= e
->active_next_branch
) {
2004 if (e
->last_commit
< min_commit
) {
2006 min_commit
= e
->last_commit
;
2012 e
= p
->active_next_branch
;
2013 p
->active_next_branch
= e
->active_next_branch
;
2015 e
= active_branches
;
2016 active_branches
= e
->active_next_branch
;
2019 e
->active_next_branch
= NULL
;
2020 if (e
->branch_tree
.tree
) {
2021 release_tree_content_recursive(e
->branch_tree
.tree
);
2022 e
->branch_tree
.tree
= NULL
;
2024 cur_active_branches
--;
2028 static void load_branch(struct branch
*b
)
2030 load_tree(&b
->branch_tree
);
2033 b
->active_next_branch
= active_branches
;
2034 active_branches
= b
;
2035 cur_active_branches
++;
2036 branch_load_count
++;
2040 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes
)
2042 unsigned char fanout
= 0;
2043 while ((num_notes
>>= 8))
2048 static void construct_path_with_fanout(const char *hex_sha1
,
2049 unsigned char fanout
, char *path
)
2051 unsigned int i
= 0, j
= 0;
2053 die("Too large fanout (%u)", fanout
);
2055 path
[i
++] = hex_sha1
[j
++];
2056 path
[i
++] = hex_sha1
[j
++];
2060 memcpy(path
+ i
, hex_sha1
+ j
, 40 - j
);
2061 path
[i
+ 40 - j
] = '\0';
2064 static uintmax_t do_change_note_fanout(
2065 struct tree_entry
*orig_root
, struct tree_entry
*root
,
2066 char *hex_sha1
, unsigned int hex_sha1_len
,
2067 char *fullpath
, unsigned int fullpath_len
,
2068 unsigned char fanout
)
2070 struct tree_content
*t
= root
->tree
;
2071 struct tree_entry
*e
, leaf
;
2072 unsigned int i
, tmp_hex_sha1_len
, tmp_fullpath_len
;
2073 uintmax_t num_notes
= 0;
2074 unsigned char sha1
[20];
2077 for (i
= 0; t
&& i
< t
->entry_count
; i
++) {
2079 tmp_hex_sha1_len
= hex_sha1_len
+ e
->name
->str_len
;
2080 tmp_fullpath_len
= fullpath_len
;
2083 * We're interested in EITHER existing note entries (entries
2084 * with exactly 40 hex chars in path, not including directory
2085 * separators), OR directory entries that may contain note
2086 * entries (with < 40 hex chars in path).
2087 * Also, each path component in a note entry must be a multiple
2090 if (!e
->versions
[1].mode
||
2091 tmp_hex_sha1_len
> 40 ||
2092 e
->name
->str_len
% 2)
2095 /* This _may_ be a note entry, or a subdir containing notes */
2096 memcpy(hex_sha1
+ hex_sha1_len
, e
->name
->str_dat
,
2098 if (tmp_fullpath_len
)
2099 fullpath
[tmp_fullpath_len
++] = '/';
2100 memcpy(fullpath
+ tmp_fullpath_len
, e
->name
->str_dat
,
2102 tmp_fullpath_len
+= e
->name
->str_len
;
2103 fullpath
[tmp_fullpath_len
] = '\0';
2105 if (tmp_hex_sha1_len
== 40 && !get_sha1_hex(hex_sha1
, sha1
)) {
2106 /* This is a note entry */
2107 construct_path_with_fanout(hex_sha1
, fanout
, realpath
);
2108 if (!strcmp(fullpath
, realpath
)) {
2109 /* Note entry is in correct location */
2114 /* Rename fullpath to realpath */
2115 if (!tree_content_remove(orig_root
, fullpath
, &leaf
))
2116 die("Failed to remove path %s", fullpath
);
2117 tree_content_set(orig_root
, realpath
,
2118 leaf
.versions
[1].sha1
,
2119 leaf
.versions
[1].mode
,
2121 } else if (S_ISDIR(e
->versions
[1].mode
)) {
2122 /* This is a subdir that may contain note entries */
2125 num_notes
+= do_change_note_fanout(orig_root
, e
,
2126 hex_sha1
, tmp_hex_sha1_len
,
2127 fullpath
, tmp_fullpath_len
, fanout
);
2130 /* The above may have reallocated the current tree_content */
2136 static uintmax_t change_note_fanout(struct tree_entry
*root
,
2137 unsigned char fanout
)
2139 char hex_sha1
[40], path
[60];
2140 return do_change_note_fanout(root
, root
, hex_sha1
, 0, path
, 0, fanout
);
2143 static void file_change_m(struct branch
*b
)
2145 const char *p
= command_buf
.buf
+ 2;
2146 static struct strbuf uq
= STRBUF_INIT
;
2148 struct object_entry
*oe
= oe
;
2149 unsigned char sha1
[20];
2150 uint16_t mode
, inline_data
= 0;
2152 p
= get_mode(p
, &mode
);
2154 die("Corrupt mode: %s", command_buf
.buf
);
2159 case S_IFREG
| 0644:
2160 case S_IFREG
| 0755:
2167 die("Corrupt mode: %s", command_buf
.buf
);
2172 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2173 hashcpy(sha1
, oe
->idx
.sha1
);
2175 } else if (!prefixcmp(p
, "inline")) {
2179 if (get_sha1_hex(p
, sha1
))
2180 die("Invalid SHA1: %s", command_buf
.buf
);
2181 oe
= find_object(sha1
);
2185 die("Missing space after SHA1: %s", command_buf
.buf
);
2188 if (!unquote_c_style(&uq
, p
, &endp
)) {
2190 die("Garbage after path in: %s", command_buf
.buf
);
2194 if (S_ISGITLINK(mode
)) {
2196 die("Git links cannot be specified 'inline': %s",
2199 if (oe
->type
!= OBJ_COMMIT
)
2200 die("Not a commit (actually a %s): %s",
2201 typename(oe
->type
), command_buf
.buf
);
2204 * Accept the sha1 without checking; it expected to be in
2205 * another repository.
2207 } else if (inline_data
) {
2209 die("Directories cannot be specified 'inline': %s",
2212 strbuf_addstr(&uq
, p
);
2215 read_next_command();
2216 parse_and_store_blob(&last_blob
, sha1
, 0);
2218 enum object_type expected
= S_ISDIR(mode
) ?
2220 enum object_type type
= oe
? oe
->type
:
2221 sha1_object_info(sha1
, NULL
);
2223 die("%s not found: %s",
2224 S_ISDIR(mode
) ? "Tree" : "Blob",
2226 if (type
!= expected
)
2227 die("Not a %s (actually a %s): %s",
2228 typename(expected
), typename(type
),
2232 tree_content_set(&b
->branch_tree
, p
, sha1
, mode
, NULL
);
2235 static void file_change_d(struct branch
*b
)
2237 const char *p
= command_buf
.buf
+ 2;
2238 static struct strbuf uq
= STRBUF_INIT
;
2242 if (!unquote_c_style(&uq
, p
, &endp
)) {
2244 die("Garbage after path in: %s", command_buf
.buf
);
2247 tree_content_remove(&b
->branch_tree
, p
, NULL
);
2250 static void file_change_cr(struct branch
*b
, int rename
)
2253 static struct strbuf s_uq
= STRBUF_INIT
;
2254 static struct strbuf d_uq
= STRBUF_INIT
;
2256 struct tree_entry leaf
;
2258 s
= command_buf
.buf
+ 2;
2259 strbuf_reset(&s_uq
);
2260 if (!unquote_c_style(&s_uq
, s
, &endp
)) {
2262 die("Missing space after source: %s", command_buf
.buf
);
2264 endp
= strchr(s
, ' ');
2266 die("Missing space after source: %s", command_buf
.buf
);
2267 strbuf_add(&s_uq
, s
, endp
- s
);
2273 die("Missing dest: %s", command_buf
.buf
);
2276 strbuf_reset(&d_uq
);
2277 if (!unquote_c_style(&d_uq
, d
, &endp
)) {
2279 die("Garbage after dest in: %s", command_buf
.buf
);
2283 memset(&leaf
, 0, sizeof(leaf
));
2285 tree_content_remove(&b
->branch_tree
, s
, &leaf
);
2287 tree_content_get(&b
->branch_tree
, s
, &leaf
);
2288 if (!leaf
.versions
[1].mode
)
2289 die("Path %s not in branch", s
);
2290 tree_content_set(&b
->branch_tree
, d
,
2291 leaf
.versions
[1].sha1
,
2292 leaf
.versions
[1].mode
,
2296 static void note_change_n(struct branch
*b
, unsigned char old_fanout
)
2298 const char *p
= command_buf
.buf
+ 2;
2299 static struct strbuf uq
= STRBUF_INIT
;
2300 struct object_entry
*oe
= oe
;
2302 unsigned char sha1
[20], commit_sha1
[20];
2304 uint16_t inline_data
= 0;
2305 unsigned char new_fanout
;
2307 /* <dataref> or 'inline' */
2310 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2311 hashcpy(sha1
, oe
->idx
.sha1
);
2313 } else if (!prefixcmp(p
, "inline")) {
2317 if (get_sha1_hex(p
, sha1
))
2318 die("Invalid SHA1: %s", command_buf
.buf
);
2319 oe
= find_object(sha1
);
2323 die("Missing space after SHA1: %s", command_buf
.buf
);
2326 s
= lookup_branch(p
);
2328 hashcpy(commit_sha1
, s
->sha1
);
2329 } else if (*p
== ':') {
2330 uintmax_t commit_mark
= strtoumax(p
+ 1, NULL
, 10);
2331 struct object_entry
*commit_oe
= find_mark(commit_mark
);
2332 if (commit_oe
->type
!= OBJ_COMMIT
)
2333 die("Mark :%" PRIuMAX
" not a commit", commit_mark
);
2334 hashcpy(commit_sha1
, commit_oe
->idx
.sha1
);
2335 } else if (!get_sha1(p
, commit_sha1
)) {
2337 char *buf
= read_object_with_reference(commit_sha1
,
2338 commit_type
, &size
, commit_sha1
);
2339 if (!buf
|| size
< 46)
2340 die("Not a valid commit: %s", p
);
2343 die("Invalid ref name or SHA1 expression: %s", p
);
2347 strbuf_addstr(&uq
, p
);
2350 read_next_command();
2351 parse_and_store_blob(&last_blob
, sha1
, 0);
2353 if (oe
->type
!= OBJ_BLOB
)
2354 die("Not a blob (actually a %s): %s",
2355 typename(oe
->type
), command_buf
.buf
);
2356 } else if (!is_null_sha1(sha1
)) {
2357 enum object_type type
= sha1_object_info(sha1
, NULL
);
2359 die("Blob not found: %s", command_buf
.buf
);
2360 if (type
!= OBJ_BLOB
)
2361 die("Not a blob (actually a %s): %s",
2362 typename(type
), command_buf
.buf
);
2365 construct_path_with_fanout(sha1_to_hex(commit_sha1
), old_fanout
, path
);
2366 if (tree_content_remove(&b
->branch_tree
, path
, NULL
))
2369 if (is_null_sha1(sha1
))
2370 return; /* nothing to insert */
2373 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2374 construct_path_with_fanout(sha1_to_hex(commit_sha1
), new_fanout
, path
);
2375 tree_content_set(&b
->branch_tree
, path
, sha1
, S_IFREG
| 0644, NULL
);
2378 static void file_change_deleteall(struct branch
*b
)
2380 release_tree_content_recursive(b
->branch_tree
.tree
);
2381 hashclr(b
->branch_tree
.versions
[0].sha1
);
2382 hashclr(b
->branch_tree
.versions
[1].sha1
);
2383 load_tree(&b
->branch_tree
);
2387 static void parse_from_commit(struct branch
*b
, char *buf
, unsigned long size
)
2389 if (!buf
|| size
< 46)
2390 die("Not a valid commit: %s", sha1_to_hex(b
->sha1
));
2391 if (memcmp("tree ", buf
, 5)
2392 || get_sha1_hex(buf
+ 5, b
->branch_tree
.versions
[1].sha1
))
2393 die("The commit %s is corrupt", sha1_to_hex(b
->sha1
));
2394 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2395 b
->branch_tree
.versions
[1].sha1
);
2398 static void parse_from_existing(struct branch
*b
)
2400 if (is_null_sha1(b
->sha1
)) {
2401 hashclr(b
->branch_tree
.versions
[0].sha1
);
2402 hashclr(b
->branch_tree
.versions
[1].sha1
);
2407 buf
= read_object_with_reference(b
->sha1
,
2408 commit_type
, &size
, b
->sha1
);
2409 parse_from_commit(b
, buf
, size
);
2414 static int parse_from(struct branch
*b
)
2419 if (prefixcmp(command_buf
.buf
, "from "))
2422 if (b
->branch_tree
.tree
) {
2423 release_tree_content_recursive(b
->branch_tree
.tree
);
2424 b
->branch_tree
.tree
= NULL
;
2427 from
= strchr(command_buf
.buf
, ' ') + 1;
2428 s
= lookup_branch(from
);
2430 die("Can't create a branch from itself: %s", b
->name
);
2432 unsigned char *t
= s
->branch_tree
.versions
[1].sha1
;
2433 hashcpy(b
->sha1
, s
->sha1
);
2434 hashcpy(b
->branch_tree
.versions
[0].sha1
, t
);
2435 hashcpy(b
->branch_tree
.versions
[1].sha1
, t
);
2436 } else if (*from
== ':') {
2437 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2438 struct object_entry
*oe
= find_mark(idnum
);
2439 if (oe
->type
!= OBJ_COMMIT
)
2440 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2441 hashcpy(b
->sha1
, oe
->idx
.sha1
);
2442 if (oe
->pack_id
!= MAX_PACK_ID
) {
2444 char *buf
= gfi_unpack_entry(oe
, &size
);
2445 parse_from_commit(b
, buf
, size
);
2448 parse_from_existing(b
);
2449 } else if (!get_sha1(from
, b
->sha1
))
2450 parse_from_existing(b
);
2452 die("Invalid ref name or SHA1 expression: %s", from
);
2454 read_next_command();
2458 static struct hash_list
*parse_merge(unsigned int *count
)
2460 struct hash_list
*list
= NULL
, *n
, *e
= e
;
2465 while (!prefixcmp(command_buf
.buf
, "merge ")) {
2466 from
= strchr(command_buf
.buf
, ' ') + 1;
2467 n
= xmalloc(sizeof(*n
));
2468 s
= lookup_branch(from
);
2470 hashcpy(n
->sha1
, s
->sha1
);
2471 else if (*from
== ':') {
2472 uintmax_t idnum
= strtoumax(from
+ 1, NULL
, 10);
2473 struct object_entry
*oe
= find_mark(idnum
);
2474 if (oe
->type
!= OBJ_COMMIT
)
2475 die("Mark :%" PRIuMAX
" not a commit", idnum
);
2476 hashcpy(n
->sha1
, oe
->idx
.sha1
);
2477 } else if (!get_sha1(from
, n
->sha1
)) {
2479 char *buf
= read_object_with_reference(n
->sha1
,
2480 commit_type
, &size
, n
->sha1
);
2481 if (!buf
|| size
< 46)
2482 die("Not a valid commit: %s", from
);
2485 die("Invalid ref name or SHA1 expression: %s", from
);
2494 read_next_command();
2499 static void parse_new_commit(void)
2501 static struct strbuf msg
= STRBUF_INIT
;
2504 char *author
= NULL
;
2505 char *committer
= NULL
;
2506 struct hash_list
*merge_list
= NULL
;
2507 unsigned int merge_count
;
2508 unsigned char prev_fanout
, new_fanout
;
2510 /* Obtain the branch name from the rest of our command */
2511 sp
= strchr(command_buf
.buf
, ' ') + 1;
2512 b
= lookup_branch(sp
);
2516 read_next_command();
2518 if (!prefixcmp(command_buf
.buf
, "author ")) {
2519 author
= parse_ident(command_buf
.buf
+ 7);
2520 read_next_command();
2522 if (!prefixcmp(command_buf
.buf
, "committer ")) {
2523 committer
= parse_ident(command_buf
.buf
+ 10);
2524 read_next_command();
2527 die("Expected committer but didn't get one");
2528 parse_data(&msg
, 0, NULL
);
2529 read_next_command();
2531 merge_list
= parse_merge(&merge_count
);
2533 /* ensure the branch is active/loaded */
2534 if (!b
->branch_tree
.tree
|| !max_active_branches
) {
2535 unload_one_branch();
2539 prev_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2542 while (command_buf
.len
> 0) {
2543 if (!prefixcmp(command_buf
.buf
, "M "))
2545 else if (!prefixcmp(command_buf
.buf
, "D "))
2547 else if (!prefixcmp(command_buf
.buf
, "R "))
2548 file_change_cr(b
, 1);
2549 else if (!prefixcmp(command_buf
.buf
, "C "))
2550 file_change_cr(b
, 0);
2551 else if (!prefixcmp(command_buf
.buf
, "N "))
2552 note_change_n(b
, prev_fanout
);
2553 else if (!strcmp("deleteall", command_buf
.buf
))
2554 file_change_deleteall(b
);
2556 unread_command_buf
= 1;
2559 if (read_next_command() == EOF
)
2563 new_fanout
= convert_num_notes_to_fanout(b
->num_notes
);
2564 if (new_fanout
!= prev_fanout
)
2565 b
->num_notes
= change_note_fanout(&b
->branch_tree
, new_fanout
);
2567 /* build the tree and the commit */
2568 store_tree(&b
->branch_tree
);
2569 hashcpy(b
->branch_tree
.versions
[0].sha1
,
2570 b
->branch_tree
.versions
[1].sha1
);
2572 strbuf_reset(&new_data
);
2573 strbuf_addf(&new_data
, "tree %s\n",
2574 sha1_to_hex(b
->branch_tree
.versions
[1].sha1
));
2575 if (!is_null_sha1(b
->sha1
))
2576 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(b
->sha1
));
2577 while (merge_list
) {
2578 struct hash_list
*next
= merge_list
->next
;
2579 strbuf_addf(&new_data
, "parent %s\n", sha1_to_hex(merge_list
->sha1
));
2583 strbuf_addf(&new_data
,
2587 author
? author
: committer
, committer
);
2588 strbuf_addbuf(&new_data
, &msg
);
2592 if (!store_object(OBJ_COMMIT
, &new_data
, NULL
, b
->sha1
, next_mark
))
2593 b
->pack_id
= pack_id
;
2594 b
->last_commit
= object_count_by_type
[OBJ_COMMIT
];
2597 static void parse_new_tag(void)
2599 static struct strbuf msg
= STRBUF_INIT
;
2605 uintmax_t from_mark
= 0;
2606 unsigned char sha1
[20];
2607 enum object_type type
;
2609 /* Obtain the new tag name from the rest of our command */
2610 sp
= strchr(command_buf
.buf
, ' ') + 1;
2611 t
= pool_alloc(sizeof(struct tag
));
2613 t
->name
= pool_strdup(sp
);
2615 last_tag
->next_tag
= t
;
2619 read_next_command();
2622 if (prefixcmp(command_buf
.buf
, "from "))
2623 die("Expected from command, got %s", command_buf
.buf
);
2624 from
= strchr(command_buf
.buf
, ' ') + 1;
2625 s
= lookup_branch(from
);
2627 hashcpy(sha1
, s
->sha1
);
2629 } else if (*from
== ':') {
2630 struct object_entry
*oe
;
2631 from_mark
= strtoumax(from
+ 1, NULL
, 10);
2632 oe
= find_mark(from_mark
);
2634 hashcpy(sha1
, oe
->idx
.sha1
);
2635 } else if (!get_sha1(from
, sha1
)) {
2639 buf
= read_sha1_file(sha1
, &type
, &size
);
2640 if (!buf
|| size
< 46)
2641 die("Not a valid commit: %s", from
);
2644 die("Invalid ref name or SHA1 expression: %s", from
);
2645 read_next_command();
2648 if (!prefixcmp(command_buf
.buf
, "tagger ")) {
2649 tagger
= parse_ident(command_buf
.buf
+ 7);
2650 read_next_command();
2654 /* tag payload/message */
2655 parse_data(&msg
, 0, NULL
);
2657 /* build the tag object */
2658 strbuf_reset(&new_data
);
2660 strbuf_addf(&new_data
,
2664 sha1_to_hex(sha1
), typename(type
), t
->name
);
2666 strbuf_addf(&new_data
,
2667 "tagger %s\n", tagger
);
2668 strbuf_addch(&new_data
, '\n');
2669 strbuf_addbuf(&new_data
, &msg
);
2672 if (store_object(OBJ_TAG
, &new_data
, NULL
, t
->sha1
, 0))
2673 t
->pack_id
= MAX_PACK_ID
;
2675 t
->pack_id
= pack_id
;
2678 static void parse_reset_branch(void)
2683 /* Obtain the branch name from the rest of our command */
2684 sp
= strchr(command_buf
.buf
, ' ') + 1;
2685 b
= lookup_branch(sp
);
2688 hashclr(b
->branch_tree
.versions
[0].sha1
);
2689 hashclr(b
->branch_tree
.versions
[1].sha1
);
2690 if (b
->branch_tree
.tree
) {
2691 release_tree_content_recursive(b
->branch_tree
.tree
);
2692 b
->branch_tree
.tree
= NULL
;
2697 read_next_command();
2699 if (command_buf
.len
> 0)
2700 unread_command_buf
= 1;
2703 static void cat_blob_write(const char *buf
, unsigned long size
)
2705 if (write_in_full(cat_blob_fd
, buf
, size
) != size
)
2706 die_errno("Write to frontend failed");
2709 static void cat_blob(struct object_entry
*oe
, unsigned char sha1
[20])
2711 struct strbuf line
= STRBUF_INIT
;
2713 enum object_type type
= 0;
2716 if (!oe
|| oe
->pack_id
== MAX_PACK_ID
) {
2717 buf
= read_sha1_file(sha1
, &type
, &size
);
2720 buf
= gfi_unpack_entry(oe
, &size
);
2724 * Output based on batch_one_object() from cat-file.c.
2727 strbuf_reset(&line
);
2728 strbuf_addf(&line
, "%s missing\n", sha1_to_hex(sha1
));
2729 cat_blob_write(line
.buf
, line
.len
);
2730 strbuf_release(&line
);
2735 die("Can't read object %s", sha1_to_hex(sha1
));
2736 if (type
!= OBJ_BLOB
)
2737 die("Object %s is a %s but a blob was expected.",
2738 sha1_to_hex(sha1
), typename(type
));
2739 strbuf_reset(&line
);
2740 strbuf_addf(&line
, "%s %s %lu\n", sha1_to_hex(sha1
),
2741 typename(type
), size
);
2742 cat_blob_write(line
.buf
, line
.len
);
2743 strbuf_release(&line
);
2744 cat_blob_write(buf
, size
);
2745 cat_blob_write("\n", 1);
2749 static void parse_cat_blob(void)
2752 struct object_entry
*oe
= oe
;
2753 unsigned char sha1
[20];
2755 /* cat-blob SP <object> LF */
2756 p
= command_buf
.buf
+ strlen("cat-blob ");
2759 oe
= find_mark(strtoumax(p
+ 1, &x
, 10));
2761 die("Invalid mark: %s", command_buf
.buf
);
2763 die("Unknown mark: %s", command_buf
.buf
);
2765 die("Garbage after mark: %s", command_buf
.buf
);
2766 hashcpy(sha1
, oe
->idx
.sha1
);
2768 if (get_sha1_hex(p
, sha1
))
2769 die("Invalid SHA1: %s", command_buf
.buf
);
2771 die("Garbage after SHA1: %s", command_buf
.buf
);
2772 oe
= find_object(sha1
);
2778 static void parse_checkpoint(void)
2789 static void parse_progress(void)
2791 fwrite(command_buf
.buf
, 1, command_buf
.len
, stdout
);
2792 fputc('\n', stdout
);
2797 static char* make_fast_import_path(const char *path
)
2799 struct strbuf abs_path
= STRBUF_INIT
;
2801 if (!relative_marks_paths
|| is_absolute_path(path
))
2802 return xstrdup(path
);
2803 strbuf_addf(&abs_path
, "%s/info/fast-import/%s", get_git_dir(), path
);
2804 return strbuf_detach(&abs_path
, NULL
);
2807 static void option_import_marks(const char *marks
, int from_stream
)
2809 if (import_marks_file
) {
2811 die("Only one import-marks command allowed per stream");
2813 /* read previous mark file */
2814 if(!import_marks_file_from_stream
)
2818 import_marks_file
= make_fast_import_path(marks
);
2819 safe_create_leading_directories_const(import_marks_file
);
2820 import_marks_file_from_stream
= from_stream
;
2823 static void option_date_format(const char *fmt
)
2825 if (!strcmp(fmt
, "raw"))
2826 whenspec
= WHENSPEC_RAW
;
2827 else if (!strcmp(fmt
, "rfc2822"))
2828 whenspec
= WHENSPEC_RFC2822
;
2829 else if (!strcmp(fmt
, "now"))
2830 whenspec
= WHENSPEC_NOW
;
2832 die("unknown --date-format argument %s", fmt
);
2835 static unsigned long ulong_arg(const char *option
, const char *arg
)
2838 unsigned long rv
= strtoul(arg
, &endptr
, 0);
2839 if (strchr(arg
, '-') || endptr
== arg
|| *endptr
)
2840 die("%s: argument must be a non-negative integer", option
);
2844 static void option_depth(const char *depth
)
2846 max_depth
= ulong_arg("--depth", depth
);
2847 if (max_depth
> MAX_DEPTH
)
2848 die("--depth cannot exceed %u", MAX_DEPTH
);
2851 static void option_active_branches(const char *branches
)
2853 max_active_branches
= ulong_arg("--active-branches", branches
);
2856 static void option_export_marks(const char *marks
)
2858 export_marks_file
= make_fast_import_path(marks
);
2859 safe_create_leading_directories_const(export_marks_file
);
2862 static void option_cat_blob_fd(const char *fd
)
2864 unsigned long n
= ulong_arg("--cat-blob-fd", fd
);
2865 if (n
> (unsigned long) INT_MAX
)
2866 die("--cat-blob-fd cannot exceed %d", INT_MAX
);
2867 cat_blob_fd
= (int) n
;
2870 static void option_export_pack_edges(const char *edges
)
2874 pack_edges
= fopen(edges
, "a");
2876 die_errno("Cannot open '%s'", edges
);
2879 static int parse_one_option(const char *option
)
2881 if (!prefixcmp(option
, "max-pack-size=")) {
2883 if (!git_parse_ulong(option
+ 14, &v
))
2886 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v
);
2888 } else if (v
< 1024 * 1024) {
2889 warning("minimum max-pack-size is 1 MiB");
2893 } else if (!prefixcmp(option
, "big-file-threshold=")) {
2895 if (!git_parse_ulong(option
+ 19, &v
))
2897 big_file_threshold
= v
;
2898 } else if (!prefixcmp(option
, "depth=")) {
2899 option_depth(option
+ 6);
2900 } else if (!prefixcmp(option
, "active-branches=")) {
2901 option_active_branches(option
+ 16);
2902 } else if (!prefixcmp(option
, "export-pack-edges=")) {
2903 option_export_pack_edges(option
+ 18);
2904 } else if (!prefixcmp(option
, "quiet")) {
2906 } else if (!prefixcmp(option
, "stats")) {
2915 static int parse_one_feature(const char *feature
, int from_stream
)
2917 if (!prefixcmp(feature
, "date-format=")) {
2918 option_date_format(feature
+ 12);
2919 } else if (!prefixcmp(feature
, "import-marks=")) {
2920 option_import_marks(feature
+ 13, from_stream
);
2921 } else if (!prefixcmp(feature
, "export-marks=")) {
2922 option_export_marks(feature
+ 13);
2923 } else if (!strcmp(feature
, "cat-blob")) {
2924 ; /* Don't die - this feature is supported */
2925 } else if (!prefixcmp(feature
, "relative-marks")) {
2926 relative_marks_paths
= 1;
2927 } else if (!prefixcmp(feature
, "no-relative-marks")) {
2928 relative_marks_paths
= 0;
2929 } else if (!prefixcmp(feature
, "force")) {
2938 static void parse_feature(void)
2940 char *feature
= command_buf
.buf
+ 8;
2942 if (seen_data_command
)
2943 die("Got feature command '%s' after data command", feature
);
2945 if (parse_one_feature(feature
, 1))
2948 die("This version of fast-import does not support feature %s.", feature
);
2951 static void parse_option(void)
2953 char *option
= command_buf
.buf
+ 11;
2955 if (seen_data_command
)
2956 die("Got option command '%s' after data command", option
);
2958 if (parse_one_option(option
))
2961 die("This version of fast-import does not support option: %s", option
);
2964 static int git_pack_config(const char *k
, const char *v
, void *cb
)
2966 if (!strcmp(k
, "pack.depth")) {
2967 max_depth
= git_config_int(k
, v
);
2968 if (max_depth
> MAX_DEPTH
)
2969 max_depth
= MAX_DEPTH
;
2972 if (!strcmp(k
, "pack.compression")) {
2973 int level
= git_config_int(k
, v
);
2975 level
= Z_DEFAULT_COMPRESSION
;
2976 else if (level
< 0 || level
> Z_BEST_COMPRESSION
)
2977 die("bad pack compression level %d", level
);
2978 pack_compression_level
= level
;
2979 pack_compression_seen
= 1;
2982 if (!strcmp(k
, "pack.indexversion")) {
2983 pack_idx_default_version
= git_config_int(k
, v
);
2984 if (pack_idx_default_version
> 2)
2985 die("bad pack.indexversion=%"PRIu32
,
2986 pack_idx_default_version
);
2989 if (!strcmp(k
, "pack.packsizelimit")) {
2990 max_packsize
= git_config_ulong(k
, v
);
2993 if (!strcmp(k
, "core.bigfilethreshold")) {
2994 long n
= git_config_int(k
, v
);
2995 big_file_threshold
= 0 < n
? n
: 0;
2997 return git_default_config(k
, v
, cb
);
3000 static const char fast_import_usage
[] =
3001 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3003 static void parse_argv(void)
3007 for (i
= 1; i
< global_argc
; i
++) {
3008 const char *a
= global_argv
[i
];
3010 if (*a
!= '-' || !strcmp(a
, "--"))
3013 if (parse_one_option(a
+ 2))
3016 if (parse_one_feature(a
+ 2, 0))
3019 if (!prefixcmp(a
+ 2, "cat-blob-fd=")) {
3020 option_cat_blob_fd(a
+ 2 + strlen("cat-blob-fd="));
3024 die("unknown option %s", a
);
3026 if (i
!= global_argc
)
3027 usage(fast_import_usage
);
3029 seen_data_command
= 1;
3030 if (import_marks_file
)
3034 int main(int argc
, const char **argv
)
3038 git_extract_argv0_path(argv
[0]);
3040 if (argc
== 2 && !strcmp(argv
[1], "-h"))
3041 usage(fast_import_usage
);
3043 setup_git_directory();
3044 git_config(git_pack_config
, NULL
);
3045 if (!pack_compression_seen
&& core_compression_seen
)
3046 pack_compression_level
= core_compression_level
;
3048 alloc_objects(object_entry_alloc
);
3049 strbuf_init(&command_buf
, 0);
3050 atom_table
= xcalloc(atom_table_sz
, sizeof(struct atom_str
*));
3051 branch_table
= xcalloc(branch_table_sz
, sizeof(struct branch
*));
3052 avail_tree_table
= xcalloc(avail_tree_table_sz
, sizeof(struct avail_tree_content
*));
3053 marks
= pool_calloc(1, sizeof(struct mark_set
));
3058 rc_free
= pool_alloc(cmd_save
* sizeof(*rc_free
));
3059 for (i
= 0; i
< (cmd_save
- 1); i
++)
3060 rc_free
[i
].next
= &rc_free
[i
+ 1];
3061 rc_free
[cmd_save
- 1].next
= NULL
;
3063 prepare_packed_git();
3065 set_die_routine(die_nicely
);
3066 while (read_next_command() != EOF
) {
3067 if (!strcmp("blob", command_buf
.buf
))
3069 else if (!prefixcmp(command_buf
.buf
, "commit "))
3071 else if (!prefixcmp(command_buf
.buf
, "tag "))
3073 else if (!prefixcmp(command_buf
.buf
, "reset "))
3074 parse_reset_branch();
3075 else if (!strcmp("checkpoint", command_buf
.buf
))
3077 else if (!prefixcmp(command_buf
.buf
, "progress "))
3079 else if (!prefixcmp(command_buf
.buf
, "feature "))
3081 else if (!prefixcmp(command_buf
.buf
, "option git "))
3083 else if (!prefixcmp(command_buf
.buf
, "option "))
3084 /* ignore non-git options*/;
3086 die("Unsupported command: %s", command_buf
.buf
);
3089 /* argv hasn't been parsed yet, do so */
3090 if (!seen_data_command
)
3104 uintmax_t total_count
= 0, duplicate_count
= 0;
3105 for (i
= 0; i
< ARRAY_SIZE(object_count_by_type
); i
++)
3106 total_count
+= object_count_by_type
[i
];
3107 for (i
= 0; i
< ARRAY_SIZE(duplicate_count_by_type
); i
++)
3108 duplicate_count
+= duplicate_count_by_type
[i
];
3110 fprintf(stderr
, "%s statistics:\n", argv
[0]);
3111 fprintf(stderr
, "---------------------------------------------------------------------\n");
3112 fprintf(stderr
, "Alloc'd objects: %10" PRIuMAX
"\n", alloc_count
);
3113 fprintf(stderr
, "Total objects: %10" PRIuMAX
" (%10" PRIuMAX
" duplicates )\n", total_count
, duplicate_count
);
3114 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
]);
3115 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
]);
3116 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
]);
3117 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
]);
3118 fprintf(stderr
, "Total branches: %10lu (%10lu loads )\n", branch_count
, branch_load_count
);
3119 fprintf(stderr
, " marks: %10" PRIuMAX
" (%10" PRIuMAX
" unique )\n", (((uintmax_t)1) << marks
->shift
) * 1024, marks_set_count
);
3120 fprintf(stderr
, " atoms: %10u\n", atom_cnt
);
3121 fprintf(stderr
, "Memory total: %10" PRIuMAX
" KiB\n", (total_allocd
+ alloc_count
*sizeof(struct object_entry
))/1024);
3122 fprintf(stderr
, " pools: %10lu KiB\n", (unsigned long)(total_allocd
/1024));
3123 fprintf(stderr
, " objects: %10" PRIuMAX
" KiB\n", (alloc_count
*sizeof(struct object_entry
))/1024);
3124 fprintf(stderr
, "---------------------------------------------------------------------\n");
3126 fprintf(stderr
, "---------------------------------------------------------------------\n");
3127 fprintf(stderr
, "\n");
3130 return failure
? 1 : 0;