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