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