]>
Commit | Line | Data |
---|---|---|
db5e523f | 1 | #include "builtin.h" |
0b027f6c | 2 | #include "abspath.h" |
32a8f510 | 3 | #include "environment.h" |
f394e093 | 4 | #include "gettext.h" |
41771fa4 | 5 | #include "hex.h" |
a80d72db | 6 | #include "repository.h" |
b2141fc1 | 7 | #include "config.h" |
697cc8ef | 8 | #include "lockfile.h" |
db5e523f SP |
9 | #include "object.h" |
10 | #include "blob.h" | |
463acbe1 | 11 | #include "tree.h" |
7073e69e | 12 | #include "commit.h" |
db5e523f SP |
13 | #include "delta.h" |
14 | #include "pack.h" | |
c339932b | 15 | #include "path.h" |
463acbe1 | 16 | #include "refs.h" |
db5e523f | 17 | #include "csum-file.h" |
c44cdc7e | 18 | #include "quote.h" |
50906e04 | 19 | #include "dir.h" |
d9545c7f | 20 | #include "run-command.h" |
4f39cd82 | 21 | #include "packfile.h" |
87bed179 | 22 | #include "object-file.h" |
dabab1d6 | 23 | #include "object-name.h" |
a034e910 | 24 | #include "object-store-ll.h" |
065feab4 | 25 | #include "mem-pool.h" |
64043556 | 26 | #include "commit-reach.h" |
1bdca816 | 27 | #include "khash.h" |
88c7b4c3 | 28 | #include "date.h" |
db5e523f | 29 | |
69e74e74 SP |
30 | #define PACK_ID_BITS 16 |
31 | #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) | |
436e7a74 SP |
32 | #define DEPTH_BITS 13 |
33 | #define MAX_DEPTH ((1<<DEPTH_BITS)-1) | |
69e74e74 | 34 | |
8fb3ad76 DI |
35 | /* |
36 | * We abuse the setuid bit on directories to mean "do not delta". | |
37 | */ | |
38 | #define NO_DELTA S_ISUID | |
39 | ||
28d055bd | 40 | /* |
41 | * The amount of additional space required in order to write an object into the | |
42 | * current pack. This is the hash lengths at the end of the pack, plus the | |
43 | * length of one object ID. | |
44 | */ | |
45 | #define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3) | |
46 | ||
9cba13ca | 47 | struct object_entry { |
3fc366bd | 48 | struct pack_idx_entry idx; |
d8410a81 | 49 | struct hashmap_entry ent; |
436e7a74 SP |
50 | uint32_t type : TYPE_BITS, |
51 | pack_id : PACK_ID_BITS, | |
52 | depth : DEPTH_BITS; | |
27d6d290 SP |
53 | }; |
54 | ||
5cf88fd8 | 55 | static int object_entry_hashcmp(const void *map_data UNUSED, |
d8410a81 JK |
56 | const struct hashmap_entry *eptr, |
57 | const struct hashmap_entry *entry_or_key, | |
58 | const void *keydata) | |
59 | { | |
60 | const struct object_id *oid = keydata; | |
61 | const struct object_entry *e1, *e2; | |
62 | ||
63 | e1 = container_of(eptr, const struct object_entry, ent); | |
64 | if (oid) | |
65 | return oidcmp(&e1->idx.oid, oid); | |
66 | ||
67 | e2 = container_of(entry_or_key, const struct object_entry, ent); | |
68 | return oidcmp(&e1->idx.oid, &e2->idx.oid); | |
69 | } | |
70 | ||
9cba13ca | 71 | struct object_entry_pool { |
463acbe1 | 72 | struct object_entry_pool *next_pool; |
27d6d290 SP |
73 | struct object_entry *next_free; |
74 | struct object_entry *end; | |
ac47a738 | 75 | struct object_entry entries[FLEX_ARRAY]; /* more */ |
27d6d290 SP |
76 | }; |
77 | ||
9cba13ca | 78 | struct mark_set { |
d8397168 | 79 | union { |
1bdca816 | 80 | struct object_id *oids[1024]; |
d8397168 SP |
81 | struct object_entry *marked[1024]; |
82 | struct mark_set *sets[1024]; | |
83 | } data; | |
6f64f6d9 | 84 | unsigned int shift; |
d8397168 SP |
85 | }; |
86 | ||
9cba13ca | 87 | struct last_object { |
05576569 | 88 | struct strbuf data; |
89e0a3a1 | 89 | off_t offset; |
6bb5b329 | 90 | unsigned int depth; |
05576569 | 91 | unsigned no_swap : 1; |
ac47a738 SP |
92 | }; |
93 | ||
9cba13ca | 94 | struct atom_str { |
463acbe1 | 95 | struct atom_str *next_atom; |
10831c55 | 96 | unsigned short str_len; |
463acbe1 SP |
97 | char str_dat[FLEX_ARRAY]; /* more */ |
98 | }; | |
99 | ||
100 | struct tree_content; | |
9cba13ca | 101 | struct tree_entry { |
463acbe1 | 102 | struct tree_content *tree; |
4b25d091 | 103 | struct atom_str *name; |
9cba13ca | 104 | struct tree_entry_ms { |
10831c55 | 105 | uint16_t mode; |
d7e6b6a8 | 106 | struct object_id oid; |
4cabf858 | 107 | } versions[2]; |
6bb5b329 SP |
108 | }; |
109 | ||
9cba13ca | 110 | struct tree_content { |
463acbe1 SP |
111 | unsigned int entry_capacity; /* must match avail_tree_content */ |
112 | unsigned int entry_count; | |
4cabf858 | 113 | unsigned int delta_depth; |
463acbe1 SP |
114 | struct tree_entry *entries[FLEX_ARRAY]; /* more */ |
115 | }; | |
116 | ||
9cba13ca | 117 | struct avail_tree_content { |
463acbe1 SP |
118 | unsigned int entry_capacity; /* must match tree_content */ |
119 | struct avail_tree_content *next_avail; | |
6bb5b329 SP |
120 | }; |
121 | ||
9cba13ca | 122 | struct branch { |
463acbe1 SP |
123 | struct branch *table_next_branch; |
124 | struct branch *active_next_branch; | |
6bb5b329 | 125 | const char *name; |
463acbe1 | 126 | struct tree_entry branch_tree; |
69e74e74 | 127 | uintmax_t last_commit; |
2a113aee | 128 | uintmax_t num_notes; |
734c91f9 | 129 | unsigned active : 1; |
4ee1b225 | 130 | unsigned delete : 1; |
734c91f9 | 131 | unsigned pack_id : PACK_ID_BITS; |
d7e6b6a8 | 132 | struct object_id oid; |
6bb5b329 SP |
133 | }; |
134 | ||
9cba13ca | 135 | struct tag { |
72303d44 SP |
136 | struct tag *next_tag; |
137 | const char *name; | |
2369ed79 | 138 | unsigned int pack_id; |
d7e6b6a8 | 139 | struct object_id oid; |
72303d44 SP |
140 | }; |
141 | ||
9cba13ca | 142 | struct hash_list { |
62b6f483 | 143 | struct hash_list *next; |
d7e6b6a8 | 144 | struct object_id oid; |
62b6f483 | 145 | }; |
463acbe1 | 146 | |
63e0c8b3 SP |
147 | typedef enum { |
148 | WHENSPEC_RAW = 1, | |
d42a2fb7 | 149 | WHENSPEC_RAW_PERMISSIVE, |
63e0c8b3 | 150 | WHENSPEC_RFC2822, |
4b05548f | 151 | WHENSPEC_NOW |
63e0c8b3 SP |
152 | } whenspec_type; |
153 | ||
9cba13ca | 154 | struct recent_command { |
904b1941 SP |
155 | struct recent_command *prev; |
156 | struct recent_command *next; | |
157 | char *buf; | |
158 | }; | |
159 | ||
3f018ec7 | 160 | typedef void (*mark_set_inserter_t)(struct mark_set **s, struct object_id *oid, uintmax_t mark); |
d9db599c | 161 | typedef void (*each_mark_fn_t)(uintmax_t mark, void *obj, void *cbp); |
abe0cc53 | 162 | |
0ea9f045 | 163 | /* Configured limits on output */ |
4f2220e6 | 164 | static unsigned long max_depth = 50; |
89e0a3a1 | 165 | static off_t max_packsize; |
d9545c7f | 166 | static int unpack_limit = 100; |
7073e69e | 167 | static int force_update; |
0ea9f045 SP |
168 | |
169 | /* Stats and misc. counters */ | |
170 | static uintmax_t alloc_count; | |
0ea9f045 SP |
171 | static uintmax_t marks_set_count; |
172 | static uintmax_t object_count_by_type[1 << TYPE_BITS]; | |
173 | static uintmax_t duplicate_count_by_type[1 << TYPE_BITS]; | |
174 | static uintmax_t delta_count_by_type[1 << TYPE_BITS]; | |
94c3b482 | 175 | static uintmax_t delta_count_attempts_by_type[1 << TYPE_BITS]; |
a7ddc487 | 176 | static unsigned long object_count; |
6bb5b329 | 177 | static unsigned long branch_count; |
d6c7eb2c | 178 | static unsigned long branch_load_count; |
7073e69e | 179 | static int failure; |
bdf1c06d | 180 | static FILE *pack_edges; |
0f6927c2 | 181 | static unsigned int show_stats = 1; |
9c8398f0 | 182 | static int global_argc; |
3f2e2297 | 183 | static const char **global_argv; |
9dc607f1 | 184 | static const char *global_prefix; |
ac47a738 | 185 | |
463acbe1 | 186 | /* Memory pools */ |
c829f5f8 ÆAB |
187 | static struct mem_pool fi_mem_pool = { |
188 | .block_alloc = 2*1024*1024 - sizeof(struct mp_block), | |
189 | }; | |
463acbe1 | 190 | |
c44cdc7e | 191 | /* Atom management */ |
463acbe1 SP |
192 | static unsigned int atom_table_sz = 4451; |
193 | static unsigned int atom_cnt; | |
194 | static struct atom_str **atom_table; | |
195 | ||
196 | /* The .pack file being generated */ | |
ebcfb379 | 197 | static struct pack_idx_option pack_idx_opts; |
7bfe6e26 | 198 | static unsigned int pack_id; |
98a3beab | 199 | static struct hashfile *pack_file; |
d489bc14 | 200 | static struct packed_git *pack_data; |
7bfe6e26 | 201 | static struct packed_git **all_packs; |
89e0a3a1 | 202 | static off_t pack_size; |
ac47a738 SP |
203 | |
204 | /* Table of objects we've written. */ | |
4cabf858 | 205 | static unsigned int object_entry_alloc = 5000; |
463acbe1 | 206 | static struct object_entry_pool *blocks; |
d8410a81 | 207 | static struct hashmap object_table; |
d8397168 | 208 | static struct mark_set *marks; |
07cd9328 SR |
209 | static const char *export_marks_file; |
210 | static const char *import_marks_file; | |
081751c8 | 211 | static int import_marks_file_from_stream; |
dded4f12 | 212 | static int import_marks_file_ignore_missing; |
f4beed60 | 213 | static int import_marks_file_done; |
bc3c79ae | 214 | static int relative_marks_paths; |
ac47a738 SP |
215 | |
216 | /* Our last blob */ | |
c829f5f8 ÆAB |
217 | static struct last_object last_blob = { |
218 | .data = STRBUF_INIT, | |
219 | }; | |
463acbe1 SP |
220 | |
221 | /* Tree management */ | |
222 | static unsigned int tree_entry_alloc = 1000; | |
223 | static void *avail_tree_entry; | |
224 | static unsigned int avail_tree_table_sz = 100; | |
225 | static struct avail_tree_content **avail_tree_table; | |
96c47d14 | 226 | static size_t tree_entry_allocd; |
eec813cf PH |
227 | static struct strbuf old_tree = STRBUF_INIT; |
228 | static struct strbuf new_tree = STRBUF_INIT; | |
8bcce301 | 229 | |
6bb5b329 | 230 | /* Branch data */ |
d5c57b28 SP |
231 | static unsigned long max_active_branches = 5; |
232 | static unsigned long cur_active_branches; | |
233 | static unsigned long branch_table_sz = 1039; | |
463acbe1 SP |
234 | static struct branch **branch_table; |
235 | static struct branch *active_branches; | |
236 | ||
72303d44 SP |
237 | /* Tag data */ |
238 | static struct tag *first_tag; | |
239 | static struct tag *last_tag; | |
240 | ||
c44cdc7e | 241 | /* Input stream parsing */ |
63e0c8b3 | 242 | static whenspec_type whenspec = WHENSPEC_RAW; |
4a241d79 | 243 | static struct strbuf command_buf = STRBUF_INIT; |
1fdb649c | 244 | static int unread_command_buf; |
c829f5f8 ÆAB |
245 | static struct recent_command cmd_hist = { |
246 | .prev = &cmd_hist, | |
247 | .next = &cmd_hist, | |
248 | }; | |
904b1941 SP |
249 | static struct recent_command *cmd_tail = &cmd_hist; |
250 | static struct recent_command *rc_free; | |
251 | static unsigned int cmd_save = 100; | |
0ea9f045 | 252 | static uintmax_t next_mark; |
eec813cf | 253 | static struct strbuf new_data = STRBUF_INIT; |
f963bd5d | 254 | static int seen_data_command; |
be56862f | 255 | static int require_explicit_termination; |
68061e34 | 256 | static int allow_unsafe_features; |
c44cdc7e | 257 | |
dc01f59d JN |
258 | /* Signal handling */ |
259 | static volatile sig_atomic_t checkpoint_requested; | |
260 | ||
1bdca816 | 261 | /* Submodule marks */ |
262 | static struct string_list sub_marks_from = STRING_LIST_INIT_DUP; | |
263 | static struct string_list sub_marks_to = STRING_LIST_INIT_DUP; | |
264 | static kh_oid_map_t *sub_oid_map; | |
265 | ||
85c62395 DB |
266 | /* Where to write output of cat-blob commands */ |
267 | static int cat_blob_fd = STDOUT_FILENO; | |
268 | ||
9c8398f0 | 269 | static void parse_argv(void); |
28c7b1f7 | 270 | static void parse_get_mark(const char *p); |
97313bef JK |
271 | static void parse_cat_blob(const char *p); |
272 | static void parse_ls(const char *p, struct branch *b); | |
c44cdc7e | 273 | |
d9db599c | 274 | static void for_each_mark(struct mark_set *m, uintmax_t base, each_mark_fn_t callback, void *p) |
275 | { | |
276 | uintmax_t k; | |
277 | if (m->shift) { | |
278 | for (k = 0; k < 1024; k++) { | |
279 | if (m->data.sets[k]) | |
280 | for_each_mark(m->data.sets[k], base + (k << m->shift), callback, p); | |
281 | } | |
282 | } else { | |
283 | for (k = 0; k < 1024; k++) { | |
284 | if (m->data.marked[k]) | |
285 | callback(base + k, m->data.marked[k], p); | |
286 | } | |
287 | } | |
288 | } | |
289 | ||
290 | static void dump_marks_fn(uintmax_t mark, void *object, void *cbp) { | |
291 | struct object_entry *e = object; | |
292 | FILE *f = cbp; | |
293 | ||
294 | fprintf(f, ":%" PRIuMAX " %s\n", mark, oid_to_hex(&e->idx.oid)); | |
295 | } | |
296 | ||
8acb3297 SP |
297 | static void write_branch_report(FILE *rpt, struct branch *b) |
298 | { | |
299 | fprintf(rpt, "%s:\n", b->name); | |
300 | ||
301 | fprintf(rpt, " status :"); | |
302 | if (b->active) | |
303 | fputs(" active", rpt); | |
304 | if (b->branch_tree.tree) | |
305 | fputs(" loaded", rpt); | |
d7e6b6a8 | 306 | if (is_null_oid(&b->branch_tree.versions[1].oid)) |
8acb3297 SP |
307 | fputs(" dirty", rpt); |
308 | fputc('\n', rpt); | |
309 | ||
d7e6b6a8 | 310 | fprintf(rpt, " tip commit : %s\n", oid_to_hex(&b->oid)); |
311 | fprintf(rpt, " old tree : %s\n", | |
312 | oid_to_hex(&b->branch_tree.versions[0].oid)); | |
313 | fprintf(rpt, " cur tree : %s\n", | |
314 | oid_to_hex(&b->branch_tree.versions[1].oid)); | |
8acb3297 SP |
315 | fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit); |
316 | ||
317 | fputs(" last pack : ", rpt); | |
318 | if (b->pack_id < MAX_PACK_ID) | |
319 | fprintf(rpt, "%u", b->pack_id); | |
320 | fputc('\n', rpt); | |
321 | ||
322 | fputc('\n', rpt); | |
323 | } | |
324 | ||
4bf53833 | 325 | static void write_crash_report(const char *err) |
8acb3297 | 326 | { |
fcd12db6 | 327 | char *loc = git_pathdup("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid()); |
8acb3297 SP |
328 | FILE *rpt = fopen(loc, "w"); |
329 | struct branch *b; | |
330 | unsigned long lu; | |
904b1941 | 331 | struct recent_command *rc; |
8acb3297 SP |
332 | |
333 | if (!rpt) { | |
6c223e49 | 334 | error_errno("can't write crash report %s", loc); |
fcd12db6 | 335 | free(loc); |
8acb3297 SP |
336 | return; |
337 | } | |
338 | ||
339 | fprintf(stderr, "fast-import: dumping crash report to %s\n", loc); | |
340 | ||
341 | fprintf(rpt, "fast-import crash report:\n"); | |
85e72830 DSP |
342 | fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid()); |
343 | fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid()); | |
547ed716 | 344 | fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_MODE(ISO8601))); |
8acb3297 SP |
345 | fputc('\n', rpt); |
346 | ||
347 | fputs("fatal: ", rpt); | |
4bf53833 | 348 | fputs(err, rpt); |
8acb3297 SP |
349 | fputc('\n', rpt); |
350 | ||
904b1941 SP |
351 | fputc('\n', rpt); |
352 | fputs("Most Recent Commands Before Crash\n", rpt); | |
353 | fputs("---------------------------------\n", rpt); | |
354 | for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) { | |
355 | if (rc->next == &cmd_hist) | |
356 | fputs("* ", rpt); | |
357 | else | |
358 | fputs(" ", rpt); | |
359 | fputs(rc->buf, rpt); | |
360 | fputc('\n', rpt); | |
361 | } | |
362 | ||
8acb3297 SP |
363 | fputc('\n', rpt); |
364 | fputs("Active Branch LRU\n", rpt); | |
365 | fputs("-----------------\n", rpt); | |
366 | fprintf(rpt, " active_branches = %lu cur, %lu max\n", | |
367 | cur_active_branches, | |
368 | max_active_branches); | |
369 | fputc('\n', rpt); | |
370 | fputs(" pos clock name\n", rpt); | |
371 | fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt); | |
372 | for (b = active_branches, lu = 0; b; b = b->active_next_branch) | |
373 | fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n", | |
374 | ++lu, b->last_commit, b->name); | |
375 | ||
376 | fputc('\n', rpt); | |
377 | fputs("Inactive Branches\n", rpt); | |
378 | fputs("-----------------\n", rpt); | |
379 | for (lu = 0; lu < branch_table_sz; lu++) { | |
380 | for (b = branch_table[lu]; b; b = b->table_next_branch) | |
381 | write_branch_report(rpt, b); | |
382 | } | |
383 | ||
fbc63ea6 SP |
384 | if (first_tag) { |
385 | struct tag *tg; | |
386 | fputc('\n', rpt); | |
387 | fputs("Annotated Tags\n", rpt); | |
388 | fputs("--------------\n", rpt); | |
389 | for (tg = first_tag; tg; tg = tg->next_tag) { | |
d7e6b6a8 | 390 | fputs(oid_to_hex(&tg->oid), rpt); |
fbc63ea6 SP |
391 | fputc(' ', rpt); |
392 | fputs(tg->name, rpt); | |
393 | fputc('\n', rpt); | |
394 | } | |
395 | } | |
396 | ||
3b08e5b8 SP |
397 | fputc('\n', rpt); |
398 | fputs("Marks\n", rpt); | |
399 | fputs("-----\n", rpt); | |
07cd9328 SR |
400 | if (export_marks_file) |
401 | fprintf(rpt, " exported to %s\n", export_marks_file); | |
3b08e5b8 | 402 | else |
d9db599c | 403 | for_each_mark(marks, 0, dump_marks_fn, rpt); |
3b08e5b8 | 404 | |
8acb3297 SP |
405 | fputc('\n', rpt); |
406 | fputs("-------------------\n", rpt); | |
407 | fputs("END OF CRASH REPORT\n", rpt); | |
408 | fclose(rpt); | |
fcd12db6 | 409 | free(loc); |
8acb3297 SP |
410 | } |
411 | ||
118805b9 SP |
412 | static void end_packfile(void); |
413 | static void unkeep_all_packs(void); | |
414 | static void dump_marks(void); | |
415 | ||
8acb3297 SP |
416 | static NORETURN void die_nicely(const char *err, va_list params) |
417 | { | |
e081a7c3 | 418 | va_list cp; |
8acb3297 | 419 | static int zombie; |
e081a7c3 | 420 | report_fn die_message_fn = get_die_message_routine(); |
8acb3297 | 421 | |
e081a7c3 ÆAB |
422 | va_copy(cp, params); |
423 | die_message_fn(err, params); | |
8acb3297 SP |
424 | |
425 | if (!zombie) { | |
e081a7c3 ÆAB |
426 | char message[2 * PATH_MAX]; |
427 | ||
8acb3297 | 428 | zombie = 1; |
e081a7c3 | 429 | vsnprintf(message, sizeof(message), err, cp); |
4bf53833 | 430 | write_crash_report(message); |
118805b9 SP |
431 | end_packfile(); |
432 | unkeep_all_packs(); | |
433 | dump_marks(); | |
8acb3297 | 434 | } |
8acb3297 SP |
435 | exit(128); |
436 | } | |
6bb5b329 | 437 | |
dc01f59d JN |
438 | #ifndef SIGUSR1 /* Windows, for example */ |
439 | ||
440 | static void set_checkpoint_signal(void) | |
441 | { | |
442 | } | |
443 | ||
444 | #else | |
445 | ||
9ec03b59 | 446 | static void checkpoint_signal(int signo UNUSED) |
dc01f59d JN |
447 | { |
448 | checkpoint_requested = 1; | |
449 | } | |
450 | ||
451 | static void set_checkpoint_signal(void) | |
452 | { | |
453 | struct sigaction sa; | |
454 | ||
455 | memset(&sa, 0, sizeof(sa)); | |
456 | sa.sa_handler = checkpoint_signal; | |
457 | sigemptyset(&sa.sa_mask); | |
458 | sa.sa_flags = SA_RESTART; | |
459 | sigaction(SIGUSR1, &sa, NULL); | |
460 | } | |
461 | ||
462 | #endif | |
463 | ||
03842d8e | 464 | static void alloc_objects(unsigned int cnt) |
8bcce301 | 465 | { |
463acbe1 | 466 | struct object_entry_pool *b; |
27d6d290 | 467 | |
463acbe1 | 468 | b = xmalloc(sizeof(struct object_entry_pool) |
27d6d290 | 469 | + cnt * sizeof(struct object_entry)); |
463acbe1 | 470 | b->next_pool = blocks; |
27d6d290 SP |
471 | b->next_free = b->entries; |
472 | b->end = b->entries + cnt; | |
473 | blocks = b; | |
474 | alloc_count += cnt; | |
475 | } | |
8bcce301 | 476 | |
912c13d5 | 477 | static struct object_entry *new_object(struct object_id *oid) |
8bcce301 | 478 | { |
27d6d290 | 479 | struct object_entry *e; |
8bcce301 | 480 | |
27d6d290 | 481 | if (blocks->next_free == blocks->end) |
463acbe1 | 482 | alloc_objects(object_entry_alloc); |
8bcce301 | 483 | |
27d6d290 | 484 | e = blocks->next_free++; |
e6a492b7 | 485 | oidcpy(&e->idx.oid, oid); |
27d6d290 | 486 | return e; |
8bcce301 SP |
487 | } |
488 | ||
912c13d5 | 489 | static struct object_entry *find_object(struct object_id *oid) |
463acbe1 | 490 | { |
d8410a81 JK |
491 | return hashmap_get_entry_from_hash(&object_table, oidhash(oid), oid, |
492 | struct object_entry, ent); | |
463acbe1 SP |
493 | } |
494 | ||
912c13d5 | 495 | static struct object_entry *insert_object(struct object_id *oid) |
8bcce301 | 496 | { |
d8410a81 JK |
497 | struct object_entry *e; |
498 | unsigned int hash = oidhash(oid); | |
8bcce301 | 499 | |
d8410a81 JK |
500 | e = hashmap_get_entry_from_hash(&object_table, hash, oid, |
501 | struct object_entry, ent); | |
502 | if (!e) { | |
503 | e = new_object(oid); | |
504 | e->idx.offset = 0; | |
505 | hashmap_entry_init(&e->ent, hash); | |
506 | hashmap_add(&object_table, &e->ent); | |
8bcce301 SP |
507 | } |
508 | ||
8bcce301 SP |
509 | return e; |
510 | } | |
db5e523f | 511 | |
d2986d0f EW |
512 | static void invalidate_pack_id(unsigned int id) |
513 | { | |
d2986d0f EW |
514 | unsigned long lu; |
515 | struct tag *t; | |
d8410a81 JK |
516 | struct hashmap_iter iter; |
517 | struct object_entry *e; | |
d2986d0f | 518 | |
d8410a81 JK |
519 | hashmap_for_each_entry(&object_table, &iter, e, ent) { |
520 | if (e->pack_id == id) | |
521 | e->pack_id = MAX_PACK_ID; | |
d2986d0f EW |
522 | } |
523 | ||
524 | for (lu = 0; lu < branch_table_sz; lu++) { | |
525 | struct branch *b; | |
526 | ||
527 | for (b = branch_table[lu]; b; b = b->table_next_branch) | |
528 | if (b->pack_id == id) | |
529 | b->pack_id = MAX_PACK_ID; | |
530 | } | |
531 | ||
532 | for (t = first_tag; t; t = t->next_tag) | |
533 | if (t->pack_id == id) | |
534 | t->pack_id = MAX_PACK_ID; | |
535 | } | |
536 | ||
463acbe1 SP |
537 | static unsigned int hc_str(const char *s, size_t len) |
538 | { | |
539 | unsigned int r = 0; | |
540 | while (len-- > 0) | |
541 | r = r * 31 + *s++; | |
542 | return r; | |
543 | } | |
544 | ||
3f018ec7 | 545 | static void insert_mark(struct mark_set **top, uintmax_t idnum, struct object_entry *oe) |
d8397168 | 546 | { |
3f018ec7 JK |
547 | struct mark_set *s = *top; |
548 | ||
d8397168 | 549 | while ((idnum >> s->shift) >= 1024) { |
96c47d14 | 550 | s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); |
3f018ec7 JK |
551 | s->shift = (*top)->shift + 10; |
552 | s->data.sets[0] = *top; | |
553 | *top = s; | |
d8397168 SP |
554 | } |
555 | while (s->shift) { | |
0ea9f045 | 556 | uintmax_t i = idnum >> s->shift; |
d8397168 SP |
557 | idnum -= i << s->shift; |
558 | if (!s->data.sets[i]) { | |
96c47d14 | 559 | s->data.sets[i] = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); |
d8397168 SP |
560 | s->data.sets[i]->shift = s->shift - 10; |
561 | } | |
562 | s = s->data.sets[i]; | |
563 | } | |
564 | if (!s->data.marked[idnum]) | |
565 | marks_set_count++; | |
566 | s->data.marked[idnum] = oe; | |
567 | } | |
568 | ||
11d8ef3e | 569 | static void *find_mark(struct mark_set *s, uintmax_t idnum) |
d8397168 | 570 | { |
0ea9f045 | 571 | uintmax_t orig_idnum = idnum; |
d8397168 SP |
572 | struct object_entry *oe = NULL; |
573 | if ((idnum >> s->shift) < 1024) { | |
574 | while (s && s->shift) { | |
0ea9f045 | 575 | uintmax_t i = idnum >> s->shift; |
d8397168 SP |
576 | idnum -= i << s->shift; |
577 | s = s->data.sets[i]; | |
578 | } | |
579 | if (s) | |
580 | oe = s->data.marked[idnum]; | |
581 | } | |
582 | if (!oe) | |
3efb1f34 | 583 | die("mark :%" PRIuMAX " not declared", orig_idnum); |
d8397168 SP |
584 | return oe; |
585 | } | |
586 | ||
e5b1444b | 587 | static struct atom_str *to_atom(const char *s, unsigned short len) |
463acbe1 SP |
588 | { |
589 | unsigned int hc = hc_str(s, len) % atom_table_sz; | |
590 | struct atom_str *c; | |
591 | ||
592 | for (c = atom_table[hc]; c; c = c->next_atom) | |
593 | if (c->str_len == len && !strncmp(s, c->str_dat, len)) | |
594 | return c; | |
595 | ||
96c47d14 | 596 | c = mem_pool_alloc(&fi_mem_pool, sizeof(struct atom_str) + len + 1); |
463acbe1 | 597 | c->str_len = len; |
eddda371 | 598 | memcpy(c->str_dat, s, len); |
463acbe1 SP |
599 | c->str_dat[len] = 0; |
600 | c->next_atom = atom_table[hc]; | |
601 | atom_table[hc] = c; | |
602 | atom_cnt++; | |
603 | return c; | |
604 | } | |
605 | ||
e5b1444b | 606 | static struct branch *lookup_branch(const char *name) |
463acbe1 SP |
607 | { |
608 | unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz; | |
609 | struct branch *b; | |
610 | ||
611 | for (b = branch_table[hc]; b; b = b->table_next_branch) | |
612 | if (!strcmp(name, b->name)) | |
613 | return b; | |
614 | return NULL; | |
615 | } | |
616 | ||
e5b1444b | 617 | static struct branch *new_branch(const char *name) |
463acbe1 SP |
618 | { |
619 | unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz; | |
4b25d091 | 620 | struct branch *b = lookup_branch(name); |
463acbe1 SP |
621 | |
622 | if (b) | |
623 | die("Invalid attempt to create duplicate branch: %s", name); | |
8d9c5010 | 624 | if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL)) |
c44cdc7e | 625 | die("Branch name doesn't conform to GIT standards: %s", name); |
463acbe1 | 626 | |
96c47d14 | 627 | b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch)); |
a762c8c1 | 628 | b->name = mem_pool_strdup(&fi_mem_pool, name); |
463acbe1 | 629 | b->table_next_branch = branch_table[hc]; |
8a8c55ea SP |
630 | b->branch_tree.versions[0].mode = S_IFDIR; |
631 | b->branch_tree.versions[1].mode = S_IFDIR; | |
2a113aee | 632 | b->num_notes = 0; |
734c91f9 | 633 | b->active = 0; |
69e74e74 | 634 | b->pack_id = MAX_PACK_ID; |
463acbe1 SP |
635 | branch_table[hc] = b; |
636 | branch_count++; | |
637 | return b; | |
638 | } | |
639 | ||
640 | static unsigned int hc_entries(unsigned int cnt) | |
641 | { | |
642 | cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8; | |
643 | return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1; | |
644 | } | |
645 | ||
e5b1444b | 646 | static struct tree_content *new_tree_content(unsigned int cnt) |
463acbe1 SP |
647 | { |
648 | struct avail_tree_content *f, *l = NULL; | |
649 | struct tree_content *t; | |
650 | unsigned int hc = hc_entries(cnt); | |
651 | ||
652 | for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail) | |
653 | if (f->entry_capacity >= cnt) | |
654 | break; | |
655 | ||
656 | if (f) { | |
657 | if (l) | |
658 | l->next_avail = f->next_avail; | |
659 | else | |
660 | avail_tree_table[hc] = f->next_avail; | |
661 | } else { | |
662 | cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt; | |
96c47d14 | 663 | f = mem_pool_alloc(&fi_mem_pool, sizeof(*t) + sizeof(t->entries[0]) * cnt); |
463acbe1 SP |
664 | f->entry_capacity = cnt; |
665 | } | |
666 | ||
667 | t = (struct tree_content*)f; | |
668 | t->entry_count = 0; | |
4cabf858 | 669 | t->delta_depth = 0; |
463acbe1 SP |
670 | return t; |
671 | } | |
672 | ||
673 | static void release_tree_entry(struct tree_entry *e); | |
674 | static void release_tree_content(struct tree_content *t) | |
675 | { | |
676 | struct avail_tree_content *f = (struct avail_tree_content*)t; | |
677 | unsigned int hc = hc_entries(f->entry_capacity); | |
afde8dd9 SP |
678 | f->next_avail = avail_tree_table[hc]; |
679 | avail_tree_table[hc] = f; | |
680 | } | |
681 | ||
682 | static void release_tree_content_recursive(struct tree_content *t) | |
683 | { | |
463acbe1 SP |
684 | unsigned int i; |
685 | for (i = 0; i < t->entry_count; i++) | |
686 | release_tree_entry(t->entries[i]); | |
afde8dd9 | 687 | release_tree_content(t); |
463acbe1 SP |
688 | } |
689 | ||
e5b1444b | 690 | static struct tree_content *grow_tree_content( |
463acbe1 SP |
691 | struct tree_content *t, |
692 | int amt) | |
693 | { | |
694 | struct tree_content *r = new_tree_content(t->entry_count + amt); | |
695 | r->entry_count = t->entry_count; | |
4cabf858 | 696 | r->delta_depth = t->delta_depth; |
921d49be | 697 | COPY_ARRAY(r->entries, t->entries, t->entry_count); |
463acbe1 SP |
698 | release_tree_content(t); |
699 | return r; | |
700 | } | |
701 | ||
e5b1444b | 702 | static struct tree_entry *new_tree_entry(void) |
463acbe1 SP |
703 | { |
704 | struct tree_entry *e; | |
705 | ||
706 | if (!avail_tree_entry) { | |
707 | unsigned int n = tree_entry_alloc; | |
96c47d14 | 708 | tree_entry_allocd += n * sizeof(struct tree_entry); |
b32fa95f JK |
709 | ALLOC_ARRAY(e, n); |
710 | avail_tree_entry = e; | |
2eb26d84 | 711 | while (n-- > 1) { |
463acbe1 SP |
712 | *((void**)e) = e + 1; |
713 | e++; | |
714 | } | |
35ef237c | 715 | *((void**)e) = NULL; |
463acbe1 SP |
716 | } |
717 | ||
718 | e = avail_tree_entry; | |
719 | avail_tree_entry = *((void**)e); | |
720 | return e; | |
721 | } | |
722 | ||
723 | static void release_tree_entry(struct tree_entry *e) | |
724 | { | |
725 | if (e->tree) | |
afde8dd9 | 726 | release_tree_content_recursive(e->tree); |
463acbe1 SP |
727 | *((void**)e) = avail_tree_entry; |
728 | avail_tree_entry = e; | |
729 | } | |
730 | ||
b6f3481b SP |
731 | static struct tree_content *dup_tree_content(struct tree_content *s) |
732 | { | |
733 | struct tree_content *d; | |
734 | struct tree_entry *a, *b; | |
735 | unsigned int i; | |
736 | ||
737 | if (!s) | |
738 | return NULL; | |
739 | d = new_tree_content(s->entry_count); | |
740 | for (i = 0; i < s->entry_count; i++) { | |
741 | a = s->entries[i]; | |
742 | b = new_tree_entry(); | |
743 | memcpy(b, a, sizeof(*a)); | |
d7e6b6a8 | 744 | if (a->tree && is_null_oid(&b->versions[1].oid)) |
b6f3481b SP |
745 | b->tree = dup_tree_content(a->tree); |
746 | else | |
747 | b->tree = NULL; | |
748 | d->entries[i] = b; | |
749 | } | |
750 | d->entry_count = s->entry_count; | |
751 | d->delta_depth = s->delta_depth; | |
752 | ||
753 | return d; | |
754 | } | |
755 | ||
fd99224e | 756 | static void start_packfile(void) |
f70b6534 | 757 | { |
594fa999 | 758 | struct strbuf tmp_file = STRBUF_INIT; |
7bfe6e26 | 759 | struct packed_git *p; |
0fcbcae7 | 760 | int pack_fd; |
f70b6534 | 761 | |
594fa999 JK |
762 | pack_fd = odb_mkstemp(&tmp_file, "pack/tmp_pack_XXXXXX"); |
763 | FLEX_ALLOC_STR(p, pack_name, tmp_file.buf); | |
764 | strbuf_release(&tmp_file); | |
765 | ||
7bfe6e26 | 766 | p->pack_fd = pack_fd; |
d131b7af | 767 | p->do_not_close = 1; |
98a3beab | 768 | pack_file = hashfd(pack_fd, p->pack_name); |
f70b6534 | 769 | |
7bfe6e26 | 770 | pack_data = p; |
ccb181d0 | 771 | pack_size = write_pack_header(pack_file, 0); |
f70b6534 | 772 | object_count = 0; |
7bfe6e26 | 773 | |
2756ca43 | 774 | REALLOC_ARRAY(all_packs, pack_id + 1); |
7bfe6e26 | 775 | all_packs[pack_id] = p; |
f70b6534 SP |
776 | } |
777 | ||
427cb22c | 778 | static const char *create_index(void) |
f70b6534 | 779 | { |
427cb22c NP |
780 | const char *tmpfile; |
781 | struct pack_idx_entry **idx, **c, **last; | |
782 | struct object_entry *e; | |
f70b6534 | 783 | struct object_entry_pool *o; |
f70b6534 | 784 | |
427cb22c | 785 | /* Build the table of object IDs. */ |
b32fa95f | 786 | ALLOC_ARRAY(idx, object_count); |
f70b6534 SP |
787 | c = idx; |
788 | for (o = blocks; o; o = o->next_pool) | |
d9ee53ce SP |
789 | for (e = o->next_free; e-- != o->entries;) |
790 | if (pack_id == e->pack_id) | |
427cb22c | 791 | *c++ = &e->idx; |
f70b6534 | 792 | last = idx + object_count; |
2fce1f3c SP |
793 | if (c != last) |
794 | die("internal consistency error creating the index"); | |
f70b6534 | 795 | |
538b1523 | 796 | tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts, |
797 | pack_data->hash); | |
f70b6534 | 798 | free(idx); |
8455e484 SP |
799 | return tmpfile; |
800 | } | |
801 | ||
427cb22c | 802 | static char *keep_pack(const char *curr_index_name) |
8455e484 | 803 | { |
3a55602e | 804 | static const char *keep_msg = "fast-import"; |
ba47a308 | 805 | struct strbuf name = STRBUF_INIT; |
8455e484 SP |
806 | int keep_fd; |
807 | ||
538b1523 | 808 | odb_pack_name(&name, pack_data->hash, "keep"); |
ba47a308 | 809 | keep_fd = odb_pack_keep(name.buf); |
8455e484 | 810 | if (keep_fd < 0) |
0721c314 | 811 | die_errno("cannot create keep file"); |
95693d45 JM |
812 | write_or_die(keep_fd, keep_msg, strlen(keep_msg)); |
813 | if (close(keep_fd)) | |
0721c314 | 814 | die_errno("failed to write keep file"); |
8455e484 | 815 | |
538b1523 | 816 | odb_pack_name(&name, pack_data->hash, "pack"); |
ba47a308 | 817 | if (finalize_object_file(pack_data->pack_name, name.buf)) |
8455e484 | 818 | die("cannot store pack file"); |
8455e484 | 819 | |
538b1523 | 820 | odb_pack_name(&name, pack_data->hash, "idx"); |
ba47a308 | 821 | if (finalize_object_file(curr_index_name, name.buf)) |
8455e484 | 822 | die("cannot store index file"); |
427cb22c | 823 | free((void *)curr_index_name); |
ba47a308 | 824 | return strbuf_detach(&name, NULL); |
8455e484 SP |
825 | } |
826 | ||
fd99224e | 827 | static void unkeep_all_packs(void) |
8455e484 | 828 | { |
ba47a308 | 829 | struct strbuf name = STRBUF_INIT; |
8455e484 SP |
830 | int k; |
831 | ||
832 | for (k = 0; k < pack_id; k++) { | |
833 | struct packed_git *p = all_packs[k]; | |
538b1523 | 834 | odb_pack_name(&name, p->hash, "keep"); |
ba47a308 | 835 | unlink_or_warn(name.buf); |
8455e484 | 836 | } |
ba47a308 | 837 | strbuf_release(&name); |
f70b6534 SP |
838 | } |
839 | ||
d9545c7f EW |
840 | static int loosen_small_pack(const struct packed_git *p) |
841 | { | |
842 | struct child_process unpack = CHILD_PROCESS_INIT; | |
843 | ||
844 | if (lseek(p->pack_fd, 0, SEEK_SET) < 0) | |
845 | die_errno("Failed seeking to start of '%s'", p->pack_name); | |
846 | ||
847 | unpack.in = p->pack_fd; | |
848 | unpack.git_cmd = 1; | |
849 | unpack.stdout_to_stderr = 1; | |
ef8d7ac4 | 850 | strvec_push(&unpack.args, "unpack-objects"); |
d9545c7f | 851 | if (!show_stats) |
ef8d7ac4 | 852 | strvec_push(&unpack.args, "-q"); |
d9545c7f EW |
853 | |
854 | return run_command(&unpack); | |
855 | } | |
856 | ||
fd99224e | 857 | static void end_packfile(void) |
f70b6534 | 858 | { |
5e915f30 JK |
859 | static int running; |
860 | ||
861 | if (running || !pack_data) | |
3c078b9c | 862 | return; |
7bfe6e26 | 863 | |
5e915f30 | 864 | running = 1; |
3d20c636 | 865 | clear_delta_base_cache(); |
3e005baf | 866 | if (object_count) { |
3c078b9c | 867 | struct packed_git *new_p; |
912c13d5 | 868 | struct object_id cur_pack_oid; |
8455e484 | 869 | char *idx_name; |
2369ed79 SP |
870 | int i; |
871 | struct branch *b; | |
872 | struct tag *t; | |
8455e484 | 873 | |
c9ced051 | 874 | close_pack_windows(pack_data); |
020406ea | 875 | finalize_hashfile(pack_file, cur_pack_oid.hash, FSYNC_COMPONENT_PACK, 0); |
538b1523 | 876 | fixup_pack_header_footer(pack_data->pack_fd, pack_data->hash, |
877 | pack_data->pack_name, object_count, | |
878 | cur_pack_oid.hash, pack_size); | |
d9545c7f EW |
879 | |
880 | if (object_count <= unpack_limit) { | |
d2986d0f EW |
881 | if (!loosen_small_pack(pack_data)) { |
882 | invalidate_pack_id(pack_id); | |
d9545c7f | 883 | goto discard_pack; |
d2986d0f | 884 | } |
d9545c7f EW |
885 | } |
886 | ||
8b0eca7c | 887 | close(pack_data->pack_fd); |
8455e484 | 888 | idx_name = keep_pack(create_index()); |
3e005baf | 889 | |
3ea3c215 | 890 | /* Register the packfile with core git's machinery. */ |
3e005baf SP |
891 | new_p = add_packed_git(idx_name, strlen(idx_name), 1); |
892 | if (!new_p) | |
893 | die("core git rejected index %s", idx_name); | |
2369ed79 | 894 | all_packs[pack_id] = new_p; |
5babff16 | 895 | install_packed_git(the_repository, new_p); |
ba47a308 | 896 | free(idx_name); |
2369ed79 SP |
897 | |
898 | /* Print the boundary */ | |
bdf1c06d SP |
899 | if (pack_edges) { |
900 | fprintf(pack_edges, "%s:", new_p->pack_name); | |
901 | for (i = 0; i < branch_table_sz; i++) { | |
902 | for (b = branch_table[i]; b; b = b->table_next_branch) { | |
903 | if (b->pack_id == pack_id) | |
d7e6b6a8 | 904 | fprintf(pack_edges, " %s", |
905 | oid_to_hex(&b->oid)); | |
bdf1c06d | 906 | } |
2369ed79 | 907 | } |
bdf1c06d SP |
908 | for (t = first_tag; t; t = t->next_tag) { |
909 | if (t->pack_id == pack_id) | |
d7e6b6a8 | 910 | fprintf(pack_edges, " %s", |
911 | oid_to_hex(&t->oid)); | |
bdf1c06d SP |
912 | } |
913 | fputc('\n', pack_edges); | |
914 | fflush(pack_edges); | |
2369ed79 | 915 | } |
2369ed79 SP |
916 | |
917 | pack_id++; | |
3e005baf | 918 | } |
87c8a56e | 919 | else { |
d9545c7f | 920 | discard_pack: |
3c078b9c JK |
921 | close(pack_data->pack_fd); |
922 | unlink_or_warn(pack_data->pack_name); | |
87c8a56e | 923 | } |
6a83d902 | 924 | FREE_AND_NULL(pack_data); |
5e915f30 | 925 | running = 0; |
7bfe6e26 SP |
926 | |
927 | /* We can't carry a delta across packfiles. */ | |
05576569 | 928 | strbuf_release(&last_blob.data); |
7bfe6e26 SP |
929 | last_blob.offset = 0; |
930 | last_blob.depth = 0; | |
f70b6534 SP |
931 | } |
932 | ||
820b9310 | 933 | static void cycle_packfile(void) |
d9ee53ce SP |
934 | { |
935 | end_packfile(); | |
936 | start_packfile(); | |
937 | } | |
938 | ||
ac47a738 SP |
939 | static int store_object( |
940 | enum object_type type, | |
eec813cf | 941 | struct strbuf *dat, |
6bb5b329 | 942 | struct last_object *last, |
912c13d5 | 943 | struct object_id *oidout, |
0ea9f045 | 944 | uintmax_t mark) |
db5e523f | 945 | { |
db5e523f | 946 | void *out, *delta; |
ac47a738 SP |
947 | struct object_entry *e; |
948 | unsigned char hdr[96]; | |
912c13d5 | 949 | struct object_id oid; |
db5e523f | 950 | unsigned long hdrlen, deltalen; |
7f89428d | 951 | git_hash_ctx c; |
ef49a7a0 | 952 | git_zstream s; |
ac47a738 | 953 | |
b04cdea4 ÆAB |
954 | hdrlen = format_object_header((char *)hdr, sizeof(hdr), type, |
955 | dat->len); | |
7f89428d | 956 | the_hash_algo->init_fn(&c); |
957 | the_hash_algo->update_fn(&c, hdr, hdrlen); | |
958 | the_hash_algo->update_fn(&c, dat->buf, dat->len); | |
5951bf46 | 959 | the_hash_algo->final_oid_fn(&oid, &c); |
912c13d5 | 960 | if (oidout) |
961 | oidcpy(oidout, &oid); | |
ac47a738 | 962 | |
912c13d5 | 963 | e = insert_object(&oid); |
d8397168 | 964 | if (mark) |
3f018ec7 | 965 | insert_mark(&marks, mark, e); |
3fc366bd | 966 | if (e->idx.offset) { |
6143f064 | 967 | duplicate_count_by_type[type]++; |
463acbe1 | 968 | return 1; |
a80d72db | 969 | } else if (find_sha1_pack(oid.hash, |
454ea2e4 | 970 | get_all_packs(the_repository))) { |
a5c1780a SP |
971 | e->type = type; |
972 | e->pack_id = MAX_PACK_ID; | |
3fc366bd | 973 | e->idx.offset = 1; /* just not zero! */ |
a5c1780a SP |
974 | duplicate_count_by_type[type]++; |
975 | return 1; | |
ac47a738 | 976 | } |
db5e523f | 977 | |
9d14ecf3 | 978 | if (last && last->data.len && last->data.buf && last->depth < max_depth |
7f89428d | 979 | && dat->len > the_hash_algo->rawsz) { |
980 | ||
94c3b482 | 981 | delta_count_attempts_by_type[type]++; |
05576569 | 982 | delta = diff_delta(last->data.buf, last->data.len, |
eec813cf | 983 | dat->buf, dat->len, |
7f89428d | 984 | &deltalen, dat->len - the_hash_algo->rawsz); |
d9ee53ce SP |
985 | } else |
986 | delta = NULL; | |
db5e523f | 987 | |
55bb5c91 | 988 | git_deflate_init(&s, pack_compression_level); |
d9ee53ce SP |
989 | if (delta) { |
990 | s.next_in = delta; | |
991 | s.avail_in = deltalen; | |
992 | } else { | |
eec813cf PH |
993 | s.next_in = (void *)dat->buf; |
994 | s.avail_in = dat->len; | |
d9ee53ce | 995 | } |
225a6f10 | 996 | s.avail_out = git_deflate_bound(&s, s.avail_in); |
d9ee53ce | 997 | s.next_out = out = xmalloc(s.avail_out); |
55bb5c91 JH |
998 | while (git_deflate(&s, Z_FINISH) == Z_OK) |
999 | ; /* nothing */ | |
1000 | git_deflate_end(&s); | |
d9ee53ce SP |
1001 | |
1002 | /* Determine if we should auto-checkpoint. */ | |
28d055bd | 1003 | if ((max_packsize |
1004 | && (pack_size + PACK_SIZE_THRESHOLD + s.total_out) > max_packsize) | |
1005 | || (pack_size + PACK_SIZE_THRESHOLD + s.total_out) < pack_size) { | |
d9ee53ce SP |
1006 | |
1007 | /* This new object needs to *not* have the current pack_id. */ | |
1008 | e->pack_id = pack_id + 1; | |
820b9310 | 1009 | cycle_packfile(); |
d9ee53ce SP |
1010 | |
1011 | /* We cannot carry a delta into the new pack. */ | |
1012 | if (delta) { | |
6a83d902 | 1013 | FREE_AND_NULL(delta); |
5d6f3ef6 | 1014 | |
55bb5c91 | 1015 | git_deflate_init(&s, pack_compression_level); |
eec813cf PH |
1016 | s.next_in = (void *)dat->buf; |
1017 | s.avail_in = dat->len; | |
225a6f10 | 1018 | s.avail_out = git_deflate_bound(&s, s.avail_in); |
5d6f3ef6 | 1019 | s.next_out = out = xrealloc(out, s.avail_out); |
55bb5c91 JH |
1020 | while (git_deflate(&s, Z_FINISH) == Z_OK) |
1021 | ; /* nothing */ | |
1022 | git_deflate_end(&s); | |
d9ee53ce | 1023 | } |
d9ee53ce SP |
1024 | } |
1025 | ||
1026 | e->type = type; | |
1027 | e->pack_id = pack_id; | |
3fc366bd | 1028 | e->idx.offset = pack_size; |
d9ee53ce SP |
1029 | object_count++; |
1030 | object_count_by_type[type]++; | |
db5e523f | 1031 | |
427cb22c NP |
1032 | crc32_begin(pack_file); |
1033 | ||
db5e523f | 1034 | if (delta) { |
89e0a3a1 | 1035 | off_t ofs = e->idx.offset - last->offset; |
d489bc14 SP |
1036 | unsigned pos = sizeof(hdr) - 1; |
1037 | ||
4cabf858 | 1038 | delta_count_by_type[type]++; |
436e7a74 | 1039 | e->depth = last->depth + 1; |
d489bc14 | 1040 | |
7202a6fa JK |
1041 | hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr), |
1042 | OBJ_OFS_DELTA, deltalen); | |
98a3beab | 1043 | hashwrite(pack_file, hdr, hdrlen); |
d489bc14 SP |
1044 | pack_size += hdrlen; |
1045 | ||
1046 | hdr[pos] = ofs & 127; | |
1047 | while (ofs >>= 7) | |
1048 | hdr[--pos] = 128 | (--ofs & 127); | |
98a3beab | 1049 | hashwrite(pack_file, hdr + pos, sizeof(hdr) - pos); |
d489bc14 | 1050 | pack_size += sizeof(hdr) - pos; |
db5e523f | 1051 | } else { |
436e7a74 | 1052 | e->depth = 0; |
7202a6fa JK |
1053 | hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr), |
1054 | type, dat->len); | |
98a3beab | 1055 | hashwrite(pack_file, hdr, hdrlen); |
41e5257f | 1056 | pack_size += hdrlen; |
db5e523f SP |
1057 | } |
1058 | ||
98a3beab | 1059 | hashwrite(pack_file, out, s.total_out); |
41e5257f | 1060 | pack_size += s.total_out; |
db5e523f | 1061 | |
427cb22c NP |
1062 | e->idx.crc32 = crc32_end(pack_file); |
1063 | ||
db5e523f | 1064 | free(out); |
e7d06a4b | 1065 | free(delta); |
463acbe1 | 1066 | if (last) { |
05576569 PH |
1067 | if (last->no_swap) { |
1068 | last->data = *dat; | |
1069 | } else { | |
c76689df | 1070 | strbuf_swap(&last->data, dat); |
05576569 | 1071 | } |
3fc366bd | 1072 | last->offset = e->idx.offset; |
436e7a74 | 1073 | last->depth = e->depth; |
463acbe1 SP |
1074 | } |
1075 | return 0; | |
1076 | } | |
1077 | ||
98a3beab | 1078 | static void truncate_pack(struct hashfile_checkpoint *checkpoint) |
5eef828b | 1079 | { |
98a3beab | 1080 | if (hashfile_truncate(pack_file, checkpoint)) |
5eef828b | 1081 | die_errno("cannot truncate pack to skip duplicate"); |
6c526148 | 1082 | pack_size = checkpoint->offset; |
5eef828b SP |
1083 | } |
1084 | ||
912c13d5 | 1085 | static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) |
5eef828b SP |
1086 | { |
1087 | size_t in_sz = 64 * 1024, out_sz = 64 * 1024; | |
1088 | unsigned char *in_buf = xmalloc(in_sz); | |
1089 | unsigned char *out_buf = xmalloc(out_sz); | |
1090 | struct object_entry *e; | |
912c13d5 | 1091 | struct object_id oid; |
5eef828b SP |
1092 | unsigned long hdrlen; |
1093 | off_t offset; | |
7f89428d | 1094 | git_hash_ctx c; |
ef49a7a0 | 1095 | git_zstream s; |
98a3beab | 1096 | struct hashfile_checkpoint checkpoint; |
5eef828b SP |
1097 | int status = Z_OK; |
1098 | ||
1099 | /* Determine if we should auto-checkpoint. */ | |
28d055bd | 1100 | if ((max_packsize |
1101 | && (pack_size + PACK_SIZE_THRESHOLD + len) > max_packsize) | |
1102 | || (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size) | |
5eef828b SP |
1103 | cycle_packfile(); |
1104 | ||
e0b8c842 | 1105 | the_hash_algo->init_fn(&checkpoint.ctx); |
98a3beab | 1106 | hashfile_checkpoint(pack_file, &checkpoint); |
6c526148 | 1107 | offset = checkpoint.offset; |
21281816 | 1108 | |
b04cdea4 | 1109 | hdrlen = format_object_header((char *)out_buf, out_sz, OBJ_BLOB, len); |
5eef828b | 1110 | |
7f89428d | 1111 | the_hash_algo->init_fn(&c); |
1112 | the_hash_algo->update_fn(&c, out_buf, hdrlen); | |
5eef828b | 1113 | |
427cb22c NP |
1114 | crc32_begin(pack_file); |
1115 | ||
55bb5c91 | 1116 | git_deflate_init(&s, pack_compression_level); |
5eef828b | 1117 | |
7202a6fa | 1118 | hdrlen = encode_in_pack_object_header(out_buf, out_sz, OBJ_BLOB, len); |
5eef828b SP |
1119 | |
1120 | s.next_out = out_buf + hdrlen; | |
1121 | s.avail_out = out_sz - hdrlen; | |
1122 | ||
1123 | while (status != Z_STREAM_END) { | |
1124 | if (0 < len && !s.avail_in) { | |
1125 | size_t cnt = in_sz < len ? in_sz : (size_t)len; | |
1126 | size_t n = fread(in_buf, 1, cnt, stdin); | |
1127 | if (!n && feof(stdin)) | |
1128 | die("EOF in data (%" PRIuMAX " bytes remaining)", len); | |
1129 | ||
7f89428d | 1130 | the_hash_algo->update_fn(&c, in_buf, n); |
5eef828b SP |
1131 | s.next_in = in_buf; |
1132 | s.avail_in = n; | |
1133 | len -= n; | |
1134 | } | |
1135 | ||
55bb5c91 | 1136 | status = git_deflate(&s, len ? 0 : Z_FINISH); |
5eef828b SP |
1137 | |
1138 | if (!s.avail_out || status == Z_STREAM_END) { | |
1139 | size_t n = s.next_out - out_buf; | |
98a3beab | 1140 | hashwrite(pack_file, out_buf, n); |
5eef828b SP |
1141 | pack_size += n; |
1142 | s.next_out = out_buf; | |
1143 | s.avail_out = out_sz; | |
1144 | } | |
1145 | ||
1146 | switch (status) { | |
1147 | case Z_OK: | |
1148 | case Z_BUF_ERROR: | |
1149 | case Z_STREAM_END: | |
1150 | continue; | |
1151 | default: | |
1152 | die("unexpected deflate failure: %d", status); | |
1153 | } | |
1154 | } | |
55bb5c91 | 1155 | git_deflate_end(&s); |
5951bf46 | 1156 | the_hash_algo->final_oid_fn(&oid, &c); |
5eef828b | 1157 | |
912c13d5 | 1158 | if (oidout) |
1159 | oidcpy(oidout, &oid); | |
5eef828b | 1160 | |
912c13d5 | 1161 | e = insert_object(&oid); |
5eef828b SP |
1162 | |
1163 | if (mark) | |
3f018ec7 | 1164 | insert_mark(&marks, mark, e); |
5eef828b | 1165 | |
3fc366bd | 1166 | if (e->idx.offset) { |
5eef828b | 1167 | duplicate_count_by_type[OBJ_BLOB]++; |
6c526148 | 1168 | truncate_pack(&checkpoint); |
5eef828b | 1169 | |
a80d72db | 1170 | } else if (find_sha1_pack(oid.hash, |
454ea2e4 | 1171 | get_all_packs(the_repository))) { |
5eef828b SP |
1172 | e->type = OBJ_BLOB; |
1173 | e->pack_id = MAX_PACK_ID; | |
3fc366bd | 1174 | e->idx.offset = 1; /* just not zero! */ |
5eef828b | 1175 | duplicate_count_by_type[OBJ_BLOB]++; |
6c526148 | 1176 | truncate_pack(&checkpoint); |
5eef828b SP |
1177 | |
1178 | } else { | |
1179 | e->depth = 0; | |
1180 | e->type = OBJ_BLOB; | |
1181 | e->pack_id = pack_id; | |
3fc366bd | 1182 | e->idx.offset = offset; |
427cb22c | 1183 | e->idx.crc32 = crc32_end(pack_file); |
5eef828b SP |
1184 | object_count++; |
1185 | object_count_by_type[OBJ_BLOB]++; | |
1186 | } | |
1187 | ||
1188 | free(in_buf); | |
1189 | free(out_buf); | |
1190 | } | |
1191 | ||
7422bac4 SP |
1192 | /* All calls must be guarded by find_object() or find_mark() to |
1193 | * ensure the 'struct object_entry' passed was written by this | |
1194 | * process instance. We unpack the entry by the offset, avoiding | |
1195 | * the need for the corresponding .idx file. This unpacking rule | |
1196 | * works because we only use OBJ_REF_DELTA within the packfiles | |
1197 | * created by fast-import. | |
1198 | * | |
1199 | * oe must not be NULL. Such an oe usually comes from giving | |
1200 | * an unknown SHA-1 to find_object() or an undefined mark to | |
1201 | * find_mark(). Callers must test for this condition and use | |
1202 | * the standard read_sha1_file() when it happens. | |
1203 | * | |
1204 | * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from | |
1205 | * find_mark(), where the mark was reloaded from an existing marks | |
1206 | * file and is referencing an object that this fast-import process | |
1207 | * instance did not write out to a packfile. Callers must test for | |
1208 | * this condition and use read_sha1_file() instead. | |
1209 | */ | |
7bfe6e26 SP |
1210 | static void *gfi_unpack_entry( |
1211 | struct object_entry *oe, | |
1212 | unsigned long *sizep) | |
41e5257f | 1213 | { |
21666f1a | 1214 | enum object_type type; |
7bfe6e26 | 1215 | struct packed_git *p = all_packs[oe->pack_id]; |
7f89428d | 1216 | if (p == pack_data && p->pack_size < (pack_size + the_hash_algo->rawsz)) { |
7422bac4 SP |
1217 | /* The object is stored in the packfile we are writing to |
1218 | * and we have modified it since the last time we scanned | |
1219 | * back to read a previously written object. If an old | |
7f89428d | 1220 | * window covered [p->pack_size, p->pack_size + rawsz) its |
7422bac4 SP |
1221 | * data is stale and is not valid. Closing all windows |
1222 | * and updating the packfile length ensures we can read | |
1223 | * the newly written data. | |
1224 | */ | |
c9ced051 | 1225 | close_pack_windows(p); |
98a3beab | 1226 | hashflush(pack_file); |
7422bac4 | 1227 | |
7f89428d | 1228 | /* We have to offer rawsz bytes additional on the end of |
7422bac4 SP |
1229 | * the packfile as the core unpacker code assumes the |
1230 | * footer is present at the file end and must promise | |
7f89428d | 1231 | * at least rawsz bytes within any window it maps. But |
7422bac4 SP |
1232 | * we don't actually create the footer here. |
1233 | */ | |
7f89428d | 1234 | p->pack_size = pack_size + the_hash_algo->rawsz; |
c9ced051 | 1235 | } |
57a6a500 | 1236 | return unpack_entry(the_repository, p, oe->idx.offset, &type, sizep); |
41e5257f SP |
1237 | } |
1238 | ||
10831c55 | 1239 | static const char *get_mode(const char *str, uint16_t *modep) |
463acbe1 SP |
1240 | { |
1241 | unsigned char c; | |
10831c55 | 1242 | uint16_t mode = 0; |
463acbe1 SP |
1243 | |
1244 | while ((c = *str++) != ' ') { | |
1245 | if (c < '0' || c > '7') | |
1246 | return NULL; | |
1247 | mode = (mode << 3) + (c - '0'); | |
1248 | } | |
1249 | *modep = mode; | |
1250 | return str; | |
1251 | } | |
1252 | ||
1253 | static void load_tree(struct tree_entry *root) | |
1254 | { | |
912c13d5 | 1255 | struct object_id *oid = &root->versions[1].oid; |
463acbe1 SP |
1256 | struct object_entry *myoe; |
1257 | struct tree_content *t; | |
1258 | unsigned long size; | |
1259 | char *buf; | |
1260 | const char *c; | |
463acbe1 SP |
1261 | |
1262 | root->tree = t = new_tree_content(8); | |
912c13d5 | 1263 | if (is_null_oid(oid)) |
463acbe1 SP |
1264 | return; |
1265 | ||
912c13d5 | 1266 | myoe = find_object(oid); |
20f546a8 | 1267 | if (myoe && myoe->pack_id != MAX_PACK_ID) { |
41e5257f | 1268 | if (myoe->type != OBJ_TREE) |
912c13d5 | 1269 | die("Not a tree: %s", oid_to_hex(oid)); |
436e7a74 | 1270 | t->delta_depth = myoe->depth; |
7bfe6e26 | 1271 | buf = gfi_unpack_entry(myoe, &size); |
e8b32e06 | 1272 | if (!buf) |
912c13d5 | 1273 | die("Can't load tree %s", oid_to_hex(oid)); |
463acbe1 | 1274 | } else { |
21666f1a | 1275 | enum object_type type; |
bc726bd0 | 1276 | buf = repo_read_object_file(the_repository, oid, &type, &size); |
21666f1a | 1277 | if (!buf || type != OBJ_TREE) |
912c13d5 | 1278 | die("Can't load tree %s", oid_to_hex(oid)); |
463acbe1 SP |
1279 | } |
1280 | ||
1281 | c = buf; | |
1282 | while (c != (buf + size)) { | |
1283 | struct tree_entry *e = new_tree_entry(); | |
1284 | ||
1285 | if (t->entry_count == t->entry_capacity) | |
f022f85f | 1286 | root->tree = t = grow_tree_content(t, t->entry_count); |
463acbe1 SP |
1287 | t->entries[t->entry_count++] = e; |
1288 | ||
1289 | e->tree = NULL; | |
4cabf858 | 1290 | c = get_mode(c, &e->versions[1].mode); |
463acbe1 | 1291 | if (!c) |
912c13d5 | 1292 | die("Corrupt mode in %s", oid_to_hex(oid)); |
4cabf858 | 1293 | e->versions[0].mode = e->versions[1].mode; |
061e35c5 | 1294 | e->name = to_atom(c, strlen(c)); |
463acbe1 | 1295 | c += e->name->str_len + 1; |
92e2cab9 | 1296 | oidread(&e->versions[0].oid, (unsigned char *)c); |
1297 | oidread(&e->versions[1].oid, (unsigned char *)c); | |
28d055bd | 1298 | c += the_hash_algo->rawsz; |
463acbe1 SP |
1299 | } |
1300 | free(buf); | |
1301 | } | |
1302 | ||
4cabf858 | 1303 | static int tecmp0 (const void *_a, const void *_b) |
463acbe1 SP |
1304 | { |
1305 | struct tree_entry *a = *((struct tree_entry**)_a); | |
1306 | struct tree_entry *b = *((struct tree_entry**)_b); | |
1307 | return base_name_compare( | |
4cabf858 SP |
1308 | a->name->str_dat, a->name->str_len, a->versions[0].mode, |
1309 | b->name->str_dat, b->name->str_len, b->versions[0].mode); | |
463acbe1 SP |
1310 | } |
1311 | ||
4cabf858 | 1312 | static int tecmp1 (const void *_a, const void *_b) |
463acbe1 | 1313 | { |
4cabf858 SP |
1314 | struct tree_entry *a = *((struct tree_entry**)_a); |
1315 | struct tree_entry *b = *((struct tree_entry**)_b); | |
1316 | return base_name_compare( | |
1317 | a->name->str_dat, a->name->str_len, a->versions[1].mode, | |
1318 | b->name->str_dat, b->name->str_len, b->versions[1].mode); | |
1319 | } | |
1320 | ||
eec813cf | 1321 | static void mktree(struct tree_content *t, int v, struct strbuf *b) |
4cabf858 SP |
1322 | { |
1323 | size_t maxlen = 0; | |
463acbe1 | 1324 | unsigned int i; |
463acbe1 | 1325 | |
4cabf858 | 1326 | if (!v) |
9ed0d8d6 | 1327 | QSORT(t->entries, t->entry_count, tecmp0); |
4cabf858 | 1328 | else |
9ed0d8d6 | 1329 | QSORT(t->entries, t->entry_count, tecmp1); |
463acbe1 | 1330 | |
463acbe1 | 1331 | for (i = 0; i < t->entry_count; i++) { |
4cabf858 SP |
1332 | if (t->entries[i]->versions[v].mode) |
1333 | maxlen += t->entries[i]->name->str_len + 34; | |
463acbe1 SP |
1334 | } |
1335 | ||
eec813cf PH |
1336 | strbuf_reset(b); |
1337 | strbuf_grow(b, maxlen); | |
463acbe1 SP |
1338 | for (i = 0; i < t->entry_count; i++) { |
1339 | struct tree_entry *e = t->entries[i]; | |
4cabf858 SP |
1340 | if (!e->versions[v].mode) |
1341 | continue; | |
8fb3ad76 DI |
1342 | strbuf_addf(b, "%o %s%c", |
1343 | (unsigned int)(e->versions[v].mode & ~NO_DELTA), | |
1344 | e->name->str_dat, '\0'); | |
28d055bd | 1345 | strbuf_add(b, e->versions[v].oid.hash, the_hash_algo->rawsz); |
463acbe1 | 1346 | } |
4cabf858 SP |
1347 | } |
1348 | ||
1349 | static void store_tree(struct tree_entry *root) | |
1350 | { | |
2668d692 | 1351 | struct tree_content *t; |
4cabf858 | 1352 | unsigned int i, j, del; |
05576569 | 1353 | struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 }; |
8fb3ad76 | 1354 | struct object_entry *le = NULL; |
4cabf858 | 1355 | |
d7e6b6a8 | 1356 | if (!is_null_oid(&root->versions[1].oid)) |
4cabf858 SP |
1357 | return; |
1358 | ||
2668d692 MB |
1359 | if (!root->tree) |
1360 | load_tree(root); | |
1361 | t = root->tree; | |
1362 | ||
4cabf858 SP |
1363 | for (i = 0; i < t->entry_count; i++) { |
1364 | if (t->entries[i]->tree) | |
1365 | store_tree(t->entries[i]); | |
1366 | } | |
1367 | ||
8fb3ad76 | 1368 | if (!(root->versions[0].mode & NO_DELTA)) |
912c13d5 | 1369 | le = find_object(&root->versions[0].oid); |
05576569 | 1370 | if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) { |
eec813cf | 1371 | mktree(t, 0, &old_tree); |
05576569 | 1372 | lo.data = old_tree; |
3fc366bd | 1373 | lo.offset = le->idx.offset; |
4cabf858 | 1374 | lo.depth = t->delta_depth; |
4cabf858 | 1375 | } |
4cabf858 | 1376 | |
eec813cf | 1377 | mktree(t, 1, &new_tree); |
912c13d5 | 1378 | store_object(OBJ_TREE, &new_tree, &lo, &root->versions[1].oid, 0); |
4cabf858 SP |
1379 | |
1380 | t->delta_depth = lo.depth; | |
4cabf858 SP |
1381 | for (i = 0, j = 0, del = 0; i < t->entry_count; i++) { |
1382 | struct tree_entry *e = t->entries[i]; | |
1383 | if (e->versions[1].mode) { | |
1384 | e->versions[0].mode = e->versions[1].mode; | |
d7e6b6a8 | 1385 | oidcpy(&e->versions[0].oid, &e->versions[1].oid); |
4cabf858 SP |
1386 | t->entries[j++] = e; |
1387 | } else { | |
1388 | release_tree_entry(e); | |
1389 | del++; | |
1390 | } | |
1391 | } | |
1392 | t->entry_count -= del; | |
463acbe1 SP |
1393 | } |
1394 | ||
34215783 JN |
1395 | static void tree_content_replace( |
1396 | struct tree_entry *root, | |
912c13d5 | 1397 | const struct object_id *oid, |
34215783 JN |
1398 | const uint16_t mode, |
1399 | struct tree_content *newtree) | |
1400 | { | |
1401 | if (!S_ISDIR(mode)) | |
1402 | die("Root cannot be a non-directory"); | |
d7e6b6a8 | 1403 | oidclr(&root->versions[0].oid); |
912c13d5 | 1404 | oidcpy(&root->versions[1].oid, oid); |
34215783 JN |
1405 | if (root->tree) |
1406 | release_tree_content_recursive(root->tree); | |
1407 | root->tree = newtree; | |
1408 | } | |
1409 | ||
463acbe1 SP |
1410 | static int tree_content_set( |
1411 | struct tree_entry *root, | |
1412 | const char *p, | |
912c13d5 | 1413 | const struct object_id *oid, |
f39a946a SP |
1414 | const uint16_t mode, |
1415 | struct tree_content *subtree) | |
463acbe1 | 1416 | { |
5edde510 | 1417 | struct tree_content *t; |
463acbe1 SP |
1418 | const char *slash1; |
1419 | unsigned int i, n; | |
1420 | struct tree_entry *e; | |
1421 | ||
2c5495f7 RM |
1422 | slash1 = strchrnul(p, '/'); |
1423 | n = slash1 - p; | |
475d1b33 SP |
1424 | if (!n) |
1425 | die("Empty path component found in input"); | |
2c5495f7 | 1426 | if (!*slash1 && !S_ISDIR(mode) && subtree) |
f39a946a | 1427 | die("Non-directories cannot have subtrees"); |
463acbe1 | 1428 | |
5edde510 JN |
1429 | if (!root->tree) |
1430 | load_tree(root); | |
1431 | t = root->tree; | |
463acbe1 SP |
1432 | for (i = 0; i < t->entry_count; i++) { |
1433 | e = t->entries[i]; | |
ba0897e6 | 1434 | if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { |
2c5495f7 | 1435 | if (!*slash1) { |
f39a946a SP |
1436 | if (!S_ISDIR(mode) |
1437 | && e->versions[1].mode == mode | |
4a7e27e9 | 1438 | && oideq(&e->versions[1].oid, oid)) |
463acbe1 | 1439 | return 0; |
4cabf858 | 1440 | e->versions[1].mode = mode; |
912c13d5 | 1441 | oidcpy(&e->versions[1].oid, oid); |
f39a946a | 1442 | if (e->tree) |
afde8dd9 | 1443 | release_tree_content_recursive(e->tree); |
f39a946a | 1444 | e->tree = subtree; |
8fb3ad76 DI |
1445 | |
1446 | /* | |
1447 | * We need to leave e->versions[0].sha1 alone | |
1448 | * to avoid modifying the preimage tree used | |
1449 | * when writing out the parent directory. | |
1450 | * But after replacing the subdir with a | |
1451 | * completely different one, it's not a good | |
1452 | * delta base any more, and besides, we've | |
1453 | * thrown away the tree entries needed to | |
1454 | * make a delta against it. | |
1455 | * | |
1456 | * So let's just explicitly disable deltas | |
1457 | * for the subtree. | |
1458 | */ | |
1459 | if (S_ISDIR(e->versions[0].mode)) | |
1460 | e->versions[0].mode |= NO_DELTA; | |
1461 | ||
d7e6b6a8 | 1462 | oidclr(&root->versions[1].oid); |
463acbe1 SP |
1463 | return 1; |
1464 | } | |
4cabf858 | 1465 | if (!S_ISDIR(e->versions[1].mode)) { |
463acbe1 | 1466 | e->tree = new_tree_content(8); |
4cabf858 | 1467 | e->versions[1].mode = S_IFDIR; |
463acbe1 SP |
1468 | } |
1469 | if (!e->tree) | |
1470 | load_tree(e); | |
912c13d5 | 1471 | if (tree_content_set(e, slash1 + 1, oid, mode, subtree)) { |
d7e6b6a8 | 1472 | oidclr(&root->versions[1].oid); |
463acbe1 SP |
1473 | return 1; |
1474 | } | |
1475 | return 0; | |
1476 | } | |
1477 | } | |
1478 | ||
1479 | if (t->entry_count == t->entry_capacity) | |
f022f85f | 1480 | root->tree = t = grow_tree_content(t, t->entry_count); |
463acbe1 | 1481 | e = new_tree_entry(); |
061e35c5 | 1482 | e->name = to_atom(p, n); |
4cabf858 | 1483 | e->versions[0].mode = 0; |
d7e6b6a8 | 1484 | oidclr(&e->versions[0].oid); |
463acbe1 | 1485 | t->entries[t->entry_count++] = e; |
2c5495f7 | 1486 | if (*slash1) { |
463acbe1 | 1487 | e->tree = new_tree_content(8); |
4cabf858 | 1488 | e->versions[1].mode = S_IFDIR; |
912c13d5 | 1489 | tree_content_set(e, slash1 + 1, oid, mode, subtree); |
463acbe1 | 1490 | } else { |
f39a946a | 1491 | e->tree = subtree; |
4cabf858 | 1492 | e->versions[1].mode = mode; |
912c13d5 | 1493 | oidcpy(&e->versions[1].oid, oid); |
463acbe1 | 1494 | } |
d7e6b6a8 | 1495 | oidclr(&root->versions[1].oid); |
463acbe1 SP |
1496 | return 1; |
1497 | } | |
1498 | ||
f39a946a SP |
1499 | static int tree_content_remove( |
1500 | struct tree_entry *root, | |
1501 | const char *p, | |
62bfa11c JK |
1502 | struct tree_entry *backup_leaf, |
1503 | int allow_root) | |
463acbe1 | 1504 | { |
5edde510 | 1505 | struct tree_content *t; |
463acbe1 SP |
1506 | const char *slash1; |
1507 | unsigned int i, n; | |
1508 | struct tree_entry *e; | |
1509 | ||
2c5495f7 RM |
1510 | slash1 = strchrnul(p, '/'); |
1511 | n = slash1 - p; | |
463acbe1 | 1512 | |
5edde510 JN |
1513 | if (!root->tree) |
1514 | load_tree(root); | |
62bfa11c JK |
1515 | |
1516 | if (!*p && allow_root) { | |
1517 | e = root; | |
1518 | goto del_entry; | |
1519 | } | |
1520 | ||
5edde510 | 1521 | t = root->tree; |
463acbe1 SP |
1522 | for (i = 0; i < t->entry_count; i++) { |
1523 | e = t->entries[i]; | |
ba0897e6 | 1524 | if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { |
2c5495f7 | 1525 | if (*slash1 && !S_ISDIR(e->versions[1].mode)) |
253fb5f8 EN |
1526 | /* |
1527 | * If p names a file in some subdirectory, and a | |
1528 | * file or symlink matching the name of the | |
1529 | * parent directory of p exists, then p cannot | |
1530 | * exist and need not be deleted. | |
1531 | */ | |
1532 | return 1; | |
2c5495f7 | 1533 | if (!*slash1 || !S_ISDIR(e->versions[1].mode)) |
463acbe1 SP |
1534 | goto del_entry; |
1535 | if (!e->tree) | |
1536 | load_tree(e); | |
62bfa11c | 1537 | if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) { |
b54d6422 SP |
1538 | for (n = 0; n < e->tree->entry_count; n++) { |
1539 | if (e->tree->entries[n]->versions[1].mode) { | |
d7e6b6a8 | 1540 | oidclr(&root->versions[1].oid); |
b54d6422 SP |
1541 | return 1; |
1542 | } | |
1543 | } | |
f39a946a | 1544 | backup_leaf = NULL; |
b54d6422 | 1545 | goto del_entry; |
463acbe1 SP |
1546 | } |
1547 | return 0; | |
1548 | } | |
1549 | } | |
1550 | return 0; | |
1551 | ||
1552 | del_entry: | |
f39a946a SP |
1553 | if (backup_leaf) |
1554 | memcpy(backup_leaf, e, sizeof(*backup_leaf)); | |
1555 | else if (e->tree) | |
4cabf858 | 1556 | release_tree_content_recursive(e->tree); |
f39a946a | 1557 | e->tree = NULL; |
4cabf858 | 1558 | e->versions[1].mode = 0; |
d7e6b6a8 | 1559 | oidclr(&e->versions[1].oid); |
1560 | oidclr(&root->versions[1].oid); | |
ac47a738 | 1561 | return 1; |
db5e523f SP |
1562 | } |
1563 | ||
b6f3481b SP |
1564 | static int tree_content_get( |
1565 | struct tree_entry *root, | |
1566 | const char *p, | |
e0eb6b97 JK |
1567 | struct tree_entry *leaf, |
1568 | int allow_root) | |
b6f3481b | 1569 | { |
5edde510 | 1570 | struct tree_content *t; |
b6f3481b SP |
1571 | const char *slash1; |
1572 | unsigned int i, n; | |
1573 | struct tree_entry *e; | |
1574 | ||
2c5495f7 RM |
1575 | slash1 = strchrnul(p, '/'); |
1576 | n = slash1 - p; | |
e0eb6b97 | 1577 | if (!n && !allow_root) |
178e1dea | 1578 | die("Empty path component found in input"); |
b6f3481b | 1579 | |
5edde510 JN |
1580 | if (!root->tree) |
1581 | load_tree(root); | |
e0eb6b97 JK |
1582 | |
1583 | if (!n) { | |
1584 | e = root; | |
1585 | goto found_entry; | |
1586 | } | |
1587 | ||
5edde510 | 1588 | t = root->tree; |
b6f3481b SP |
1589 | for (i = 0; i < t->entry_count; i++) { |
1590 | e = t->entries[i]; | |
ba0897e6 | 1591 | if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) { |
2c5495f7 | 1592 | if (!*slash1) |
e0eb6b97 | 1593 | goto found_entry; |
b6f3481b SP |
1594 | if (!S_ISDIR(e->versions[1].mode)) |
1595 | return 0; | |
1596 | if (!e->tree) | |
1597 | load_tree(e); | |
e0eb6b97 | 1598 | return tree_content_get(e, slash1 + 1, leaf, 0); |
b6f3481b SP |
1599 | } |
1600 | } | |
1601 | return 0; | |
e0eb6b97 JK |
1602 | |
1603 | found_entry: | |
1604 | memcpy(leaf, e, sizeof(*leaf)); | |
d7e6b6a8 | 1605 | if (e->tree && is_null_oid(&e->versions[1].oid)) |
e0eb6b97 JK |
1606 | leaf->tree = dup_tree_content(e->tree); |
1607 | else | |
1608 | leaf->tree = NULL; | |
1609 | return 1; | |
b6f3481b SP |
1610 | } |
1611 | ||
7073e69e | 1612 | static int update_branch(struct branch *b) |
463acbe1 SP |
1613 | { |
1614 | static const char *msg = "fast-import"; | |
de7e86f5 | 1615 | struct ref_transaction *transaction; |
912c13d5 | 1616 | struct object_id old_oid; |
de7e86f5 | 1617 | struct strbuf err = STRBUF_INIT; |
7073e69e | 1618 | |
d7e6b6a8 | 1619 | if (is_null_oid(&b->oid)) { |
4ee1b225 | 1620 | if (b->delete) |
755b49ae | 1621 | delete_ref(NULL, b->name, NULL, 0); |
4ee1b225 FC |
1622 | return 0; |
1623 | } | |
34c290a6 | 1624 | if (read_ref(b->name, &old_oid)) |
912c13d5 | 1625 | oidclr(&old_oid); |
1626 | if (!force_update && !is_null_oid(&old_oid)) { | |
7073e69e | 1627 | struct commit *old_cmit, *new_cmit; |
24876ebf | 1628 | int ret; |
7073e69e | 1629 | |
21e1ee8f SB |
1630 | old_cmit = lookup_commit_reference_gently(the_repository, |
1631 | &old_oid, 0); | |
1632 | new_cmit = lookup_commit_reference_gently(the_repository, | |
1633 | &b->oid, 0); | |
de7e86f5 | 1634 | if (!old_cmit || !new_cmit) |
7073e69e | 1635 | return error("Branch %s is missing commits.", b->name); |
7073e69e | 1636 | |
24876ebf JS |
1637 | ret = repo_in_merge_bases(the_repository, old_cmit, new_cmit); |
1638 | if (ret < 0) | |
1639 | exit(128); | |
1640 | if (!ret) { | |
46efd2d9 | 1641 | warning("Not updating %s" |
7073e69e | 1642 | " (new tip %s does not contain %s)", |
d7e6b6a8 | 1643 | b->name, oid_to_hex(&b->oid), |
912c13d5 | 1644 | oid_to_hex(&old_oid)); |
7073e69e SP |
1645 | return -1; |
1646 | } | |
1647 | } | |
de7e86f5 RS |
1648 | transaction = ref_transaction_begin(&err); |
1649 | if (!transaction || | |
89f3bbdd | 1650 | ref_transaction_update(transaction, b->name, &b->oid, &old_oid, |
1d147bdf | 1651 | 0, msg, &err) || |
db7516ab | 1652 | ref_transaction_commit(transaction, &err)) { |
de7e86f5 RS |
1653 | ref_transaction_free(transaction); |
1654 | error("%s", err.buf); | |
1655 | strbuf_release(&err); | |
1656 | return -1; | |
1657 | } | |
1658 | ref_transaction_free(transaction); | |
1659 | strbuf_release(&err); | |
7073e69e SP |
1660 | return 0; |
1661 | } | |
1662 | ||
1663 | static void dump_branches(void) | |
1664 | { | |
463acbe1 SP |
1665 | unsigned int i; |
1666 | struct branch *b; | |
463acbe1 SP |
1667 | |
1668 | for (i = 0; i < branch_table_sz; i++) { | |
7073e69e SP |
1669 | for (b = branch_table[i]; b; b = b->table_next_branch) |
1670 | failure |= update_branch(b); | |
463acbe1 SP |
1671 | } |
1672 | } | |
1673 | ||
fd99224e | 1674 | static void dump_tags(void) |
72303d44 SP |
1675 | { |
1676 | static const char *msg = "fast-import"; | |
1677 | struct tag *t; | |
3f09ba75 RS |
1678 | struct strbuf ref_name = STRBUF_INIT; |
1679 | struct strbuf err = STRBUF_INIT; | |
1680 | struct ref_transaction *transaction; | |
72303d44 | 1681 | |
3f09ba75 RS |
1682 | transaction = ref_transaction_begin(&err); |
1683 | if (!transaction) { | |
1684 | failure |= error("%s", err.buf); | |
1685 | goto cleanup; | |
1686 | } | |
72303d44 | 1687 | for (t = first_tag; t; t = t->next_tag) { |
3f09ba75 RS |
1688 | strbuf_reset(&ref_name); |
1689 | strbuf_addf(&ref_name, "refs/tags/%s", t->name); | |
1690 | ||
1d147bdf | 1691 | if (ref_transaction_update(transaction, ref_name.buf, |
89f3bbdd | 1692 | &t->oid, NULL, 0, msg, &err)) { |
3f09ba75 RS |
1693 | failure |= error("%s", err.buf); |
1694 | goto cleanup; | |
1695 | } | |
72303d44 | 1696 | } |
db7516ab | 1697 | if (ref_transaction_commit(transaction, &err)) |
3f09ba75 RS |
1698 | failure |= error("%s", err.buf); |
1699 | ||
1700 | cleanup: | |
1701 | ref_transaction_free(transaction); | |
1702 | strbuf_release(&ref_name); | |
1703 | strbuf_release(&err); | |
72303d44 SP |
1704 | } |
1705 | ||
fd99224e | 1706 | static void dump_marks(void) |
a6a1a831 | 1707 | { |
b2275868 | 1708 | struct lock_file mark_lock = LOCK_INIT; |
60b9004c SP |
1709 | FILE *f; |
1710 | ||
f4beed60 | 1711 | if (!export_marks_file || (import_marks_file && !import_marks_file_done)) |
60b9004c SP |
1712 | return; |
1713 | ||
01968302 JK |
1714 | if (safe_create_leading_directories_const(export_marks_file)) { |
1715 | failure |= error_errno("unable to create leading directories of %s", | |
1716 | export_marks_file); | |
1717 | return; | |
1718 | } | |
1719 | ||
f70f0565 | 1720 | if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) { |
6c223e49 NTND |
1721 | failure |= error_errno("Unable to write marks file %s", |
1722 | export_marks_file); | |
60b9004c | 1723 | return; |
a6a1a831 | 1724 | } |
60b9004c | 1725 | |
f70f0565 | 1726 | f = fdopen_lock_file(&mark_lock, "w"); |
60b9004c | 1727 | if (!f) { |
5a7b1b57 | 1728 | int saved_errno = errno; |
60b9004c SP |
1729 | rollback_lock_file(&mark_lock); |
1730 | failure |= error("Unable to write marks file %s: %s", | |
07cd9328 | 1731 | export_marks_file, strerror(saved_errno)); |
60b9004c | 1732 | return; |
a6a1a831 | 1733 | } |
60b9004c | 1734 | |
d9db599c | 1735 | for_each_mark(marks, 0, dump_marks_fn, f); |
fb54abd6 | 1736 | if (commit_lock_file(&mark_lock)) { |
6c223e49 NTND |
1737 | failure |= error_errno("Unable to write file %s", |
1738 | export_marks_file); | |
fb54abd6 BC |
1739 | return; |
1740 | } | |
a6a1a831 SP |
1741 | } |
1742 | ||
3f018ec7 | 1743 | static void insert_object_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark) |
abe0cc53 | 1744 | { |
1745 | struct object_entry *e; | |
1746 | e = find_object(oid); | |
1747 | if (!e) { | |
1748 | enum object_type type = oid_object_info(the_repository, | |
1749 | oid, NULL); | |
1750 | if (type < 0) | |
1751 | die("object not found: %s", oid_to_hex(oid)); | |
1752 | e = insert_object(oid); | |
1753 | e->type = type; | |
1754 | e->pack_id = MAX_PACK_ID; | |
1755 | e->idx.offset = 1; /* just not zero! */ | |
1756 | } | |
1757 | insert_mark(s, mark, e); | |
1758 | } | |
1759 | ||
3f018ec7 | 1760 | static void insert_oid_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark) |
1bdca816 | 1761 | { |
1762 | insert_mark(s, mark, xmemdupz(oid, sizeof(*oid))); | |
1763 | } | |
1764 | ||
3f018ec7 | 1765 | static void read_mark_file(struct mark_set **s, FILE *f, mark_set_inserter_t inserter) |
07cd9328 SR |
1766 | { |
1767 | char line[512]; | |
07cd9328 SR |
1768 | while (fgets(line, sizeof(line), f)) { |
1769 | uintmax_t mark; | |
1770 | char *end; | |
912c13d5 | 1771 | struct object_id oid; |
07cd9328 | 1772 | |
1bdca816 | 1773 | /* Ensure SHA-1 objects are padded with zeros. */ |
1774 | memset(oid.hash, 0, sizeof(oid.hash)); | |
1775 | ||
07cd9328 SR |
1776 | end = strchr(line, '\n'); |
1777 | if (line[0] != ':' || !end) | |
1778 | die("corrupt mark line: %s", line); | |
1779 | *end = 0; | |
1780 | mark = strtoumax(line + 1, &end, 10); | |
1781 | if (!mark || end == line + 1 | |
1bdca816 | 1782 | || *end != ' ' |
1783 | || get_oid_hex_any(end + 1, &oid) == GIT_HASH_UNKNOWN) | |
07cd9328 | 1784 | die("corrupt mark line: %s", line); |
abe0cc53 | 1785 | inserter(s, &oid, mark); |
07cd9328 | 1786 | } |
ddddf8d7 | 1787 | } |
1788 | ||
1789 | static void read_marks(void) | |
1790 | { | |
1791 | FILE *f = fopen(import_marks_file, "r"); | |
1792 | if (f) | |
1793 | ; | |
1794 | else if (import_marks_file_ignore_missing && errno == ENOENT) | |
1795 | goto done; /* Marks file does not exist */ | |
1796 | else | |
1797 | die_errno("cannot read '%s'", import_marks_file); | |
3f018ec7 | 1798 | read_mark_file(&marks, f, insert_object_entry); |
07cd9328 | 1799 | fclose(f); |
f4beed60 FC |
1800 | done: |
1801 | import_marks_file_done = 1; | |
07cd9328 SR |
1802 | } |
1803 | ||
1804 | ||
e6c019d0 | 1805 | static int read_next_command(void) |
c44cdc7e | 1806 | { |
e6c019d0 PH |
1807 | static int stdin_eof = 0; |
1808 | ||
1809 | if (stdin_eof) { | |
1810 | unread_command_buf = 0; | |
1811 | return EOF; | |
1812 | } | |
1813 | ||
777f80d7 | 1814 | for (;;) { |
904b1941 | 1815 | if (unread_command_buf) { |
1fdb649c | 1816 | unread_command_buf = 0; |
904b1941 SP |
1817 | } else { |
1818 | struct recent_command *rc; | |
1819 | ||
8f309aeb | 1820 | stdin_eof = strbuf_getline_lf(&command_buf, stdin); |
e6c019d0 PH |
1821 | if (stdin_eof) |
1822 | return EOF; | |
904b1941 | 1823 | |
f963bd5d | 1824 | if (!seen_data_command |
59556548 CC |
1825 | && !starts_with(command_buf.buf, "feature ") |
1826 | && !starts_with(command_buf.buf, "option ")) { | |
9c8398f0 | 1827 | parse_argv(); |
f963bd5d SR |
1828 | } |
1829 | ||
904b1941 SP |
1830 | rc = rc_free; |
1831 | if (rc) | |
1832 | rc_free = rc->next; | |
1833 | else { | |
1834 | rc = cmd_hist.next; | |
1835 | cmd_hist.next = rc->next; | |
1836 | cmd_hist.next->prev = &cmd_hist; | |
1837 | free(rc->buf); | |
1838 | } | |
1839 | ||
1ebec8df | 1840 | rc->buf = xstrdup(command_buf.buf); |
904b1941 SP |
1841 | rc->prev = cmd_tail; |
1842 | rc->next = cmd_hist.prev; | |
1843 | rc->prev->next = rc; | |
1844 | cmd_tail = rc; | |
1845 | } | |
777f80d7 JN |
1846 | if (command_buf.buf[0] == '#') |
1847 | continue; | |
1848 | return 0; | |
1849 | } | |
c44cdc7e SP |
1850 | } |
1851 | ||
7e5dcea8 | 1852 | static void skip_optional_lf(void) |
2c570cde SP |
1853 | { |
1854 | int term_char = fgetc(stdin); | |
1855 | if (term_char != '\n' && term_char != EOF) | |
1856 | ungetc(term_char, stdin); | |
1857 | } | |
1858 | ||
b3031781 | 1859 | static void parse_mark(void) |
c44cdc7e | 1860 | { |
ae021d87 JK |
1861 | const char *v; |
1862 | if (skip_prefix(command_buf.buf, "mark :", &v)) { | |
1863 | next_mark = strtoumax(v, NULL, 10); | |
c44cdc7e SP |
1864 | read_next_command(); |
1865 | } | |
1866 | else | |
d8397168 | 1867 | next_mark = 0; |
c44cdc7e SP |
1868 | } |
1869 | ||
a965bb31 EN |
1870 | static void parse_original_identifier(void) |
1871 | { | |
1872 | const char *v; | |
1873 | if (skip_prefix(command_buf.buf, "original-oid ", &v)) | |
1874 | read_next_command(); | |
1875 | } | |
1876 | ||
5eef828b | 1877 | static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) |
c44cdc7e | 1878 | { |
ae021d87 | 1879 | const char *data; |
eec813cf | 1880 | strbuf_reset(sb); |
c44cdc7e | 1881 | |
ae021d87 | 1882 | if (!skip_prefix(command_buf.buf, "data ", &data)) |
c44cdc7e SP |
1883 | die("Expected 'data n' command, found: %s", command_buf.buf); |
1884 | ||
ae021d87 JK |
1885 | if (skip_prefix(data, "<<", &data)) { |
1886 | char *term = xstrdup(data); | |
1887 | size_t term_len = command_buf.len - (data - command_buf.buf); | |
4a241d79 | 1888 | |
3b4dce02 | 1889 | for (;;) { |
8f309aeb | 1890 | if (strbuf_getline_lf(&command_buf, stdin) == EOF) |
3b4dce02 SP |
1891 | die("EOF in data (terminator '%s' not found)", term); |
1892 | if (term_len == command_buf.len | |
1893 | && !strcmp(term, command_buf.buf)) | |
1894 | break; | |
eec813cf PH |
1895 | strbuf_addbuf(sb, &command_buf); |
1896 | strbuf_addch(sb, '\n'); | |
3b4dce02 SP |
1897 | } |
1898 | free(term); | |
1899 | } | |
1900 | else { | |
ae021d87 | 1901 | uintmax_t len = strtoumax(data, NULL, 10); |
5eef828b | 1902 | size_t n = 0, length = (size_t)len; |
4a241d79 | 1903 | |
5eef828b SP |
1904 | if (limit && limit < len) { |
1905 | *len_res = len; | |
1906 | return 0; | |
1907 | } | |
1908 | if (length < len) | |
1909 | die("data is too large to use in this context"); | |
4a241d79 | 1910 | |
3b4dce02 | 1911 | while (n < length) { |
eec813cf | 1912 | size_t s = strbuf_fread(sb, length - n, stdin); |
3b4dce02 | 1913 | if (!s && feof(stdin)) |
40db58b8 JS |
1914 | die("EOF in data (%lu bytes remaining)", |
1915 | (unsigned long)(length - n)); | |
3b4dce02 SP |
1916 | n += s; |
1917 | } | |
c44cdc7e SP |
1918 | } |
1919 | ||
2c570cde | 1920 | skip_optional_lf(); |
5eef828b | 1921 | return 1; |
c44cdc7e SP |
1922 | } |
1923 | ||
d42a2fb7 | 1924 | static int validate_raw_date(const char *src, struct strbuf *result, int strict) |
63e0c8b3 SP |
1925 | { |
1926 | const char *orig_src = src; | |
eb3a9dd3 | 1927 | char *endp; |
1cd749cc | 1928 | unsigned long num; |
63e0c8b3 | 1929 | |
c55fae43 RS |
1930 | errno = 0; |
1931 | ||
1cd749cc | 1932 | num = strtoul(src, &endp, 10); |
d42a2fb7 EN |
1933 | /* |
1934 | * NEEDSWORK: perhaps check for reasonable values? For example, we | |
1935 | * could error on values representing times more than a | |
1936 | * day in the future. | |
1937 | */ | |
c55fae43 | 1938 | if (errno || endp == src || *endp != ' ') |
63e0c8b3 SP |
1939 | return -1; |
1940 | ||
1941 | src = endp + 1; | |
1942 | if (*src != '-' && *src != '+') | |
1943 | return -1; | |
63e0c8b3 | 1944 | |
1cd749cc | 1945 | num = strtoul(src + 1, &endp, 10); |
d42a2fb7 EN |
1946 | /* |
1947 | * NEEDSWORK: check for brokenness other than num > 1400, such as | |
1948 | * (num % 100) >= 60, or ((num % 100) % 15) != 0 ? | |
1949 | */ | |
1950 | if (errno || endp == src + 1 || *endp || /* did not parse */ | |
1951 | (strict && (1400 < num)) /* parsed a broken timezone */ | |
1952 | ) | |
63e0c8b3 SP |
1953 | return -1; |
1954 | ||
c33ddc2e | 1955 | strbuf_addstr(result, orig_src); |
63e0c8b3 SP |
1956 | return 0; |
1957 | } | |
1958 | ||
1959 | static char *parse_ident(const char *buf) | |
1960 | { | |
4b4963c0 | 1961 | const char *ltgt; |
63e0c8b3 | 1962 | size_t name_len; |
c33ddc2e | 1963 | struct strbuf ident = STRBUF_INIT; |
63e0c8b3 | 1964 | |
17fb0072 DI |
1965 | /* ensure there is a space delimiter even if there is no name */ |
1966 | if (*buf == '<') | |
1967 | --buf; | |
1968 | ||
4b4963c0 DI |
1969 | ltgt = buf + strcspn(buf, "<>"); |
1970 | if (*ltgt != '<') | |
1971 | die("Missing < in ident string: %s", buf); | |
1972 | if (ltgt != buf && ltgt[-1] != ' ') | |
1973 | die("Missing space before < in ident string: %s", buf); | |
1974 | ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>"); | |
1975 | if (*ltgt != '>') | |
63e0c8b3 | 1976 | die("Missing > in ident string: %s", buf); |
4b4963c0 DI |
1977 | ltgt++; |
1978 | if (*ltgt != ' ') | |
63e0c8b3 | 1979 | die("Missing space after > in ident string: %s", buf); |
4b4963c0 DI |
1980 | ltgt++; |
1981 | name_len = ltgt - buf; | |
c33ddc2e | 1982 | strbuf_add(&ident, buf, name_len); |
63e0c8b3 SP |
1983 | |
1984 | switch (whenspec) { | |
1985 | case WHENSPEC_RAW: | |
d42a2fb7 EN |
1986 | if (validate_raw_date(ltgt, &ident, 1) < 0) |
1987 | die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); | |
1988 | break; | |
1989 | case WHENSPEC_RAW_PERMISSIVE: | |
1990 | if (validate_raw_date(ltgt, &ident, 0) < 0) | |
4b4963c0 | 1991 | die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); |
63e0c8b3 SP |
1992 | break; |
1993 | case WHENSPEC_RFC2822: | |
c33ddc2e | 1994 | if (parse_date(ltgt, &ident) < 0) |
4b4963c0 | 1995 | die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf); |
63e0c8b3 SP |
1996 | break; |
1997 | case WHENSPEC_NOW: | |
4b4963c0 | 1998 | if (strcmp("now", ltgt)) |
63e0c8b3 | 1999 | die("Date in ident must be 'now': %s", buf); |
c33ddc2e | 2000 | datestamp(&ident); |
63e0c8b3 SP |
2001 | break; |
2002 | } | |
2003 | ||
c33ddc2e | 2004 | return strbuf_detach(&ident, NULL); |
63e0c8b3 SP |
2005 | } |
2006 | ||
5eef828b SP |
2007 | static void parse_and_store_blob( |
2008 | struct last_object *last, | |
912c13d5 | 2009 | struct object_id *oidout, |
5eef828b | 2010 | uintmax_t mark) |
6143f064 | 2011 | { |
05576569 | 2012 | static struct strbuf buf = STRBUF_INIT; |
5eef828b | 2013 | uintmax_t len; |
c44cdc7e | 2014 | |
5eef828b | 2015 | if (parse_data(&buf, big_file_threshold, &len)) |
912c13d5 | 2016 | store_object(OBJ_BLOB, &buf, last, oidout, mark); |
5eef828b SP |
2017 | else { |
2018 | if (last) { | |
2019 | strbuf_release(&last->data); | |
2020 | last->offset = 0; | |
2021 | last->depth = 0; | |
2022 | } | |
912c13d5 | 2023 | stream_blob(len, oidout, mark); |
5eef828b SP |
2024 | skip_optional_lf(); |
2025 | } | |
2026 | } | |
2027 | ||
2028 | static void parse_new_blob(void) | |
2029 | { | |
c44cdc7e | 2030 | read_next_command(); |
b3031781 | 2031 | parse_mark(); |
a965bb31 | 2032 | parse_original_identifier(); |
5eef828b | 2033 | parse_and_store_blob(&last_blob, NULL, next_mark); |
6143f064 SP |
2034 | } |
2035 | ||
fd99224e | 2036 | static void unload_one_branch(void) |
6bb5b329 | 2037 | { |
41e5257f SP |
2038 | while (cur_active_branches |
2039 | && cur_active_branches >= max_active_branches) { | |
6777a59f | 2040 | uintmax_t min_commit = ULONG_MAX; |
463acbe1 SP |
2041 | struct branch *e, *l = NULL, *p = NULL; |
2042 | ||
2043 | for (e = active_branches; e; e = e->active_next_branch) { | |
2044 | if (e->last_commit < min_commit) { | |
2045 | p = l; | |
2046 | min_commit = e->last_commit; | |
2047 | } | |
2048 | l = e; | |
2049 | } | |
2050 | ||
2051 | if (p) { | |
2052 | e = p->active_next_branch; | |
2053 | p->active_next_branch = e->active_next_branch; | |
2054 | } else { | |
2055 | e = active_branches; | |
2056 | active_branches = e->active_next_branch; | |
2057 | } | |
734c91f9 | 2058 | e->active = 0; |
463acbe1 SP |
2059 | e->active_next_branch = NULL; |
2060 | if (e->branch_tree.tree) { | |
afde8dd9 | 2061 | release_tree_content_recursive(e->branch_tree.tree); |
463acbe1 SP |
2062 | e->branch_tree.tree = NULL; |
2063 | } | |
2064 | cur_active_branches--; | |
6bb5b329 | 2065 | } |
6bb5b329 SP |
2066 | } |
2067 | ||
463acbe1 | 2068 | static void load_branch(struct branch *b) |
6bb5b329 | 2069 | { |
463acbe1 | 2070 | load_tree(&b->branch_tree); |
734c91f9 SP |
2071 | if (!b->active) { |
2072 | b->active = 1; | |
2073 | b->active_next_branch = active_branches; | |
2074 | active_branches = b; | |
2075 | cur_active_branches++; | |
2076 | branch_load_count++; | |
2077 | } | |
6bb5b329 SP |
2078 | } |
2079 | ||
2a113aee JH |
2080 | static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes) |
2081 | { | |
2082 | unsigned char fanout = 0; | |
2083 | while ((num_notes >>= 8)) | |
2084 | fanout++; | |
2085 | return fanout; | |
2086 | } | |
2087 | ||
2088 | static void construct_path_with_fanout(const char *hex_sha1, | |
2089 | unsigned char fanout, char *path) | |
2090 | { | |
2091 | unsigned int i = 0, j = 0; | |
7f89428d | 2092 | if (fanout >= the_hash_algo->rawsz) |
2a113aee JH |
2093 | die("Too large fanout (%u)", fanout); |
2094 | while (fanout) { | |
2095 | path[i++] = hex_sha1[j++]; | |
2096 | path[i++] = hex_sha1[j++]; | |
2097 | path[i++] = '/'; | |
2098 | fanout--; | |
2099 | } | |
7f89428d | 2100 | memcpy(path + i, hex_sha1 + j, the_hash_algo->hexsz - j); |
2101 | path[i + the_hash_algo->hexsz - j] = '\0'; | |
2a113aee JH |
2102 | } |
2103 | ||
2104 | static uintmax_t do_change_note_fanout( | |
2105 | struct tree_entry *orig_root, struct tree_entry *root, | |
912c13d5 | 2106 | char *hex_oid, unsigned int hex_oid_len, |
2a113aee JH |
2107 | char *fullpath, unsigned int fullpath_len, |
2108 | unsigned char fanout) | |
2109 | { | |
405d7f4a | 2110 | struct tree_content *t; |
2a113aee | 2111 | struct tree_entry *e, leaf; |
912c13d5 | 2112 | unsigned int i, tmp_hex_oid_len, tmp_fullpath_len; |
2a113aee | 2113 | uintmax_t num_notes = 0; |
912c13d5 | 2114 | struct object_id oid; |
28d055bd | 2115 | /* hex oid + '/' between each pair of hex digits + NUL */ |
2116 | char realpath[GIT_MAX_HEXSZ + ((GIT_MAX_HEXSZ / 2) - 1) + 1]; | |
2117 | const unsigned hexsz = the_hash_algo->hexsz; | |
2a113aee | 2118 | |
405d7f4a MH |
2119 | if (!root->tree) |
2120 | load_tree(root); | |
2121 | t = root->tree; | |
2122 | ||
2a113aee JH |
2123 | for (i = 0; t && i < t->entry_count; i++) { |
2124 | e = t->entries[i]; | |
912c13d5 | 2125 | tmp_hex_oid_len = hex_oid_len + e->name->str_len; |
2a113aee JH |
2126 | tmp_fullpath_len = fullpath_len; |
2127 | ||
2128 | /* | |
2129 | * We're interested in EITHER existing note entries (entries | |
2130 | * with exactly 40 hex chars in path, not including directory | |
2131 | * separators), OR directory entries that may contain note | |
2132 | * entries (with < 40 hex chars in path). | |
2133 | * Also, each path component in a note entry must be a multiple | |
2134 | * of 2 chars. | |
2135 | */ | |
2136 | if (!e->versions[1].mode || | |
28d055bd | 2137 | tmp_hex_oid_len > hexsz || |
2a113aee JH |
2138 | e->name->str_len % 2) |
2139 | continue; | |
2140 | ||
2141 | /* This _may_ be a note entry, or a subdir containing notes */ | |
912c13d5 | 2142 | memcpy(hex_oid + hex_oid_len, e->name->str_dat, |
2a113aee JH |
2143 | e->name->str_len); |
2144 | if (tmp_fullpath_len) | |
2145 | fullpath[tmp_fullpath_len++] = '/'; | |
2146 | memcpy(fullpath + tmp_fullpath_len, e->name->str_dat, | |
2147 | e->name->str_len); | |
2148 | tmp_fullpath_len += e->name->str_len; | |
2149 | fullpath[tmp_fullpath_len] = '\0'; | |
2150 | ||
28d055bd | 2151 | if (tmp_hex_oid_len == hexsz && !get_oid_hex(hex_oid, &oid)) { |
2a113aee | 2152 | /* This is a note entry */ |
18386857 JH |
2153 | if (fanout == 0xff) { |
2154 | /* Counting mode, no rename */ | |
2155 | num_notes++; | |
2156 | continue; | |
2157 | } | |
912c13d5 | 2158 | construct_path_with_fanout(hex_oid, fanout, realpath); |
2a113aee JH |
2159 | if (!strcmp(fullpath, realpath)) { |
2160 | /* Note entry is in correct location */ | |
2161 | num_notes++; | |
2162 | continue; | |
2163 | } | |
2164 | ||
2165 | /* Rename fullpath to realpath */ | |
62bfa11c | 2166 | if (!tree_content_remove(orig_root, fullpath, &leaf, 0)) |
2a113aee JH |
2167 | die("Failed to remove path %s", fullpath); |
2168 | tree_content_set(orig_root, realpath, | |
912c13d5 | 2169 | &leaf.versions[1].oid, |
2a113aee JH |
2170 | leaf.versions[1].mode, |
2171 | leaf.tree); | |
2172 | } else if (S_ISDIR(e->versions[1].mode)) { | |
2173 | /* This is a subdir that may contain note entries */ | |
2a113aee | 2174 | num_notes += do_change_note_fanout(orig_root, e, |
912c13d5 | 2175 | hex_oid, tmp_hex_oid_len, |
2a113aee JH |
2176 | fullpath, tmp_fullpath_len, fanout); |
2177 | } | |
2178 | ||
2179 | /* The above may have reallocated the current tree_content */ | |
2180 | t = root->tree; | |
2181 | } | |
2182 | return num_notes; | |
2183 | } | |
2184 | ||
2185 | static uintmax_t change_note_fanout(struct tree_entry *root, | |
2186 | unsigned char fanout) | |
2187 | { | |
912c13d5 | 2188 | /* |
2189 | * The size of path is due to one slash between every two hex digits, | |
2190 | * plus the terminating NUL. Note that there is no slash at the end, so | |
2191 | * the number of slashes is one less than half the number of hex | |
2192 | * characters. | |
2193 | */ | |
2194 | char hex_oid[GIT_MAX_HEXSZ], path[GIT_MAX_HEXSZ + (GIT_MAX_HEXSZ / 2) - 1 + 1]; | |
2195 | return do_change_note_fanout(root, root, hex_oid, 0, path, 0, fanout); | |
2a113aee JH |
2196 | } |
2197 | ||
1bdca816 | 2198 | static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const char **end) |
2199 | { | |
2200 | int algo; | |
2201 | khiter_t it; | |
2202 | ||
2203 | /* Make SHA-1 object IDs have all-zero padding. */ | |
2204 | memset(oid->hash, 0, sizeof(oid->hash)); | |
2205 | ||
2206 | algo = parse_oid_hex_any(hex, oid, end); | |
2207 | if (algo == GIT_HASH_UNKNOWN) | |
2208 | return -1; | |
2209 | ||
2210 | it = kh_get_oid_map(sub_oid_map, *oid); | |
2211 | /* No such object? */ | |
2212 | if (it == kh_end(sub_oid_map)) { | |
2213 | /* If we're using the same algorithm, pass it through. */ | |
2214 | if (hash_algos[algo].format_id == the_hash_algo->format_id) | |
2215 | return 0; | |
2216 | return -1; | |
2217 | } | |
2218 | oidcpy(oid, kh_value(sub_oid_map, it)); | |
2219 | return 0; | |
2220 | } | |
2221 | ||
06454cb9 PW |
2222 | /* |
2223 | * Given a pointer into a string, parse a mark reference: | |
2224 | * | |
2225 | * idnum ::= ':' bigint; | |
2226 | * | |
2227 | * Return the first character after the value in *endptr. | |
2228 | * | |
2229 | * Complain if the following character is not what is expected, | |
2230 | * either a space or end of the string. | |
2231 | */ | |
2232 | static uintmax_t parse_mark_ref(const char *p, char **endptr) | |
2233 | { | |
2234 | uintmax_t mark; | |
2235 | ||
2236 | assert(*p == ':'); | |
2237 | p++; | |
2238 | mark = strtoumax(p, endptr, 10); | |
2239 | if (*endptr == p) | |
2240 | die("No value after ':' in mark: %s", command_buf.buf); | |
2241 | return mark; | |
2242 | } | |
2243 | ||
2244 | /* | |
2245 | * Parse the mark reference, and complain if this is not the end of | |
2246 | * the string. | |
2247 | */ | |
2248 | static uintmax_t parse_mark_ref_eol(const char *p) | |
2249 | { | |
2250 | char *end; | |
2251 | uintmax_t mark; | |
2252 | ||
2253 | mark = parse_mark_ref(p, &end); | |
2254 | if (*end != '\0') | |
2255 | die("Garbage after mark: %s", command_buf.buf); | |
2256 | return mark; | |
2257 | } | |
2258 | ||
2259 | /* | |
2260 | * Parse the mark reference, demanding a trailing space. Return a | |
2261 | * pointer to the space. | |
2262 | */ | |
2263 | static uintmax_t parse_mark_ref_space(const char **p) | |
2264 | { | |
2265 | uintmax_t mark; | |
2266 | char *end; | |
2267 | ||
2268 | mark = parse_mark_ref(*p, &end); | |
e814c39c | 2269 | if (*end++ != ' ') |
06454cb9 PW |
2270 | die("Missing space after mark: %s", command_buf.buf); |
2271 | *p = end; | |
2272 | return mark; | |
2273 | } | |
2274 | ||
97313bef | 2275 | static void file_change_m(const char *p, struct branch *b) |
6bb5b329 | 2276 | { |
7fb1011e | 2277 | static struct strbuf uq = STRBUF_INIT; |
c44cdc7e | 2278 | const char *endp; |
3aa99df8 | 2279 | struct object_entry *oe; |
912c13d5 | 2280 | struct object_id oid; |
10831c55 | 2281 | uint16_t mode, inline_data = 0; |
6bb5b329 | 2282 | |
c44cdc7e SP |
2283 | p = get_mode(p, &mode); |
2284 | if (!p) | |
2285 | die("Corrupt mode: %s", command_buf.buf); | |
2286 | switch (mode) { | |
3d1d81eb FC |
2287 | case 0644: |
2288 | case 0755: | |
2289 | mode |= S_IFREG; | |
c44cdc7e SP |
2290 | case S_IFREG | 0644: |
2291 | case S_IFREG | 0755: | |
ace4a9d1 | 2292 | case S_IFLNK: |
334fba65 | 2293 | case S_IFDIR: |
03db4525 | 2294 | case S_IFGITLINK: |
c44cdc7e SP |
2295 | /* ok */ |
2296 | break; | |
2297 | default: | |
2298 | die("Corrupt mode: %s", command_buf.buf); | |
2299 | } | |
2300 | ||
d8397168 | 2301 | if (*p == ':') { |
11d8ef3e | 2302 | oe = find_mark(marks, parse_mark_ref_space(&p)); |
e6a492b7 | 2303 | oidcpy(&oid, &oe->idx.oid); |
e814c39c | 2304 | } else if (skip_prefix(p, "inline ", &p)) { |
b715cfbb | 2305 | inline_data = 1; |
3aa99df8 | 2306 | oe = NULL; /* not used with inline_data, but makes gcc happy */ |
d8397168 | 2307 | } else { |
1bdca816 | 2308 | if (parse_mapped_oid_hex(p, &oid, &p)) |
06454cb9 | 2309 | die("Invalid dataref: %s", command_buf.buf); |
912c13d5 | 2310 | oe = find_object(&oid); |
e814c39c | 2311 | if (*p++ != ' ') |
06454cb9 | 2312 | die("Missing space after SHA1: %s", command_buf.buf); |
d8397168 | 2313 | } |
c44cdc7e | 2314 | |
7fb1011e PH |
2315 | strbuf_reset(&uq); |
2316 | if (!unquote_c_style(&uq, p, &endp)) { | |
c44cdc7e SP |
2317 | if (*endp) |
2318 | die("Garbage after path in: %s", command_buf.buf); | |
7fb1011e | 2319 | p = uq.buf; |
c44cdc7e | 2320 | } |
6bb5b329 | 2321 | |
8fe533f6 | 2322 | /* Git does not track empty, non-toplevel directories. */ |
912c13d5 | 2323 | if (S_ISDIR(mode) && is_empty_tree_oid(&oid) && *p) { |
62bfa11c | 2324 | tree_content_remove(&b->branch_tree, p, NULL, 0); |
8fe533f6 JN |
2325 | return; |
2326 | } | |
2327 | ||
03db4525 AG |
2328 | if (S_ISGITLINK(mode)) { |
2329 | if (inline_data) | |
2330 | die("Git links cannot be specified 'inline': %s", | |
2331 | command_buf.buf); | |
2332 | else if (oe) { | |
2333 | if (oe->type != OBJ_COMMIT) | |
2334 | die("Not a commit (actually a %s): %s", | |
debca9d2 | 2335 | type_name(oe->type), command_buf.buf); |
03db4525 AG |
2336 | } |
2337 | /* | |
2338 | * Accept the sha1 without checking; it expected to be in | |
2339 | * another repository. | |
2340 | */ | |
2341 | } else if (inline_data) { | |
334fba65 JN |
2342 | if (S_ISDIR(mode)) |
2343 | die("Directories cannot be specified 'inline': %s", | |
2344 | command_buf.buf); | |
7fb1011e PH |
2345 | if (p != uq.buf) { |
2346 | strbuf_addstr(&uq, p); | |
2347 | p = uq.buf; | |
2348 | } | |
7ffde293 EN |
2349 | while (read_next_command() != EOF) { |
2350 | const char *v; | |
2351 | if (skip_prefix(command_buf.buf, "cat-blob ", &v)) | |
2352 | parse_cat_blob(v); | |
2353 | else { | |
2354 | parse_and_store_blob(&last_blob, &oid, 0); | |
2355 | break; | |
2356 | } | |
2357 | } | |
7111feed | 2358 | } else { |
334fba65 JN |
2359 | enum object_type expected = S_ISDIR(mode) ? |
2360 | OBJ_TREE: OBJ_BLOB; | |
2361 | enum object_type type = oe ? oe->type : | |
0df8e965 SB |
2362 | oid_object_info(the_repository, &oid, |
2363 | NULL); | |
21666f1a | 2364 | if (type < 0) |
334fba65 JN |
2365 | die("%s not found: %s", |
2366 | S_ISDIR(mode) ? "Tree" : "Blob", | |
2367 | command_buf.buf); | |
2368 | if (type != expected) | |
2369 | die("Not a %s (actually a %s): %s", | |
debca9d2 | 2370 | type_name(expected), type_name(type), |
334fba65 | 2371 | command_buf.buf); |
7111feed | 2372 | } |
6bb5b329 | 2373 | |
34215783 | 2374 | if (!*p) { |
912c13d5 | 2375 | tree_content_replace(&b->branch_tree, &oid, mode, NULL); |
34215783 JN |
2376 | return; |
2377 | } | |
912c13d5 | 2378 | tree_content_set(&b->branch_tree, p, &oid, mode, NULL); |
463acbe1 | 2379 | } |
6bb5b329 | 2380 | |
97313bef | 2381 | static void file_change_d(const char *p, struct branch *b) |
463acbe1 | 2382 | { |
7fb1011e | 2383 | static struct strbuf uq = STRBUF_INIT; |
c44cdc7e SP |
2384 | const char *endp; |
2385 | ||
7fb1011e PH |
2386 | strbuf_reset(&uq); |
2387 | if (!unquote_c_style(&uq, p, &endp)) { | |
c44cdc7e SP |
2388 | if (*endp) |
2389 | die("Garbage after path in: %s", command_buf.buf); | |
7fb1011e | 2390 | p = uq.buf; |
c44cdc7e | 2391 | } |
62bfa11c | 2392 | tree_content_remove(&b->branch_tree, p, NULL, 1); |
6bb5b329 SP |
2393 | } |
2394 | ||
97313bef | 2395 | static void file_change_cr(const char *s, struct branch *b, int rename) |
f39a946a | 2396 | { |
97313bef | 2397 | const char *d; |
7fb1011e PH |
2398 | static struct strbuf s_uq = STRBUF_INIT; |
2399 | static struct strbuf d_uq = STRBUF_INIT; | |
f39a946a SP |
2400 | const char *endp; |
2401 | struct tree_entry leaf; | |
2402 | ||
7fb1011e PH |
2403 | strbuf_reset(&s_uq); |
2404 | if (!unquote_c_style(&s_uq, s, &endp)) { | |
f39a946a SP |
2405 | if (*endp != ' ') |
2406 | die("Missing space after source: %s", command_buf.buf); | |
7fb1011e | 2407 | } else { |
f39a946a SP |
2408 | endp = strchr(s, ' '); |
2409 | if (!endp) | |
2410 | die("Missing space after source: %s", command_buf.buf); | |
7fb1011e | 2411 | strbuf_add(&s_uq, s, endp - s); |
f39a946a | 2412 | } |
7fb1011e | 2413 | s = s_uq.buf; |
f39a946a SP |
2414 | |
2415 | endp++; | |
2416 | if (!*endp) | |
2417 | die("Missing dest: %s", command_buf.buf); | |
2418 | ||
2419 | d = endp; | |
7fb1011e PH |
2420 | strbuf_reset(&d_uq); |
2421 | if (!unquote_c_style(&d_uq, d, &endp)) { | |
f39a946a SP |
2422 | if (*endp) |
2423 | die("Garbage after dest in: %s", command_buf.buf); | |
7fb1011e | 2424 | d = d_uq.buf; |
f39a946a SP |
2425 | } |
2426 | ||
2427 | memset(&leaf, 0, sizeof(leaf)); | |
b6f3481b | 2428 | if (rename) |
62bfa11c | 2429 | tree_content_remove(&b->branch_tree, s, &leaf, 1); |
b6f3481b | 2430 | else |
e0eb6b97 | 2431 | tree_content_get(&b->branch_tree, s, &leaf, 1); |
f39a946a SP |
2432 | if (!leaf.versions[1].mode) |
2433 | die("Path %s not in branch", s); | |
34215783 JN |
2434 | if (!*d) { /* C "path/to/subdir" "" */ |
2435 | tree_content_replace(&b->branch_tree, | |
912c13d5 | 2436 | &leaf.versions[1].oid, |
34215783 JN |
2437 | leaf.versions[1].mode, |
2438 | leaf.tree); | |
2439 | return; | |
2440 | } | |
f39a946a | 2441 | tree_content_set(&b->branch_tree, d, |
912c13d5 | 2442 | &leaf.versions[1].oid, |
f39a946a SP |
2443 | leaf.versions[1].mode, |
2444 | leaf.tree); | |
f39a946a SP |
2445 | } |
2446 | ||
97313bef | 2447 | static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout) |
a8dd2e7d | 2448 | { |
a8dd2e7d | 2449 | static struct strbuf uq = STRBUF_INIT; |
cbfd5e1c | 2450 | struct object_entry *oe; |
a8dd2e7d | 2451 | struct branch *s; |
912c13d5 | 2452 | struct object_id oid, commit_oid; |
28d055bd | 2453 | char path[GIT_MAX_RAWSZ * 3]; |
a8dd2e7d | 2454 | uint16_t inline_data = 0; |
2a113aee | 2455 | unsigned char new_fanout; |
a8dd2e7d | 2456 | |
18386857 JH |
2457 | /* |
2458 | * When loading a branch, we don't traverse its tree to count the real | |
2459 | * number of notes (too expensive to do this for all non-note refs). | |
2460 | * This means that recently loaded notes refs might incorrectly have | |
2461 | * b->num_notes == 0, and consequently, old_fanout might be wrong. | |
2462 | * | |
2463 | * Fix this by traversing the tree and counting the number of notes | |
2464 | * when b->num_notes == 0. If the notes tree is truly empty, the | |
2465 | * calculation should not take long. | |
2466 | */ | |
2467 | if (b->num_notes == 0 && *old_fanout == 0) { | |
2468 | /* Invoke change_note_fanout() in "counting mode". */ | |
2469 | b->num_notes = change_note_fanout(&b->branch_tree, 0xff); | |
2470 | *old_fanout = convert_num_notes_to_fanout(b->num_notes); | |
2471 | } | |
2472 | ||
2473 | /* Now parse the notemodify command. */ | |
a8dd2e7d JH |
2474 | /* <dataref> or 'inline' */ |
2475 | if (*p == ':') { | |
11d8ef3e | 2476 | oe = find_mark(marks, parse_mark_ref_space(&p)); |
e6a492b7 | 2477 | oidcpy(&oid, &oe->idx.oid); |
e814c39c | 2478 | } else if (skip_prefix(p, "inline ", &p)) { |
a8dd2e7d | 2479 | inline_data = 1; |
0a34594c | 2480 | oe = NULL; /* not used with inline_data, but makes gcc happy */ |
a8dd2e7d | 2481 | } else { |
1bdca816 | 2482 | if (parse_mapped_oid_hex(p, &oid, &p)) |
06454cb9 | 2483 | die("Invalid dataref: %s", command_buf.buf); |
912c13d5 | 2484 | oe = find_object(&oid); |
e814c39c | 2485 | if (*p++ != ' ') |
06454cb9 | 2486 | die("Missing space after SHA1: %s", command_buf.buf); |
a8dd2e7d | 2487 | } |
a8dd2e7d | 2488 | |
a8a5406a | 2489 | /* <commit-ish> */ |
a8dd2e7d JH |
2490 | s = lookup_branch(p); |
2491 | if (s) { | |
d7e6b6a8 | 2492 | if (is_null_oid(&s->oid)) |
0bc69881 | 2493 | die("Can't add a note on empty branch."); |
912c13d5 | 2494 | oidcpy(&commit_oid, &s->oid); |
a8dd2e7d | 2495 | } else if (*p == ':') { |
06454cb9 | 2496 | uintmax_t commit_mark = parse_mark_ref_eol(p); |
11d8ef3e | 2497 | struct object_entry *commit_oe = find_mark(marks, commit_mark); |
a8dd2e7d JH |
2498 | if (commit_oe->type != OBJ_COMMIT) |
2499 | die("Mark :%" PRIuMAX " not a commit", commit_mark); | |
e6a492b7 | 2500 | oidcpy(&commit_oid, &commit_oe->idx.oid); |
d850b7a5 | 2501 | } else if (!repo_get_oid(the_repository, p, &commit_oid)) { |
a8dd2e7d | 2502 | unsigned long size; |
d3b4705a NTND |
2503 | char *buf = read_object_with_reference(the_repository, |
2504 | &commit_oid, | |
6aea6bae | 2505 | OBJ_COMMIT, &size, |
02f0547e | 2506 | &commit_oid); |
28d055bd | 2507 | if (!buf || size < the_hash_algo->hexsz + 6) |
a8dd2e7d JH |
2508 | die("Not a valid commit: %s", p); |
2509 | free(buf); | |
2510 | } else | |
2511 | die("Invalid ref name or SHA1 expression: %s", p); | |
2512 | ||
2513 | if (inline_data) { | |
a8dd2e7d JH |
2514 | if (p != uq.buf) { |
2515 | strbuf_addstr(&uq, p); | |
2516 | p = uq.buf; | |
2517 | } | |
2518 | read_next_command(); | |
912c13d5 | 2519 | parse_and_store_blob(&last_blob, &oid, 0); |
a8dd2e7d JH |
2520 | } else if (oe) { |
2521 | if (oe->type != OBJ_BLOB) | |
2522 | die("Not a blob (actually a %s): %s", | |
debca9d2 | 2523 | type_name(oe->type), command_buf.buf); |
912c13d5 | 2524 | } else if (!is_null_oid(&oid)) { |
0df8e965 SB |
2525 | enum object_type type = oid_object_info(the_repository, &oid, |
2526 | NULL); | |
a8dd2e7d JH |
2527 | if (type < 0) |
2528 | die("Blob not found: %s", command_buf.buf); | |
2529 | if (type != OBJ_BLOB) | |
2530 | die("Not a blob (actually a %s): %s", | |
debca9d2 | 2531 | type_name(type), command_buf.buf); |
a8dd2e7d JH |
2532 | } |
2533 | ||
912c13d5 | 2534 | construct_path_with_fanout(oid_to_hex(&commit_oid), *old_fanout, path); |
62bfa11c | 2535 | if (tree_content_remove(&b->branch_tree, path, NULL, 0)) |
2a113aee JH |
2536 | b->num_notes--; |
2537 | ||
912c13d5 | 2538 | if (is_null_oid(&oid)) |
2a113aee JH |
2539 | return; /* nothing to insert */ |
2540 | ||
2541 | b->num_notes++; | |
2542 | new_fanout = convert_num_notes_to_fanout(b->num_notes); | |
912c13d5 | 2543 | construct_path_with_fanout(oid_to_hex(&commit_oid), new_fanout, path); |
2544 | tree_content_set(&b->branch_tree, path, &oid, S_IFREG | 0644, NULL); | |
a8dd2e7d JH |
2545 | } |
2546 | ||
825769a8 SP |
2547 | static void file_change_deleteall(struct branch *b) |
2548 | { | |
2549 | release_tree_content_recursive(b->branch_tree.tree); | |
d7e6b6a8 | 2550 | oidclr(&b->branch_tree.versions[0].oid); |
2551 | oidclr(&b->branch_tree.versions[1].oid); | |
825769a8 | 2552 | load_tree(&b->branch_tree); |
2a113aee | 2553 | b->num_notes = 0; |
825769a8 SP |
2554 | } |
2555 | ||
b3031781 | 2556 | static void parse_from_commit(struct branch *b, char *buf, unsigned long size) |
654aaa37 | 2557 | { |
28d055bd | 2558 | if (!buf || size < the_hash_algo->hexsz + 6) |
d7e6b6a8 | 2559 | die("Not a valid commit: %s", oid_to_hex(&b->oid)); |
654aaa37 | 2560 | if (memcmp("tree ", buf, 5) |
912c13d5 | 2561 | || get_oid_hex(buf + 5, &b->branch_tree.versions[1].oid)) |
d7e6b6a8 | 2562 | die("The commit %s is corrupt", oid_to_hex(&b->oid)); |
2563 | oidcpy(&b->branch_tree.versions[0].oid, | |
2564 | &b->branch_tree.versions[1].oid); | |
654aaa37 SP |
2565 | } |
2566 | ||
b3031781 | 2567 | static void parse_from_existing(struct branch *b) |
654aaa37 | 2568 | { |
d7e6b6a8 | 2569 | if (is_null_oid(&b->oid)) { |
2570 | oidclr(&b->branch_tree.versions[0].oid); | |
2571 | oidclr(&b->branch_tree.versions[1].oid); | |
654aaa37 SP |
2572 | } else { |
2573 | unsigned long size; | |
2574 | char *buf; | |
2575 | ||
d3b4705a | 2576 | buf = read_object_with_reference(the_repository, |
6aea6bae | 2577 | &b->oid, OBJ_COMMIT, &size, |
02f0547e | 2578 | &b->oid); |
b3031781 | 2579 | parse_from_commit(b, buf, size); |
654aaa37 SP |
2580 | free(buf); |
2581 | } | |
2582 | } | |
2583 | ||
b8f50e5b | 2584 | static int parse_objectish(struct branch *b, const char *objectish) |
00e2b884 | 2585 | { |
00e2b884 | 2586 | struct branch *s; |
912c13d5 | 2587 | struct object_id oid; |
00e2b884 | 2588 | |
912c13d5 | 2589 | oidcpy(&oid, &b->branch_tree.versions[1].oid); |
00e2b884 | 2590 | |
b8f50e5b | 2591 | s = lookup_branch(objectish); |
00e2b884 SP |
2592 | if (b == s) |
2593 | die("Can't create a branch from itself: %s", b->name); | |
2594 | else if (s) { | |
912c13d5 | 2595 | struct object_id *t = &s->branch_tree.versions[1].oid; |
d7e6b6a8 | 2596 | oidcpy(&b->oid, &s->oid); |
912c13d5 | 2597 | oidcpy(&b->branch_tree.versions[0].oid, t); |
2598 | oidcpy(&b->branch_tree.versions[1].oid, t); | |
b8f50e5b EN |
2599 | } else if (*objectish == ':') { |
2600 | uintmax_t idnum = parse_mark_ref_eol(objectish); | |
11d8ef3e | 2601 | struct object_entry *oe = find_mark(marks, idnum); |
00e2b884 | 2602 | if (oe->type != OBJ_COMMIT) |
3efb1f34 | 2603 | die("Mark :%" PRIuMAX " not a commit", idnum); |
9001dc2a | 2604 | if (!oideq(&b->oid, &oe->idx.oid)) { |
e6a492b7 | 2605 | oidcpy(&b->oid, &oe->idx.oid); |
0df32457 MH |
2606 | if (oe->pack_id != MAX_PACK_ID) { |
2607 | unsigned long size; | |
2608 | char *buf = gfi_unpack_entry(oe, &size); | |
2609 | parse_from_commit(b, buf, size); | |
2610 | free(buf); | |
2611 | } else | |
2612 | parse_from_existing(b); | |
2613 | } | |
d850b7a5 | 2614 | } else if (!repo_get_oid(the_repository, objectish, &b->oid)) { |
b3031781 | 2615 | parse_from_existing(b); |
d7e6b6a8 | 2616 | if (is_null_oid(&b->oid)) |
4ee1b225 FC |
2617 | b->delete = 1; |
2618 | } | |
654aaa37 | 2619 | else |
b8f50e5b | 2620 | die("Invalid ref name or SHA1 expression: %s", objectish); |
00e2b884 | 2621 | |
9001dc2a | 2622 | if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) { |
0df32457 MH |
2623 | release_tree_content_recursive(b->branch_tree.tree); |
2624 | b->branch_tree.tree = NULL; | |
2625 | } | |
2626 | ||
00e2b884 | 2627 | read_next_command(); |
1fdb649c | 2628 | return 1; |
00e2b884 SP |
2629 | } |
2630 | ||
b8f50e5b EN |
2631 | static int parse_from(struct branch *b) |
2632 | { | |
2633 | const char *from; | |
2634 | ||
2635 | if (!skip_prefix(command_buf.buf, "from ", &from)) | |
2636 | return 0; | |
2637 | ||
2638 | return parse_objectish(b, from); | |
2639 | } | |
2640 | ||
2641 | static int parse_objectish_with_prefix(struct branch *b, const char *prefix) | |
2642 | { | |
2643 | const char *base; | |
2644 | ||
2645 | if (!skip_prefix(command_buf.buf, prefix, &base)) | |
2646 | return 0; | |
2647 | ||
2648 | return parse_objectish(b, base); | |
2649 | } | |
2650 | ||
b3031781 | 2651 | static struct hash_list *parse_merge(unsigned int *count) |
62b6f483 | 2652 | { |
4db34cc1 | 2653 | struct hash_list *list = NULL, **tail = &list, *n; |
6c3aac1c | 2654 | const char *from; |
62b6f483 SP |
2655 | struct branch *s; |
2656 | ||
2657 | *count = 0; | |
97313bef | 2658 | while (skip_prefix(command_buf.buf, "merge ", &from)) { |
62b6f483 SP |
2659 | n = xmalloc(sizeof(*n)); |
2660 | s = lookup_branch(from); | |
2661 | if (s) | |
d7e6b6a8 | 2662 | oidcpy(&n->oid, &s->oid); |
62b6f483 | 2663 | else if (*from == ':') { |
06454cb9 | 2664 | uintmax_t idnum = parse_mark_ref_eol(from); |
11d8ef3e | 2665 | struct object_entry *oe = find_mark(marks, idnum); |
62b6f483 | 2666 | if (oe->type != OBJ_COMMIT) |
3efb1f34 | 2667 | die("Mark :%" PRIuMAX " not a commit", idnum); |
e6a492b7 | 2668 | oidcpy(&n->oid, &oe->idx.oid); |
d850b7a5 | 2669 | } else if (!repo_get_oid(the_repository, from, &n->oid)) { |
2f6dc35d | 2670 | unsigned long size; |
d3b4705a NTND |
2671 | char *buf = read_object_with_reference(the_repository, |
2672 | &n->oid, | |
6aea6bae | 2673 | OBJ_COMMIT, |
02f0547e | 2674 | &size, &n->oid); |
28d055bd | 2675 | if (!buf || size < the_hash_algo->hexsz + 6) |
2f6dc35d SP |
2676 | die("Not a valid commit: %s", from); |
2677 | free(buf); | |
2678 | } else | |
62b6f483 SP |
2679 | die("Invalid ref name or SHA1 expression: %s", from); |
2680 | ||
2681 | n->next = NULL; | |
4db34cc1 JK |
2682 | *tail = n; |
2683 | tail = &n->next; | |
2684 | ||
10e8d688 | 2685 | (*count)++; |
62b6f483 SP |
2686 | read_next_command(); |
2687 | } | |
2688 | return list; | |
2689 | } | |
2690 | ||
97313bef | 2691 | static void parse_new_commit(const char *arg) |
6bb5b329 | 2692 | { |
eec813cf | 2693 | static struct strbuf msg = STRBUF_INIT; |
c44cdc7e | 2694 | struct branch *b; |
c44cdc7e SP |
2695 | char *author = NULL; |
2696 | char *committer = NULL; | |
9756082b | 2697 | char *encoding = NULL; |
62b6f483 SP |
2698 | struct hash_list *merge_list = NULL; |
2699 | unsigned int merge_count; | |
2a113aee | 2700 | unsigned char prev_fanout, new_fanout; |
ae021d87 | 2701 | const char *v; |
c44cdc7e | 2702 | |
97313bef | 2703 | b = lookup_branch(arg); |
463acbe1 | 2704 | if (!b) |
97313bef | 2705 | b = new_branch(arg); |
c44cdc7e SP |
2706 | |
2707 | read_next_command(); | |
b3031781 | 2708 | parse_mark(); |
a965bb31 | 2709 | parse_original_identifier(); |
ae021d87 JK |
2710 | if (skip_prefix(command_buf.buf, "author ", &v)) { |
2711 | author = parse_ident(v); | |
c44cdc7e SP |
2712 | read_next_command(); |
2713 | } | |
ae021d87 JK |
2714 | if (skip_prefix(command_buf.buf, "committer ", &v)) { |
2715 | committer = parse_ident(v); | |
c44cdc7e SP |
2716 | read_next_command(); |
2717 | } | |
2718 | if (!committer) | |
2719 | die("Expected committer but didn't get one"); | |
9756082b JK |
2720 | if (skip_prefix(command_buf.buf, "encoding ", &v)) { |
2721 | encoding = xstrdup(v); | |
3edfcc65 | 2722 | read_next_command(); |
9756082b | 2723 | } |
5eef828b | 2724 | parse_data(&msg, 0, NULL); |
02f3389d | 2725 | read_next_command(); |
b3031781 MV |
2726 | parse_from(b); |
2727 | merge_list = parse_merge(&merge_count); | |
c44cdc7e SP |
2728 | |
2729 | /* ensure the branch is active/loaded */ | |
41e5257f | 2730 | if (!b->branch_tree.tree || !max_active_branches) { |
463acbe1 SP |
2731 | unload_one_branch(); |
2732 | load_branch(b); | |
2733 | } | |
6bb5b329 | 2734 | |
2a113aee JH |
2735 | prev_fanout = convert_num_notes_to_fanout(b->num_notes); |
2736 | ||
463acbe1 | 2737 | /* file_change* */ |
e6c019d0 | 2738 | while (command_buf.len > 0) { |
97313bef JK |
2739 | if (skip_prefix(command_buf.buf, "M ", &v)) |
2740 | file_change_m(v, b); | |
2741 | else if (skip_prefix(command_buf.buf, "D ", &v)) | |
2742 | file_change_d(v, b); | |
2743 | else if (skip_prefix(command_buf.buf, "R ", &v)) | |
2744 | file_change_cr(v, b, 1); | |
2745 | else if (skip_prefix(command_buf.buf, "C ", &v)) | |
2746 | file_change_cr(v, b, 0); | |
2747 | else if (skip_prefix(command_buf.buf, "N ", &v)) | |
2748 | note_change_n(v, b, &prev_fanout); | |
825769a8 SP |
2749 | else if (!strcmp("deleteall", command_buf.buf)) |
2750 | file_change_deleteall(b); | |
97313bef JK |
2751 | else if (skip_prefix(command_buf.buf, "ls ", &v)) |
2752 | parse_ls(v, b); | |
7ffde293 EN |
2753 | else if (skip_prefix(command_buf.buf, "cat-blob ", &v)) |
2754 | parse_cat_blob(v); | |
1fdb649c SP |
2755 | else { |
2756 | unread_command_buf = 1; | |
2757 | break; | |
2758 | } | |
e6c019d0 PH |
2759 | if (read_next_command() == EOF) |
2760 | break; | |
6bb5b329 | 2761 | } |
6bb5b329 | 2762 | |
2a113aee JH |
2763 | new_fanout = convert_num_notes_to_fanout(b->num_notes); |
2764 | if (new_fanout != prev_fanout) | |
2765 | b->num_notes = change_note_fanout(&b->branch_tree, new_fanout); | |
2766 | ||
c44cdc7e | 2767 | /* build the tree and the commit */ |
463acbe1 | 2768 | store_tree(&b->branch_tree); |
d7e6b6a8 | 2769 | oidcpy(&b->branch_tree.versions[0].oid, |
2770 | &b->branch_tree.versions[1].oid); | |
eec813cf PH |
2771 | |
2772 | strbuf_reset(&new_data); | |
2773 | strbuf_addf(&new_data, "tree %s\n", | |
d7e6b6a8 | 2774 | oid_to_hex(&b->branch_tree.versions[1].oid)); |
2775 | if (!is_null_oid(&b->oid)) | |
2776 | strbuf_addf(&new_data, "parent %s\n", | |
2777 | oid_to_hex(&b->oid)); | |
62b6f483 SP |
2778 | while (merge_list) { |
2779 | struct hash_list *next = merge_list->next; | |
d7e6b6a8 | 2780 | strbuf_addf(&new_data, "parent %s\n", |
2781 | oid_to_hex(&merge_list->oid)); | |
62b6f483 SP |
2782 | free(merge_list); |
2783 | merge_list = next; | |
2784 | } | |
eec813cf PH |
2785 | strbuf_addf(&new_data, |
2786 | "author %s\n" | |
3edfcc65 | 2787 | "committer %s\n", |
eec813cf | 2788 | author ? author : committer, committer); |
3edfcc65 EN |
2789 | if (encoding) |
2790 | strbuf_addf(&new_data, | |
2791 | "encoding %s\n", | |
2792 | encoding); | |
2793 | strbuf_addch(&new_data, '\n'); | |
eec813cf | 2794 | strbuf_addbuf(&new_data, &msg); |
e7d06a4b | 2795 | free(author); |
c44cdc7e | 2796 | free(committer); |
9756082b | 2797 | free(encoding); |
c44cdc7e | 2798 | |
912c13d5 | 2799 | if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark)) |
69e74e74 | 2800 | b->pack_id = pack_id; |
463acbe1 | 2801 | b->last_commit = object_count_by_type[OBJ_COMMIT]; |
6bb5b329 SP |
2802 | } |
2803 | ||
97313bef | 2804 | static void parse_new_tag(const char *arg) |
72303d44 | 2805 | { |
eec813cf | 2806 | static struct strbuf msg = STRBUF_INIT; |
72303d44 SP |
2807 | const char *from; |
2808 | char *tagger; | |
2809 | struct branch *s; | |
72303d44 | 2810 | struct tag *t; |
0ea9f045 | 2811 | uintmax_t from_mark = 0; |
912c13d5 | 2812 | struct object_id oid; |
8db751a8 | 2813 | enum object_type type; |
ae021d87 | 2814 | const char *v; |
72303d44 | 2815 | |
5b7eec4b | 2816 | t = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct tag)); |
a762c8c1 | 2817 | t->name = mem_pool_strdup(&fi_mem_pool, arg); |
72303d44 SP |
2818 | if (last_tag) |
2819 | last_tag->next_tag = t; | |
2820 | else | |
2821 | first_tag = t; | |
2822 | last_tag = t; | |
72303d44 | 2823 | read_next_command(); |
f73b2aba | 2824 | parse_mark(); |
72303d44 SP |
2825 | |
2826 | /* from ... */ | |
97313bef | 2827 | if (!skip_prefix(command_buf.buf, "from ", &from)) |
72303d44 | 2828 | die("Expected from command, got %s", command_buf.buf); |
72303d44 SP |
2829 | s = lookup_branch(from); |
2830 | if (s) { | |
d7e6b6a8 | 2831 | if (is_null_oid(&s->oid)) |
2c9c8ee2 | 2832 | die("Can't tag an empty branch."); |
912c13d5 | 2833 | oidcpy(&oid, &s->oid); |
8db751a8 | 2834 | type = OBJ_COMMIT; |
72303d44 | 2835 | } else if (*from == ':') { |
10e8d688 | 2836 | struct object_entry *oe; |
06454cb9 | 2837 | from_mark = parse_mark_ref_eol(from); |
11d8ef3e | 2838 | oe = find_mark(marks, from_mark); |
8db751a8 | 2839 | type = oe->type; |
e6a492b7 | 2840 | oidcpy(&oid, &oe->idx.oid); |
d850b7a5 | 2841 | } else if (!repo_get_oid(the_repository, from, &oid)) { |
912c13d5 | 2842 | struct object_entry *oe = find_object(&oid); |
6c447f63 | 2843 | if (!oe) { |
0df8e965 | 2844 | type = oid_object_info(the_repository, &oid, NULL); |
6c447f63 DI |
2845 | if (type < 0) |
2846 | die("Not a valid object: %s", from); | |
2847 | } else | |
2848 | type = oe->type; | |
72303d44 SP |
2849 | } else |
2850 | die("Invalid ref name or SHA1 expression: %s", from); | |
72303d44 SP |
2851 | read_next_command(); |
2852 | ||
a965bb31 EN |
2853 | /* original-oid ... */ |
2854 | parse_original_identifier(); | |
2855 | ||
72303d44 | 2856 | /* tagger ... */ |
ae021d87 JK |
2857 | if (skip_prefix(command_buf.buf, "tagger ", &v)) { |
2858 | tagger = parse_ident(v); | |
88fbf67b JH |
2859 | read_next_command(); |
2860 | } else | |
2861 | tagger = NULL; | |
72303d44 SP |
2862 | |
2863 | /* tag payload/message */ | |
5eef828b | 2864 | parse_data(&msg, 0, NULL); |
72303d44 SP |
2865 | |
2866 | /* build the tag object */ | |
eec813cf | 2867 | strbuf_reset(&new_data); |
88fbf67b | 2868 | |
eec813cf | 2869 | strbuf_addf(&new_data, |
88fbf67b JH |
2870 | "object %s\n" |
2871 | "type %s\n" | |
2872 | "tag %s\n", | |
debca9d2 | 2873 | oid_to_hex(&oid), type_name(type), t->name); |
88fbf67b JH |
2874 | if (tagger) |
2875 | strbuf_addf(&new_data, | |
2876 | "tagger %s\n", tagger); | |
2877 | strbuf_addch(&new_data, '\n'); | |
eec813cf | 2878 | strbuf_addbuf(&new_data, &msg); |
72303d44 | 2879 | free(tagger); |
72303d44 | 2880 | |
f73b2aba | 2881 | if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark)) |
69e74e74 SP |
2882 | t->pack_id = MAX_PACK_ID; |
2883 | else | |
2884 | t->pack_id = pack_id; | |
72303d44 SP |
2885 | } |
2886 | ||
97313bef | 2887 | static void parse_reset_branch(const char *arg) |
5fced8dc SP |
2888 | { |
2889 | struct branch *b; | |
3164e6bd | 2890 | const char *tag_name; |
5fced8dc | 2891 | |
97313bef | 2892 | b = lookup_branch(arg); |
5fced8dc | 2893 | if (b) { |
d7e6b6a8 | 2894 | oidclr(&b->oid); |
2895 | oidclr(&b->branch_tree.versions[0].oid); | |
2896 | oidclr(&b->branch_tree.versions[1].oid); | |
5fced8dc SP |
2897 | if (b->branch_tree.tree) { |
2898 | release_tree_content_recursive(b->branch_tree.tree); | |
2899 | b->branch_tree.tree = NULL; | |
2900 | } | |
2901 | } | |
9938ffc5 | 2902 | else |
97313bef | 2903 | b = new_branch(arg); |
9938ffc5 | 2904 | read_next_command(); |
b3031781 | 2905 | parse_from(b); |
3164e6bd EN |
2906 | if (b->delete && skip_prefix(b->name, "refs/tags/", &tag_name)) { |
2907 | /* | |
2908 | * Elsewhere, we call dump_branches() before dump_tags(), | |
2909 | * and dump_branches() will handle ref deletions first, so | |
2910 | * in order to make sure the deletion actually takes effect, | |
2911 | * we need to remove the tag from our list of tags to update. | |
2912 | * | |
2913 | * NEEDSWORK: replace list of tags with hashmap for faster | |
2914 | * deletion? | |
2915 | */ | |
2916 | struct tag *t, *prev = NULL; | |
2917 | for (t = first_tag; t; t = t->next_tag) { | |
2918 | if (!strcmp(t->name, tag_name)) | |
2919 | break; | |
2920 | prev = t; | |
2921 | } | |
2922 | if (t) { | |
2923 | if (prev) | |
2924 | prev->next_tag = t->next_tag; | |
2925 | else | |
2926 | first_tag = t->next_tag; | |
2927 | if (!t->next_tag) | |
2928 | last_tag = prev; | |
2929 | /* There is no mem_pool_free(t) function to call. */ | |
2930 | } | |
2931 | } | |
655e8515 | 2932 | if (command_buf.len > 0) |
1fdb649c | 2933 | unread_command_buf = 1; |
5fced8dc SP |
2934 | } |
2935 | ||
85c62395 DB |
2936 | static void cat_blob_write(const char *buf, unsigned long size) |
2937 | { | |
06f46f23 | 2938 | if (write_in_full(cat_blob_fd, buf, size) < 0) |
85c62395 DB |
2939 | die_errno("Write to frontend failed"); |
2940 | } | |
2941 | ||
912c13d5 | 2942 | static void cat_blob(struct object_entry *oe, struct object_id *oid) |
85c62395 DB |
2943 | { |
2944 | struct strbuf line = STRBUF_INIT; | |
2945 | unsigned long size; | |
2946 | enum object_type type = 0; | |
2947 | char *buf; | |
2948 | ||
2949 | if (!oe || oe->pack_id == MAX_PACK_ID) { | |
bc726bd0 | 2950 | buf = repo_read_object_file(the_repository, oid, &type, &size); |
85c62395 DB |
2951 | } else { |
2952 | type = oe->type; | |
2953 | buf = gfi_unpack_entry(oe, &size); | |
2954 | } | |
2955 | ||
2956 | /* | |
2957 | * Output based on batch_one_object() from cat-file.c. | |
2958 | */ | |
2959 | if (type <= 0) { | |
2960 | strbuf_reset(&line); | |
912c13d5 | 2961 | strbuf_addf(&line, "%s missing\n", oid_to_hex(oid)); |
85c62395 DB |
2962 | cat_blob_write(line.buf, line.len); |
2963 | strbuf_release(&line); | |
2964 | free(buf); | |
2965 | return; | |
2966 | } | |
2967 | if (!buf) | |
912c13d5 | 2968 | die("Can't read object %s", oid_to_hex(oid)); |
85c62395 DB |
2969 | if (type != OBJ_BLOB) |
2970 | die("Object %s is a %s but a blob was expected.", | |
debca9d2 | 2971 | oid_to_hex(oid), type_name(type)); |
85c62395 | 2972 | strbuf_reset(&line); |
ca473cef TB |
2973 | strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid), |
2974 | type_name(type), (uintmax_t)size); | |
85c62395 DB |
2975 | cat_blob_write(line.buf, line.len); |
2976 | strbuf_release(&line); | |
2977 | cat_blob_write(buf, size); | |
2978 | cat_blob_write("\n", 1); | |
a7e9c341 DI |
2979 | if (oe && oe->pack_id == pack_id) { |
2980 | last_blob.offset = oe->idx.offset; | |
2981 | strbuf_attach(&last_blob.data, buf, size, size); | |
2982 | last_blob.depth = oe->depth; | |
2983 | } else | |
2984 | free(buf); | |
85c62395 DB |
2985 | } |
2986 | ||
28c7b1f7 MH |
2987 | static void parse_get_mark(const char *p) |
2988 | { | |
156e1782 | 2989 | struct object_entry *oe; |
912c13d5 | 2990 | char output[GIT_MAX_HEXSZ + 2]; |
28c7b1f7 MH |
2991 | |
2992 | /* get-mark SP <object> LF */ | |
2993 | if (*p != ':') | |
2994 | die("Not a mark: %s", p); | |
2995 | ||
11d8ef3e | 2996 | oe = find_mark(marks, parse_mark_ref_eol(p)); |
28c7b1f7 MH |
2997 | if (!oe) |
2998 | die("Unknown mark: %s", command_buf.buf); | |
2999 | ||
e6a492b7 | 3000 | xsnprintf(output, sizeof(output), "%s\n", oid_to_hex(&oe->idx.oid)); |
28d055bd | 3001 | cat_blob_write(output, the_hash_algo->hexsz + 1); |
28c7b1f7 MH |
3002 | } |
3003 | ||
97313bef | 3004 | static void parse_cat_blob(const char *p) |
85c62395 | 3005 | { |
156e1782 | 3006 | struct object_entry *oe; |
912c13d5 | 3007 | struct object_id oid; |
85c62395 DB |
3008 | |
3009 | /* cat-blob SP <object> LF */ | |
85c62395 | 3010 | if (*p == ':') { |
11d8ef3e | 3011 | oe = find_mark(marks, parse_mark_ref_eol(p)); |
85c62395 DB |
3012 | if (!oe) |
3013 | die("Unknown mark: %s", command_buf.buf); | |
e6a492b7 | 3014 | oidcpy(&oid, &oe->idx.oid); |
85c62395 | 3015 | } else { |
1bdca816 | 3016 | if (parse_mapped_oid_hex(p, &oid, &p)) |
06454cb9 | 3017 | die("Invalid dataref: %s", command_buf.buf); |
912c13d5 | 3018 | if (*p) |
85c62395 | 3019 | die("Garbage after SHA1: %s", command_buf.buf); |
912c13d5 | 3020 | oe = find_object(&oid); |
85c62395 DB |
3021 | } |
3022 | ||
912c13d5 | 3023 | cat_blob(oe, &oid); |
85c62395 DB |
3024 | } |
3025 | ||
8dc6a373 | 3026 | static struct object_entry *dereference(struct object_entry *oe, |
912c13d5 | 3027 | struct object_id *oid) |
8dc6a373 DB |
3028 | { |
3029 | unsigned long size; | |
6288e3e1 | 3030 | char *buf = NULL; |
28d055bd | 3031 | const unsigned hexsz = the_hash_algo->hexsz; |
3032 | ||
8dc6a373 | 3033 | if (!oe) { |
0df8e965 SB |
3034 | enum object_type type = oid_object_info(the_repository, oid, |
3035 | NULL); | |
8dc6a373 | 3036 | if (type < 0) |
912c13d5 | 3037 | die("object not found: %s", oid_to_hex(oid)); |
8dc6a373 | 3038 | /* cache it! */ |
912c13d5 | 3039 | oe = insert_object(oid); |
8dc6a373 DB |
3040 | oe->type = type; |
3041 | oe->pack_id = MAX_PACK_ID; | |
3042 | oe->idx.offset = 1; | |
3043 | } | |
3044 | switch (oe->type) { | |
3045 | case OBJ_TREE: /* easy case. */ | |
3046 | return oe; | |
3047 | case OBJ_COMMIT: | |
3048 | case OBJ_TAG: | |
3049 | break; | |
3050 | default: | |
bb8040f9 | 3051 | die("Not a tree-ish: %s", command_buf.buf); |
8dc6a373 DB |
3052 | } |
3053 | ||
3054 | if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */ | |
3055 | buf = gfi_unpack_entry(oe, &size); | |
3056 | } else { | |
3057 | enum object_type unused; | |
bc726bd0 ÆAB |
3058 | buf = repo_read_object_file(the_repository, oid, &unused, |
3059 | &size); | |
8dc6a373 DB |
3060 | } |
3061 | if (!buf) | |
912c13d5 | 3062 | die("Can't load object %s", oid_to_hex(oid)); |
8dc6a373 DB |
3063 | |
3064 | /* Peel one layer. */ | |
3065 | switch (oe->type) { | |
3066 | case OBJ_TAG: | |
28d055bd | 3067 | if (size < hexsz + strlen("object ") || |
912c13d5 | 3068 | get_oid_hex(buf + strlen("object "), oid)) |
8dc6a373 DB |
3069 | die("Invalid SHA1 in tag: %s", command_buf.buf); |
3070 | break; | |
3071 | case OBJ_COMMIT: | |
28d055bd | 3072 | if (size < hexsz + strlen("tree ") || |
912c13d5 | 3073 | get_oid_hex(buf + strlen("tree "), oid)) |
8dc6a373 DB |
3074 | die("Invalid SHA1 in commit: %s", command_buf.buf); |
3075 | } | |
3076 | ||
3077 | free(buf); | |
912c13d5 | 3078 | return find_object(oid); |
8dc6a373 DB |
3079 | } |
3080 | ||
1bdca816 | 3081 | static void insert_mapped_mark(uintmax_t mark, void *object, void *cbp) |
3082 | { | |
3083 | struct object_id *fromoid = object; | |
3084 | struct object_id *tooid = find_mark(cbp, mark); | |
3085 | int ret; | |
3086 | khiter_t it; | |
3087 | ||
3088 | it = kh_put_oid_map(sub_oid_map, *fromoid, &ret); | |
3089 | /* We've already seen this object. */ | |
3090 | if (ret == 0) | |
3091 | return; | |
3092 | kh_value(sub_oid_map, it) = tooid; | |
3093 | } | |
3094 | ||
3095 | static void build_mark_map_one(struct mark_set *from, struct mark_set *to) | |
3096 | { | |
3097 | for_each_mark(from, 0, insert_mapped_mark, to); | |
3098 | } | |
3099 | ||
3100 | static void build_mark_map(struct string_list *from, struct string_list *to) | |
3101 | { | |
3102 | struct string_list_item *fromp, *top; | |
3103 | ||
3104 | sub_oid_map = kh_init_oid_map(); | |
3105 | ||
3106 | for_each_string_list_item(fromp, from) { | |
3107 | top = string_list_lookup(to, fromp->string); | |
3108 | if (!fromp->util) { | |
3109 | die(_("Missing from marks for submodule '%s'"), fromp->string); | |
3110 | } else if (!top || !top->util) { | |
3111 | die(_("Missing to marks for submodule '%s'"), fromp->string); | |
3112 | } | |
3113 | build_mark_map_one(fromp->util, top->util); | |
3114 | } | |
3115 | } | |
3116 | ||
8dc6a373 DB |
3117 | static struct object_entry *parse_treeish_dataref(const char **p) |
3118 | { | |
912c13d5 | 3119 | struct object_id oid; |
8dc6a373 DB |
3120 | struct object_entry *e; |
3121 | ||
3122 | if (**p == ':') { /* <mark> */ | |
11d8ef3e | 3123 | e = find_mark(marks, parse_mark_ref_space(p)); |
8dc6a373 DB |
3124 | if (!e) |
3125 | die("Unknown mark: %s", command_buf.buf); | |
e6a492b7 | 3126 | oidcpy(&oid, &e->idx.oid); |
8dc6a373 | 3127 | } else { /* <sha1> */ |
1bdca816 | 3128 | if (parse_mapped_oid_hex(*p, &oid, p)) |
06454cb9 | 3129 | die("Invalid dataref: %s", command_buf.buf); |
912c13d5 | 3130 | e = find_object(&oid); |
e814c39c JK |
3131 | if (*(*p)++ != ' ') |
3132 | die("Missing space after tree-ish: %s", command_buf.buf); | |
8dc6a373 DB |
3133 | } |
3134 | ||
3135 | while (!e || e->type != OBJ_TREE) | |
912c13d5 | 3136 | e = dereference(e, &oid); |
8dc6a373 DB |
3137 | return e; |
3138 | } | |
3139 | ||
ef479a12 | 3140 | static void print_ls(int mode, const unsigned char *hash, const char *path) |
8dc6a373 DB |
3141 | { |
3142 | static struct strbuf line = STRBUF_INIT; | |
3143 | ||
3144 | /* See show_tree(). */ | |
3145 | const char *type = | |
3146 | S_ISGITLINK(mode) ? commit_type : | |
3147 | S_ISDIR(mode) ? tree_type : | |
3148 | blob_type; | |
3149 | ||
3150 | if (!mode) { | |
3151 | /* missing SP path LF */ | |
3152 | strbuf_reset(&line); | |
3153 | strbuf_addstr(&line, "missing "); | |
3154 | quote_c_style(path, &line, NULL, 0); | |
3155 | strbuf_addch(&line, '\n'); | |
3156 | } else { | |
3157 | /* mode SP type SP object_name TAB path LF */ | |
3158 | strbuf_reset(&line); | |
3159 | strbuf_addf(&line, "%06o %s %s\t", | |
ef479a12 | 3160 | mode & ~NO_DELTA, type, hash_to_hex(hash)); |
8dc6a373 DB |
3161 | quote_c_style(path, &line, NULL, 0); |
3162 | strbuf_addch(&line, '\n'); | |
3163 | } | |
3164 | cat_blob_write(line.buf, line.len); | |
3165 | } | |
3166 | ||
97313bef | 3167 | static void parse_ls(const char *p, struct branch *b) |
8dc6a373 | 3168 | { |
8dc6a373 | 3169 | struct tree_entry *root = NULL; |
c2e86add | 3170 | struct tree_entry leaf = {NULL}; |
8dc6a373 | 3171 | |
bb8040f9 | 3172 | /* ls SP (<tree-ish> SP)? <path> */ |
8dc6a373 DB |
3173 | if (*p == '"') { |
3174 | if (!b) | |
3175 | die("Not in a commit: %s", command_buf.buf); | |
3176 | root = &b->branch_tree; | |
3177 | } else { | |
3178 | struct object_entry *e = parse_treeish_dataref(&p); | |
3179 | root = new_tree_entry(); | |
e6a492b7 | 3180 | oidcpy(&root->versions[1].oid, &e->idx.oid); |
d7e6b6a8 | 3181 | if (!is_null_oid(&root->versions[1].oid)) |
adefdba5 | 3182 | root->versions[1].mode = S_IFDIR; |
8dc6a373 | 3183 | load_tree(root); |
8dc6a373 DB |
3184 | } |
3185 | if (*p == '"') { | |
3186 | static struct strbuf uq = STRBUF_INIT; | |
3187 | const char *endp; | |
3188 | strbuf_reset(&uq); | |
3189 | if (unquote_c_style(&uq, p, &endp)) | |
3190 | die("Invalid path: %s", command_buf.buf); | |
3191 | if (*endp) | |
3192 | die("Garbage after path in: %s", command_buf.buf); | |
3193 | p = uq.buf; | |
3194 | } | |
e0eb6b97 | 3195 | tree_content_get(root, p, &leaf, 1); |
8dc6a373 DB |
3196 | /* |
3197 | * A directory in preparation would have a sha1 of zero | |
3198 | * until it is saved. Save, for simplicity. | |
3199 | */ | |
3200 | if (S_ISDIR(leaf.versions[1].mode)) | |
3201 | store_tree(&leaf); | |
3202 | ||
d7e6b6a8 | 3203 | print_ls(leaf.versions[1].mode, leaf.versions[1].oid.hash, p); |
c27e559d JN |
3204 | if (leaf.tree) |
3205 | release_tree_content_recursive(leaf.tree); | |
8dc6a373 DB |
3206 | if (!b || root != &b->branch_tree) |
3207 | release_tree_entry(root); | |
3208 | } | |
3209 | ||
dc01f59d | 3210 | static void checkpoint(void) |
7bfe6e26 | 3211 | { |
dc01f59d | 3212 | checkpoint_requested = 0; |
820b9310 SP |
3213 | if (object_count) { |
3214 | cycle_packfile(); | |
820b9310 | 3215 | } |
30e215a6 ER |
3216 | dump_branches(); |
3217 | dump_tags(); | |
3218 | dump_marks(); | |
dc01f59d JN |
3219 | } |
3220 | ||
3221 | static void parse_checkpoint(void) | |
3222 | { | |
3223 | checkpoint_requested = 1; | |
1fdb649c | 3224 | skip_optional_lf(); |
7bfe6e26 SP |
3225 | } |
3226 | ||
b3031781 | 3227 | static void parse_progress(void) |
ac053c02 | 3228 | { |
b449f4cf | 3229 | fwrite(command_buf.buf, 1, command_buf.len, stdout); |
ac053c02 SP |
3230 | fputc('\n', stdout); |
3231 | fflush(stdout); | |
3232 | skip_optional_lf(); | |
3233 | } | |
3234 | ||
b8f50e5b EN |
3235 | static void parse_alias(void) |
3236 | { | |
3237 | struct object_entry *e; | |
3238 | struct branch b; | |
3239 | ||
3240 | skip_optional_lf(); | |
3241 | read_next_command(); | |
3242 | ||
3243 | /* mark ... */ | |
3244 | parse_mark(); | |
3245 | if (!next_mark) | |
3246 | die(_("Expected 'mark' command, got %s"), command_buf.buf); | |
3247 | ||
3248 | /* to ... */ | |
3249 | memset(&b, 0, sizeof(b)); | |
3250 | if (!parse_objectish_with_prefix(&b, "to ")) | |
3251 | die(_("Expected 'to' command, got %s"), command_buf.buf); | |
3252 | e = find_object(&b.oid); | |
3253 | assert(e); | |
3f018ec7 | 3254 | insert_mark(&marks, next_mark, e); |
b8f50e5b EN |
3255 | } |
3256 | ||
bc3c79ae | 3257 | static char* make_fast_import_path(const char *path) |
e8438420 | 3258 | { |
bc3c79ae | 3259 | if (!relative_marks_paths || is_absolute_path(path)) |
9dc607f1 | 3260 | return prefix_filename(global_prefix, path); |
d9c69644 | 3261 | return git_pathdup("info/fast-import/%s", path); |
bc3c79ae SR |
3262 | } |
3263 | ||
dded4f12 RR |
3264 | static void option_import_marks(const char *marks, |
3265 | int from_stream, int ignore_missing) | |
e8438420 | 3266 | { |
081751c8 SR |
3267 | if (import_marks_file) { |
3268 | if (from_stream) | |
3269 | die("Only one import-marks command allowed per stream"); | |
3270 | ||
3271 | /* read previous mark file */ | |
3272 | if(!import_marks_file_from_stream) | |
3273 | read_marks(); | |
e8438420 | 3274 | } |
081751c8 | 3275 | |
bc3c79ae | 3276 | import_marks_file = make_fast_import_path(marks); |
081751c8 | 3277 | import_marks_file_from_stream = from_stream; |
dded4f12 | 3278 | import_marks_file_ignore_missing = ignore_missing; |
e8438420 SP |
3279 | } |
3280 | ||
0f6927c2 SR |
3281 | static void option_date_format(const char *fmt) |
3282 | { | |
3283 | if (!strcmp(fmt, "raw")) | |
3284 | whenspec = WHENSPEC_RAW; | |
d42a2fb7 EN |
3285 | else if (!strcmp(fmt, "raw-permissive")) |
3286 | whenspec = WHENSPEC_RAW_PERMISSIVE; | |
0f6927c2 SR |
3287 | else if (!strcmp(fmt, "rfc2822")) |
3288 | whenspec = WHENSPEC_RFC2822; | |
3289 | else if (!strcmp(fmt, "now")) | |
3290 | whenspec = WHENSPEC_NOW; | |
3291 | else | |
3292 | die("unknown --date-format argument %s", fmt); | |
3293 | } | |
3294 | ||
a9ff277e JN |
3295 | static unsigned long ulong_arg(const char *option, const char *arg) |
3296 | { | |
3297 | char *endptr; | |
3298 | unsigned long rv = strtoul(arg, &endptr, 0); | |
3299 | if (strchr(arg, '-') || endptr == arg || *endptr) | |
3300 | die("%s: argument must be a non-negative integer", option); | |
3301 | return rv; | |
3302 | } | |
3303 | ||
0f6927c2 SR |
3304 | static void option_depth(const char *depth) |
3305 | { | |
a9ff277e | 3306 | max_depth = ulong_arg("--depth", depth); |
0f6927c2 SR |
3307 | if (max_depth > MAX_DEPTH) |
3308 | die("--depth cannot exceed %u", MAX_DEPTH); | |
3309 | } | |
3310 | ||
3311 | static void option_active_branches(const char *branches) | |
3312 | { | |
a9ff277e | 3313 | max_active_branches = ulong_arg("--active-branches", branches); |
0f6927c2 SR |
3314 | } |
3315 | ||
3316 | static void option_export_marks(const char *marks) | |
3317 | { | |
bc3c79ae | 3318 | export_marks_file = make_fast_import_path(marks); |
0f6927c2 SR |
3319 | } |
3320 | ||
85c62395 DB |
3321 | static void option_cat_blob_fd(const char *fd) |
3322 | { | |
3323 | unsigned long n = ulong_arg("--cat-blob-fd", fd); | |
3324 | if (n > (unsigned long) INT_MAX) | |
3325 | die("--cat-blob-fd cannot exceed %d", INT_MAX); | |
3326 | cat_blob_fd = (int) n; | |
3327 | } | |
3328 | ||
0f6927c2 SR |
3329 | static void option_export_pack_edges(const char *edges) |
3330 | { | |
9dc607f1 | 3331 | char *fn = prefix_filename(global_prefix, edges); |
0f6927c2 SR |
3332 | if (pack_edges) |
3333 | fclose(pack_edges); | |
9dc607f1 JK |
3334 | pack_edges = xfopen(fn, "a"); |
3335 | free(fn); | |
0f6927c2 SR |
3336 | } |
3337 | ||
1bdca816 | 3338 | static void option_rewrite_submodules(const char *arg, struct string_list *list) |
3339 | { | |
3340 | struct mark_set *ms; | |
3341 | FILE *fp; | |
3342 | char *s = xstrdup(arg); | |
3343 | char *f = strchr(s, ':'); | |
3344 | if (!f) | |
3345 | die(_("Expected format name:filename for submodule rewrite option")); | |
3346 | *f = '\0'; | |
3347 | f++; | |
ca56dadb | 3348 | CALLOC_ARRAY(ms, 1); |
1bdca816 | 3349 | |
9dc607f1 | 3350 | f = prefix_filename(global_prefix, f); |
1bdca816 | 3351 | fp = fopen(f, "r"); |
3352 | if (!fp) | |
3353 | die_errno("cannot read '%s'", f); | |
3f018ec7 | 3354 | read_mark_file(&ms, fp, insert_oid_entry); |
1bdca816 | 3355 | fclose(fp); |
9dc607f1 | 3356 | free(f); |
3f018ec7 JK |
3357 | |
3358 | string_list_insert(list, s)->util = ms; | |
1bdca816 | 3359 | } |
3360 | ||
9c8398f0 | 3361 | static int parse_one_option(const char *option) |
0f6927c2 | 3362 | { |
ae021d87 | 3363 | if (skip_prefix(option, "max-pack-size=", &option)) { |
4d0cc224 | 3364 | unsigned long v; |
ae021d87 | 3365 | if (!git_parse_ulong(option, &v)) |
4d0cc224 JH |
3366 | return 0; |
3367 | if (v < 8192) { | |
3368 | warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v); | |
3369 | v *= 1024 * 1024; | |
3370 | } else if (v < 1024 * 1024) { | |
3371 | warning("minimum max-pack-size is 1 MiB"); | |
3372 | v = 1024 * 1024; | |
3373 | } | |
3374 | max_packsize = v; | |
ae021d87 | 3375 | } else if (skip_prefix(option, "big-file-threshold=", &option)) { |
76ea93cc | 3376 | unsigned long v; |
ae021d87 | 3377 | if (!git_parse_ulong(option, &v)) |
76ea93cc JH |
3378 | return 0; |
3379 | big_file_threshold = v; | |
ae021d87 JK |
3380 | } else if (skip_prefix(option, "depth=", &option)) { |
3381 | option_depth(option); | |
3382 | } else if (skip_prefix(option, "active-branches=", &option)) { | |
3383 | option_active_branches(option); | |
3384 | } else if (skip_prefix(option, "export-pack-edges=", &option)) { | |
3385 | option_export_pack_edges(option); | |
11e934d5 | 3386 | } else if (!strcmp(option, "quiet")) { |
0f6927c2 | 3387 | show_stats = 0; |
11e934d5 | 3388 | } else if (!strcmp(option, "stats")) { |
0f6927c2 | 3389 | show_stats = 1; |
68061e34 JK |
3390 | } else if (!strcmp(option, "allow-unsafe-features")) { |
3391 | ; /* already handled during early option parsing */ | |
0f6927c2 | 3392 | } else { |
9c8398f0 | 3393 | return 0; |
0f6927c2 | 3394 | } |
9c8398f0 SR |
3395 | |
3396 | return 1; | |
0f6927c2 SR |
3397 | } |
3398 | ||
68061e34 JK |
3399 | static void check_unsafe_feature(const char *feature, int from_stream) |
3400 | { | |
3401 | if (from_stream && !allow_unsafe_features) | |
3402 | die(_("feature '%s' forbidden in input without --allow-unsafe-features"), | |
3403 | feature); | |
3404 | } | |
3405 | ||
081751c8 | 3406 | static int parse_one_feature(const char *feature, int from_stream) |
f963bd5d | 3407 | { |
ae021d87 JK |
3408 | const char *arg; |
3409 | ||
3410 | if (skip_prefix(feature, "date-format=", &arg)) { | |
3411 | option_date_format(arg); | |
3412 | } else if (skip_prefix(feature, "import-marks=", &arg)) { | |
a52ed761 | 3413 | check_unsafe_feature("import-marks", from_stream); |
ae021d87 JK |
3414 | option_import_marks(arg, from_stream, 0); |
3415 | } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) { | |
a52ed761 | 3416 | check_unsafe_feature("import-marks-if-exists", from_stream); |
ae021d87 JK |
3417 | option_import_marks(arg, from_stream, 1); |
3418 | } else if (skip_prefix(feature, "export-marks=", &arg)) { | |
68061e34 | 3419 | check_unsafe_feature(feature, from_stream); |
ae021d87 | 3420 | option_export_marks(arg); |
b8f50e5b EN |
3421 | } else if (!strcmp(feature, "alias")) { |
3422 | ; /* Don't die - this feature is supported */ | |
1bdca816 | 3423 | } else if (skip_prefix(feature, "rewrite-submodules-to=", &arg)) { |
3424 | option_rewrite_submodules(arg, &sub_marks_to); | |
3425 | } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) { | |
3426 | option_rewrite_submodules(arg, &sub_marks_from); | |
28c7b1f7 MH |
3427 | } else if (!strcmp(feature, "get-mark")) { |
3428 | ; /* Don't die - this feature is supported */ | |
85c62395 DB |
3429 | } else if (!strcmp(feature, "cat-blob")) { |
3430 | ; /* Don't die - this feature is supported */ | |
4cce4ef2 | 3431 | } else if (!strcmp(feature, "relative-marks")) { |
bc3c79ae | 3432 | relative_marks_paths = 1; |
4cce4ef2 | 3433 | } else if (!strcmp(feature, "no-relative-marks")) { |
bc3c79ae | 3434 | relative_marks_paths = 0; |
be56862f SR |
3435 | } else if (!strcmp(feature, "done")) { |
3436 | require_explicit_termination = 1; | |
4cce4ef2 | 3437 | } else if (!strcmp(feature, "force")) { |
f963bd5d | 3438 | force_update = 1; |
8dc6a373 | 3439 | } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) { |
547e8b92 | 3440 | ; /* do nothing; we have the feature */ |
f963bd5d SR |
3441 | } else { |
3442 | return 0; | |
3443 | } | |
3444 | ||
3445 | return 1; | |
3446 | } | |
3447 | ||
97313bef | 3448 | static void parse_feature(const char *feature) |
f963bd5d | 3449 | { |
f963bd5d SR |
3450 | if (seen_data_command) |
3451 | die("Got feature command '%s' after data command", feature); | |
3452 | ||
081751c8 | 3453 | if (parse_one_feature(feature, 1)) |
f963bd5d SR |
3454 | return; |
3455 | ||
3456 | die("This version of fast-import does not support feature %s.", feature); | |
3457 | } | |
3458 | ||
97313bef | 3459 | static void parse_option(const char *option) |
9c8398f0 | 3460 | { |
9c8398f0 SR |
3461 | if (seen_data_command) |
3462 | die("Got option command '%s' after data command", option); | |
3463 | ||
3464 | if (parse_one_option(option)) | |
3465 | return; | |
3466 | ||
3467 | die("This version of fast-import does not support option: %s", option); | |
e8438420 SP |
3468 | } |
3469 | ||
536900e5 | 3470 | static void git_pack_config(void) |
bb23fdfa | 3471 | { |
536900e5 | 3472 | int indexversion_value; |
d9545c7f | 3473 | int limit; |
536900e5 TA |
3474 | unsigned long packsizelimit_value; |
3475 | ||
3476 | if (!git_config_get_ulong("pack.depth", &max_depth)) { | |
bb23fdfa SP |
3477 | if (max_depth > MAX_DEPTH) |
3478 | max_depth = MAX_DEPTH; | |
bb23fdfa | 3479 | } |
536900e5 TA |
3480 | if (!git_config_get_int("pack.indexversion", &indexversion_value)) { |
3481 | pack_idx_opts.version = indexversion_value; | |
ebcfb379 | 3482 | if (pack_idx_opts.version > 2) |
536900e5 | 3483 | git_die_config("pack.indexversion", |
b4eda05d | 3484 | "bad pack.indexVersion=%"PRIu32, pack_idx_opts.version); |
8c2ca8dd | 3485 | } |
536900e5 TA |
3486 | if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value)) |
3487 | max_packsize = packsizelimit_value; | |
3488 | ||
d9545c7f EW |
3489 | if (!git_config_get_int("fastimport.unpacklimit", &limit)) |
3490 | unpack_limit = limit; | |
3491 | else if (!git_config_get_int("transfer.unpacklimit", &limit)) | |
3492 | unpack_limit = limit; | |
3493 | ||
536900e5 | 3494 | git_config(git_default_config, NULL); |
bb23fdfa SP |
3495 | } |
3496 | ||
d5c57b28 | 3497 | static const char fast_import_usage[] = |
62b4698e | 3498 | "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]"; |
d5c57b28 | 3499 | |
9c8398f0 SR |
3500 | static void parse_argv(void) |
3501 | { | |
3502 | unsigned int i; | |
3503 | ||
3504 | for (i = 1; i < global_argc; i++) { | |
3505 | const char *a = global_argv[i]; | |
3506 | ||
3507 | if (*a != '-' || !strcmp(a, "--")) | |
3508 | break; | |
3509 | ||
ff45c0d4 JK |
3510 | if (!skip_prefix(a, "--", &a)) |
3511 | die("unknown option %s", a); | |
3512 | ||
3513 | if (parse_one_option(a)) | |
9c8398f0 SR |
3514 | continue; |
3515 | ||
ff45c0d4 | 3516 | if (parse_one_feature(a, 0)) |
9c8398f0 SR |
3517 | continue; |
3518 | ||
ff45c0d4 JK |
3519 | if (skip_prefix(a, "cat-blob-fd=", &a)) { |
3520 | option_cat_blob_fd(a); | |
85c62395 DB |
3521 | continue; |
3522 | } | |
3523 | ||
ff45c0d4 | 3524 | die("unknown option --%s", a); |
9c8398f0 SR |
3525 | } |
3526 | if (i != global_argc) | |
3527 | usage(fast_import_usage); | |
3528 | ||
3529 | seen_data_command = 1; | |
3530 | if (import_marks_file) | |
3531 | read_marks(); | |
1bdca816 | 3532 | build_mark_map(&sub_marks_from, &sub_marks_to); |
9c8398f0 SR |
3533 | } |
3534 | ||
a006f875 | 3535 | int cmd_fast_import(int argc, const char **argv, const char *prefix) |
8bcce301 | 3536 | { |
0f6927c2 | 3537 | unsigned int i; |
8bcce301 | 3538 | |
71a04a8b JN |
3539 | if (argc == 2 && !strcmp(argv[1], "-h")) |
3540 | usage(fast_import_usage); | |
3541 | ||
ebcfb379 | 3542 | reset_pack_idx_option(&pack_idx_opts); |
536900e5 | 3543 | git_pack_config(); |
bb23fdfa | 3544 | |
93e72d8d | 3545 | alloc_objects(object_entry_alloc); |
f1696ee3 | 3546 | strbuf_init(&command_buf, 0); |
ca56dadb RS |
3547 | CALLOC_ARRAY(atom_table, atom_table_sz); |
3548 | CALLOC_ARRAY(branch_table, branch_table_sz); | |
3549 | CALLOC_ARRAY(avail_tree_table, avail_tree_table_sz); | |
96c47d14 | 3550 | marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); |
463acbe1 | 3551 | |
d8410a81 JK |
3552 | hashmap_init(&object_table, object_entry_hashcmp, NULL, 0); |
3553 | ||
68061e34 JK |
3554 | /* |
3555 | * We don't parse most options until after we've seen the set of | |
3556 | * "feature" lines at the start of the stream (which allows the command | |
3557 | * line to override stream data). But we must do an early parse of any | |
3558 | * command-line options that impact how we interpret the feature lines. | |
3559 | */ | |
3560 | for (i = 1; i < argc; i++) { | |
3561 | const char *arg = argv[i]; | |
3562 | if (*arg != '-' || !strcmp(arg, "--")) | |
3563 | break; | |
3564 | if (!strcmp(arg, "--allow-unsafe-features")) | |
3565 | allow_unsafe_features = 1; | |
3566 | } | |
3567 | ||
9c8398f0 SR |
3568 | global_argc = argc; |
3569 | global_argv = argv; | |
9dc607f1 | 3570 | global_prefix = prefix; |
d5c57b28 | 3571 | |
96c47d14 | 3572 | rc_free = mem_pool_alloc(&fi_mem_pool, cmd_save * sizeof(*rc_free)); |
904b1941 SP |
3573 | for (i = 0; i < (cmd_save - 1); i++) |
3574 | rc_free[i].next = &rc_free[i + 1]; | |
3575 | rc_free[cmd_save - 1].next = NULL; | |
3576 | ||
f70b6534 | 3577 | start_packfile(); |
8acb3297 | 3578 | set_die_routine(die_nicely); |
dc01f59d | 3579 | set_checkpoint_signal(); |
e6c019d0 | 3580 | while (read_next_command() != EOF) { |
97313bef | 3581 | const char *v; |
e6c019d0 | 3582 | if (!strcmp("blob", command_buf.buf)) |
b3031781 | 3583 | parse_new_blob(); |
97313bef JK |
3584 | else if (skip_prefix(command_buf.buf, "commit ", &v)) |
3585 | parse_new_commit(v); | |
3586 | else if (skip_prefix(command_buf.buf, "tag ", &v)) | |
3587 | parse_new_tag(v); | |
3588 | else if (skip_prefix(command_buf.buf, "reset ", &v)) | |
3589 | parse_reset_branch(v); | |
5056bb76 EN |
3590 | else if (skip_prefix(command_buf.buf, "ls ", &v)) |
3591 | parse_ls(v, NULL); | |
7ffde293 EN |
3592 | else if (skip_prefix(command_buf.buf, "cat-blob ", &v)) |
3593 | parse_cat_blob(v); | |
cf7b857a EN |
3594 | else if (skip_prefix(command_buf.buf, "get-mark ", &v)) |
3595 | parse_get_mark(v); | |
7bfe6e26 | 3596 | else if (!strcmp("checkpoint", command_buf.buf)) |
b3031781 | 3597 | parse_checkpoint(); |
be56862f SR |
3598 | else if (!strcmp("done", command_buf.buf)) |
3599 | break; | |
b8f50e5b EN |
3600 | else if (!strcmp("alias", command_buf.buf)) |
3601 | parse_alias(); | |
59556548 | 3602 | else if (starts_with(command_buf.buf, "progress ")) |
b3031781 | 3603 | parse_progress(); |
97313bef JK |
3604 | else if (skip_prefix(command_buf.buf, "feature ", &v)) |
3605 | parse_feature(v); | |
3606 | else if (skip_prefix(command_buf.buf, "option git ", &v)) | |
3607 | parse_option(v); | |
59556548 | 3608 | else if (starts_with(command_buf.buf, "option ")) |
9c8398f0 | 3609 | /* ignore non-git options*/; |
c44cdc7e SP |
3610 | else |
3611 | die("Unsupported command: %s", command_buf.buf); | |
dc01f59d JN |
3612 | |
3613 | if (checkpoint_requested) | |
3614 | checkpoint(); | |
db5e523f | 3615 | } |
9c8398f0 SR |
3616 | |
3617 | /* argv hasn't been parsed yet, do so */ | |
3618 | if (!seen_data_command) | |
3619 | parse_argv(); | |
3620 | ||
be56862f SR |
3621 | if (require_explicit_termination && feof(stdin)) |
3622 | die("stream ends early"); | |
3623 | ||
f70b6534 | 3624 | end_packfile(); |
c44cdc7e | 3625 | |
463acbe1 | 3626 | dump_branches(); |
72303d44 | 3627 | dump_tags(); |
8455e484 | 3628 | unkeep_all_packs(); |
a6a1a831 | 3629 | dump_marks(); |
8bcce301 | 3630 | |
bdf1c06d SP |
3631 | if (pack_edges) |
3632 | fclose(pack_edges); | |
3633 | ||
c499d768 SP |
3634 | if (show_stats) { |
3635 | uintmax_t total_count = 0, duplicate_count = 0; | |
3636 | for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++) | |
3637 | total_count += object_count_by_type[i]; | |
3638 | for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++) | |
3639 | duplicate_count += duplicate_count_by_type[i]; | |
3640 | ||
3641 | fprintf(stderr, "%s statistics:\n", argv[0]); | |
3642 | fprintf(stderr, "---------------------------------------------------------------------\n"); | |
3efb1f34 JR |
3643 | fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count); |
3644 | fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count); | |
94c3b482 DI |
3645 | fprintf(stderr, " blobs : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB], delta_count_attempts_by_type[OBJ_BLOB]); |
3646 | fprintf(stderr, " trees : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE], delta_count_attempts_by_type[OBJ_TREE]); | |
3647 | fprintf(stderr, " commits: %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT], delta_count_attempts_by_type[OBJ_COMMIT]); | |
3648 | fprintf(stderr, " tags : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG], delta_count_attempts_by_type[OBJ_TAG]); | |
c499d768 | 3649 | fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count); |
3efb1f34 | 3650 | fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count); |
c499d768 | 3651 | fprintf(stderr, " atoms: %10u\n", atom_cnt); |
96c47d14 JM |
3652 | fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (tree_entry_allocd + fi_mem_pool.pool_alloc + alloc_count*sizeof(struct object_entry))/1024); |
3653 | fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd + fi_mem_pool.pool_alloc) /1024)); | |
3efb1f34 | 3654 | fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024); |
c499d768 SP |
3655 | fprintf(stderr, "---------------------------------------------------------------------\n"); |
3656 | pack_report(); | |
3657 | fprintf(stderr, "---------------------------------------------------------------------\n"); | |
3658 | fprintf(stderr, "\n"); | |
3659 | } | |
db5e523f | 3660 | |
7073e69e | 3661 | return failure ? 1 : 0; |
db5e523f | 3662 | } |