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