]>
Commit | Line | Data |
---|---|---|
463acbe1 SP |
1 | /* |
2 | Format of STDIN stream: | |
3 | ||
4 | stream ::= cmd*; | |
5 | ||
6 | cmd ::= new_blob | |
c44cdc7e | 7 | | new_commit |
463acbe1 | 8 | | new_tag |
5fced8dc | 9 | | reset_branch |
8c1f22da | 10 | | checkpoint |
ac053c02 | 11 | | progress |
463acbe1 SP |
12 | ; |
13 | ||
c44cdc7e | 14 | new_blob ::= 'blob' lf |
c905e090 | 15 | mark? |
c44cdc7e SP |
16 | file_content; |
17 | file_content ::= data; | |
463acbe1 | 18 | |
c44cdc7e | 19 | new_commit ::= 'commit' sp ref_str lf |
00e2b884 | 20 | mark? |
63e0c8b3 SP |
21 | ('author' sp name '<' email '>' when lf)? |
22 | 'committer' sp name '<' email '>' when lf | |
00e2b884 | 23 | commit_msg |
02f3389d | 24 | ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)? |
62b6f483 | 25 | ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)* |
c44cdc7e | 26 | file_change* |
1fdb649c | 27 | lf?; |
c44cdc7e | 28 | commit_msg ::= data; |
463acbe1 | 29 | |
b6f3481b SP |
30 | file_change ::= file_clr |
31 | | file_del | |
32 | | file_rnm | |
33 | | file_cpy | |
34 | | file_obm | |
35 | | file_inm; | |
825769a8 | 36 | file_clr ::= 'deleteall' lf; |
b715cfbb | 37 | file_del ::= 'D' sp path_str lf; |
f39a946a | 38 | file_rnm ::= 'R' sp path_str sp path_str lf; |
b6f3481b | 39 | file_cpy ::= 'C' sp path_str sp path_str lf; |
b715cfbb SP |
40 | file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf; |
41 | file_inm ::= 'M' sp mode sp 'inline' sp path_str lf | |
42 | data; | |
c44cdc7e SP |
43 | |
44 | new_tag ::= 'tag' sp tag_str lf | |
45 | 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf | |
88fbf67b | 46 | ('tagger' sp name '<' email '>' when lf)? |
c44cdc7e SP |
47 | tag_msg; |
48 | tag_msg ::= data; | |
49 | ||
9938ffc5 SP |
50 | reset_branch ::= 'reset' sp ref_str lf |
51 | ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)? | |
1fdb649c | 52 | lf?; |
5fced8dc | 53 | |
7bfe6e26 | 54 | checkpoint ::= 'checkpoint' lf |
1fdb649c | 55 | lf?; |
7bfe6e26 | 56 | |
ac053c02 SP |
57 | progress ::= 'progress' sp not_lf* lf |
58 | lf?; | |
59 | ||
c44cdc7e SP |
60 | # note: the first idnum in a stream should be 1 and subsequent |
61 | # idnums should not have gaps between values as this will cause | |
62 | # the stream parser to reserve space for the gapped values. An | |
c905e090 | 63 | # idnum can be updated in the future to a new object by issuing |
c44cdc7e | 64 | # a new mark directive with the old idnum. |
c905e090 | 65 | # |
c44cdc7e | 66 | mark ::= 'mark' sp idnum lf; |
3b4dce02 | 67 | data ::= (delimited_data | exact_data) |
2c570cde | 68 | lf?; |
3b4dce02 SP |
69 | |
70 | # note: delim may be any string but must not contain lf. | |
71 | # data_line may contain any data but must not be exactly | |
72 | # delim. | |
73 | delimited_data ::= 'data' sp '<<' delim lf | |
74 | (data_line lf)* | |
c905e090 | 75 | delim lf; |
c44cdc7e SP |
76 | |
77 | # note: declen indicates the length of binary_data in bytes. | |
3b4dce02 | 78 | # declen does not include the lf preceeding the binary data. |
c44cdc7e | 79 | # |
3b4dce02 SP |
80 | exact_data ::= 'data' sp declen lf |
81 | binary_data; | |
c44cdc7e SP |
82 | |
83 | # note: quoted strings are C-style quoting supporting \c for | |
84 | # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn | |
c905e090 | 85 | # is the signed byte value in octal. Note that the only |
c44cdc7e SP |
86 | # characters which must actually be escaped to protect the |
87 | # stream formatting is: \, " and LF. Otherwise these values | |
c905e090 | 88 | # are UTF8. |
c44cdc7e | 89 | # |
6c3aac1c SP |
90 | ref_str ::= ref; |
91 | sha1exp_str ::= sha1exp; | |
92 | tag_str ::= tag; | |
c44cdc7e | 93 | path_str ::= path | '"' quoted(path) '"' ; |
b715cfbb SP |
94 | mode ::= '100644' | '644' |
95 | | '100755' | '755' | |
9981b6d9 | 96 | | '120000' |
b715cfbb | 97 | ; |
c44cdc7e SP |
98 | |
99 | declen ::= # unsigned 32 bit value, ascii base10 notation; | |
2104838b | 100 | bigint ::= # unsigned integer value, ascii base10 notation; |
463acbe1 | 101 | binary_data ::= # file content, not interpreted; |
c44cdc7e | 102 | |
63e0c8b3 SP |
103 | when ::= raw_when | rfc2822_when; |
104 | raw_when ::= ts sp tz; | |
105 | rfc2822_when ::= # Valid RFC 2822 date and time; | |
106 | ||
463acbe1 SP |
107 | sp ::= # ASCII space character; |
108 | lf ::= # ASCII newline (LF) character; | |
c44cdc7e SP |
109 | |
110 | # note: a colon (':') must precede the numerical value assigned to | |
c905e090 | 111 | # an idnum. This is to distinguish it from a ref or tag name as |
c44cdc7e | 112 | # GIT does not permit ':' in ref or tag strings. |
c905e090 | 113 | # |
2104838b | 114 | idnum ::= ':' bigint; |
c44cdc7e SP |
115 | path ::= # GIT style file path, e.g. "a/b/c"; |
116 | ref ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT"; | |
117 | tag ::= # GIT tag name, e.g. "FIREFOX_1_5"; | |
463acbe1 SP |
118 | sha1exp ::= # Any valid GIT SHA1 expression; |
119 | hexsha1 ::= # SHA1 in hexadecimal format; | |
c44cdc7e SP |
120 | |
121 | # note: name and email are UTF8 strings, however name must not | |
c905e090 | 122 | # contain '<' or lf and email must not contain any of the |
c44cdc7e | 123 | # following: '<', '>', lf. |
c905e090 | 124 | # |
c44cdc7e | 125 | name ::= # valid GIT author/committer name; |
463acbe1 | 126 | email ::= # valid GIT author/committer email; |
c44cdc7e SP |
127 | ts ::= # time since the epoch in seconds, ascii base10 notation; |
128 | tz ::= # GIT style timezone; | |
401d53fa SP |
129 | |
130 | # note: comments may appear anywhere in the input, except | |
131 | # within a data command. Any form of the data command | |
132 | # always escapes the related input from comment processing. | |
133 | # | |
134 | # In case it is not clear, the '#' that starts the comment | |
135 | # must be the first character on that the line (an lf have | |
136 | # preceeded it). | |
137 | # | |
138 | comment ::= '#' not_lf* lf; | |
139 | not_lf ::= # Any byte that is not ASCII newline (LF); | |
463acbe1 SP |
140 | */ |
141 | ||
db5e523f SP |
142 | #include "builtin.h" |
143 | #include "cache.h" | |
144 | #include "object.h" | |
145 | #include "blob.h" | |
463acbe1 | 146 | #include "tree.h" |
7073e69e | 147 | #include "commit.h" |
db5e523f SP |
148 | #include "delta.h" |
149 | #include "pack.h" | |
463acbe1 | 150 | #include "refs.h" |
db5e523f | 151 | #include "csum-file.h" |
c44cdc7e | 152 | #include "quote.h" |
2fb3f6db | 153 | #include "exec_cmd.h" |
db5e523f | 154 | |
69e74e74 SP |
155 | #define PACK_ID_BITS 16 |
156 | #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) | |
436e7a74 SP |
157 | #define DEPTH_BITS 13 |
158 | #define MAX_DEPTH ((1<<DEPTH_BITS)-1) | |
69e74e74 | 159 | |
27d6d290 SP |
160 | struct object_entry |
161 | { | |
162 | struct object_entry *next; | |
10831c55 | 163 | uint32_t offset; |
436e7a74 SP |
164 | uint32_t type : TYPE_BITS, |
165 | pack_id : PACK_ID_BITS, | |
166 | depth : DEPTH_BITS; | |
27d6d290 SP |
167 | unsigned char sha1[20]; |
168 | }; | |
169 | ||
463acbe1 | 170 | struct object_entry_pool |
27d6d290 | 171 | { |
463acbe1 | 172 | struct object_entry_pool *next_pool; |
27d6d290 SP |
173 | struct object_entry *next_free; |
174 | struct object_entry *end; | |
ac47a738 | 175 | struct object_entry entries[FLEX_ARRAY]; /* more */ |
27d6d290 SP |
176 | }; |
177 | ||
d8397168 SP |
178 | struct mark_set |
179 | { | |
d8397168 SP |
180 | union { |
181 | struct object_entry *marked[1024]; | |
182 | struct mark_set *sets[1024]; | |
183 | } data; | |
6f64f6d9 | 184 | unsigned int shift; |
d8397168 SP |
185 | }; |
186 | ||
ac47a738 SP |
187 | struct last_object |
188 | { | |
05576569 | 189 | struct strbuf data; |
10831c55 | 190 | uint32_t offset; |
6bb5b329 | 191 | unsigned int depth; |
05576569 | 192 | unsigned no_swap : 1; |
ac47a738 SP |
193 | }; |
194 | ||
463acbe1 SP |
195 | struct mem_pool |
196 | { | |
197 | struct mem_pool *next_pool; | |
198 | char *next_free; | |
199 | char *end; | |
69ae5175 | 200 | uintmax_t space[FLEX_ARRAY]; /* more */ |
463acbe1 SP |
201 | }; |
202 | ||
203 | struct atom_str | |
204 | { | |
205 | struct atom_str *next_atom; | |
10831c55 | 206 | unsigned short str_len; |
463acbe1 SP |
207 | char str_dat[FLEX_ARRAY]; /* more */ |
208 | }; | |
209 | ||
210 | struct tree_content; | |
6bb5b329 SP |
211 | struct tree_entry |
212 | { | |
463acbe1 SP |
213 | struct tree_content *tree; |
214 | struct atom_str* name; | |
4cabf858 SP |
215 | struct tree_entry_ms |
216 | { | |
10831c55 | 217 | uint16_t mode; |
4cabf858 SP |
218 | unsigned char sha1[20]; |
219 | } versions[2]; | |
6bb5b329 SP |
220 | }; |
221 | ||
463acbe1 | 222 | struct tree_content |
6bb5b329 | 223 | { |
463acbe1 SP |
224 | unsigned int entry_capacity; /* must match avail_tree_content */ |
225 | unsigned int entry_count; | |
4cabf858 | 226 | unsigned int delta_depth; |
463acbe1 SP |
227 | struct tree_entry *entries[FLEX_ARRAY]; /* more */ |
228 | }; | |
229 | ||
230 | struct avail_tree_content | |
231 | { | |
232 | unsigned int entry_capacity; /* must match tree_content */ | |
233 | struct avail_tree_content *next_avail; | |
6bb5b329 SP |
234 | }; |
235 | ||
236 | struct branch | |
237 | { | |
463acbe1 SP |
238 | struct branch *table_next_branch; |
239 | struct branch *active_next_branch; | |
6bb5b329 | 240 | const char *name; |
463acbe1 | 241 | struct tree_entry branch_tree; |
69e74e74 | 242 | uintmax_t last_commit; |
734c91f9 SP |
243 | unsigned active : 1; |
244 | unsigned pack_id : PACK_ID_BITS; | |
463acbe1 | 245 | unsigned char sha1[20]; |
6bb5b329 SP |
246 | }; |
247 | ||
72303d44 SP |
248 | struct tag |
249 | { | |
250 | struct tag *next_tag; | |
251 | const char *name; | |
2369ed79 | 252 | unsigned int pack_id; |
72303d44 SP |
253 | unsigned char sha1[20]; |
254 | }; | |
255 | ||
62b6f483 SP |
256 | struct hash_list |
257 | { | |
258 | struct hash_list *next; | |
259 | unsigned char sha1[20]; | |
260 | }; | |
463acbe1 | 261 | |
63e0c8b3 SP |
262 | typedef enum { |
263 | WHENSPEC_RAW = 1, | |
264 | WHENSPEC_RFC2822, | |
265 | WHENSPEC_NOW, | |
266 | } whenspec_type; | |
267 | ||
904b1941 SP |
268 | struct recent_command |
269 | { | |
270 | struct recent_command *prev; | |
271 | struct recent_command *next; | |
272 | char *buf; | |
273 | }; | |
274 | ||
0ea9f045 | 275 | /* Configured limits on output */ |
d5c57b28 | 276 | static unsigned long max_depth = 10; |
6777a59f | 277 | static off_t max_packsize = (1LL << 32) - 1; |
7073e69e | 278 | static int force_update; |
bb23fdfa SP |
279 | static int pack_compression_level = Z_DEFAULT_COMPRESSION; |
280 | static int pack_compression_seen; | |
0ea9f045 SP |
281 | |
282 | /* Stats and misc. counters */ | |
283 | static uintmax_t alloc_count; | |
0ea9f045 SP |
284 | static uintmax_t marks_set_count; |
285 | static uintmax_t object_count_by_type[1 << TYPE_BITS]; | |
286 | static uintmax_t duplicate_count_by_type[1 << TYPE_BITS]; | |
287 | static uintmax_t delta_count_by_type[1 << TYPE_BITS]; | |
a7ddc487 | 288 | static unsigned long object_count; |
6bb5b329 | 289 | static unsigned long branch_count; |
d6c7eb2c | 290 | static unsigned long branch_load_count; |
7073e69e | 291 | static int failure; |
bdf1c06d | 292 | static FILE *pack_edges; |
ac47a738 | 293 | |
463acbe1 SP |
294 | /* Memory pools */ |
295 | static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); | |
296 | static size_t total_allocd; | |
297 | static struct mem_pool *mem_pool; | |
298 | ||
c44cdc7e | 299 | /* Atom management */ |
463acbe1 SP |
300 | static unsigned int atom_table_sz = 4451; |
301 | static unsigned int atom_cnt; | |
302 | static struct atom_str **atom_table; | |
303 | ||
304 | /* The .pack file being generated */ | |
7bfe6e26 | 305 | static unsigned int pack_id; |
d489bc14 | 306 | static struct packed_git *pack_data; |
7bfe6e26 | 307 | static struct packed_git **all_packs; |
41e5257f | 308 | static unsigned long pack_size; |
ac47a738 SP |
309 | |
310 | /* Table of objects we've written. */ | |
4cabf858 | 311 | static unsigned int object_entry_alloc = 5000; |
463acbe1 SP |
312 | static struct object_entry_pool *blocks; |
313 | static struct object_entry *object_table[1 << 16]; | |
d8397168 | 314 | static struct mark_set *marks; |
a6a1a831 | 315 | static const char* mark_file; |
ac47a738 SP |
316 | |
317 | /* Our last blob */ | |
05576569 | 318 | static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 }; |
463acbe1 SP |
319 | |
320 | /* Tree management */ | |
321 | static unsigned int tree_entry_alloc = 1000; | |
322 | static void *avail_tree_entry; | |
323 | static unsigned int avail_tree_table_sz = 100; | |
324 | static struct avail_tree_content **avail_tree_table; | |
eec813cf PH |
325 | static struct strbuf old_tree = STRBUF_INIT; |
326 | static struct strbuf new_tree = STRBUF_INIT; | |
8bcce301 | 327 | |
6bb5b329 | 328 | /* Branch data */ |
d5c57b28 SP |
329 | static unsigned long max_active_branches = 5; |
330 | static unsigned long cur_active_branches; | |
331 | static unsigned long branch_table_sz = 1039; | |
463acbe1 SP |
332 | static struct branch **branch_table; |
333 | static struct branch *active_branches; | |
334 | ||
72303d44 SP |
335 | /* Tag data */ |
336 | static struct tag *first_tag; | |
337 | static struct tag *last_tag; | |
338 | ||
c44cdc7e | 339 | /* Input stream parsing */ |
63e0c8b3 | 340 | static whenspec_type whenspec = WHENSPEC_RAW; |
4a241d79 | 341 | static struct strbuf command_buf = STRBUF_INIT; |
1fdb649c | 342 | static int unread_command_buf; |
904b1941 SP |
343 | static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL}; |
344 | static struct recent_command *cmd_tail = &cmd_hist; | |
345 | static struct recent_command *rc_free; | |
346 | static unsigned int cmd_save = 100; | |
0ea9f045 | 347 | static uintmax_t next_mark; |
eec813cf | 348 | static struct strbuf new_data = STRBUF_INIT; |
c44cdc7e | 349 | |
8acb3297 SP |
350 | static void write_branch_report(FILE *rpt, struct branch *b) |
351 | { | |
352 | fprintf(rpt, "%s:\n", b->name); | |
353 | ||
354 | fprintf(rpt, " status :"); | |
355 | if (b->active) | |
356 | fputs(" active", rpt); | |
357 | if (b->branch_tree.tree) | |
358 | fputs(" loaded", rpt); | |
359 | if (is_null_sha1(b->branch_tree.versions[1].sha1)) | |
360 | fputs(" dirty", rpt); | |
361 | fputc('\n', rpt); | |
362 | ||
363 | fprintf(rpt, " tip commit : %s\n", sha1_to_hex(b->sha1)); | |
364 | fprintf(rpt, " old tree : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1)); | |
365 | fprintf(rpt, " cur tree : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1)); | |
366 | fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit); | |
367 | ||
368 | fputs(" last pack : ", rpt); | |
369 | if (b->pack_id < MAX_PACK_ID) | |
370 | fprintf(rpt, "%u", b->pack_id); | |
371 | fputc('\n', rpt); | |
372 | ||
373 | fputc('\n', rpt); | |
374 | } | |
375 | ||
3b08e5b8 SP |
376 | static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *); |
377 | ||
4bf53833 | 378 | static void write_crash_report(const char *err) |
8acb3297 | 379 | { |
85e72830 | 380 | char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid()); |
8acb3297 SP |
381 | FILE *rpt = fopen(loc, "w"); |
382 | struct branch *b; | |
383 | unsigned long lu; | |
904b1941 | 384 | struct recent_command *rc; |
8acb3297 SP |
385 | |
386 | if (!rpt) { | |
387 | error("can't write crash report %s: %s", loc, strerror(errno)); | |
388 | return; | |
389 | } | |
390 | ||
391 | fprintf(stderr, "fast-import: dumping crash report to %s\n", loc); | |
392 | ||
393 | fprintf(rpt, "fast-import crash report:\n"); | |
85e72830 DSP |
394 | fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid()); |
395 | fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid()); | |
8acb3297 SP |
396 | fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL)); |
397 | fputc('\n', rpt); | |
398 | ||
399 | fputs("fatal: ", rpt); | |
4bf53833 | 400 | fputs(err, rpt); |
8acb3297 SP |
401 | fputc('\n', rpt); |
402 | ||
904b1941 SP |
403 | fputc('\n', rpt); |
404 | fputs("Most Recent Commands Before Crash\n", rpt); | |
405 | fputs("---------------------------------\n", rpt); | |
406 | for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) { | |
407 | if (rc->next == &cmd_hist) | |
408 | fputs("* ", rpt); | |
409 | else | |
410 | fputs(" ", rpt); | |
411 | fputs(rc->buf, rpt); | |
412 | fputc('\n', rpt); | |
413 | } | |
414 | ||
8acb3297 SP |
415 | fputc('\n', rpt); |
416 | fputs("Active Branch LRU\n", rpt); | |
417 | fputs("-----------------\n", rpt); | |
418 | fprintf(rpt, " active_branches = %lu cur, %lu max\n", | |
419 | cur_active_branches, | |
420 | max_active_branches); | |
421 | fputc('\n', rpt); | |
422 | fputs(" pos clock name\n", rpt); | |
423 | fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt); | |
424 | for (b = active_branches, lu = 0; b; b = b->active_next_branch) | |
425 | fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n", | |
426 | ++lu, b->last_commit, b->name); | |
427 | ||
428 | fputc('\n', rpt); | |
429 | fputs("Inactive Branches\n", rpt); | |
430 | fputs("-----------------\n", rpt); | |
431 | for (lu = 0; lu < branch_table_sz; lu++) { | |
432 | for (b = branch_table[lu]; b; b = b->table_next_branch) | |
433 | write_branch_report(rpt, b); | |
434 | } | |
435 | ||
fbc63ea6 SP |
436 | if (first_tag) { |
437 | struct tag *tg; | |
438 | fputc('\n', rpt); | |
439 | fputs("Annotated Tags\n", rpt); | |
440 | fputs("--------------\n", rpt); | |
441 | for (tg = first_tag; tg; tg = tg->next_tag) { | |
442 | fputs(sha1_to_hex(tg->sha1), rpt); | |
443 | fputc(' ', rpt); | |
444 | fputs(tg->name, rpt); | |
445 | fputc('\n', rpt); | |
446 | } | |
447 | } | |
448 | ||
3b08e5b8 SP |
449 | fputc('\n', rpt); |
450 | fputs("Marks\n", rpt); | |
451 | fputs("-----\n", rpt); | |
452 | if (mark_file) | |
453 | fprintf(rpt, " exported to %s\n", mark_file); | |
454 | else | |
455 | dump_marks_helper(rpt, 0, marks); | |
456 | ||
8acb3297 SP |
457 | fputc('\n', rpt); |
458 | fputs("-------------------\n", rpt); | |
459 | fputs("END OF CRASH REPORT\n", rpt); | |
460 | fclose(rpt); | |
461 | } | |
462 | ||
118805b9 SP |
463 | static void end_packfile(void); |
464 | static void unkeep_all_packs(void); | |
465 | static void dump_marks(void); | |
466 | ||
8acb3297 SP |
467 | static NORETURN void die_nicely(const char *err, va_list params) |
468 | { | |
469 | static int zombie; | |
4bf53833 | 470 | char message[2 * PATH_MAX]; |
8acb3297 | 471 | |
4bf53833 | 472 | vsnprintf(message, sizeof(message), err, params); |
8acb3297 | 473 | fputs("fatal: ", stderr); |
4bf53833 | 474 | fputs(message, stderr); |
8acb3297 SP |
475 | fputc('\n', stderr); |
476 | ||
477 | if (!zombie) { | |
478 | zombie = 1; | |
4bf53833 | 479 | write_crash_report(message); |
118805b9 SP |
480 | end_packfile(); |
481 | unkeep_all_packs(); | |
482 | dump_marks(); | |
8acb3297 | 483 | } |
8acb3297 SP |
484 | exit(128); |
485 | } | |
6bb5b329 | 486 | |
03842d8e | 487 | static void alloc_objects(unsigned int cnt) |
8bcce301 | 488 | { |
463acbe1 | 489 | struct object_entry_pool *b; |
27d6d290 | 490 | |
463acbe1 | 491 | b = xmalloc(sizeof(struct object_entry_pool) |
27d6d290 | 492 | + cnt * sizeof(struct object_entry)); |
463acbe1 | 493 | b->next_pool = blocks; |
27d6d290 SP |
494 | b->next_free = b->entries; |
495 | b->end = b->entries + cnt; | |
496 | blocks = b; | |
497 | alloc_count += cnt; | |
498 | } | |
8bcce301 | 499 | |
e5b1444b | 500 | static struct object_entry *new_object(unsigned char *sha1) |
8bcce301 | 501 | { |
27d6d290 | 502 | struct object_entry *e; |
8bcce301 | 503 | |
27d6d290 | 504 | if (blocks->next_free == blocks->end) |
463acbe1 | 505 | alloc_objects(object_entry_alloc); |
8bcce301 | 506 | |
27d6d290 | 507 | e = blocks->next_free++; |
445b8599 | 508 | hashcpy(e->sha1, sha1); |
27d6d290 | 509 | return e; |
8bcce301 SP |
510 | } |
511 | ||
e5b1444b | 512 | static struct object_entry *find_object(unsigned char *sha1) |
463acbe1 SP |
513 | { |
514 | unsigned int h = sha1[0] << 8 | sha1[1]; | |
515 | struct object_entry *e; | |
516 | for (e = object_table[h]; e; e = e->next) | |
445b8599 | 517 | if (!hashcmp(sha1, e->sha1)) |
463acbe1 SP |
518 | return e; |
519 | return NULL; | |
520 | } | |
521 | ||
e5b1444b | 522 | static struct object_entry *insert_object(unsigned char *sha1) |
8bcce301 SP |
523 | { |
524 | unsigned int h = sha1[0] << 8 | sha1[1]; | |
27d6d290 | 525 | struct object_entry *e = object_table[h]; |
463acbe1 | 526 | struct object_entry *p = NULL; |
8bcce301 SP |
527 | |
528 | while (e) { | |
445b8599 | 529 | if (!hashcmp(sha1, e->sha1)) |
8bcce301 SP |
530 | return e; |
531 | p = e; | |
532 | e = e->next; | |
533 | } | |
534 | ||
535 | e = new_object(sha1); | |
463acbe1 | 536 | e->next = NULL; |
8bcce301 SP |
537 | e->offset = 0; |
538 | if (p) | |
539 | p->next = e; | |
540 | else | |
27d6d290 | 541 | object_table[h] = e; |
8bcce301 SP |
542 | return e; |
543 | } | |
db5e523f | 544 | |
463acbe1 SP |
545 | static unsigned int hc_str(const char *s, size_t len) |
546 | { | |
547 | unsigned int r = 0; | |
548 | while (len-- > 0) | |
549 | r = r * 31 + *s++; | |
550 | return r; | |
551 | } | |
552 | ||
e5b1444b | 553 | static void *pool_alloc(size_t len) |
463acbe1 SP |
554 | { |
555 | struct mem_pool *p; | |
556 | void *r; | |
557 | ||
2fad5329 YT |
558 | /* round up to a 'uintmax_t' alignment */ |
559 | if (len & (sizeof(uintmax_t) - 1)) | |
560 | len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1)); | |
561 | ||
463acbe1 SP |
562 | for (p = mem_pool; p; p = p->next_pool) |
563 | if ((p->end - p->next_free >= len)) | |
564 | break; | |
565 | ||
566 | if (!p) { | |
567 | if (len >= (mem_pool_alloc/2)) { | |
568 | total_allocd += len; | |
569 | return xmalloc(len); | |
570 | } | |
571 | total_allocd += sizeof(struct mem_pool) + mem_pool_alloc; | |
572 | p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc); | |
573 | p->next_pool = mem_pool; | |
69ae5175 | 574 | p->next_free = (char *) p->space; |
463acbe1 SP |
575 | p->end = p->next_free + mem_pool_alloc; |
576 | mem_pool = p; | |
577 | } | |
578 | ||
579 | r = p->next_free; | |
580 | p->next_free += len; | |
581 | return r; | |
582 | } | |
583 | ||
e5b1444b | 584 | static void *pool_calloc(size_t count, size_t size) |
463acbe1 SP |
585 | { |
586 | size_t len = count * size; | |
587 | void *r = pool_alloc(len); | |
588 | memset(r, 0, len); | |
589 | return r; | |
590 | } | |
591 | ||
e5b1444b | 592 | static char *pool_strdup(const char *s) |
463acbe1 SP |
593 | { |
594 | char *r = pool_alloc(strlen(s) + 1); | |
595 | strcpy(r, s); | |
596 | return r; | |
597 | } | |
598 | ||
0ea9f045 | 599 | static void insert_mark(uintmax_t idnum, struct object_entry *oe) |
d8397168 SP |
600 | { |
601 | struct mark_set *s = marks; | |
602 | while ((idnum >> s->shift) >= 1024) { | |
603 | s = pool_calloc(1, sizeof(struct mark_set)); | |
604 | s->shift = marks->shift + 10; | |
605 | s->data.sets[0] = marks; | |
606 | marks = s; | |
607 | } | |
608 | while (s->shift) { | |
0ea9f045 | 609 | uintmax_t i = idnum >> s->shift; |
d8397168 SP |
610 | idnum -= i << s->shift; |
611 | if (!s->data.sets[i]) { | |
612 | s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set)); | |
613 | s->data.sets[i]->shift = s->shift - 10; | |
614 | } | |
615 | s = s->data.sets[i]; | |
616 | } | |
617 | if (!s->data.marked[idnum]) | |
618 | marks_set_count++; | |
619 | s->data.marked[idnum] = oe; | |
620 | } | |
621 | ||
e5b1444b | 622 | static struct object_entry *find_mark(uintmax_t idnum) |
d8397168 | 623 | { |
0ea9f045 | 624 | uintmax_t orig_idnum = idnum; |
d8397168 SP |
625 | struct mark_set *s = marks; |
626 | struct object_entry *oe = NULL; | |
627 | if ((idnum >> s->shift) < 1024) { | |
628 | while (s && s->shift) { | |
0ea9f045 | 629 | uintmax_t i = idnum >> s->shift; |
d8397168 SP |
630 | idnum -= i << s->shift; |
631 | s = s->data.sets[i]; | |
632 | } | |
633 | if (s) | |
634 | oe = s->data.marked[idnum]; | |
635 | } | |
636 | if (!oe) | |
3efb1f34 | 637 | die("mark :%" PRIuMAX " not declared", orig_idnum); |
d8397168 SP |
638 | return oe; |
639 | } | |
640 | ||
e5b1444b | 641 | static struct atom_str *to_atom(const char *s, unsigned short len) |
463acbe1 SP |
642 | { |
643 | unsigned int hc = hc_str(s, len) % atom_table_sz; | |
644 | struct atom_str *c; | |
645 | ||
646 | for (c = atom_table[hc]; c; c = c->next_atom) | |
647 | if (c->str_len == len && !strncmp(s, c->str_dat, len)) | |
648 | return c; | |
649 | ||
650 | c = pool_alloc(sizeof(struct atom_str) + len + 1); | |
651 | c->str_len = len; | |
652 | strncpy(c->str_dat, s, len); | |
653 | c->str_dat[len] = 0; | |
654 | c->next_atom = atom_table[hc]; | |
655 | atom_table[hc] = c; | |
656 | atom_cnt++; | |
657 | return c; | |
658 | } | |
659 | ||
e5b1444b | 660 | static struct branch *lookup_branch(const char *name) |
463acbe1 SP |
661 | { |
662 | unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz; | |
663 | struct branch *b; | |
664 | ||
665 | for (b = branch_table[hc]; b; b = b->table_next_branch) | |
666 | if (!strcmp(name, b->name)) | |
667 | return b; | |
668 | return NULL; | |
669 | } | |
670 | ||
e5b1444b | 671 | static struct branch *new_branch(const char *name) |
463acbe1 SP |
672 | { |
673 | unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz; | |
674 | struct branch* b = lookup_branch(name); | |
675 | ||
676 | if (b) | |
677 | die("Invalid attempt to create duplicate branch: %s", name); | |
ea08a6fd | 678 | switch (check_ref_format(name)) { |
257f3020 JH |
679 | case 0: break; /* its valid */ |
680 | case CHECK_REF_FORMAT_ONELEVEL: | |
681 | break; /* valid, but too few '/', allow anyway */ | |
ea08a6fd | 682 | default: |
c44cdc7e | 683 | die("Branch name doesn't conform to GIT standards: %s", name); |
ea08a6fd | 684 | } |
463acbe1 SP |
685 | |
686 | b = pool_calloc(1, sizeof(struct branch)); | |
687 | b->name = pool_strdup(name); | |
688 | b->table_next_branch = branch_table[hc]; | |
8a8c55ea SP |
689 | b->branch_tree.versions[0].mode = S_IFDIR; |
690 | b->branch_tree.versions[1].mode = S_IFDIR; | |
734c91f9 | 691 | b->active = 0; |
69e74e74 | 692 | b->pack_id = MAX_PACK_ID; |
463acbe1 SP |
693 | branch_table[hc] = b; |
694 | branch_count++; | |
695 | return b; | |
696 | } | |
697 | ||
698 | static unsigned int hc_entries(unsigned int cnt) | |
699 | { | |
700 | cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8; | |
701 | return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1; | |
702 | } | |
703 | ||
e5b1444b | 704 | static struct tree_content *new_tree_content(unsigned int cnt) |
463acbe1 SP |
705 | { |
706 | struct avail_tree_content *f, *l = NULL; | |
707 | struct tree_content *t; | |
708 | unsigned int hc = hc_entries(cnt); | |
709 | ||
710 | for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail) | |
711 | if (f->entry_capacity >= cnt) | |
712 | break; | |
713 | ||
714 | if (f) { | |
715 | if (l) | |
716 | l->next_avail = f->next_avail; | |
717 | else | |
718 | avail_tree_table[hc] = f->next_avail; | |
719 | } else { | |
720 | cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt; | |
721 | f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt); | |
722 | f->entry_capacity = cnt; | |
723 | } | |
724 | ||
725 | t = (struct tree_content*)f; | |
726 | t->entry_count = 0; | |
4cabf858 | 727 | t->delta_depth = 0; |
463acbe1 SP |
728 | return t; |
729 | } | |
730 | ||
731 | static void release_tree_entry(struct tree_entry *e); | |
732 | static void release_tree_content(struct tree_content *t) | |
733 | { | |
734 | struct avail_tree_content *f = (struct avail_tree_content*)t; | |
735 | unsigned int hc = hc_entries(f->entry_capacity); | |
afde8dd9 SP |
736 | f->next_avail = avail_tree_table[hc]; |
737 | avail_tree_table[hc] = f; | |
738 | } | |
739 | ||
740 | static void release_tree_content_recursive(struct tree_content *t) | |
741 | { | |
463acbe1 SP |
742 | unsigned int i; |
743 | for (i = 0; i < t->entry_count; i++) | |
744 | release_tree_entry(t->entries[i]); | |
afde8dd9 | 745 | release_tree_content(t); |
463acbe1 SP |
746 | } |
747 | ||
e5b1444b | 748 | static struct tree_content *grow_tree_content( |
463acbe1 SP |
749 | struct tree_content *t, |
750 | int amt) | |
751 | { | |
752 | struct tree_content *r = new_tree_content(t->entry_count + amt); | |
753 | r->entry_count = t->entry_count; | |
4cabf858 | 754 | r->delta_depth = t->delta_depth; |
463acbe1 SP |
755 | memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0])); |
756 | release_tree_content(t); | |
757 | return r; | |
758 | } | |
759 | ||
e5b1444b | 760 | static struct tree_entry *new_tree_entry(void) |
463acbe1 SP |
761 | { |
762 | struct tree_entry *e; | |
763 | ||
764 | if (!avail_tree_entry) { | |
765 | unsigned int n = tree_entry_alloc; | |
8435a9cb | 766 | total_allocd += n * sizeof(struct tree_entry); |
463acbe1 | 767 | avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry)); |
2eb26d84 | 768 | while (n-- > 1) { |
463acbe1 SP |
769 | *((void**)e) = e + 1; |
770 | e++; | |
771 | } | |
35ef237c | 772 | *((void**)e) = NULL; |
463acbe1 SP |
773 | } |
774 | ||
775 | e = avail_tree_entry; | |
776 | avail_tree_entry = *((void**)e); | |
777 | return e; | |
778 | } | |
779 | ||
780 | static void release_tree_entry(struct tree_entry *e) | |
781 | { | |
782 | if (e->tree) | |
afde8dd9 | 783 | release_tree_content_recursive(e->tree); |
463acbe1 SP |
784 | *((void**)e) = avail_tree_entry; |
785 | avail_tree_entry = e; | |
786 | } | |
787 | ||
b6f3481b SP |
788 | static struct tree_content *dup_tree_content(struct tree_content *s) |
789 | { | |
790 | struct tree_content *d; | |
791 | struct tree_entry *a, *b; | |
792 | unsigned int i; | |
793 | ||
794 | if (!s) | |
795 | return NULL; | |
796 | d = new_tree_content(s->entry_count); | |
797 | for (i = 0; i < s->entry_count; i++) { | |
798 | a = s->entries[i]; | |
799 | b = new_tree_entry(); | |
800 | memcpy(b, a, sizeof(*a)); | |
801 | if (a->tree && is_null_sha1(b->versions[1].sha1)) | |
802 | b->tree = dup_tree_content(a->tree); | |
803 | else | |
804 | b->tree = NULL; | |
805 | d->entries[i] = b; | |
806 | } | |
807 | d->entry_count = s->entry_count; | |
808 | d->delta_depth = s->delta_depth; | |
809 | ||
810 | return d; | |
811 | } | |
812 | ||
fd99224e | 813 | static void start_packfile(void) |
f70b6534 | 814 | { |
8455e484 | 815 | static char tmpfile[PATH_MAX]; |
7bfe6e26 | 816 | struct packed_git *p; |
f70b6534 | 817 | struct pack_header hdr; |
0fcbcae7 | 818 | int pack_fd; |
f70b6534 | 819 | |
6e180cdc JH |
820 | pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile), |
821 | "pack/tmp_pack_XXXXXX"); | |
8455e484 SP |
822 | p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2); |
823 | strcpy(p->pack_name, tmpfile); | |
7bfe6e26 | 824 | p->pack_fd = pack_fd; |
f70b6534 SP |
825 | |
826 | hdr.hdr_signature = htonl(PACK_SIGNATURE); | |
827 | hdr.hdr_version = htonl(2); | |
828 | hdr.hdr_entries = 0; | |
0fcbcae7 | 829 | write_or_die(p->pack_fd, &hdr, sizeof(hdr)); |
7bfe6e26 SP |
830 | |
831 | pack_data = p; | |
f70b6534 SP |
832 | pack_size = sizeof(hdr); |
833 | object_count = 0; | |
7bfe6e26 SP |
834 | |
835 | all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1)); | |
836 | all_packs[pack_id] = p; | |
f70b6534 SP |
837 | } |
838 | ||
f70b6534 SP |
839 | static int oecmp (const void *a_, const void *b_) |
840 | { | |
841 | struct object_entry *a = *((struct object_entry**)a_); | |
842 | struct object_entry *b = *((struct object_entry**)b_); | |
843 | return hashcmp(a->sha1, b->sha1); | |
844 | } | |
845 | ||
e5b1444b | 846 | static char *create_index(void) |
f70b6534 | 847 | { |
8455e484 | 848 | static char tmpfile[PATH_MAX]; |
9126f009 | 849 | git_SHA_CTX ctx; |
f70b6534 SP |
850 | struct sha1file *f; |
851 | struct object_entry **idx, **c, **last, *e; | |
852 | struct object_entry_pool *o; | |
ebea9dd4 | 853 | uint32_t array[256]; |
8455e484 | 854 | int i, idx_fd; |
f70b6534 SP |
855 | |
856 | /* Build the sorted table of object IDs. */ | |
857 | idx = xmalloc(object_count * sizeof(struct object_entry*)); | |
858 | c = idx; | |
859 | for (o = blocks; o; o = o->next_pool) | |
d9ee53ce SP |
860 | for (e = o->next_free; e-- != o->entries;) |
861 | if (pack_id == e->pack_id) | |
862 | *c++ = e; | |
f70b6534 | 863 | last = idx + object_count; |
2fce1f3c SP |
864 | if (c != last) |
865 | die("internal consistency error creating the index"); | |
f70b6534 SP |
866 | qsort(idx, object_count, sizeof(struct object_entry*), oecmp); |
867 | ||
868 | /* Generate the fan-out array. */ | |
869 | c = idx; | |
870 | for (i = 0; i < 256; i++) { | |
ba19a808 | 871 | struct object_entry **next = c; |
f70b6534 SP |
872 | while (next < last) { |
873 | if ((*next)->sha1[0] != i) | |
874 | break; | |
875 | next++; | |
876 | } | |
877 | array[i] = htonl(next - idx); | |
878 | c = next; | |
879 | } | |
880 | ||
6e180cdc JH |
881 | idx_fd = odb_mkstemp(tmpfile, sizeof(tmpfile), |
882 | "pack/tmp_idx_XXXXXX"); | |
8455e484 | 883 | f = sha1fd(idx_fd, tmpfile); |
f70b6534 | 884 | sha1write(f, array, 256 * sizeof(int)); |
9126f009 | 885 | git_SHA1_Init(&ctx); |
f70b6534 | 886 | for (c = idx; c != last; c++) { |
ebea9dd4 | 887 | uint32_t offset = htonl((*c)->offset); |
f70b6534 SP |
888 | sha1write(f, &offset, 4); |
889 | sha1write(f, (*c)->sha1, sizeof((*c)->sha1)); | |
9126f009 | 890 | git_SHA1_Update(&ctx, (*c)->sha1, 20); |
f70b6534 | 891 | } |
09543c96 | 892 | sha1write(f, pack_data->sha1, sizeof(pack_data->sha1)); |
4c81b03e | 893 | sha1close(f, NULL, CSUM_FSYNC); |
f70b6534 | 894 | free(idx); |
9126f009 | 895 | git_SHA1_Final(pack_data->sha1, &ctx); |
8455e484 SP |
896 | return tmpfile; |
897 | } | |
898 | ||
e5b1444b | 899 | static char *keep_pack(char *curr_index_name) |
8455e484 SP |
900 | { |
901 | static char name[PATH_MAX]; | |
3a55602e | 902 | static const char *keep_msg = "fast-import"; |
8455e484 SP |
903 | int keep_fd; |
904 | ||
905 | chmod(pack_data->pack_name, 0444); | |
906 | chmod(curr_index_name, 0444); | |
907 | ||
6e180cdc | 908 | keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1); |
8455e484 SP |
909 | if (keep_fd < 0) |
910 | die("cannot create keep file"); | |
95693d45 JM |
911 | write_or_die(keep_fd, keep_msg, strlen(keep_msg)); |
912 | if (close(keep_fd)) | |
913 | die("failed to write keep file"); | |
8455e484 SP |
914 | |
915 | snprintf(name, sizeof(name), "%s/pack/pack-%s.pack", | |
916 | get_object_directory(), sha1_to_hex(pack_data->sha1)); | |
917 | if (move_temp_to_file(pack_data->pack_name, name)) | |
918 | die("cannot store pack file"); | |
8455e484 SP |
919 | |
920 | snprintf(name, sizeof(name), "%s/pack/pack-%s.idx", | |
921 | get_object_directory(), sha1_to_hex(pack_data->sha1)); | |
922 | if (move_temp_to_file(curr_index_name, name)) | |
923 | die("cannot store index file"); | |
924 | return name; | |
925 | } | |
926 | ||
fd99224e | 927 | static void unkeep_all_packs(void) |
8455e484 SP |
928 | { |
929 | static char name[PATH_MAX]; | |
930 | int k; | |
931 | ||
932 | for (k = 0; k < pack_id; k++) { | |
933 | struct packed_git *p = all_packs[k]; | |
934 | snprintf(name, sizeof(name), "%s/pack/pack-%s.keep", | |
935 | get_object_directory(), sha1_to_hex(p->sha1)); | |
936 | unlink(name); | |
937 | } | |
f70b6534 SP |
938 | } |
939 | ||
fd99224e | 940 | static void end_packfile(void) |
f70b6534 | 941 | { |
7bfe6e26 SP |
942 | struct packed_git *old_p = pack_data, *new_p; |
943 | ||
3d20c636 | 944 | clear_delta_base_cache(); |
3e005baf | 945 | if (object_count) { |
8455e484 | 946 | char *idx_name; |
2369ed79 SP |
947 | int i; |
948 | struct branch *b; | |
949 | struct tag *t; | |
8455e484 | 950 | |
c9ced051 | 951 | close_pack_windows(pack_data); |
8b0eca7c | 952 | fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1, |
abeb40e5 NP |
953 | pack_data->pack_name, object_count, |
954 | NULL, 0); | |
8b0eca7c | 955 | close(pack_data->pack_fd); |
8455e484 | 956 | idx_name = keep_pack(create_index()); |
3e005baf SP |
957 | |
958 | /* Register the packfile with core git's machinary. */ | |
959 | new_p = add_packed_git(idx_name, strlen(idx_name), 1); | |
960 | if (!new_p) | |
961 | die("core git rejected index %s", idx_name); | |
2369ed79 | 962 | all_packs[pack_id] = new_p; |
3e005baf | 963 | install_packed_git(new_p); |
2369ed79 SP |
964 | |
965 | /* Print the boundary */ | |
bdf1c06d SP |
966 | if (pack_edges) { |
967 | fprintf(pack_edges, "%s:", new_p->pack_name); | |
968 | for (i = 0; i < branch_table_sz; i++) { | |
969 | for (b = branch_table[i]; b; b = b->table_next_branch) { | |
970 | if (b->pack_id == pack_id) | |
971 | fprintf(pack_edges, " %s", sha1_to_hex(b->sha1)); | |
972 | } | |
2369ed79 | 973 | } |
bdf1c06d SP |
974 | for (t = first_tag; t; t = t->next_tag) { |
975 | if (t->pack_id == pack_id) | |
976 | fprintf(pack_edges, " %s", sha1_to_hex(t->sha1)); | |
977 | } | |
978 | fputc('\n', pack_edges); | |
979 | fflush(pack_edges); | |
2369ed79 | 980 | } |
2369ed79 SP |
981 | |
982 | pack_id++; | |
3e005baf | 983 | } |
87c8a56e JS |
984 | else { |
985 | close(old_p->pack_fd); | |
3e005baf | 986 | unlink(old_p->pack_name); |
87c8a56e | 987 | } |
7bfe6e26 | 988 | free(old_p); |
7bfe6e26 SP |
989 | |
990 | /* We can't carry a delta across packfiles. */ | |
05576569 | 991 | strbuf_release(&last_blob.data); |
7bfe6e26 SP |
992 | last_blob.offset = 0; |
993 | last_blob.depth = 0; | |
f70b6534 SP |
994 | } |
995 | ||
820b9310 | 996 | static void cycle_packfile(void) |
d9ee53ce SP |
997 | { |
998 | end_packfile(); | |
999 | start_packfile(); | |
1000 | } | |
1001 | ||
c44cdc7e | 1002 | static size_t encode_header( |
ac47a738 | 1003 | enum object_type type, |
c44cdc7e | 1004 | size_t size, |
ac47a738 | 1005 | unsigned char *hdr) |
db5e523f SP |
1006 | { |
1007 | int n = 1; | |
1008 | unsigned char c; | |
1009 | ||
1fcdd62a | 1010 | if (type < OBJ_COMMIT || type > OBJ_REF_DELTA) |
db5e523f SP |
1011 | die("bad type %d", type); |
1012 | ||
1013 | c = (type << 4) | (size & 15); | |
1014 | size >>= 4; | |
1015 | while (size) { | |
1016 | *hdr++ = c | 0x80; | |
1017 | c = size & 0x7f; | |
1018 | size >>= 7; | |
1019 | n++; | |
1020 | } | |
1021 | *hdr = c; | |
1022 | return n; | |
1023 | } | |
1024 | ||
ac47a738 SP |
1025 | static int store_object( |
1026 | enum object_type type, | |
eec813cf | 1027 | struct strbuf *dat, |
6bb5b329 | 1028 | struct last_object *last, |
d8397168 | 1029 | unsigned char *sha1out, |
0ea9f045 | 1030 | uintmax_t mark) |
db5e523f | 1031 | { |
db5e523f | 1032 | void *out, *delta; |
ac47a738 SP |
1033 | struct object_entry *e; |
1034 | unsigned char hdr[96]; | |
1035 | unsigned char sha1[20]; | |
db5e523f | 1036 | unsigned long hdrlen, deltalen; |
9126f009 | 1037 | git_SHA_CTX c; |
ac47a738 SP |
1038 | z_stream s; |
1039 | ||
df843662 | 1040 | hdrlen = sprintf((char*)hdr,"%s %lu", typename(type), |
eec813cf | 1041 | (unsigned long)dat->len) + 1; |
9126f009 NP |
1042 | git_SHA1_Init(&c); |
1043 | git_SHA1_Update(&c, hdr, hdrlen); | |
1044 | git_SHA1_Update(&c, dat->buf, dat->len); | |
1045 | git_SHA1_Final(sha1, &c); | |
6bb5b329 | 1046 | if (sha1out) |
445b8599 | 1047 | hashcpy(sha1out, sha1); |
ac47a738 SP |
1048 | |
1049 | e = insert_object(sha1); | |
d8397168 SP |
1050 | if (mark) |
1051 | insert_mark(mark, e); | |
ac47a738 | 1052 | if (e->offset) { |
6143f064 | 1053 | duplicate_count_by_type[type]++; |
463acbe1 | 1054 | return 1; |
a5c1780a SP |
1055 | } else if (find_sha1_pack(sha1, packed_git)) { |
1056 | e->type = type; | |
1057 | e->pack_id = MAX_PACK_ID; | |
1058 | e->offset = 1; /* just not zero! */ | |
1059 | duplicate_count_by_type[type]++; | |
1060 | return 1; | |
ac47a738 | 1061 | } |
db5e523f | 1062 | |
05576569 PH |
1063 | if (last && last->data.buf && last->depth < max_depth) { |
1064 | delta = diff_delta(last->data.buf, last->data.len, | |
eec813cf | 1065 | dat->buf, dat->len, |
db5e523f | 1066 | &deltalen, 0); |
eec813cf | 1067 | if (delta && deltalen >= dat->len) { |
d9ee53ce SP |
1068 | free(delta); |
1069 | delta = NULL; | |
1070 | } | |
1071 | } else | |
1072 | delta = NULL; | |
db5e523f SP |
1073 | |
1074 | memset(&s, 0, sizeof(s)); | |
bb23fdfa | 1075 | deflateInit(&s, pack_compression_level); |
d9ee53ce SP |
1076 | if (delta) { |
1077 | s.next_in = delta; | |
1078 | s.avail_in = deltalen; | |
1079 | } else { | |
eec813cf PH |
1080 | s.next_in = (void *)dat->buf; |
1081 | s.avail_in = dat->len; | |
d9ee53ce SP |
1082 | } |
1083 | s.avail_out = deflateBound(&s, s.avail_in); | |
1084 | s.next_out = out = xmalloc(s.avail_out); | |
1085 | while (deflate(&s, Z_FINISH) == Z_OK) | |
1086 | /* nothing */; | |
1087 | deflateEnd(&s); | |
1088 | ||
1089 | /* Determine if we should auto-checkpoint. */ | |
e5808826 | 1090 | if ((pack_size + 60 + s.total_out) > max_packsize |
d9ee53ce SP |
1091 | || (pack_size + 60 + s.total_out) < pack_size) { |
1092 | ||
1093 | /* This new object needs to *not* have the current pack_id. */ | |
1094 | e->pack_id = pack_id + 1; | |
820b9310 | 1095 | cycle_packfile(); |
d9ee53ce SP |
1096 | |
1097 | /* We cannot carry a delta into the new pack. */ | |
1098 | if (delta) { | |
1099 | free(delta); | |
1100 | delta = NULL; | |
5d6f3ef6 SP |
1101 | |
1102 | memset(&s, 0, sizeof(s)); | |
bb23fdfa | 1103 | deflateInit(&s, pack_compression_level); |
eec813cf PH |
1104 | s.next_in = (void *)dat->buf; |
1105 | s.avail_in = dat->len; | |
5d6f3ef6 SP |
1106 | s.avail_out = deflateBound(&s, s.avail_in); |
1107 | s.next_out = out = xrealloc(out, s.avail_out); | |
1108 | while (deflate(&s, Z_FINISH) == Z_OK) | |
1109 | /* nothing */; | |
1110 | deflateEnd(&s); | |
d9ee53ce | 1111 | } |
d9ee53ce SP |
1112 | } |
1113 | ||
1114 | e->type = type; | |
1115 | e->pack_id = pack_id; | |
1116 | e->offset = pack_size; | |
1117 | object_count++; | |
1118 | object_count_by_type[type]++; | |
db5e523f SP |
1119 | |
1120 | if (delta) { | |
d489bc14 SP |
1121 | unsigned long ofs = e->offset - last->offset; |
1122 | unsigned pos = sizeof(hdr) - 1; | |
1123 | ||
4cabf858 | 1124 | delta_count_by_type[type]++; |
436e7a74 | 1125 | e->depth = last->depth + 1; |
d489bc14 SP |
1126 | |
1127 | hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr); | |
0fcbcae7 | 1128 | write_or_die(pack_data->pack_fd, hdr, hdrlen); |
d489bc14 SP |
1129 | pack_size += hdrlen; |
1130 | ||
1131 | hdr[pos] = ofs & 127; | |
1132 | while (ofs >>= 7) | |
1133 | hdr[--pos] = 128 | (--ofs & 127); | |
0fcbcae7 | 1134 | write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos); |
d489bc14 | 1135 | pack_size += sizeof(hdr) - pos; |
db5e523f | 1136 | } else { |
436e7a74 | 1137 | e->depth = 0; |
eec813cf | 1138 | hdrlen = encode_header(type, dat->len, hdr); |
0fcbcae7 | 1139 | write_or_die(pack_data->pack_fd, hdr, hdrlen); |
41e5257f | 1140 | pack_size += hdrlen; |
db5e523f SP |
1141 | } |
1142 | ||
0fcbcae7 | 1143 | write_or_die(pack_data->pack_fd, out, s.total_out); |
41e5257f | 1144 | pack_size += s.total_out; |
db5e523f SP |
1145 | |
1146 | free(out); | |
e7d06a4b | 1147 | free(delta); |
463acbe1 | 1148 | if (last) { |
05576569 PH |
1149 | if (last->no_swap) { |
1150 | last->data = *dat; | |
1151 | } else { | |
c76689df | 1152 | strbuf_swap(&last->data, dat); |
05576569 | 1153 | } |
d489bc14 | 1154 | last->offset = e->offset; |
436e7a74 | 1155 | last->depth = e->depth; |
463acbe1 SP |
1156 | } |
1157 | return 0; | |
1158 | } | |
1159 | ||
7422bac4 SP |
1160 | /* All calls must be guarded by find_object() or find_mark() to |
1161 | * ensure the 'struct object_entry' passed was written by this | |
1162 | * process instance. We unpack the entry by the offset, avoiding | |
1163 | * the need for the corresponding .idx file. This unpacking rule | |
1164 | * works because we only use OBJ_REF_DELTA within the packfiles | |
1165 | * created by fast-import. | |
1166 | * | |
1167 | * oe must not be NULL. Such an oe usually comes from giving | |
1168 | * an unknown SHA-1 to find_object() or an undefined mark to | |
1169 | * find_mark(). Callers must test for this condition and use | |
1170 | * the standard read_sha1_file() when it happens. | |
1171 | * | |
1172 | * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from | |
1173 | * find_mark(), where the mark was reloaded from an existing marks | |
1174 | * file and is referencing an object that this fast-import process | |
1175 | * instance did not write out to a packfile. Callers must test for | |
1176 | * this condition and use read_sha1_file() instead. | |
1177 | */ | |
7bfe6e26 SP |
1178 | static void *gfi_unpack_entry( |
1179 | struct object_entry *oe, | |
1180 | unsigned long *sizep) | |
41e5257f | 1181 | { |
21666f1a | 1182 | enum object_type type; |
7bfe6e26 | 1183 | struct packed_git *p = all_packs[oe->pack_id]; |
c9ced051 | 1184 | if (p == pack_data && p->pack_size < (pack_size + 20)) { |
7422bac4 SP |
1185 | /* The object is stored in the packfile we are writing to |
1186 | * and we have modified it since the last time we scanned | |
1187 | * back to read a previously written object. If an old | |
1188 | * window covered [p->pack_size, p->pack_size + 20) its | |
1189 | * data is stale and is not valid. Closing all windows | |
1190 | * and updating the packfile length ensures we can read | |
1191 | * the newly written data. | |
1192 | */ | |
c9ced051 | 1193 | close_pack_windows(p); |
7422bac4 SP |
1194 | |
1195 | /* We have to offer 20 bytes additional on the end of | |
1196 | * the packfile as the core unpacker code assumes the | |
1197 | * footer is present at the file end and must promise | |
1198 | * at least 20 bytes within any window it maps. But | |
1199 | * we don't actually create the footer here. | |
1200 | */ | |
7bfe6e26 | 1201 | p->pack_size = pack_size + 20; |
c9ced051 | 1202 | } |
21666f1a | 1203 | return unpack_entry(p, oe->offset, &type, sizep); |
41e5257f SP |
1204 | } |
1205 | ||
10831c55 | 1206 | static const char *get_mode(const char *str, uint16_t *modep) |
463acbe1 SP |
1207 | { |
1208 | unsigned char c; | |
10831c55 | 1209 | uint16_t mode = 0; |
463acbe1 SP |
1210 | |
1211 | while ((c = *str++) != ' ') { | |
1212 | if (c < '0' || c > '7') | |
1213 | return NULL; | |
1214 | mode = (mode << 3) + (c - '0'); | |
1215 | } | |
1216 | *modep = mode; | |
1217 | return str; | |
1218 | } | |
1219 | ||
1220 | static void load_tree(struct tree_entry *root) | |
1221 | { | |
4cabf858 | 1222 | unsigned char* sha1 = root->versions[1].sha1; |
463acbe1 SP |
1223 | struct object_entry *myoe; |
1224 | struct tree_content *t; | |
1225 | unsigned long size; | |
1226 | char *buf; | |
1227 | const char *c; | |
463acbe1 SP |
1228 | |
1229 | root->tree = t = new_tree_content(8); | |
4cabf858 | 1230 | if (is_null_sha1(sha1)) |
463acbe1 SP |
1231 | return; |
1232 | ||
4cabf858 | 1233 | myoe = find_object(sha1); |
20f546a8 | 1234 | if (myoe && myoe->pack_id != MAX_PACK_ID) { |
41e5257f | 1235 | if (myoe->type != OBJ_TREE) |
4cabf858 | 1236 | die("Not a tree: %s", sha1_to_hex(sha1)); |
436e7a74 | 1237 | t->delta_depth = myoe->depth; |
7bfe6e26 | 1238 | buf = gfi_unpack_entry(myoe, &size); |
e8b32e06 SP |
1239 | if (!buf) |
1240 | die("Can't load tree %s", sha1_to_hex(sha1)); | |
463acbe1 | 1241 | } else { |
21666f1a NP |
1242 | enum object_type type; |
1243 | buf = read_sha1_file(sha1, &type, &size); | |
1244 | if (!buf || type != OBJ_TREE) | |
4cabf858 | 1245 | die("Can't load tree %s", sha1_to_hex(sha1)); |
463acbe1 SP |
1246 | } |
1247 | ||
1248 | c = buf; | |
1249 | while (c != (buf + size)) { | |
1250 | struct tree_entry *e = new_tree_entry(); | |
1251 | ||
1252 | if (t->entry_count == t->entry_capacity) | |
f022f85f | 1253 | root->tree = t = grow_tree_content(t, t->entry_count); |
463acbe1 SP |
1254 | t->entries[t->entry_count++] = e; |
1255 | ||
1256 | e->tree = NULL; | |
4cabf858 | 1257 | c = get_mode(c, &e->versions[1].mode); |
463acbe1 | 1258 | if (!c) |
4cabf858 SP |
1259 | die("Corrupt mode in %s", sha1_to_hex(sha1)); |
1260 | e->versions[0].mode = e->versions[1].mode; | |
061e35c5 | 1261 | e->name = to_atom(c, strlen(c)); |
463acbe1 | 1262 | c += e->name->str_len + 1; |
4cabf858 SP |
1263 | hashcpy(e->versions[0].sha1, (unsigned char*)c); |
1264 | hashcpy(e->versions[1].sha1, (unsigned char*)c); | |
463acbe1 SP |
1265 | c += 20; |
1266 | } | |
1267 | free(buf); | |
1268 | } | |
1269 | ||
4cabf858 | 1270 | static int tecmp0 (const void *_a, const void *_b) |
463acbe1 SP |
1271 | { |
1272 | struct tree_entry *a = *((struct tree_entry**)_a); | |
1273 | struct tree_entry *b = *((struct tree_entry**)_b); | |
1274 | return base_name_compare( | |
4cabf858 SP |
1275 | a->name->str_dat, a->name->str_len, a->versions[0].mode, |
1276 | b->name->str_dat, b->name->str_len, b->versions[0].mode); | |
463acbe1 SP |
1277 | } |
1278 | ||
4cabf858 | 1279 | static int tecmp1 (const void *_a, const void *_b) |
463acbe1 | 1280 | { |
4cabf858 SP |
1281 | struct tree_entry *a = *((struct tree_entry**)_a); |
1282 | struct tree_entry *b = *((struct tree_entry**)_b); | |
1283 | return base_name_compare( | |
1284 | a->name->str_dat, a->name->str_len, a->versions[1].mode, | |
1285 | b->name->str_dat, b->name->str_len, b->versions[1].mode); | |
1286 | } | |
1287 | ||
eec813cf | 1288 | static void mktree(struct tree_content *t, int v, struct strbuf *b) |
4cabf858 SP |
1289 | { |
1290 | size_t maxlen = 0; | |
463acbe1 | 1291 | unsigned int i; |
463acbe1 | 1292 | |
4cabf858 SP |
1293 | if (!v) |
1294 | qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0); | |
1295 | else | |
1296 | qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1); | |
463acbe1 | 1297 | |
463acbe1 | 1298 | for (i = 0; i < t->entry_count; i++) { |
4cabf858 SP |
1299 | if (t->entries[i]->versions[v].mode) |
1300 | maxlen += t->entries[i]->name->str_len + 34; | |
463acbe1 SP |
1301 | } |
1302 | ||
eec813cf PH |
1303 | strbuf_reset(b); |
1304 | strbuf_grow(b, maxlen); | |
463acbe1 SP |
1305 | for (i = 0; i < t->entry_count; i++) { |
1306 | struct tree_entry *e = t->entries[i]; | |
4cabf858 SP |
1307 | if (!e->versions[v].mode) |
1308 | continue; | |
eec813cf PH |
1309 | strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode, |
1310 | e->name->str_dat, '\0'); | |
1311 | strbuf_add(b, e->versions[v].sha1, 20); | |
463acbe1 | 1312 | } |
4cabf858 SP |
1313 | } |
1314 | ||
1315 | static void store_tree(struct tree_entry *root) | |
1316 | { | |
1317 | struct tree_content *t = root->tree; | |
1318 | unsigned int i, j, del; | |
05576569 | 1319 | struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 }; |
d489bc14 | 1320 | struct object_entry *le; |
4cabf858 SP |
1321 | |
1322 | if (!is_null_sha1(root->versions[1].sha1)) | |
1323 | return; | |
1324 | ||
1325 | for (i = 0; i < t->entry_count; i++) { | |
1326 | if (t->entries[i]->tree) | |
1327 | store_tree(t->entries[i]); | |
1328 | } | |
1329 | ||
d489bc14 | 1330 | le = find_object(root->versions[0].sha1); |
05576569 | 1331 | if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) { |
eec813cf | 1332 | mktree(t, 0, &old_tree); |
05576569 | 1333 | lo.data = old_tree; |
d489bc14 | 1334 | lo.offset = le->offset; |
4cabf858 | 1335 | lo.depth = t->delta_depth; |
4cabf858 | 1336 | } |
4cabf858 | 1337 | |
eec813cf PH |
1338 | mktree(t, 1, &new_tree); |
1339 | store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0); | |
4cabf858 SP |
1340 | |
1341 | t->delta_depth = lo.depth; | |
4cabf858 SP |
1342 | for (i = 0, j = 0, del = 0; i < t->entry_count; i++) { |
1343 | struct tree_entry *e = t->entries[i]; | |
1344 | if (e->versions[1].mode) { | |
1345 | e->versions[0].mode = e->versions[1].mode; | |
1346 | hashcpy(e->versions[0].sha1, e->versions[1].sha1); | |
1347 | t->entries[j++] = e; | |
1348 | } else { | |
1349 | release_tree_entry(e); | |
1350 | del++; | |
1351 | } | |
1352 | } | |
1353 | t->entry_count -= del; | |
463acbe1 SP |
1354 | } |
1355 | ||
1356 | static int tree_content_set( | |
1357 | struct tree_entry *root, | |
1358 | const char *p, | |
1359 | const unsigned char *sha1, | |
f39a946a SP |
1360 | const uint16_t mode, |
1361 | struct tree_content *subtree) | |
463acbe1 SP |
1362 | { |
1363 | struct tree_content *t = root->tree; | |
1364 | const char *slash1; | |
1365 | unsigned int i, n; | |
1366 | struct tree_entry *e; | |
1367 | ||
1368 | slash1 = strchr(p, '/'); | |
1369 | if (slash1) | |
1370 | n = slash1 - p; | |
1371 | else | |
1372 | n = strlen(p); | |
475d1b33 SP |
1373 | if (!n) |
1374 | die("Empty path component found in input"); | |
f39a946a SP |
1375 | if (!slash1 && !S_ISDIR(mode) && subtree) |
1376 | die("Non-directories cannot have subtrees"); | |
463acbe1 SP |
1377 | |
1378 | for (i = 0; i < t->entry_count; i++) { | |
1379 | e = t->entries[i]; | |
1380 | if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) { | |
1381 | if (!slash1) { | |
f39a946a SP |
1382 | if (!S_ISDIR(mode) |
1383 | && e->versions[1].mode == mode | |
4cabf858 | 1384 | && !hashcmp(e->versions[1].sha1, sha1)) |
463acbe1 | 1385 | return 0; |
4cabf858 SP |
1386 | e->versions[1].mode = mode; |
1387 | hashcpy(e->versions[1].sha1, sha1); | |
f39a946a | 1388 | if (e->tree) |
afde8dd9 | 1389 | release_tree_content_recursive(e->tree); |
f39a946a | 1390 | e->tree = subtree; |
4cabf858 | 1391 | hashclr(root->versions[1].sha1); |
463acbe1 SP |
1392 | return 1; |
1393 | } | |
4cabf858 | 1394 | if (!S_ISDIR(e->versions[1].mode)) { |
463acbe1 | 1395 | e->tree = new_tree_content(8); |
4cabf858 | 1396 | e->versions[1].mode = S_IFDIR; |
463acbe1 SP |
1397 | } |
1398 | if (!e->tree) | |
1399 | load_tree(e); | |
f39a946a | 1400 | if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) { |
4cabf858 | 1401 | hashclr(root->versions[1].sha1); |
463acbe1 SP |
1402 | return 1; |
1403 | } | |
1404 | return 0; | |
1405 | } | |
1406 | } | |
1407 | ||
1408 | if (t->entry_count == t->entry_capacity) | |
f022f85f | 1409 | root->tree = t = grow_tree_content(t, t->entry_count); |
463acbe1 | 1410 | e = new_tree_entry(); |
061e35c5 | 1411 | e->name = to_atom(p, n); |
4cabf858 SP |
1412 | e->versions[0].mode = 0; |
1413 | hashclr(e->versions[0].sha1); | |
463acbe1 SP |
1414 | t->entries[t->entry_count++] = e; |
1415 | if (slash1) { | |
1416 | e->tree = new_tree_content(8); | |
4cabf858 | 1417 | e->versions[1].mode = S_IFDIR; |
f39a946a | 1418 | tree_content_set(e, slash1 + 1, sha1, mode, subtree); |
463acbe1 | 1419 | } else { |
f39a946a | 1420 | e->tree = subtree; |
4cabf858 SP |
1421 | e->versions[1].mode = mode; |
1422 | hashcpy(e->versions[1].sha1, sha1); | |
463acbe1 | 1423 | } |
4cabf858 | 1424 | hashclr(root->versions[1].sha1); |
463acbe1 SP |
1425 | return 1; |
1426 | } | |
1427 | ||
f39a946a SP |
1428 | static int tree_content_remove( |
1429 | struct tree_entry *root, | |
1430 | const char *p, | |
1431 | struct tree_entry *backup_leaf) | |
463acbe1 SP |
1432 | { |
1433 | struct tree_content *t = root->tree; | |
1434 | const char *slash1; | |
1435 | unsigned int i, n; | |
1436 | struct tree_entry *e; | |
1437 | ||
1438 | slash1 = strchr(p, '/'); | |
1439 | if (slash1) | |
1440 | n = slash1 - p; | |
1441 | else | |
1442 | n = strlen(p); | |
1443 | ||
1444 | for (i = 0; i < t->entry_count; i++) { | |
1445 | e = t->entries[i]; | |
1446 | if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) { | |
4cabf858 | 1447 | if (!slash1 || !S_ISDIR(e->versions[1].mode)) |
463acbe1 SP |
1448 | goto del_entry; |
1449 | if (!e->tree) | |
1450 | load_tree(e); | |
f39a946a | 1451 | if (tree_content_remove(e, slash1 + 1, backup_leaf)) { |
b54d6422 SP |
1452 | for (n = 0; n < e->tree->entry_count; n++) { |
1453 | if (e->tree->entries[n]->versions[1].mode) { | |
1454 | hashclr(root->versions[1].sha1); | |
1455 | return 1; | |
1456 | } | |
1457 | } | |
f39a946a | 1458 | backup_leaf = NULL; |
b54d6422 | 1459 | goto del_entry; |
463acbe1 SP |
1460 | } |
1461 | return 0; | |
1462 | } | |
1463 | } | |
1464 | return 0; | |
1465 | ||
1466 | del_entry: | |
f39a946a SP |
1467 | if (backup_leaf) |
1468 | memcpy(backup_leaf, e, sizeof(*backup_leaf)); | |
1469 | else if (e->tree) | |
4cabf858 | 1470 | release_tree_content_recursive(e->tree); |
f39a946a | 1471 | e->tree = NULL; |
4cabf858 SP |
1472 | e->versions[1].mode = 0; |
1473 | hashclr(e->versions[1].sha1); | |
1474 | hashclr(root->versions[1].sha1); | |
ac47a738 | 1475 | return 1; |
db5e523f SP |
1476 | } |
1477 | ||
b6f3481b SP |
1478 | static int tree_content_get( |
1479 | struct tree_entry *root, | |
1480 | const char *p, | |
1481 | struct tree_entry *leaf) | |
1482 | { | |
1483 | struct tree_content *t = root->tree; | |
1484 | const char *slash1; | |
1485 | unsigned int i, n; | |
1486 | struct tree_entry *e; | |
1487 | ||
1488 | slash1 = strchr(p, '/'); | |
1489 | if (slash1) | |
1490 | n = slash1 - p; | |
1491 | else | |
1492 | n = strlen(p); | |
1493 | ||
1494 | for (i = 0; i < t->entry_count; i++) { | |
1495 | e = t->entries[i]; | |
1496 | if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) { | |
1497 | if (!slash1) { | |
1498 | memcpy(leaf, e, sizeof(*leaf)); | |
1499 | if (e->tree && is_null_sha1(e->versions[1].sha1)) | |
1500 | leaf->tree = dup_tree_content(e->tree); | |
1501 | else | |
1502 | leaf->tree = NULL; | |
1503 | return 1; | |
1504 | } | |
1505 | if (!S_ISDIR(e->versions[1].mode)) | |
1506 | return 0; | |
1507 | if (!e->tree) | |
1508 | load_tree(e); | |
1509 | return tree_content_get(e, slash1 + 1, leaf); | |
1510 | } | |
1511 | } | |
1512 | return 0; | |
1513 | } | |
1514 | ||
7073e69e | 1515 | static int update_branch(struct branch *b) |
463acbe1 SP |
1516 | { |
1517 | static const char *msg = "fast-import"; | |
7073e69e SP |
1518 | struct ref_lock *lock; |
1519 | unsigned char old_sha1[20]; | |
1520 | ||
198724ad EB |
1521 | if (is_null_sha1(b->sha1)) |
1522 | return 0; | |
7073e69e SP |
1523 | if (read_ref(b->name, old_sha1)) |
1524 | hashclr(old_sha1); | |
68db31cc | 1525 | lock = lock_any_ref_for_update(b->name, old_sha1, 0); |
7073e69e SP |
1526 | if (!lock) |
1527 | return error("Unable to lock %s", b->name); | |
1528 | if (!force_update && !is_null_sha1(old_sha1)) { | |
1529 | struct commit *old_cmit, *new_cmit; | |
1530 | ||
1531 | old_cmit = lookup_commit_reference_gently(old_sha1, 0); | |
1532 | new_cmit = lookup_commit_reference_gently(b->sha1, 0); | |
1533 | if (!old_cmit || !new_cmit) { | |
1534 | unlock_ref(lock); | |
1535 | return error("Branch %s is missing commits.", b->name); | |
1536 | } | |
1537 | ||
4a164d48 | 1538 | if (!in_merge_bases(old_cmit, &new_cmit, 1)) { |
7073e69e | 1539 | unlock_ref(lock); |
46efd2d9 | 1540 | warning("Not updating %s" |
7073e69e SP |
1541 | " (new tip %s does not contain %s)", |
1542 | b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1)); | |
1543 | return -1; | |
1544 | } | |
1545 | } | |
1546 | if (write_ref_sha1(lock, b->sha1, msg) < 0) | |
1547 | return error("Unable to update %s", b->name); | |
1548 | return 0; | |
1549 | } | |
1550 | ||
1551 | static void dump_branches(void) | |
1552 | { | |
463acbe1 SP |
1553 | unsigned int i; |
1554 | struct branch *b; | |
463acbe1 SP |
1555 | |
1556 | for (i = 0; i < branch_table_sz; i++) { | |
7073e69e SP |
1557 | for (b = branch_table[i]; b; b = b->table_next_branch) |
1558 | failure |= update_branch(b); | |
463acbe1 SP |
1559 | } |
1560 | } | |
1561 | ||
fd99224e | 1562 | static void dump_tags(void) |
72303d44 SP |
1563 | { |
1564 | static const char *msg = "fast-import"; | |
1565 | struct tag *t; | |
1566 | struct ref_lock *lock; | |
7073e69e | 1567 | char ref_name[PATH_MAX]; |
72303d44 SP |
1568 | |
1569 | for (t = first_tag; t; t = t->next_tag) { | |
7073e69e SP |
1570 | sprintf(ref_name, "tags/%s", t->name); |
1571 | lock = lock_ref_sha1(ref_name, NULL); | |
72303d44 | 1572 | if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0) |
7073e69e | 1573 | failure |= error("Unable to update %s", ref_name); |
72303d44 SP |
1574 | } |
1575 | } | |
1576 | ||
a6a1a831 | 1577 | static void dump_marks_helper(FILE *f, |
0ea9f045 | 1578 | uintmax_t base, |
a6a1a831 SP |
1579 | struct mark_set *m) |
1580 | { | |
0ea9f045 | 1581 | uintmax_t k; |
a6a1a831 SP |
1582 | if (m->shift) { |
1583 | for (k = 0; k < 1024; k++) { | |
1584 | if (m->data.sets[k]) | |
1585 | dump_marks_helper(f, (base + k) << m->shift, | |
1586 | m->data.sets[k]); | |
1587 | } | |
1588 | } else { | |
1589 | for (k = 0; k < 1024; k++) { | |
1590 | if (m->data.marked[k]) | |
3efb1f34 | 1591 | fprintf(f, ":%" PRIuMAX " %s\n", base + k, |
a6a1a831 SP |
1592 | sha1_to_hex(m->data.marked[k]->sha1)); |
1593 | } | |
1594 | } | |
1595 | } | |
1596 | ||
fd99224e | 1597 | static void dump_marks(void) |
a6a1a831 | 1598 | { |
60b9004c SP |
1599 | static struct lock_file mark_lock; |
1600 | int mark_fd; | |
1601 | FILE *f; | |
1602 | ||
1603 | if (!mark_file) | |
1604 | return; | |
1605 | ||
1606 | mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0); | |
1607 | if (mark_fd < 0) { | |
1608 | failure |= error("Unable to write marks file %s: %s", | |
1609 | mark_file, strerror(errno)); | |
1610 | return; | |
a6a1a831 | 1611 | } |
60b9004c SP |
1612 | |
1613 | f = fdopen(mark_fd, "w"); | |
1614 | if (!f) { | |
5a7b1b57 | 1615 | int saved_errno = errno; |
60b9004c SP |
1616 | rollback_lock_file(&mark_lock); |
1617 | failure |= error("Unable to write marks file %s: %s", | |
5a7b1b57 | 1618 | mark_file, strerror(saved_errno)); |
60b9004c | 1619 | return; |
a6a1a831 | 1620 | } |
60b9004c | 1621 | |
4ed7cd3a | 1622 | /* |
fb54abd6 BC |
1623 | * Since the lock file was fdopen()'ed, it should not be close()'ed. |
1624 | * Assign -1 to the lock file descriptor so that commit_lock_file() | |
4ed7cd3a BC |
1625 | * won't try to close() it. |
1626 | */ | |
1627 | mark_lock.fd = -1; | |
fb54abd6 BC |
1628 | |
1629 | dump_marks_helper(f, 0, marks); | |
1630 | if (ferror(f) || fclose(f)) { | |
5a7b1b57 | 1631 | int saved_errno = errno; |
fb54abd6 BC |
1632 | rollback_lock_file(&mark_lock); |
1633 | failure |= error("Unable to write marks file %s: %s", | |
5a7b1b57 | 1634 | mark_file, strerror(saved_errno)); |
fb54abd6 BC |
1635 | return; |
1636 | } | |
1637 | ||
1638 | if (commit_lock_file(&mark_lock)) { | |
5a7b1b57 | 1639 | int saved_errno = errno; |
fb54abd6 BC |
1640 | rollback_lock_file(&mark_lock); |
1641 | failure |= error("Unable to commit marks file %s: %s", | |
5a7b1b57 | 1642 | mark_file, strerror(saved_errno)); |
fb54abd6 BC |
1643 | return; |
1644 | } | |
a6a1a831 SP |
1645 | } |
1646 | ||
e6c019d0 | 1647 | static int read_next_command(void) |
c44cdc7e | 1648 | { |
e6c019d0 PH |
1649 | static int stdin_eof = 0; |
1650 | ||
1651 | if (stdin_eof) { | |
1652 | unread_command_buf = 0; | |
1653 | return EOF; | |
1654 | } | |
1655 | ||
401d53fa | 1656 | do { |
904b1941 | 1657 | if (unread_command_buf) { |
1fdb649c | 1658 | unread_command_buf = 0; |
904b1941 SP |
1659 | } else { |
1660 | struct recent_command *rc; | |
1661 | ||
b315c5c0 | 1662 | strbuf_detach(&command_buf, NULL); |
e6c019d0 PH |
1663 | stdin_eof = strbuf_getline(&command_buf, stdin, '\n'); |
1664 | if (stdin_eof) | |
1665 | return EOF; | |
904b1941 SP |
1666 | |
1667 | rc = rc_free; | |
1668 | if (rc) | |
1669 | rc_free = rc->next; | |
1670 | else { | |
1671 | rc = cmd_hist.next; | |
1672 | cmd_hist.next = rc->next; | |
1673 | cmd_hist.next->prev = &cmd_hist; | |
1674 | free(rc->buf); | |
1675 | } | |
1676 | ||
1677 | rc->buf = command_buf.buf; | |
1678 | rc->prev = cmd_tail; | |
1679 | rc->next = cmd_hist.prev; | |
1680 | rc->prev->next = rc; | |
1681 | cmd_tail = rc; | |
1682 | } | |
1683 | } while (command_buf.buf[0] == '#'); | |
e6c019d0 PH |
1684 | |
1685 | return 0; | |
c44cdc7e SP |
1686 | } |
1687 | ||
7e5dcea8 | 1688 | static void skip_optional_lf(void) |
2c570cde SP |
1689 | { |
1690 | int term_char = fgetc(stdin); | |
1691 | if (term_char != '\n' && term_char != EOF) | |
1692 | ungetc(term_char, stdin); | |
1693 | } | |
1694 | ||
b3031781 | 1695 | static void parse_mark(void) |
c44cdc7e | 1696 | { |
599065a3 | 1697 | if (!prefixcmp(command_buf.buf, "mark :")) { |
0ea9f045 | 1698 | next_mark = strtoumax(command_buf.buf + 6, NULL, 10); |
c44cdc7e SP |
1699 | read_next_command(); |
1700 | } | |
1701 | else | |
d8397168 | 1702 | next_mark = 0; |
c44cdc7e SP |
1703 | } |
1704 | ||
b3031781 | 1705 | static void parse_data(struct strbuf *sb) |
c44cdc7e | 1706 | { |
eec813cf | 1707 | strbuf_reset(sb); |
c44cdc7e | 1708 | |
599065a3 | 1709 | if (prefixcmp(command_buf.buf, "data ")) |
c44cdc7e SP |
1710 | die("Expected 'data n' command, found: %s", command_buf.buf); |
1711 | ||
599065a3 | 1712 | if (!prefixcmp(command_buf.buf + 5, "<<")) { |
3b4dce02 | 1713 | char *term = xstrdup(command_buf.buf + 5 + 2); |
4a241d79 PH |
1714 | size_t term_len = command_buf.len - 5 - 2; |
1715 | ||
c2e6b6d0 | 1716 | strbuf_detach(&command_buf, NULL); |
3b4dce02 | 1717 | for (;;) { |
e6c019d0 | 1718 | if (strbuf_getline(&command_buf, stdin, '\n') == EOF) |
3b4dce02 SP |
1719 | die("EOF in data (terminator '%s' not found)", term); |
1720 | if (term_len == command_buf.len | |
1721 | && !strcmp(term, command_buf.buf)) | |
1722 | break; | |
eec813cf PH |
1723 | strbuf_addbuf(sb, &command_buf); |
1724 | strbuf_addch(sb, '\n'); | |
3b4dce02 SP |
1725 | } |
1726 | free(term); | |
1727 | } | |
1728 | else { | |
4a241d79 PH |
1729 | size_t n = 0, length; |
1730 | ||
3b4dce02 | 1731 | length = strtoul(command_buf.buf + 5, NULL, 10); |
4a241d79 | 1732 | |
3b4dce02 | 1733 | while (n < length) { |
eec813cf | 1734 | size_t s = strbuf_fread(sb, length - n, stdin); |
3b4dce02 | 1735 | if (!s && feof(stdin)) |
40db58b8 JS |
1736 | die("EOF in data (%lu bytes remaining)", |
1737 | (unsigned long)(length - n)); | |
3b4dce02 SP |
1738 | n += s; |
1739 | } | |
c44cdc7e SP |
1740 | } |
1741 | ||
2c570cde | 1742 | skip_optional_lf(); |
c44cdc7e SP |
1743 | } |
1744 | ||
63e0c8b3 SP |
1745 | static int validate_raw_date(const char *src, char *result, int maxlen) |
1746 | { | |
1747 | const char *orig_src = src; | |
1748 | char *endp, sign; | |
c55fae43 | 1749 | unsigned long date; |
63e0c8b3 | 1750 | |
c55fae43 RS |
1751 | errno = 0; |
1752 | ||
1753 | date = strtoul(src, &endp, 10); | |
1754 | if (errno || endp == src || *endp != ' ') | |
63e0c8b3 SP |
1755 | return -1; |
1756 | ||
1757 | src = endp + 1; | |
1758 | if (*src != '-' && *src != '+') | |
1759 | return -1; | |
1760 | sign = *src; | |
1761 | ||
c55fae43 RS |
1762 | date = strtoul(src + 1, &endp, 10); |
1763 | if (errno || endp == src || *endp || (endp - orig_src) >= maxlen) | |
63e0c8b3 SP |
1764 | return -1; |
1765 | ||
1766 | strcpy(result, orig_src); | |
1767 | return 0; | |
1768 | } | |
1769 | ||
1770 | static char *parse_ident(const char *buf) | |
1771 | { | |
1772 | const char *gt; | |
1773 | size_t name_len; | |
1774 | char *ident; | |
1775 | ||
1776 | gt = strrchr(buf, '>'); | |
1777 | if (!gt) | |
1778 | die("Missing > in ident string: %s", buf); | |
1779 | gt++; | |
1780 | if (*gt != ' ') | |
1781 | die("Missing space after > in ident string: %s", buf); | |
1782 | gt++; | |
1783 | name_len = gt - buf; | |
1784 | ident = xmalloc(name_len + 24); | |
1785 | strncpy(ident, buf, name_len); | |
1786 | ||
1787 | switch (whenspec) { | |
1788 | case WHENSPEC_RAW: | |
1789 | if (validate_raw_date(gt, ident + name_len, 24) < 0) | |
1790 | die("Invalid raw date \"%s\" in ident: %s", gt, buf); | |
1791 | break; | |
1792 | case WHENSPEC_RFC2822: | |
1793 | if (parse_date(gt, ident + name_len, 24) < 0) | |
1794 | die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf); | |
1795 | break; | |
1796 | case WHENSPEC_NOW: | |
1797 | if (strcmp("now", gt)) | |
1798 | die("Date in ident must be 'now': %s", buf); | |
1799 | datestamp(ident + name_len, 24); | |
1800 | break; | |
1801 | } | |
1802 | ||
1803 | return ident; | |
1804 | } | |
1805 | ||
b3031781 | 1806 | static void parse_new_blob(void) |
6143f064 | 1807 | { |
05576569 | 1808 | static struct strbuf buf = STRBUF_INIT; |
c44cdc7e SP |
1809 | |
1810 | read_next_command(); | |
b3031781 MV |
1811 | parse_mark(); |
1812 | parse_data(&buf); | |
05576569 | 1813 | store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark); |
6143f064 SP |
1814 | } |
1815 | ||
fd99224e | 1816 | static void unload_one_branch(void) |
6bb5b329 | 1817 | { |
41e5257f SP |
1818 | while (cur_active_branches |
1819 | && cur_active_branches >= max_active_branches) { | |
6777a59f | 1820 | uintmax_t min_commit = ULONG_MAX; |
463acbe1 SP |
1821 | struct branch *e, *l = NULL, *p = NULL; |
1822 | ||
1823 | for (e = active_branches; e; e = e->active_next_branch) { | |
1824 | if (e->last_commit < min_commit) { | |
1825 | p = l; | |
1826 | min_commit = e->last_commit; | |
1827 | } | |
1828 | l = e; | |
1829 | } | |
1830 | ||
1831 | if (p) { | |
1832 | e = p->active_next_branch; | |
1833 | p->active_next_branch = e->active_next_branch; | |
1834 | } else { | |
1835 | e = active_branches; | |
1836 | active_branches = e->active_next_branch; | |
1837 | } | |
734c91f9 | 1838 | e->active = 0; |
463acbe1 SP |
1839 | e->active_next_branch = NULL; |
1840 | if (e->branch_tree.tree) { | |
afde8dd9 | 1841 | release_tree_content_recursive(e->branch_tree.tree); |
463acbe1 SP |
1842 | e->branch_tree.tree = NULL; |
1843 | } | |
1844 | cur_active_branches--; | |
6bb5b329 | 1845 | } |
6bb5b329 SP |
1846 | } |
1847 | ||
463acbe1 | 1848 | static void load_branch(struct branch *b) |
6bb5b329 | 1849 | { |
463acbe1 | 1850 | load_tree(&b->branch_tree); |
734c91f9 SP |
1851 | if (!b->active) { |
1852 | b->active = 1; | |
1853 | b->active_next_branch = active_branches; | |
1854 | active_branches = b; | |
1855 | cur_active_branches++; | |
1856 | branch_load_count++; | |
1857 | } | |
6bb5b329 SP |
1858 | } |
1859 | ||
463acbe1 | 1860 | static void file_change_m(struct branch *b) |
6bb5b329 | 1861 | { |
c44cdc7e | 1862 | const char *p = command_buf.buf + 2; |
7fb1011e | 1863 | static struct strbuf uq = STRBUF_INIT; |
c44cdc7e | 1864 | const char *endp; |
10e8d688 | 1865 | struct object_entry *oe = oe; |
463acbe1 | 1866 | unsigned char sha1[20]; |
10831c55 | 1867 | uint16_t mode, inline_data = 0; |
6bb5b329 | 1868 | |
c44cdc7e SP |
1869 | p = get_mode(p, &mode); |
1870 | if (!p) | |
1871 | die("Corrupt mode: %s", command_buf.buf); | |
1872 | switch (mode) { | |
3d1d81eb FC |
1873 | case 0644: |
1874 | case 0755: | |
1875 | mode |= S_IFREG; | |
c44cdc7e SP |
1876 | case S_IFREG | 0644: |
1877 | case S_IFREG | 0755: | |
ace4a9d1 | 1878 | case S_IFLNK: |
03db4525 | 1879 | case S_IFGITLINK: |
c44cdc7e SP |
1880 | /* ok */ |
1881 | break; | |
1882 | default: | |
1883 | die("Corrupt mode: %s", command_buf.buf); | |
1884 | } | |
1885 | ||
d8397168 SP |
1886 | if (*p == ':') { |
1887 | char *x; | |
0ea9f045 | 1888 | oe = find_mark(strtoumax(p + 1, &x, 10)); |
cacbdd0a | 1889 | hashcpy(sha1, oe->sha1); |
d8397168 | 1890 | p = x; |
599065a3 | 1891 | } else if (!prefixcmp(p, "inline")) { |
b715cfbb SP |
1892 | inline_data = 1; |
1893 | p += 6; | |
d8397168 SP |
1894 | } else { |
1895 | if (get_sha1_hex(p, sha1)) | |
1896 | die("Invalid SHA1: %s", command_buf.buf); | |
1897 | oe = find_object(sha1); | |
1898 | p += 40; | |
1899 | } | |
c44cdc7e SP |
1900 | if (*p++ != ' ') |
1901 | die("Missing space after SHA1: %s", command_buf.buf); | |
1902 | ||
7fb1011e PH |
1903 | strbuf_reset(&uq); |
1904 | if (!unquote_c_style(&uq, p, &endp)) { | |
c44cdc7e SP |
1905 | if (*endp) |
1906 | die("Garbage after path in: %s", command_buf.buf); | |
7fb1011e | 1907 | p = uq.buf; |
c44cdc7e | 1908 | } |
6bb5b329 | 1909 | |
03db4525 AG |
1910 | if (S_ISGITLINK(mode)) { |
1911 | if (inline_data) | |
1912 | die("Git links cannot be specified 'inline': %s", | |
1913 | command_buf.buf); | |
1914 | else if (oe) { | |
1915 | if (oe->type != OBJ_COMMIT) | |
1916 | die("Not a commit (actually a %s): %s", | |
1917 | typename(oe->type), command_buf.buf); | |
1918 | } | |
1919 | /* | |
1920 | * Accept the sha1 without checking; it expected to be in | |
1921 | * another repository. | |
1922 | */ | |
1923 | } else if (inline_data) { | |
05576569 | 1924 | static struct strbuf buf = STRBUF_INIT; |
eec813cf | 1925 | |
7fb1011e PH |
1926 | if (p != uq.buf) { |
1927 | strbuf_addstr(&uq, p); | |
1928 | p = uq.buf; | |
1929 | } | |
b715cfbb | 1930 | read_next_command(); |
b3031781 | 1931 | parse_data(&buf); |
05576569 | 1932 | store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0); |
b715cfbb | 1933 | } else if (oe) { |
7111feed | 1934 | if (oe->type != OBJ_BLOB) |
c44cdc7e | 1935 | die("Not a blob (actually a %s): %s", |
2005dbe2 | 1936 | typename(oe->type), command_buf.buf); |
7111feed | 1937 | } else { |
21666f1a NP |
1938 | enum object_type type = sha1_object_info(sha1, NULL); |
1939 | if (type < 0) | |
c44cdc7e | 1940 | die("Blob not found: %s", command_buf.buf); |
21666f1a | 1941 | if (type != OBJ_BLOB) |
c44cdc7e | 1942 | die("Not a blob (actually a %s): %s", |
21666f1a | 1943 | typename(type), command_buf.buf); |
7111feed | 1944 | } |
6bb5b329 | 1945 | |
3d1d81eb | 1946 | tree_content_set(&b->branch_tree, p, sha1, mode, NULL); |
463acbe1 | 1947 | } |
6bb5b329 | 1948 | |
463acbe1 SP |
1949 | static void file_change_d(struct branch *b) |
1950 | { | |
c44cdc7e | 1951 | const char *p = command_buf.buf + 2; |
7fb1011e | 1952 | static struct strbuf uq = STRBUF_INIT; |
c44cdc7e SP |
1953 | const char *endp; |
1954 | ||
7fb1011e PH |
1955 | strbuf_reset(&uq); |
1956 | if (!unquote_c_style(&uq, p, &endp)) { | |
c44cdc7e SP |
1957 | if (*endp) |
1958 | die("Garbage after path in: %s", command_buf.buf); | |
7fb1011e | 1959 | p = uq.buf; |
c44cdc7e | 1960 | } |
f39a946a | 1961 | tree_content_remove(&b->branch_tree, p, NULL); |
6bb5b329 SP |
1962 | } |
1963 | ||
b6f3481b | 1964 | static void file_change_cr(struct branch *b, int rename) |
f39a946a SP |
1965 | { |
1966 | const char *s, *d; | |
7fb1011e PH |
1967 | static struct strbuf s_uq = STRBUF_INIT; |
1968 | static struct strbuf d_uq = STRBUF_INIT; | |
f39a946a SP |
1969 | const char *endp; |
1970 | struct tree_entry leaf; | |
1971 | ||
1972 | s = command_buf.buf + 2; | |
7fb1011e PH |
1973 | strbuf_reset(&s_uq); |
1974 | if (!unquote_c_style(&s_uq, s, &endp)) { | |
f39a946a SP |
1975 | if (*endp != ' ') |
1976 | die("Missing space after source: %s", command_buf.buf); | |
7fb1011e | 1977 | } else { |
f39a946a SP |
1978 | endp = strchr(s, ' '); |
1979 | if (!endp) | |
1980 | die("Missing space after source: %s", command_buf.buf); | |
7fb1011e | 1981 | strbuf_add(&s_uq, s, endp - s); |
f39a946a | 1982 | } |
7fb1011e | 1983 | s = s_uq.buf; |
f39a946a SP |
1984 | |
1985 | endp++; | |
1986 | if (!*endp) | |
1987 | die("Missing dest: %s", command_buf.buf); | |
1988 | ||
1989 | d = endp; | |
7fb1011e PH |
1990 | strbuf_reset(&d_uq); |
1991 | if (!unquote_c_style(&d_uq, d, &endp)) { | |
f39a946a SP |
1992 | if (*endp) |
1993 | die("Garbage after dest in: %s", command_buf.buf); | |
7fb1011e | 1994 | d = d_uq.buf; |
f39a946a SP |
1995 | } |
1996 | ||
1997 | memset(&leaf, 0, sizeof(leaf)); | |
b6f3481b SP |
1998 | if (rename) |
1999 | tree_content_remove(&b->branch_tree, s, &leaf); | |
2000 | else | |
2001 | tree_content_get(&b->branch_tree, s, &leaf); | |
f39a946a SP |
2002 | if (!leaf.versions[1].mode) |
2003 | die("Path %s not in branch", s); | |
2004 | tree_content_set(&b->branch_tree, d, | |
2005 | leaf.versions[1].sha1, | |
2006 | leaf.versions[1].mode, | |
2007 | leaf.tree); | |
f39a946a SP |
2008 | } |
2009 | ||
825769a8 SP |
2010 | static void file_change_deleteall(struct branch *b) |
2011 | { | |
2012 | release_tree_content_recursive(b->branch_tree.tree); | |
2013 | hashclr(b->branch_tree.versions[0].sha1); | |
2014 | hashclr(b->branch_tree.versions[1].sha1); | |
2015 | load_tree(&b->branch_tree); | |
2016 | } | |
2017 | ||
b3031781 | 2018 | static void parse_from_commit(struct branch *b, char *buf, unsigned long size) |
654aaa37 SP |
2019 | { |
2020 | if (!buf || size < 46) | |
2021 | die("Not a valid commit: %s", sha1_to_hex(b->sha1)); | |
2022 | if (memcmp("tree ", buf, 5) | |
2023 | || get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1)) | |
2024 | die("The commit %s is corrupt", sha1_to_hex(b->sha1)); | |
2025 | hashcpy(b->branch_tree.versions[0].sha1, | |
2026 | b->branch_tree.versions[1].sha1); | |
2027 | } | |
2028 | ||
b3031781 | 2029 | static void parse_from_existing(struct branch *b) |
654aaa37 SP |
2030 | { |
2031 | if (is_null_sha1(b->sha1)) { | |
2032 | hashclr(b->branch_tree.versions[0].sha1); | |
2033 | hashclr(b->branch_tree.versions[1].sha1); | |
2034 | } else { | |
2035 | unsigned long size; | |
2036 | char *buf; | |
2037 | ||
2038 | buf = read_object_with_reference(b->sha1, | |
2039 | commit_type, &size, b->sha1); | |
b3031781 | 2040 | parse_from_commit(b, buf, size); |
654aaa37 SP |
2041 | free(buf); |
2042 | } | |
2043 | } | |
2044 | ||
b3031781 | 2045 | static int parse_from(struct branch *b) |
00e2b884 | 2046 | { |
6c3aac1c | 2047 | const char *from; |
00e2b884 SP |
2048 | struct branch *s; |
2049 | ||
599065a3 | 2050 | if (prefixcmp(command_buf.buf, "from ")) |
1fdb649c | 2051 | return 0; |
00e2b884 | 2052 | |
ea5e370a SP |
2053 | if (b->branch_tree.tree) { |
2054 | release_tree_content_recursive(b->branch_tree.tree); | |
2055 | b->branch_tree.tree = NULL; | |
2056 | } | |
00e2b884 SP |
2057 | |
2058 | from = strchr(command_buf.buf, ' ') + 1; | |
00e2b884 SP |
2059 | s = lookup_branch(from); |
2060 | if (b == s) | |
2061 | die("Can't create a branch from itself: %s", b->name); | |
2062 | else if (s) { | |
4cabf858 | 2063 | unsigned char *t = s->branch_tree.versions[1].sha1; |
445b8599 | 2064 | hashcpy(b->sha1, s->sha1); |
4cabf858 SP |
2065 | hashcpy(b->branch_tree.versions[0].sha1, t); |
2066 | hashcpy(b->branch_tree.versions[1].sha1, t); | |
00e2b884 | 2067 | } else if (*from == ':') { |
0ea9f045 | 2068 | uintmax_t idnum = strtoumax(from + 1, NULL, 10); |
00e2b884 | 2069 | struct object_entry *oe = find_mark(idnum); |
00e2b884 | 2070 | if (oe->type != OBJ_COMMIT) |
3efb1f34 | 2071 | die("Mark :%" PRIuMAX " not a commit", idnum); |
445b8599 | 2072 | hashcpy(b->sha1, oe->sha1); |
aac65ed1 | 2073 | if (oe->pack_id != MAX_PACK_ID) { |
00e2b884 | 2074 | unsigned long size; |
aac65ed1 | 2075 | char *buf = gfi_unpack_entry(oe, &size); |
b3031781 | 2076 | parse_from_commit(b, buf, size); |
00e2b884 | 2077 | free(buf); |
aac65ed1 | 2078 | } else |
b3031781 | 2079 | parse_from_existing(b); |
654aaa37 | 2080 | } else if (!get_sha1(from, b->sha1)) |
b3031781 | 2081 | parse_from_existing(b); |
654aaa37 | 2082 | else |
00e2b884 SP |
2083 | die("Invalid ref name or SHA1 expression: %s", from); |
2084 | ||
2085 | read_next_command(); | |
1fdb649c | 2086 | return 1; |
00e2b884 SP |
2087 | } |
2088 | ||
b3031781 | 2089 | static struct hash_list *parse_merge(unsigned int *count) |
62b6f483 | 2090 | { |
10e8d688 | 2091 | struct hash_list *list = NULL, *n, *e = e; |
6c3aac1c | 2092 | const char *from; |
62b6f483 SP |
2093 | struct branch *s; |
2094 | ||
2095 | *count = 0; | |
599065a3 | 2096 | while (!prefixcmp(command_buf.buf, "merge ")) { |
62b6f483 | 2097 | from = strchr(command_buf.buf, ' ') + 1; |
62b6f483 SP |
2098 | n = xmalloc(sizeof(*n)); |
2099 | s = lookup_branch(from); | |
2100 | if (s) | |
2101 | hashcpy(n->sha1, s->sha1); | |
2102 | else if (*from == ':') { | |
0ea9f045 | 2103 | uintmax_t idnum = strtoumax(from + 1, NULL, 10); |
62b6f483 SP |
2104 | struct object_entry *oe = find_mark(idnum); |
2105 | if (oe->type != OBJ_COMMIT) | |
3efb1f34 | 2106 | die("Mark :%" PRIuMAX " not a commit", idnum); |
62b6f483 | 2107 | hashcpy(n->sha1, oe->sha1); |
2f6dc35d SP |
2108 | } else if (!get_sha1(from, n->sha1)) { |
2109 | unsigned long size; | |
2110 | char *buf = read_object_with_reference(n->sha1, | |
6b4318e6 | 2111 | commit_type, &size, n->sha1); |
2f6dc35d SP |
2112 | if (!buf || size < 46) |
2113 | die("Not a valid commit: %s", from); | |
2114 | free(buf); | |
2115 | } else | |
62b6f483 SP |
2116 | die("Invalid ref name or SHA1 expression: %s", from); |
2117 | ||
2118 | n->next = NULL; | |
2119 | if (list) | |
2120 | e->next = n; | |
2121 | else | |
2122 | list = n; | |
2123 | e = n; | |
10e8d688 | 2124 | (*count)++; |
62b6f483 SP |
2125 | read_next_command(); |
2126 | } | |
2127 | return list; | |
2128 | } | |
2129 | ||
b3031781 | 2130 | static void parse_new_commit(void) |
6bb5b329 | 2131 | { |
eec813cf | 2132 | static struct strbuf msg = STRBUF_INIT; |
c44cdc7e | 2133 | struct branch *b; |
c44cdc7e SP |
2134 | char *sp; |
2135 | char *author = NULL; | |
2136 | char *committer = NULL; | |
62b6f483 SP |
2137 | struct hash_list *merge_list = NULL; |
2138 | unsigned int merge_count; | |
c44cdc7e SP |
2139 | |
2140 | /* Obtain the branch name from the rest of our command */ | |
2141 | sp = strchr(command_buf.buf, ' ') + 1; | |
c44cdc7e | 2142 | b = lookup_branch(sp); |
463acbe1 | 2143 | if (!b) |
00e2b884 | 2144 | b = new_branch(sp); |
c44cdc7e SP |
2145 | |
2146 | read_next_command(); | |
b3031781 | 2147 | parse_mark(); |
599065a3 | 2148 | if (!prefixcmp(command_buf.buf, "author ")) { |
63e0c8b3 | 2149 | author = parse_ident(command_buf.buf + 7); |
c44cdc7e SP |
2150 | read_next_command(); |
2151 | } | |
599065a3 | 2152 | if (!prefixcmp(command_buf.buf, "committer ")) { |
63e0c8b3 | 2153 | committer = parse_ident(command_buf.buf + 10); |
c44cdc7e SP |
2154 | read_next_command(); |
2155 | } | |
2156 | if (!committer) | |
2157 | die("Expected committer but didn't get one"); | |
b3031781 | 2158 | parse_data(&msg); |
02f3389d | 2159 | read_next_command(); |
b3031781 MV |
2160 | parse_from(b); |
2161 | merge_list = parse_merge(&merge_count); | |
c44cdc7e SP |
2162 | |
2163 | /* ensure the branch is active/loaded */ | |
41e5257f | 2164 | if (!b->branch_tree.tree || !max_active_branches) { |
463acbe1 SP |
2165 | unload_one_branch(); |
2166 | load_branch(b); | |
2167 | } | |
6bb5b329 | 2168 | |
463acbe1 | 2169 | /* file_change* */ |
e6c019d0 | 2170 | while (command_buf.len > 0) { |
1fdb649c | 2171 | if (!prefixcmp(command_buf.buf, "M ")) |
463acbe1 | 2172 | file_change_m(b); |
599065a3 | 2173 | else if (!prefixcmp(command_buf.buf, "D ")) |
463acbe1 | 2174 | file_change_d(b); |
f39a946a | 2175 | else if (!prefixcmp(command_buf.buf, "R ")) |
b6f3481b SP |
2176 | file_change_cr(b, 1); |
2177 | else if (!prefixcmp(command_buf.buf, "C ")) | |
2178 | file_change_cr(b, 0); | |
825769a8 SP |
2179 | else if (!strcmp("deleteall", command_buf.buf)) |
2180 | file_change_deleteall(b); | |
1fdb649c SP |
2181 | else { |
2182 | unread_command_buf = 1; | |
2183 | break; | |
2184 | } | |
e6c019d0 PH |
2185 | if (read_next_command() == EOF) |
2186 | break; | |
6bb5b329 | 2187 | } |
6bb5b329 | 2188 | |
c44cdc7e | 2189 | /* build the tree and the commit */ |
463acbe1 | 2190 | store_tree(&b->branch_tree); |
8a8c55ea SP |
2191 | hashcpy(b->branch_tree.versions[0].sha1, |
2192 | b->branch_tree.versions[1].sha1); | |
eec813cf PH |
2193 | |
2194 | strbuf_reset(&new_data); | |
2195 | strbuf_addf(&new_data, "tree %s\n", | |
4cabf858 | 2196 | sha1_to_hex(b->branch_tree.versions[1].sha1)); |
445b8599 | 2197 | if (!is_null_sha1(b->sha1)) |
eec813cf | 2198 | strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1)); |
62b6f483 SP |
2199 | while (merge_list) { |
2200 | struct hash_list *next = merge_list->next; | |
eec813cf | 2201 | strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1)); |
62b6f483 SP |
2202 | free(merge_list); |
2203 | merge_list = next; | |
2204 | } | |
eec813cf PH |
2205 | strbuf_addf(&new_data, |
2206 | "author %s\n" | |
2207 | "committer %s\n" | |
2208 | "\n", | |
2209 | author ? author : committer, committer); | |
2210 | strbuf_addbuf(&new_data, &msg); | |
e7d06a4b | 2211 | free(author); |
c44cdc7e | 2212 | free(committer); |
c44cdc7e | 2213 | |
eec813cf | 2214 | if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark)) |
69e74e74 | 2215 | b->pack_id = pack_id; |
463acbe1 | 2216 | b->last_commit = object_count_by_type[OBJ_COMMIT]; |
6bb5b329 SP |
2217 | } |
2218 | ||
b3031781 | 2219 | static void parse_new_tag(void) |
72303d44 | 2220 | { |
eec813cf | 2221 | static struct strbuf msg = STRBUF_INIT; |
72303d44 SP |
2222 | char *sp; |
2223 | const char *from; | |
2224 | char *tagger; | |
2225 | struct branch *s; | |
72303d44 | 2226 | struct tag *t; |
0ea9f045 | 2227 | uintmax_t from_mark = 0; |
72303d44 SP |
2228 | unsigned char sha1[20]; |
2229 | ||
2230 | /* Obtain the new tag name from the rest of our command */ | |
2231 | sp = strchr(command_buf.buf, ' ') + 1; | |
72303d44 SP |
2232 | t = pool_alloc(sizeof(struct tag)); |
2233 | t->next_tag = NULL; | |
2234 | t->name = pool_strdup(sp); | |
2235 | if (last_tag) | |
2236 | last_tag->next_tag = t; | |
2237 | else | |
2238 | first_tag = t; | |
2239 | last_tag = t; | |
72303d44 SP |
2240 | read_next_command(); |
2241 | ||
2242 | /* from ... */ | |
599065a3 | 2243 | if (prefixcmp(command_buf.buf, "from ")) |
72303d44 | 2244 | die("Expected from command, got %s", command_buf.buf); |
72303d44 | 2245 | from = strchr(command_buf.buf, ' ') + 1; |
72303d44 SP |
2246 | s = lookup_branch(from); |
2247 | if (s) { | |
445b8599 | 2248 | hashcpy(sha1, s->sha1); |
72303d44 | 2249 | } else if (*from == ':') { |
10e8d688 | 2250 | struct object_entry *oe; |
0ea9f045 | 2251 | from_mark = strtoumax(from + 1, NULL, 10); |
10e8d688 | 2252 | oe = find_mark(from_mark); |
72303d44 | 2253 | if (oe->type != OBJ_COMMIT) |
3efb1f34 | 2254 | die("Mark :%" PRIuMAX " not a commit", from_mark); |
445b8599 | 2255 | hashcpy(sha1, oe->sha1); |
72303d44 SP |
2256 | } else if (!get_sha1(from, sha1)) { |
2257 | unsigned long size; | |
2258 | char *buf; | |
2259 | ||
2260 | buf = read_object_with_reference(sha1, | |
df843662 | 2261 | commit_type, &size, sha1); |
72303d44 SP |
2262 | if (!buf || size < 46) |
2263 | die("Not a valid commit: %s", from); | |
2264 | free(buf); | |
2265 | } else | |
2266 | die("Invalid ref name or SHA1 expression: %s", from); | |
72303d44 SP |
2267 | read_next_command(); |
2268 | ||
2269 | /* tagger ... */ | |
88fbf67b JH |
2270 | if (!prefixcmp(command_buf.buf, "tagger ")) { |
2271 | tagger = parse_ident(command_buf.buf + 7); | |
2272 | read_next_command(); | |
2273 | } else | |
2274 | tagger = NULL; | |
72303d44 SP |
2275 | |
2276 | /* tag payload/message */ | |
b3031781 | 2277 | parse_data(&msg); |
72303d44 SP |
2278 | |
2279 | /* build the tag object */ | |
eec813cf | 2280 | strbuf_reset(&new_data); |
88fbf67b | 2281 | |
eec813cf | 2282 | strbuf_addf(&new_data, |
88fbf67b JH |
2283 | "object %s\n" |
2284 | "type %s\n" | |
2285 | "tag %s\n", | |
2286 | sha1_to_hex(sha1), commit_type, t->name); | |
2287 | if (tagger) | |
2288 | strbuf_addf(&new_data, | |
2289 | "tagger %s\n", tagger); | |
2290 | strbuf_addch(&new_data, '\n'); | |
eec813cf | 2291 | strbuf_addbuf(&new_data, &msg); |
72303d44 | 2292 | free(tagger); |
72303d44 | 2293 | |
eec813cf | 2294 | if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0)) |
69e74e74 SP |
2295 | t->pack_id = MAX_PACK_ID; |
2296 | else | |
2297 | t->pack_id = pack_id; | |
72303d44 SP |
2298 | } |
2299 | ||
b3031781 | 2300 | static void parse_reset_branch(void) |
5fced8dc SP |
2301 | { |
2302 | struct branch *b; | |
5fced8dc SP |
2303 | char *sp; |
2304 | ||
2305 | /* Obtain the branch name from the rest of our command */ | |
2306 | sp = strchr(command_buf.buf, ' ') + 1; | |
5fced8dc SP |
2307 | b = lookup_branch(sp); |
2308 | if (b) { | |
ea5e370a SP |
2309 | hashclr(b->sha1); |
2310 | hashclr(b->branch_tree.versions[0].sha1); | |
2311 | hashclr(b->branch_tree.versions[1].sha1); | |
5fced8dc SP |
2312 | if (b->branch_tree.tree) { |
2313 | release_tree_content_recursive(b->branch_tree.tree); | |
2314 | b->branch_tree.tree = NULL; | |
2315 | } | |
2316 | } | |
9938ffc5 SP |
2317 | else |
2318 | b = new_branch(sp); | |
9938ffc5 | 2319 | read_next_command(); |
b3031781 | 2320 | parse_from(b); |
655e8515 | 2321 | if (command_buf.len > 0) |
1fdb649c | 2322 | unread_command_buf = 1; |
5fced8dc SP |
2323 | } |
2324 | ||
b3031781 | 2325 | static void parse_checkpoint(void) |
7bfe6e26 | 2326 | { |
820b9310 SP |
2327 | if (object_count) { |
2328 | cycle_packfile(); | |
2329 | dump_branches(); | |
2330 | dump_tags(); | |
2331 | dump_marks(); | |
2332 | } | |
1fdb649c | 2333 | skip_optional_lf(); |
7bfe6e26 SP |
2334 | } |
2335 | ||
b3031781 | 2336 | static void parse_progress(void) |
ac053c02 | 2337 | { |
b449f4cf | 2338 | fwrite(command_buf.buf, 1, command_buf.len, stdout); |
ac053c02 SP |
2339 | fputc('\n', stdout); |
2340 | fflush(stdout); | |
2341 | skip_optional_lf(); | |
2342 | } | |
2343 | ||
e8438420 SP |
2344 | static void import_marks(const char *input_file) |
2345 | { | |
2346 | char line[512]; | |
2347 | FILE *f = fopen(input_file, "r"); | |
2348 | if (!f) | |
2349 | die("cannot read %s: %s", input_file, strerror(errno)); | |
2350 | while (fgets(line, sizeof(line), f)) { | |
2351 | uintmax_t mark; | |
2352 | char *end; | |
2353 | unsigned char sha1[20]; | |
2354 | struct object_entry *e; | |
2355 | ||
2356 | end = strchr(line, '\n'); | |
2357 | if (line[0] != ':' || !end) | |
2358 | die("corrupt mark line: %s", line); | |
2359 | *end = 0; | |
2360 | mark = strtoumax(line + 1, &end, 10); | |
2361 | if (!mark || end == line + 1 | |
2362 | || *end != ' ' || get_sha1(end + 1, sha1)) | |
2363 | die("corrupt mark line: %s", line); | |
2364 | e = find_object(sha1); | |
2365 | if (!e) { | |
2366 | enum object_type type = sha1_object_info(sha1, NULL); | |
2367 | if (type < 0) | |
2368 | die("object not found: %s", sha1_to_hex(sha1)); | |
2369 | e = insert_object(sha1); | |
2370 | e->type = type; | |
2371 | e->pack_id = MAX_PACK_ID; | |
a5c1780a | 2372 | e->offset = 1; /* just not zero! */ |
e8438420 SP |
2373 | } |
2374 | insert_mark(mark, e); | |
2375 | } | |
2376 | fclose(f); | |
2377 | } | |
2378 | ||
ef90d6d4 | 2379 | static int git_pack_config(const char *k, const char *v, void *cb) |
bb23fdfa SP |
2380 | { |
2381 | if (!strcmp(k, "pack.depth")) { | |
2382 | max_depth = git_config_int(k, v); | |
2383 | if (max_depth > MAX_DEPTH) | |
2384 | max_depth = MAX_DEPTH; | |
2385 | return 0; | |
2386 | } | |
2387 | if (!strcmp(k, "pack.compression")) { | |
2388 | int level = git_config_int(k, v); | |
2389 | if (level == -1) | |
2390 | level = Z_DEFAULT_COMPRESSION; | |
2391 | else if (level < 0 || level > Z_BEST_COMPRESSION) | |
2392 | die("bad pack compression level %d", level); | |
2393 | pack_compression_level = level; | |
2394 | pack_compression_seen = 1; | |
2395 | return 0; | |
2396 | } | |
ef90d6d4 | 2397 | return git_default_config(k, v, cb); |
bb23fdfa SP |
2398 | } |
2399 | ||
d5c57b28 | 2400 | static const char fast_import_usage[] = |
1b1dd23f | 2401 | "git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]"; |
d5c57b28 | 2402 | |
8bcce301 SP |
2403 | int main(int argc, const char **argv) |
2404 | { | |
904b1941 | 2405 | unsigned int i, show_stats = 1; |
8bcce301 | 2406 | |
2fb3f6db SP |
2407 | git_extract_argv0_path(argv[0]); |
2408 | ||
733ee2b7 | 2409 | setup_git_directory(); |
ef90d6d4 | 2410 | git_config(git_pack_config, NULL); |
bb23fdfa SP |
2411 | if (!pack_compression_seen && core_compression_seen) |
2412 | pack_compression_level = core_compression_level; | |
2413 | ||
93e72d8d | 2414 | alloc_objects(object_entry_alloc); |
f1696ee3 | 2415 | strbuf_init(&command_buf, 0); |
93e72d8d SP |
2416 | atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*)); |
2417 | branch_table = xcalloc(branch_table_sz, sizeof(struct branch*)); | |
2418 | avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*)); | |
2419 | marks = pool_calloc(1, sizeof(struct mark_set)); | |
463acbe1 | 2420 | |
d5c57b28 SP |
2421 | for (i = 1; i < argc; i++) { |
2422 | const char *a = argv[i]; | |
2423 | ||
2424 | if (*a != '-' || !strcmp(a, "--")) | |
2425 | break; | |
cc44c765 | 2426 | else if (!prefixcmp(a, "--date-format=")) { |
63e0c8b3 SP |
2427 | const char *fmt = a + 14; |
2428 | if (!strcmp(fmt, "raw")) | |
2429 | whenspec = WHENSPEC_RAW; | |
2430 | else if (!strcmp(fmt, "rfc2822")) | |
2431 | whenspec = WHENSPEC_RFC2822; | |
2432 | else if (!strcmp(fmt, "now")) | |
2433 | whenspec = WHENSPEC_NOW; | |
2434 | else | |
2435 | die("unknown --date-format argument %s", fmt); | |
2436 | } | |
cc44c765 | 2437 | else if (!prefixcmp(a, "--max-pack-size=")) |
0ea9f045 | 2438 | max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024; |
436e7a74 | 2439 | else if (!prefixcmp(a, "--depth=")) { |
d5c57b28 | 2440 | max_depth = strtoul(a + 8, NULL, 0); |
436e7a74 SP |
2441 | if (max_depth > MAX_DEPTH) |
2442 | die("--depth cannot exceed %u", MAX_DEPTH); | |
2443 | } | |
cc44c765 | 2444 | else if (!prefixcmp(a, "--active-branches=")) |
d5c57b28 | 2445 | max_active_branches = strtoul(a + 18, NULL, 0); |
e8438420 SP |
2446 | else if (!prefixcmp(a, "--import-marks=")) |
2447 | import_marks(a + 15); | |
cc44c765 | 2448 | else if (!prefixcmp(a, "--export-marks=")) |
a6a1a831 | 2449 | mark_file = a + 15; |
cc44c765 | 2450 | else if (!prefixcmp(a, "--export-pack-edges=")) { |
bdf1c06d SP |
2451 | if (pack_edges) |
2452 | fclose(pack_edges); | |
2453 | pack_edges = fopen(a + 20, "a"); | |
2454 | if (!pack_edges) | |
2455 | die("Cannot open %s: %s", a + 20, strerror(errno)); | |
2456 | } else if (!strcmp(a, "--force")) | |
7073e69e | 2457 | force_update = 1; |
c499d768 SP |
2458 | else if (!strcmp(a, "--quiet")) |
2459 | show_stats = 0; | |
2460 | else if (!strcmp(a, "--stats")) | |
2461 | show_stats = 1; | |
d5c57b28 SP |
2462 | else |
2463 | die("unknown option %s", a); | |
2464 | } | |
8455e484 | 2465 | if (i != argc) |
d5c57b28 | 2466 | usage(fast_import_usage); |
d5c57b28 | 2467 | |
904b1941 SP |
2468 | rc_free = pool_alloc(cmd_save * sizeof(*rc_free)); |
2469 | for (i = 0; i < (cmd_save - 1); i++) | |
2470 | rc_free[i].next = &rc_free[i + 1]; | |
2471 | rc_free[cmd_save - 1].next = NULL; | |
2472 | ||
a5c1780a | 2473 | prepare_packed_git(); |
f70b6534 | 2474 | start_packfile(); |
8acb3297 | 2475 | set_die_routine(die_nicely); |
e6c019d0 PH |
2476 | while (read_next_command() != EOF) { |
2477 | if (!strcmp("blob", command_buf.buf)) | |
b3031781 | 2478 | parse_new_blob(); |
599065a3 | 2479 | else if (!prefixcmp(command_buf.buf, "commit ")) |
b3031781 | 2480 | parse_new_commit(); |
599065a3 | 2481 | else if (!prefixcmp(command_buf.buf, "tag ")) |
b3031781 | 2482 | parse_new_tag(); |
599065a3 | 2483 | else if (!prefixcmp(command_buf.buf, "reset ")) |
b3031781 | 2484 | parse_reset_branch(); |
7bfe6e26 | 2485 | else if (!strcmp("checkpoint", command_buf.buf)) |
b3031781 | 2486 | parse_checkpoint(); |
ac053c02 | 2487 | else if (!prefixcmp(command_buf.buf, "progress ")) |
b3031781 | 2488 | parse_progress(); |
c44cdc7e SP |
2489 | else |
2490 | die("Unsupported command: %s", command_buf.buf); | |
db5e523f | 2491 | } |
f70b6534 | 2492 | end_packfile(); |
c44cdc7e | 2493 | |
463acbe1 | 2494 | dump_branches(); |
72303d44 | 2495 | dump_tags(); |
8455e484 | 2496 | unkeep_all_packs(); |
a6a1a831 | 2497 | dump_marks(); |
8bcce301 | 2498 | |
bdf1c06d SP |
2499 | if (pack_edges) |
2500 | fclose(pack_edges); | |
2501 | ||
c499d768 SP |
2502 | if (show_stats) { |
2503 | uintmax_t total_count = 0, duplicate_count = 0; | |
2504 | for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++) | |
2505 | total_count += object_count_by_type[i]; | |
2506 | for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++) | |
2507 | duplicate_count += duplicate_count_by_type[i]; | |
2508 | ||
2509 | fprintf(stderr, "%s statistics:\n", argv[0]); | |
2510 | fprintf(stderr, "---------------------------------------------------------------------\n"); | |
3efb1f34 JR |
2511 | fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count); |
2512 | fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count); | |
2513 | 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]); | |
2514 | 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]); | |
2515 | 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]); | |
2516 | 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]); | |
c499d768 | 2517 | fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count); |
3efb1f34 | 2518 | fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count); |
c499d768 | 2519 | fprintf(stderr, " atoms: %10u\n", atom_cnt); |
3efb1f34 | 2520 | fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024); |
40db58b8 | 2521 | fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)(total_allocd/1024)); |
3efb1f34 | 2522 | fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024); |
c499d768 SP |
2523 | fprintf(stderr, "---------------------------------------------------------------------\n"); |
2524 | pack_report(); | |
2525 | fprintf(stderr, "---------------------------------------------------------------------\n"); | |
2526 | fprintf(stderr, "\n"); | |
2527 | } | |
db5e523f | 2528 | |
7073e69e | 2529 | return failure ? 1 : 0; |
db5e523f | 2530 | } |