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