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