]>
Commit | Line | Data |
---|---|---|
5d4a6003 | 1 | #include "builtin.h" |
c323ac7d | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
a74db82e | 4 | #include "attr.h" |
c323ac7d | 5 | #include "object.h" |
8e440259 PE |
6 | #include "blob.h" |
7 | #include "commit.h" | |
8 | #include "tag.h" | |
9 | #include "tree.h" | |
c323ac7d | 10 | #include "delta.h" |
a733cb60 | 11 | #include "pack.h" |
3449f8c4 | 12 | #include "pack-revindex.h" |
c38138cd | 13 | #include "csum-file.h" |
1b0c7174 | 14 | #include "tree-walk.h" |
b5d97e6b JH |
15 | #include "diff.h" |
16 | #include "revision.h" | |
17 | #include "list-objects.h" | |
2834bc27 | 18 | #include "pack-objects.h" |
96a02f8f | 19 | #include "progress.h" |
f0a24aa5 | 20 | #include "refs.h" |
cf2ba13a | 21 | #include "streaming.h" |
93749194 | 22 | #include "thread-utils.h" |
6b8fda2d | 23 | #include "pack-bitmap.h" |
abcb8655 JK |
24 | #include "reachable.h" |
25 | #include "sha1-array.h" | |
edfbb2aa | 26 | #include "argv-array.h" |
c9af708b | 27 | #include "mru.h" |
8ecce684 | 28 | |
99fb6e04 | 29 | static const char *pack_usage[] = { |
b8c1d275 AH |
30 | N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"), |
31 | N_("git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"), | |
99fb6e04 NTND |
32 | NULL |
33 | }; | |
c323ac7d | 34 | |
3f9ac8d2 | 35 | /* |
2834bc27 VM |
36 | * Objects we are going to pack are collected in the `to_pack` structure. |
37 | * It contains an array (dynamically expanded) of the object data, and a map | |
38 | * that can resolve SHA1s to their position in the array. | |
3f9ac8d2 | 39 | */ |
2834bc27 VM |
40 | static struct packing_data to_pack; |
41 | ||
79814f42 | 42 | static struct pack_idx_entry **written_list; |
2834bc27 | 43 | static uint32_t nr_result, nr_written; |
3f9ac8d2 | 44 | |
96f1e58f | 45 | static int non_empty; |
a7de7130 | 46 | static int reuse_delta = 1, reuse_object = 1; |
e5e9714a | 47 | static int keep_unreachable, unpack_unreachable, include_tag; |
dddbad72 | 48 | static timestamp_t unpack_unreachable_expiration; |
e26a8c47 | 49 | static int pack_loose_unreachable; |
96f1e58f | 50 | static int local; |
56dfeb62 | 51 | static int have_non_local_packs; |
96f1e58f | 52 | static int incremental; |
e96fb9b8 | 53 | static int ignore_packed_keep; |
be6b1914 | 54 | static int allow_ofs_delta; |
ebcfb379 | 55 | static struct pack_idx_option pack_idx_opts; |
d01fb92f | 56 | static const char *base_name; |
024701f1 | 57 | static int progress = 1; |
4812a93a | 58 | static int window = 10; |
568508e7 | 59 | static unsigned long pack_size_limit; |
618e613a | 60 | static int depth = 50; |
43cc2b42 | 61 | static int delta_search_threads; |
df6d6101 | 62 | static int pack_to_stdout; |
8d1d8f83 | 63 | static int num_preferred_base; |
dc6a0757 | 64 | static struct progress *progress_state; |
c323ac7d | 65 | |
6b8fda2d VM |
66 | static struct packed_git *reuse_packfile; |
67 | static uint32_t reuse_packfile_objects; | |
68 | static off_t reuse_packfile_offset; | |
69 | ||
645c432d KS |
70 | static int use_bitmap_index_default = 1; |
71 | static int use_bitmap_index = -1; | |
7cc8f971 | 72 | static int write_bitmap_index; |
ae4f07fb | 73 | static uint16_t write_bitmap_options; |
6b8fda2d | 74 | |
074b2eea | 75 | static unsigned long delta_cache_size = 0; |
5749b0b2 | 76 | static unsigned long max_delta_cache_size = 256 * 1024 * 1024; |
e3dfddb3 | 77 | static unsigned long cache_max_small_delta_size = 1000; |
074b2eea | 78 | |
a97773ce BD |
79 | static unsigned long window_memory_limit = 0; |
80 | ||
3f9ac8d2 JH |
81 | /* |
82 | * stats | |
83 | */ | |
7cadf491 SP |
84 | static uint32_t written, written_delta; |
85 | static uint32_t reused, reused_delta; | |
3f9ac8d2 | 86 | |
7cc8f971 VM |
87 | /* |
88 | * Indexed commits | |
89 | */ | |
90 | static struct commit **indexed_commits; | |
91 | static unsigned int indexed_commits_nr; | |
92 | static unsigned int indexed_commits_alloc; | |
93 | ||
94 | static void index_commit_for_bitmap(struct commit *commit) | |
95 | { | |
96 | if (indexed_commits_nr >= indexed_commits_alloc) { | |
97 | indexed_commits_alloc = (indexed_commits_alloc + 32) * 2; | |
2756ca43 | 98 | REALLOC_ARRAY(indexed_commits, indexed_commits_alloc); |
7cc8f971 VM |
99 | } |
100 | ||
101 | indexed_commits[indexed_commits_nr++] = commit; | |
102 | } | |
780e6e73 | 103 | |
3613f9b4 | 104 | static void *get_delta(struct object_entry *entry) |
c323ac7d | 105 | { |
3613f9b4 NP |
106 | unsigned long size, base_size, delta_size; |
107 | void *buf, *base_buf, *delta_buf; | |
21666f1a | 108 | enum object_type type; |
c323ac7d | 109 | |
e6a492b7 | 110 | buf = read_sha1_file(entry->idx.oid.hash, &type, &size); |
3613f9b4 | 111 | if (!buf) |
e6a492b7 | 112 | die("unable to read %s", oid_to_hex(&entry->idx.oid)); |
113 | base_buf = read_sha1_file(entry->delta->idx.oid.hash, &type, | |
114 | &base_size); | |
3613f9b4 | 115 | if (!base_buf) |
e6a492b7 | 116 | die("unable to read %s", |
117 | oid_to_hex(&entry->delta->idx.oid)); | |
3613f9b4 | 118 | delta_buf = diff_delta(base_buf, base_size, |
dcde55bc | 119 | buf, size, &delta_size, 0); |
3613f9b4 | 120 | if (!delta_buf || delta_size != entry->delta_size) |
a6080a0a | 121 | die("delta size changed"); |
3613f9b4 NP |
122 | free(buf); |
123 | free(base_buf); | |
c323ac7d LT |
124 | return delta_buf; |
125 | } | |
126 | ||
30ebb40a NP |
127 | static unsigned long do_compress(void **pptr, unsigned long size) |
128 | { | |
ef49a7a0 | 129 | git_zstream stream; |
30ebb40a NP |
130 | void *in, *out; |
131 | unsigned long maxsize; | |
132 | ||
55bb5c91 | 133 | git_deflate_init(&stream, pack_compression_level); |
225a6f10 | 134 | maxsize = git_deflate_bound(&stream, size); |
30ebb40a NP |
135 | |
136 | in = *pptr; | |
137 | out = xmalloc(maxsize); | |
138 | *pptr = out; | |
139 | ||
140 | stream.next_in = in; | |
141 | stream.avail_in = size; | |
142 | stream.next_out = out; | |
143 | stream.avail_out = maxsize; | |
55bb5c91 | 144 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
30ebb40a | 145 | ; /* nothing */ |
55bb5c91 | 146 | git_deflate_end(&stream); |
30ebb40a NP |
147 | |
148 | free(in); | |
149 | return stream.total_out; | |
150 | } | |
151 | ||
cf2ba13a NTND |
152 | static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f, |
153 | const unsigned char *sha1) | |
154 | { | |
155 | git_zstream stream; | |
156 | unsigned char ibuf[1024 * 16]; | |
157 | unsigned char obuf[1024 * 16]; | |
158 | unsigned long olen = 0; | |
159 | ||
cf2ba13a NTND |
160 | git_deflate_init(&stream, pack_compression_level); |
161 | ||
162 | for (;;) { | |
163 | ssize_t readlen; | |
164 | int zret = Z_OK; | |
165 | readlen = read_istream(st, ibuf, sizeof(ibuf)); | |
166 | if (readlen == -1) | |
167 | die(_("unable to read %s"), sha1_to_hex(sha1)); | |
168 | ||
169 | stream.next_in = ibuf; | |
170 | stream.avail_in = readlen; | |
171 | while ((stream.avail_in || readlen == 0) && | |
172 | (zret == Z_OK || zret == Z_BUF_ERROR)) { | |
173 | stream.next_out = obuf; | |
174 | stream.avail_out = sizeof(obuf); | |
175 | zret = git_deflate(&stream, readlen ? 0 : Z_FINISH); | |
176 | sha1write(f, obuf, stream.next_out - obuf); | |
177 | olen += stream.next_out - obuf; | |
178 | } | |
179 | if (stream.avail_in) | |
180 | die(_("deflate error (%d)"), zret); | |
181 | if (readlen == 0) { | |
182 | if (zret != Z_STREAM_END) | |
183 | die(_("deflate error (%d)"), zret); | |
184 | break; | |
185 | } | |
186 | } | |
187 | git_deflate_end(&stream); | |
188 | return olen; | |
189 | } | |
190 | ||
780e6e73 NP |
191 | /* |
192 | * we are going to reuse the existing object data as is. make | |
193 | * sure it is not corrupt. | |
194 | */ | |
079afb18 SP |
195 | static int check_pack_inflate(struct packed_git *p, |
196 | struct pack_window **w_curs, | |
6777a59f SP |
197 | off_t offset, |
198 | off_t len, | |
079afb18 SP |
199 | unsigned long expect) |
200 | { | |
ef49a7a0 | 201 | git_zstream stream; |
079afb18 SP |
202 | unsigned char fakebuf[4096], *in; |
203 | int st; | |
204 | ||
205 | memset(&stream, 0, sizeof(stream)); | |
39c68542 | 206 | git_inflate_init(&stream); |
079afb18 SP |
207 | do { |
208 | in = use_pack(p, w_curs, offset, &stream.avail_in); | |
209 | stream.next_in = in; | |
210 | stream.next_out = fakebuf; | |
211 | stream.avail_out = sizeof(fakebuf); | |
39c68542 | 212 | st = git_inflate(&stream, Z_FINISH); |
079afb18 SP |
213 | offset += stream.next_in - in; |
214 | } while (st == Z_OK || st == Z_BUF_ERROR); | |
39c68542 | 215 | git_inflate_end(&stream); |
079afb18 SP |
216 | return (st == Z_STREAM_END && |
217 | stream.total_out == expect && | |
218 | stream.total_in == len) ? 0 : -1; | |
219 | } | |
220 | ||
221 | static void copy_pack_data(struct sha1file *f, | |
222 | struct packed_git *p, | |
223 | struct pack_window **w_curs, | |
6777a59f SP |
224 | off_t offset, |
225 | off_t len) | |
079afb18 SP |
226 | { |
227 | unsigned char *in; | |
ef49a7a0 | 228 | unsigned long avail; |
079afb18 SP |
229 | |
230 | while (len) { | |
231 | in = use_pack(p, w_curs, offset, &avail); | |
232 | if (avail > len) | |
ef49a7a0 | 233 | avail = (unsigned long)len; |
079afb18 SP |
234 | sha1write(f, in, avail); |
235 | offset += avail; | |
236 | len -= avail; | |
237 | } | |
238 | } | |
239 | ||
1b4bb16b | 240 | /* Return 0 if we will bust the pack-size limit */ |
c9018b03 NTND |
241 | static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry, |
242 | unsigned long limit, int usable_delta) | |
c323ac7d | 243 | { |
c9018b03 | 244 | unsigned long size, datalen; |
2c5e2865 JK |
245 | unsigned char header[MAX_PACK_OBJECT_HEADER], |
246 | dheader[MAX_PACK_OBJECT_HEADER]; | |
6777a59f | 247 | unsigned hdrlen; |
2c5ef824 | 248 | enum object_type type; |
c9018b03 | 249 | void *buf; |
cf2ba13a | 250 | struct git_istream *st = NULL; |
c9018b03 NTND |
251 | |
252 | if (!usable_delta) { | |
cf2ba13a NTND |
253 | if (entry->type == OBJ_BLOB && |
254 | entry->size > big_file_threshold && | |
e6a492b7 | 255 | (st = open_istream(entry->idx.oid.hash, &type, &size, NULL)) != NULL) |
cf2ba13a NTND |
256 | buf = NULL; |
257 | else { | |
e6a492b7 | 258 | buf = read_sha1_file(entry->idx.oid.hash, &type, |
259 | &size); | |
cf2ba13a | 260 | if (!buf) |
e6a492b7 | 261 | die(_("unable to read %s"), |
262 | oid_to_hex(&entry->idx.oid)); | |
cf2ba13a | 263 | } |
c9018b03 NTND |
264 | /* |
265 | * make sure no cached delta data remains from a | |
266 | * previous attempt before a pack split occurred. | |
267 | */ | |
6a83d902 | 268 | FREE_AND_NULL(entry->delta_data); |
c9018b03 NTND |
269 | entry->z_delta_size = 0; |
270 | } else if (entry->delta_data) { | |
271 | size = entry->delta_size; | |
272 | buf = entry->delta_data; | |
273 | entry->delta_data = NULL; | |
274 | type = (allow_ofs_delta && entry->delta->idx.offset) ? | |
275 | OBJ_OFS_DELTA : OBJ_REF_DELTA; | |
276 | } else { | |
277 | buf = get_delta(entry); | |
278 | size = entry->delta_size; | |
279 | type = (allow_ofs_delta && entry->delta->idx.offset) ? | |
280 | OBJ_OFS_DELTA : OBJ_REF_DELTA; | |
281 | } | |
282 | ||
cf2ba13a NTND |
283 | if (st) /* large blob case, just assume we don't compress well */ |
284 | datalen = size; | |
285 | else if (entry->z_delta_size) | |
c9018b03 NTND |
286 | datalen = entry->z_delta_size; |
287 | else | |
288 | datalen = do_compress(&buf, size); | |
289 | ||
290 | /* | |
291 | * The object header is a byte of 'type' followed by zero or | |
292 | * more bytes of length. | |
293 | */ | |
7202a6fa JK |
294 | hdrlen = encode_in_pack_object_header(header, sizeof(header), |
295 | type, size); | |
c9018b03 NTND |
296 | |
297 | if (type == OBJ_OFS_DELTA) { | |
298 | /* | |
299 | * Deltas with relative base contain an additional | |
300 | * encoding of the relative offset for the delta | |
301 | * base from this object's position in the pack. | |
302 | */ | |
303 | off_t ofs = entry->idx.offset - entry->delta->idx.offset; | |
304 | unsigned pos = sizeof(dheader) - 1; | |
305 | dheader[pos] = ofs & 127; | |
306 | while (ofs >>= 7) | |
307 | dheader[--pos] = 128 | (--ofs & 127); | |
308 | if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { | |
cf2ba13a NTND |
309 | if (st) |
310 | close_istream(st); | |
c9018b03 NTND |
311 | free(buf); |
312 | return 0; | |
313 | } | |
314 | sha1write(f, header, hdrlen); | |
315 | sha1write(f, dheader + pos, sizeof(dheader) - pos); | |
316 | hdrlen += sizeof(dheader) - pos; | |
317 | } else if (type == OBJ_REF_DELTA) { | |
318 | /* | |
319 | * Deltas with a base reference contain | |
320 | * an additional 20 bytes for the base sha1. | |
321 | */ | |
322 | if (limit && hdrlen + 20 + datalen + 20 >= limit) { | |
cf2ba13a NTND |
323 | if (st) |
324 | close_istream(st); | |
c9018b03 NTND |
325 | free(buf); |
326 | return 0; | |
327 | } | |
328 | sha1write(f, header, hdrlen); | |
e6a492b7 | 329 | sha1write(f, entry->delta->idx.oid.hash, 20); |
c9018b03 NTND |
330 | hdrlen += 20; |
331 | } else { | |
332 | if (limit && hdrlen + datalen + 20 >= limit) { | |
cf2ba13a NTND |
333 | if (st) |
334 | close_istream(st); | |
c9018b03 NTND |
335 | free(buf); |
336 | return 0; | |
337 | } | |
338 | sha1write(f, header, hdrlen); | |
339 | } | |
cf2ba13a | 340 | if (st) { |
e6a492b7 | 341 | datalen = write_large_blob_data(st, f, entry->idx.oid.hash); |
cf2ba13a NTND |
342 | close_istream(st); |
343 | } else { | |
344 | sha1write(f, buf, datalen); | |
345 | free(buf); | |
346 | } | |
c9018b03 NTND |
347 | |
348 | return hdrlen + datalen; | |
349 | } | |
350 | ||
351 | /* Return 0 if we will bust the pack-size limit */ | |
af92a645 NTND |
352 | static off_t write_reuse_object(struct sha1file *f, struct object_entry *entry, |
353 | unsigned long limit, int usable_delta) | |
c9018b03 NTND |
354 | { |
355 | struct packed_git *p = entry->in_pack; | |
356 | struct pack_window *w_curs = NULL; | |
357 | struct revindex_entry *revidx; | |
358 | off_t offset; | |
359 | enum object_type type = entry->type; | |
211c61c6 | 360 | off_t datalen; |
2c5e2865 JK |
361 | unsigned char header[MAX_PACK_OBJECT_HEADER], |
362 | dheader[MAX_PACK_OBJECT_HEADER]; | |
c9018b03 NTND |
363 | unsigned hdrlen; |
364 | ||
365 | if (entry->delta) | |
366 | type = (allow_ofs_delta && entry->delta->idx.offset) ? | |
367 | OBJ_OFS_DELTA : OBJ_REF_DELTA; | |
7202a6fa JK |
368 | hdrlen = encode_in_pack_object_header(header, sizeof(header), |
369 | type, entry->size); | |
c9018b03 NTND |
370 | |
371 | offset = entry->in_pack_offset; | |
372 | revidx = find_pack_revindex(p, offset); | |
373 | datalen = revidx[1].offset - offset; | |
374 | if (!pack_to_stdout && p->index_version > 1 && | |
375 | check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) { | |
e6a492b7 | 376 | error("bad packed object CRC for %s", |
377 | oid_to_hex(&entry->idx.oid)); | |
c9018b03 NTND |
378 | unuse_pack(&w_curs); |
379 | return write_no_reuse_object(f, entry, limit, usable_delta); | |
380 | } | |
381 | ||
382 | offset += entry->in_pack_header_size; | |
383 | datalen -= entry->in_pack_header_size; | |
384 | ||
385 | if (!pack_to_stdout && p->index_version == 1 && | |
386 | check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) { | |
e6a492b7 | 387 | error("corrupt packed object for %s", |
388 | oid_to_hex(&entry->idx.oid)); | |
c9018b03 NTND |
389 | unuse_pack(&w_curs); |
390 | return write_no_reuse_object(f, entry, limit, usable_delta); | |
391 | } | |
392 | ||
393 | if (type == OBJ_OFS_DELTA) { | |
394 | off_t ofs = entry->idx.offset - entry->delta->idx.offset; | |
395 | unsigned pos = sizeof(dheader) - 1; | |
396 | dheader[pos] = ofs & 127; | |
397 | while (ofs >>= 7) | |
398 | dheader[--pos] = 128 | (--ofs & 127); | |
399 | if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { | |
400 | unuse_pack(&w_curs); | |
401 | return 0; | |
402 | } | |
403 | sha1write(f, header, hdrlen); | |
404 | sha1write(f, dheader + pos, sizeof(dheader) - pos); | |
405 | hdrlen += sizeof(dheader) - pos; | |
406 | reused_delta++; | |
407 | } else if (type == OBJ_REF_DELTA) { | |
408 | if (limit && hdrlen + 20 + datalen + 20 >= limit) { | |
409 | unuse_pack(&w_curs); | |
410 | return 0; | |
411 | } | |
412 | sha1write(f, header, hdrlen); | |
e6a492b7 | 413 | sha1write(f, entry->delta->idx.oid.hash, 20); |
c9018b03 NTND |
414 | hdrlen += 20; |
415 | reused_delta++; | |
416 | } else { | |
417 | if (limit && hdrlen + datalen + 20 >= limit) { | |
418 | unuse_pack(&w_curs); | |
419 | return 0; | |
420 | } | |
421 | sha1write(f, header, hdrlen); | |
422 | } | |
423 | copy_pack_data(f, p, &w_curs, offset, datalen); | |
424 | unuse_pack(&w_curs); | |
425 | reused++; | |
426 | return hdrlen + datalen; | |
427 | } | |
428 | ||
429 | /* Return 0 if we will bust the pack-size limit */ | |
af92a645 NTND |
430 | static off_t write_object(struct sha1file *f, |
431 | struct object_entry *entry, | |
432 | off_t write_offset) | |
c9018b03 | 433 | { |
af92a645 NTND |
434 | unsigned long limit; |
435 | off_t len; | |
2c5ef824 | 436 | int usable_delta, to_reuse; |
c323ac7d | 437 | |
78d1e84f NP |
438 | if (!pack_to_stdout) |
439 | crc32_begin(f); | |
440 | ||
a2430dde | 441 | /* apply size limit if limited packsize and not first object */ |
a1e4760f NP |
442 | if (!pack_size_limit || !nr_written) |
443 | limit = 0; | |
444 | else if (pack_size_limit <= write_offset) | |
445 | /* | |
446 | * the earlier object did not fit the limit; avoid | |
447 | * mistaking this with unlimited (i.e. limit = 0). | |
448 | */ | |
449 | limit = 1; | |
450 | else | |
451 | limit = pack_size_limit - write_offset; | |
2c5ef824 NP |
452 | |
453 | if (!entry->delta) | |
454 | usable_delta = 0; /* no delta */ | |
455 | else if (!pack_size_limit) | |
456 | usable_delta = 1; /* unlimited packfile */ | |
457 | else if (entry->delta->idx.offset == (off_t)-1) | |
458 | usable_delta = 0; /* base was written to another pack */ | |
459 | else if (entry->delta->idx.offset) | |
460 | usable_delta = 1; /* base already exists in this pack */ | |
461 | else | |
462 | usable_delta = 0; /* base could end up in another pack */ | |
463 | ||
a7de7130 | 464 | if (!reuse_object) |
fa736f72 NP |
465 | to_reuse = 0; /* explicit */ |
466 | else if (!entry->in_pack) | |
ab7cd7bb | 467 | to_reuse = 0; /* can't reuse what we don't have */ |
c9018b03 | 468 | else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA) |
17b08f2c DH |
469 | /* check_object() decided it for us ... */ |
470 | to_reuse = usable_delta; | |
471 | /* ... but pack split may override that */ | |
c9018b03 | 472 | else if (entry->type != entry->in_pack_type) |
ab7cd7bb JH |
473 | to_reuse = 0; /* pack has delta which is unusable */ |
474 | else if (entry->delta) | |
475 | to_reuse = 0; /* we want to pack afresh */ | |
476 | else | |
477 | to_reuse = 1; /* we have it in-pack undeltified, | |
478 | * and we do not need to deltify it. | |
479 | */ | |
480 | ||
c9018b03 NTND |
481 | if (!to_reuse) |
482 | len = write_no_reuse_object(f, entry, limit, usable_delta); | |
483 | else | |
484 | len = write_reuse_object(f, entry, limit, usable_delta); | |
485 | if (!len) | |
486 | return 0; | |
64bd76b1 | 487 | |
17b08f2c | 488 | if (usable_delta) |
ab7cd7bb | 489 | written_delta++; |
3f9ac8d2 | 490 | written++; |
78d1e84f | 491 | if (!pack_to_stdout) |
aa7e44bf | 492 | entry->idx.crc32 = crc32_end(f); |
c9018b03 | 493 | return len; |
c323ac7d LT |
494 | } |
495 | ||
f63c79db JH |
496 | enum write_one_status { |
497 | WRITE_ONE_SKIP = -1, /* already written */ | |
498 | WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */ | |
499 | WRITE_ONE_WRITTEN = 1, /* normal */ | |
500 | WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */ | |
501 | }; | |
502 | ||
503 | static enum write_one_status write_one(struct sha1file *f, | |
504 | struct object_entry *e, | |
505 | off_t *offset) | |
9d5ab962 | 506 | { |
af92a645 | 507 | off_t size; |
f63c79db | 508 | int recursing; |
d7dd0223 | 509 | |
f63c79db JH |
510 | /* |
511 | * we set offset to 1 (which is an impossible value) to mark | |
512 | * the fact that this object is involved in "write its base | |
513 | * first before writing a deltified object" recursion. | |
514 | */ | |
515 | recursing = (e->idx.offset == 1); | |
516 | if (recursing) { | |
517 | warning("recursive delta detected for object %s", | |
e6a492b7 | 518 | oid_to_hex(&e->idx.oid)); |
f63c79db JH |
519 | return WRITE_ONE_RECURSIVE; |
520 | } else if (e->idx.offset || e->preferred_base) { | |
521 | /* offset is non zero if object is written already. */ | |
522 | return WRITE_ONE_SKIP; | |
523 | } | |
d7dd0223 | 524 | |
720c9f7b | 525 | /* if we are deltified, write out base object first. */ |
f63c79db JH |
526 | if (e->delta) { |
527 | e->idx.offset = 1; /* now recurse */ | |
528 | switch (write_one(f, e->delta, offset)) { | |
529 | case WRITE_ONE_RECURSIVE: | |
530 | /* we cannot depend on this one */ | |
531 | e->delta = NULL; | |
532 | break; | |
533 | default: | |
534 | break; | |
535 | case WRITE_ONE_BREAK: | |
536 | e->idx.offset = recursing; | |
537 | return WRITE_ONE_BREAK; | |
538 | } | |
539 | } | |
d7dd0223 | 540 | |
6ed7f25e NP |
541 | e->idx.offset = *offset; |
542 | size = write_object(f, e, *offset); | |
17b08f2c | 543 | if (!size) { |
f63c79db JH |
544 | e->idx.offset = recursing; |
545 | return WRITE_ONE_BREAK; | |
17b08f2c | 546 | } |
79814f42 | 547 | written_list[nr_written++] = &e->idx; |
d7dd0223 NP |
548 | |
549 | /* make sure off_t is sufficiently large not to wrap */ | |
c03c8315 | 550 | if (signed_add_overflows(*offset, size)) |
d7dd0223 | 551 | die("pack too large for current definition of off_t"); |
6ed7f25e | 552 | *offset += size; |
f63c79db | 553 | return WRITE_ONE_WRITTEN; |
9d5ab962 JH |
554 | } |
555 | ||
d155254c | 556 | static int mark_tagged(const char *path, const struct object_id *oid, int flag, |
1b4bb16b JH |
557 | void *cb_data) |
558 | { | |
559 | unsigned char peeled[20]; | |
d155254c | 560 | struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL); |
1b4bb16b JH |
561 | |
562 | if (entry) | |
563 | entry->tagged = 1; | |
564 | if (!peel_ref(path, peeled)) { | |
2834bc27 | 565 | entry = packlist_find(&to_pack, peeled, NULL); |
1b4bb16b JH |
566 | if (entry) |
567 | entry->tagged = 1; | |
568 | } | |
569 | return 0; | |
570 | } | |
571 | ||
be126818 | 572 | static inline void add_to_write_order(struct object_entry **wo, |
92bef1a1 | 573 | unsigned int *endp, |
1b4bb16b JH |
574 | struct object_entry *e) |
575 | { | |
576 | if (e->filled) | |
577 | return; | |
578 | wo[(*endp)++] = e; | |
579 | e->filled = 1; | |
580 | } | |
581 | ||
582 | static void add_descendants_to_write_order(struct object_entry **wo, | |
92bef1a1 | 583 | unsigned int *endp, |
1b4bb16b JH |
584 | struct object_entry *e) |
585 | { | |
f380872f DM |
586 | int add_to_order = 1; |
587 | while (e) { | |
588 | if (add_to_order) { | |
589 | struct object_entry *s; | |
590 | /* add this node... */ | |
591 | add_to_write_order(wo, endp, e); | |
592 | /* all its siblings... */ | |
593 | for (s = e->delta_sibling; s; s = s->delta_sibling) { | |
594 | add_to_write_order(wo, endp, s); | |
595 | } | |
596 | } | |
597 | /* drop down a level to add left subtree nodes if possible */ | |
598 | if (e->delta_child) { | |
599 | add_to_order = 1; | |
600 | e = e->delta_child; | |
601 | } else { | |
602 | add_to_order = 0; | |
603 | /* our sibling might have some children, it is next */ | |
604 | if (e->delta_sibling) { | |
605 | e = e->delta_sibling; | |
606 | continue; | |
607 | } | |
608 | /* go back to our parent node */ | |
609 | e = e->delta; | |
610 | while (e && !e->delta_sibling) { | |
611 | /* we're on the right side of a subtree, keep | |
612 | * going up until we can go right again */ | |
613 | e = e->delta; | |
614 | } | |
615 | if (!e) { | |
616 | /* done- we hit our original root node */ | |
617 | return; | |
618 | } | |
619 | /* pass it off to sibling at this level */ | |
620 | e = e->delta_sibling; | |
621 | } | |
622 | }; | |
1b4bb16b JH |
623 | } |
624 | ||
625 | static void add_family_to_write_order(struct object_entry **wo, | |
92bef1a1 | 626 | unsigned int *endp, |
1b4bb16b JH |
627 | struct object_entry *e) |
628 | { | |
629 | struct object_entry *root; | |
630 | ||
631 | for (root = e; root->delta; root = root->delta) | |
632 | ; /* nothing */ | |
1b4bb16b JH |
633 | add_descendants_to_write_order(wo, endp, root); |
634 | } | |
635 | ||
636 | static struct object_entry **compute_write_order(void) | |
637 | { | |
38d4debb | 638 | unsigned int i, wo_end, last_untagged; |
1b4bb16b | 639 | |
b32fa95f | 640 | struct object_entry **wo; |
2834bc27 | 641 | struct object_entry *objects = to_pack.objects; |
1b4bb16b | 642 | |
2834bc27 | 643 | for (i = 0; i < to_pack.nr_objects; i++) { |
1b4bb16b JH |
644 | objects[i].tagged = 0; |
645 | objects[i].filled = 0; | |
646 | objects[i].delta_child = NULL; | |
647 | objects[i].delta_sibling = NULL; | |
648 | } | |
649 | ||
650 | /* | |
651 | * Fully connect delta_child/delta_sibling network. | |
652 | * Make sure delta_sibling is sorted in the original | |
653 | * recency order. | |
654 | */ | |
2834bc27 | 655 | for (i = to_pack.nr_objects; i > 0;) { |
92bef1a1 | 656 | struct object_entry *e = &objects[--i]; |
1b4bb16b JH |
657 | if (!e->delta) |
658 | continue; | |
659 | /* Mark me as the first child */ | |
660 | e->delta_sibling = e->delta->delta_child; | |
661 | e->delta->delta_child = e; | |
662 | } | |
663 | ||
664 | /* | |
665 | * Mark objects that are at the tip of tags. | |
666 | */ | |
d155254c | 667 | for_each_tag_ref(mark_tagged, NULL); |
1b4bb16b JH |
668 | |
669 | /* | |
38d4debb | 670 | * Give the objects in the original recency order until |
1b4bb16b JH |
671 | * we see a tagged tip. |
672 | */ | |
b32fa95f | 673 | ALLOC_ARRAY(wo, to_pack.nr_objects); |
2834bc27 | 674 | for (i = wo_end = 0; i < to_pack.nr_objects; i++) { |
1b4bb16b JH |
675 | if (objects[i].tagged) |
676 | break; | |
677 | add_to_write_order(wo, &wo_end, &objects[i]); | |
678 | } | |
38d4debb | 679 | last_untagged = i; |
1b4bb16b JH |
680 | |
681 | /* | |
682 | * Then fill all the tagged tips. | |
683 | */ | |
2834bc27 | 684 | for (; i < to_pack.nr_objects; i++) { |
1b4bb16b JH |
685 | if (objects[i].tagged) |
686 | add_to_write_order(wo, &wo_end, &objects[i]); | |
687 | } | |
688 | ||
689 | /* | |
690 | * And then all remaining commits and tags. | |
691 | */ | |
2834bc27 | 692 | for (i = last_untagged; i < to_pack.nr_objects; i++) { |
1b4bb16b JH |
693 | if (objects[i].type != OBJ_COMMIT && |
694 | objects[i].type != OBJ_TAG) | |
695 | continue; | |
696 | add_to_write_order(wo, &wo_end, &objects[i]); | |
697 | } | |
698 | ||
699 | /* | |
700 | * And then all the trees. | |
701 | */ | |
2834bc27 | 702 | for (i = last_untagged; i < to_pack.nr_objects; i++) { |
1b4bb16b JH |
703 | if (objects[i].type != OBJ_TREE) |
704 | continue; | |
705 | add_to_write_order(wo, &wo_end, &objects[i]); | |
706 | } | |
707 | ||
708 | /* | |
709 | * Finally all the rest in really tight order | |
710 | */ | |
2834bc27 | 711 | for (i = last_untagged; i < to_pack.nr_objects; i++) { |
38d4debb DM |
712 | if (!objects[i].filled) |
713 | add_family_to_write_order(wo, &wo_end, &objects[i]); | |
714 | } | |
715 | ||
2834bc27 VM |
716 | if (wo_end != to_pack.nr_objects) |
717 | die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects); | |
1b4bb16b JH |
718 | |
719 | return wo; | |
720 | } | |
721 | ||
6b8fda2d VM |
722 | static off_t write_reused_pack(struct sha1file *f) |
723 | { | |
724 | unsigned char buffer[8192]; | |
657673f1 | 725 | off_t to_write, total; |
6b8fda2d VM |
726 | int fd; |
727 | ||
728 | if (!is_pack_valid(reuse_packfile)) | |
729 | die("packfile is invalid: %s", reuse_packfile->pack_name); | |
730 | ||
a5436b57 | 731 | fd = git_open(reuse_packfile->pack_name); |
6b8fda2d VM |
732 | if (fd < 0) |
733 | die_errno("unable to open packfile for reuse: %s", | |
734 | reuse_packfile->pack_name); | |
735 | ||
736 | if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1) | |
737 | die_errno("unable to seek in reused packfile"); | |
738 | ||
739 | if (reuse_packfile_offset < 0) | |
740 | reuse_packfile_offset = reuse_packfile->pack_size - 20; | |
741 | ||
657673f1 | 742 | total = to_write = reuse_packfile_offset - sizeof(struct pack_header); |
6b8fda2d VM |
743 | |
744 | while (to_write) { | |
745 | int read_pack = xread(fd, buffer, sizeof(buffer)); | |
746 | ||
747 | if (read_pack <= 0) | |
748 | die_errno("unable to read from reused packfile"); | |
749 | ||
750 | if (read_pack > to_write) | |
751 | read_pack = to_write; | |
752 | ||
753 | sha1write(f, buffer, read_pack); | |
754 | to_write -= read_pack; | |
657673f1 JK |
755 | |
756 | /* | |
757 | * We don't know the actual number of objects written, | |
758 | * only how many bytes written, how many bytes total, and | |
759 | * how many objects total. So we can fake it by pretending all | |
760 | * objects we are writing are the same size. This gives us a | |
761 | * smooth progress meter, and at the end it matches the true | |
762 | * answer. | |
763 | */ | |
764 | written = reuse_packfile_objects * | |
765 | (((double)(total - to_write)) / total); | |
766 | display_progress(progress_state, written); | |
6b8fda2d VM |
767 | } |
768 | ||
769 | close(fd); | |
657673f1 JK |
770 | written = reuse_packfile_objects; |
771 | display_progress(progress_state, written); | |
6b8fda2d VM |
772 | return reuse_packfile_offset - sizeof(struct pack_header); |
773 | } | |
774 | ||
9cea46cd EW |
775 | static const char no_split_warning[] = N_( |
776 | "disabling bitmap writing, packs are split due to pack.packSizeLimit" | |
777 | ); | |
778 | ||
d01fb92f | 779 | static void write_pack_file(void) |
c323ac7d | 780 | { |
ebe27b13 | 781 | uint32_t i = 0, j; |
d22b9290 | 782 | struct sha1file *f; |
6ed7f25e | 783 | off_t offset; |
ebe27b13 | 784 | uint32_t nr_remaining = nr_result; |
f746bae8 | 785 | time_t last_mtime = 0; |
1b4bb16b | 786 | struct object_entry **write_order; |
81a216a5 | 787 | |
bcd7954e | 788 | if (progress > pack_to_stdout) |
754dbc43 | 789 | progress_state = start_progress(_("Writing objects"), nr_result); |
b32fa95f | 790 | ALLOC_ARRAY(written_list, to_pack.nr_objects); |
1b4bb16b | 791 | write_order = compute_write_order(); |
183bdb2c | 792 | |
ebe27b13 | 793 | do { |
aa7e44bf | 794 | unsigned char sha1[20]; |
7ba502c4 | 795 | char *pack_tmp_name = NULL; |
aa7e44bf | 796 | |
cdf9db3c | 797 | if (pack_to_stdout) |
2a128d63 | 798 | f = sha1fd_throughput(1, "<stdout>", progress_state); |
cdf9db3c JH |
799 | else |
800 | f = create_tmp_packfile(&pack_tmp_name); | |
ebe27b13 | 801 | |
c0ad4657 | 802 | offset = write_pack_header(f, nr_remaining); |
6b8fda2d VM |
803 | |
804 | if (reuse_packfile) { | |
805 | off_t packfile_size; | |
806 | assert(pack_to_stdout); | |
807 | ||
808 | packfile_size = write_reused_pack(f); | |
809 | offset += packfile_size; | |
810 | } | |
811 | ||
ebe27b13 | 812 | nr_written = 0; |
2834bc27 | 813 | for (; i < to_pack.nr_objects; i++) { |
1b4bb16b | 814 | struct object_entry *e = write_order[i]; |
cddec4f8 | 815 | if (write_one(f, e, &offset) == WRITE_ONE_BREAK) |
720c9f7b NP |
816 | break; |
817 | display_progress(progress_state, written); | |
818 | } | |
c553ca25 | 819 | |
ebe27b13 DH |
820 | /* |
821 | * Did we write the wrong # entries in the header? | |
822 | * If so, rewrite it like in fast-import | |
823 | */ | |
54352bb2 LT |
824 | if (pack_to_stdout) { |
825 | sha1close(f, sha1, CSUM_CLOSE); | |
826 | } else if (nr_written == nr_remaining) { | |
827 | sha1close(f, sha1, CSUM_FSYNC); | |
ebe27b13 | 828 | } else { |
ac0463ed | 829 | int fd = sha1close(f, sha1, 0); |
abeb40e5 | 830 | fixup_pack_header_footer(fd, sha1, pack_tmp_name, |
ac0463ed | 831 | nr_written, sha1, offset); |
7ba502c4 | 832 | close(fd); |
9cea46cd EW |
833 | if (write_bitmap_index) { |
834 | warning(_(no_split_warning)); | |
835 | write_bitmap_index = 0; | |
836 | } | |
ebe27b13 DH |
837 | } |
838 | ||
839 | if (!pack_to_stdout) { | |
f746bae8 | 840 | struct stat st; |
58892711 | 841 | struct strbuf tmpname = STRBUF_INIT; |
d01fb92f | 842 | |
f746bae8 NP |
843 | /* |
844 | * Packs are runtime accessed in their mtime | |
845 | * order since newer packs are more likely to contain | |
846 | * younger objects. So if we are creating multiple | |
847 | * packs then we should modify the mtime of later ones | |
848 | * to preserve this property. | |
849 | */ | |
0e990530 | 850 | if (stat(pack_tmp_name, &st) < 0) { |
54d47394 | 851 | warning_errno("failed to stat %s", pack_tmp_name); |
f746bae8 NP |
852 | } else if (!last_mtime) { |
853 | last_mtime = st.st_mtime; | |
854 | } else { | |
855 | struct utimbuf utb; | |
856 | utb.actime = st.st_atime; | |
857 | utb.modtime = --last_mtime; | |
0e990530 | 858 | if (utime(pack_tmp_name, &utb) < 0) |
54d47394 | 859 | warning_errno("failed utime() on %s", pack_tmp_name); |
f746bae8 NP |
860 | } |
861 | ||
58892711 | 862 | strbuf_addf(&tmpname, "%s-", base_name); |
7cc8f971 VM |
863 | |
864 | if (write_bitmap_index) { | |
865 | bitmap_writer_set_checksum(sha1); | |
866 | bitmap_writer_build_type_index(written_list, nr_written); | |
867 | } | |
868 | ||
58892711 | 869 | finish_tmp_packfile(&tmpname, pack_tmp_name, |
0e990530 JH |
870 | written_list, nr_written, |
871 | &pack_idx_opts, sha1); | |
7cc8f971 VM |
872 | |
873 | if (write_bitmap_index) { | |
58892711 | 874 | strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1)); |
7cc8f971 VM |
875 | |
876 | stop_progress(&progress_state); | |
877 | ||
878 | bitmap_writer_show_progress(progress); | |
879 | bitmap_writer_reuse_bitmaps(&to_pack); | |
880 | bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1); | |
881 | bitmap_writer_build(&to_pack); | |
ae4f07fb | 882 | bitmap_writer_finish(written_list, nr_written, |
58892711 | 883 | tmpname.buf, write_bitmap_options); |
7cc8f971 VM |
884 | write_bitmap_index = 0; |
885 | } | |
886 | ||
58892711 | 887 | strbuf_release(&tmpname); |
7ba502c4 | 888 | free(pack_tmp_name); |
aa7e44bf | 889 | puts(sha1_to_hex(sha1)); |
ebe27b13 DH |
890 | } |
891 | ||
892 | /* mark written objects as written to previous pack */ | |
893 | for (j = 0; j < nr_written; j++) { | |
79814f42 | 894 | written_list[j]->offset = (off_t)-1; |
ebe27b13 DH |
895 | } |
896 | nr_remaining -= nr_written; | |
2834bc27 | 897 | } while (nr_remaining && i < to_pack.nr_objects); |
ebe27b13 DH |
898 | |
899 | free(written_list); | |
1b4bb16b | 900 | free(write_order); |
4d4fcc54 | 901 | stop_progress(&progress_state); |
67c08ce1 | 902 | if (written != nr_result) |
6e1c2344 RJ |
903 | die("wrote %"PRIu32" objects while expecting %"PRIu32, |
904 | written, nr_result); | |
c323ac7d LT |
905 | } |
906 | ||
a74db82e JH |
907 | static int no_try_delta(const char *path) |
908 | { | |
2aef63d3 | 909 | static struct attr_check *check; |
a74db82e | 910 | |
2aef63d3 JH |
911 | if (!check) |
912 | check = attr_check_initl("delta", NULL); | |
913 | if (git_check_attr(path, check)) | |
a74db82e | 914 | return 0; |
2aef63d3 | 915 | if (ATTR_FALSE(check->items[0].value)) |
a74db82e JH |
916 | return 1; |
917 | return 0; | |
918 | } | |
919 | ||
ce2bc424 JK |
920 | /* |
921 | * When adding an object, check whether we have already added it | |
922 | * to our packing list. If so, we can skip. However, if we are | |
923 | * being asked to excludei t, but the previous mention was to include | |
924 | * it, make sure to adjust its flags and tweak our numbers accordingly. | |
925 | * | |
926 | * As an optimization, we pass out the index position where we would have | |
927 | * found the item, since that saves us from having to look it up again a | |
928 | * few lines later when we want to add the new entry. | |
929 | */ | |
930 | static int have_duplicate_entry(const unsigned char *sha1, | |
931 | int exclude, | |
932 | uint32_t *index_pos) | |
c323ac7d | 933 | { |
c323ac7d | 934 | struct object_entry *entry; |
29b734e4 | 935 | |
ce2bc424 JK |
936 | entry = packlist_find(&to_pack, sha1, index_pos); |
937 | if (!entry) | |
29b734e4 | 938 | return 0; |
ce2bc424 JK |
939 | |
940 | if (exclude) { | |
941 | if (!entry->preferred_base) | |
942 | nr_result--; | |
943 | entry->preferred_base = 1; | |
29b734e4 | 944 | } |
c323ac7d | 945 | |
ce2bc424 JK |
946 | return 1; |
947 | } | |
948 | ||
702d1b95 KS |
949 | static int want_found_object(int exclude, struct packed_git *p) |
950 | { | |
951 | if (exclude) | |
952 | return 1; | |
953 | if (incremental) | |
954 | return 0; | |
955 | ||
956 | /* | |
957 | * When asked to do --local (do not include an object that appears in a | |
958 | * pack we borrow from elsewhere) or --honor-pack-keep (do not include | |
959 | * an object that appears in a pack marked with .keep), finding a pack | |
960 | * that matches the criteria is sufficient for us to decide to omit it. | |
961 | * However, even if this pack does not satisfy the criteria, we need to | |
962 | * make sure no copy of this object appears in _any_ pack that makes us | |
963 | * to omit the object, so we need to check all the packs. | |
964 | * | |
965 | * We can however first check whether these options can possible matter; | |
966 | * if they do not matter we know we want the object in generated pack. | |
967 | * Otherwise, we signal "-1" at the end to tell the caller that we do | |
968 | * not know either way, and it needs to check more packs. | |
969 | */ | |
970 | if (!ignore_packed_keep && | |
971 | (!local || !have_non_local_packs)) | |
972 | return 1; | |
973 | ||
974 | if (local && !p->pack_local) | |
975 | return 0; | |
976 | if (ignore_packed_keep && p->pack_local && p->pack_keep) | |
977 | return 0; | |
978 | ||
979 | /* we don't know yet; keep looking for more packs */ | |
980 | return -1; | |
981 | } | |
982 | ||
ce2bc424 JK |
983 | /* |
984 | * Check whether we want the object in the pack (e.g., we do not want | |
985 | * objects found in non-local stores if the "--local" option was used). | |
986 | * | |
702d1b95 KS |
987 | * If the caller already knows an existing pack it wants to take the object |
988 | * from, that is passed in *found_pack and *found_offset; otherwise this | |
989 | * function finds if there is any pack that has the object and returns the pack | |
990 | * and its offset in these variables. | |
ce2bc424 JK |
991 | */ |
992 | static int want_object_in_pack(const unsigned char *sha1, | |
993 | int exclude, | |
994 | struct packed_git **found_pack, | |
995 | off_t *found_offset) | |
996 | { | |
c9af708b | 997 | struct mru_entry *entry; |
702d1b95 | 998 | int want; |
ce2bc424 | 999 | |
daae0625 BC |
1000 | if (!exclude && local && has_loose_object_nonlocal(sha1)) |
1001 | return 0; | |
1002 | ||
702d1b95 KS |
1003 | /* |
1004 | * If we already know the pack object lives in, start checks from that | |
1005 | * pack - in the usual case when neither --local was given nor .keep files | |
1006 | * are present we will determine the answer right now. | |
1007 | */ | |
1008 | if (*found_pack) { | |
1009 | want = want_found_object(exclude, *found_pack); | |
1010 | if (want != -1) | |
1011 | return want; | |
1012 | } | |
ce2bc424 | 1013 | |
c9af708b JK |
1014 | for (entry = packed_git_mru->head; entry; entry = entry->next) { |
1015 | struct packed_git *p = entry->item; | |
702d1b95 KS |
1016 | off_t offset; |
1017 | ||
1018 | if (p == *found_pack) | |
1019 | offset = *found_offset; | |
1020 | else | |
1021 | offset = find_pack_entry_one(sha1, p); | |
1022 | ||
5c49c116 | 1023 | if (offset) { |
ce2bc424 | 1024 | if (!*found_pack) { |
319b678a | 1025 | if (!is_pack_valid(p)) |
4c080182 | 1026 | continue; |
ce2bc424 JK |
1027 | *found_offset = offset; |
1028 | *found_pack = p; | |
64560374 | 1029 | } |
702d1b95 | 1030 | want = want_found_object(exclude, p); |
e6e24c94 | 1031 | if (!exclude && want > 0) |
c9af708b | 1032 | mru_mark(packed_git_mru, entry); |
702d1b95 KS |
1033 | if (want != -1) |
1034 | return want; | |
64560374 LT |
1035 | } |
1036 | } | |
eb019375 | 1037 | |
ce2bc424 JK |
1038 | return 1; |
1039 | } | |
1040 | ||
1041 | static void create_object_entry(const unsigned char *sha1, | |
1042 | enum object_type type, | |
1043 | uint32_t hash, | |
1044 | int exclude, | |
1045 | int no_try_delta, | |
1046 | uint32_t index_pos, | |
1047 | struct packed_git *found_pack, | |
1048 | off_t found_offset) | |
1049 | { | |
1050 | struct object_entry *entry; | |
29b734e4 | 1051 | |
2834bc27 | 1052 | entry = packlist_alloc(&to_pack, sha1, index_pos); |
27225f2e | 1053 | entry->hash = hash; |
5c49c116 NP |
1054 | if (type) |
1055 | entry->type = type; | |
29b734e4 NP |
1056 | if (exclude) |
1057 | entry->preferred_base = 1; | |
81a216a5 NP |
1058 | else |
1059 | nr_result++; | |
29b734e4 NP |
1060 | if (found_pack) { |
1061 | entry->in_pack = found_pack; | |
1062 | entry->in_pack_offset = found_offset; | |
1063 | } | |
7a979d99 | 1064 | |
ce2bc424 JK |
1065 | entry->no_try_delta = no_try_delta; |
1066 | } | |
29b734e4 | 1067 | |
373c67da JK |
1068 | static const char no_closure_warning[] = N_( |
1069 | "disabling bitmap writing, as some objects are not being packed" | |
1070 | ); | |
1071 | ||
ce2bc424 JK |
1072 | static int add_object_entry(const unsigned char *sha1, enum object_type type, |
1073 | const char *name, int exclude) | |
1074 | { | |
702d1b95 KS |
1075 | struct packed_git *found_pack = NULL; |
1076 | off_t found_offset = 0; | |
ce2bc424 | 1077 | uint32_t index_pos; |
7a979d99 | 1078 | |
ce2bc424 JK |
1079 | if (have_duplicate_entry(sha1, exclude, &index_pos)) |
1080 | return 0; | |
a74db82e | 1081 | |
373c67da JK |
1082 | if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) { |
1083 | /* The pack is missing an object, so it will not have closure */ | |
1084 | if (write_bitmap_index) { | |
1085 | warning(_(no_closure_warning)); | |
1086 | write_bitmap_index = 0; | |
1087 | } | |
ce2bc424 | 1088 | return 0; |
373c67da | 1089 | } |
29b734e4 | 1090 | |
ce2bc424 JK |
1091 | create_object_entry(sha1, type, pack_name_hash(name), |
1092 | exclude, name && no_try_delta(name), | |
1093 | index_pos, found_pack, found_offset); | |
a74db82e | 1094 | |
78d2214e | 1095 | display_progress(progress_state, nr_result); |
29b734e4 | 1096 | return 1; |
c323ac7d LT |
1097 | } |
1098 | ||
6b8fda2d VM |
1099 | static int add_object_entry_from_bitmap(const unsigned char *sha1, |
1100 | enum object_type type, | |
1101 | int flags, uint32_t name_hash, | |
1102 | struct packed_git *pack, off_t offset) | |
1103 | { | |
1104 | uint32_t index_pos; | |
1105 | ||
1106 | if (have_duplicate_entry(sha1, 0, &index_pos)) | |
1107 | return 0; | |
1108 | ||
702d1b95 KS |
1109 | if (!want_object_in_pack(sha1, 0, &pack, &offset)) |
1110 | return 0; | |
1111 | ||
6b8fda2d VM |
1112 | create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset); |
1113 | ||
78d2214e | 1114 | display_progress(progress_state, nr_result); |
29b734e4 | 1115 | return 1; |
c323ac7d LT |
1116 | } |
1117 | ||
5379a5c5 JH |
1118 | struct pbase_tree_cache { |
1119 | unsigned char sha1[20]; | |
1120 | int ref; | |
1121 | int temporary; | |
1122 | void *tree_data; | |
1123 | unsigned long tree_size; | |
1124 | }; | |
1125 | ||
1126 | static struct pbase_tree_cache *(pbase_tree_cache[256]); | |
1127 | static int pbase_tree_cache_ix(const unsigned char *sha1) | |
1128 | { | |
1129 | return sha1[0] % ARRAY_SIZE(pbase_tree_cache); | |
1130 | } | |
1131 | static int pbase_tree_cache_ix_incr(int ix) | |
1132 | { | |
1133 | return (ix+1) % ARRAY_SIZE(pbase_tree_cache); | |
1134 | } | |
1135 | ||
1136 | static struct pbase_tree { | |
1137 | struct pbase_tree *next; | |
1138 | /* This is a phony "cache" entry; we are not | |
01689909 | 1139 | * going to evict it or find it through _get() |
5379a5c5 JH |
1140 | * mechanism -- this is for the toplevel node that |
1141 | * would almost always change with any commit. | |
1142 | */ | |
1143 | struct pbase_tree_cache pcache; | |
1144 | } *pbase_tree; | |
1145 | ||
1146 | static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1) | |
1147 | { | |
1148 | struct pbase_tree_cache *ent, *nent; | |
1149 | void *data; | |
1150 | unsigned long size; | |
21666f1a | 1151 | enum object_type type; |
5379a5c5 JH |
1152 | int neigh; |
1153 | int my_ix = pbase_tree_cache_ix(sha1); | |
1154 | int available_ix = -1; | |
1155 | ||
1156 | /* pbase-tree-cache acts as a limited hashtable. | |
1157 | * your object will be found at your index or within a few | |
1158 | * slots after that slot if it is cached. | |
1159 | */ | |
1160 | for (neigh = 0; neigh < 8; neigh++) { | |
1161 | ent = pbase_tree_cache[my_ix]; | |
a89fccd2 | 1162 | if (ent && !hashcmp(ent->sha1, sha1)) { |
5379a5c5 JH |
1163 | ent->ref++; |
1164 | return ent; | |
1165 | } | |
1166 | else if (((available_ix < 0) && (!ent || !ent->ref)) || | |
1167 | ((0 <= available_ix) && | |
1168 | (!ent && pbase_tree_cache[available_ix]))) | |
1169 | available_ix = my_ix; | |
1170 | if (!ent) | |
1171 | break; | |
1172 | my_ix = pbase_tree_cache_ix_incr(my_ix); | |
1173 | } | |
1174 | ||
1175 | /* Did not find one. Either we got a bogus request or | |
1176 | * we need to read and perhaps cache. | |
1177 | */ | |
21666f1a | 1178 | data = read_sha1_file(sha1, &type, &size); |
5379a5c5 JH |
1179 | if (!data) |
1180 | return NULL; | |
21666f1a | 1181 | if (type != OBJ_TREE) { |
5379a5c5 JH |
1182 | free(data); |
1183 | return NULL; | |
1184 | } | |
1185 | ||
1186 | /* We need to either cache or return a throwaway copy */ | |
1187 | ||
1188 | if (available_ix < 0) | |
1189 | ent = NULL; | |
1190 | else { | |
1191 | ent = pbase_tree_cache[available_ix]; | |
1192 | my_ix = available_ix; | |
1193 | } | |
1194 | ||
1195 | if (!ent) { | |
1196 | nent = xmalloc(sizeof(*nent)); | |
1197 | nent->temporary = (available_ix < 0); | |
1198 | } | |
1199 | else { | |
1200 | /* evict and reuse */ | |
1201 | free(ent->tree_data); | |
1202 | nent = ent; | |
1203 | } | |
e702496e | 1204 | hashcpy(nent->sha1, sha1); |
5379a5c5 JH |
1205 | nent->tree_data = data; |
1206 | nent->tree_size = size; | |
1207 | nent->ref = 1; | |
1208 | if (!nent->temporary) | |
1209 | pbase_tree_cache[my_ix] = nent; | |
1210 | return nent; | |
1211 | } | |
1212 | ||
1213 | static void pbase_tree_put(struct pbase_tree_cache *cache) | |
1214 | { | |
1215 | if (!cache->temporary) { | |
1216 | cache->ref--; | |
1217 | return; | |
1218 | } | |
1219 | free(cache->tree_data); | |
1220 | free(cache); | |
1221 | } | |
1222 | ||
1223 | static int name_cmp_len(const char *name) | |
1224 | { | |
1225 | int i; | |
1226 | for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++) | |
1227 | ; | |
1228 | return i; | |
1229 | } | |
1230 | ||
1231 | static void add_pbase_object(struct tree_desc *tree, | |
5379a5c5 | 1232 | const char *name, |
ce0bd642 LT |
1233 | int cmplen, |
1234 | const char *fullname) | |
3f9ac8d2 | 1235 | { |
4c068a98 | 1236 | struct name_entry entry; |
8a5a8d6c | 1237 | int cmp; |
4c068a98 LT |
1238 | |
1239 | while (tree_entry(tree,&entry)) { | |
1211be6b LT |
1240 | if (S_ISGITLINK(entry.mode)) |
1241 | continue; | |
0de16337 | 1242 | cmp = tree_entry_len(&entry) != cmplen ? 1 : |
8a5a8d6c NP |
1243 | memcmp(name, entry.path, cmplen); |
1244 | if (cmp > 0) | |
7a979d99 | 1245 | continue; |
8a5a8d6c NP |
1246 | if (cmp < 0) |
1247 | return; | |
5379a5c5 | 1248 | if (name[cmplen] != '/') { |
7d924c91 | 1249 | add_object_entry(entry.oid->hash, |
4d1012c3 | 1250 | object_type(entry.mode), |
bc32fed5 | 1251 | fullname, 1); |
5379a5c5 JH |
1252 | return; |
1253 | } | |
8a5a8d6c | 1254 | if (S_ISDIR(entry.mode)) { |
7a979d99 | 1255 | struct tree_desc sub; |
5379a5c5 JH |
1256 | struct pbase_tree_cache *tree; |
1257 | const char *down = name+cmplen+1; | |
1258 | int downlen = name_cmp_len(down); | |
1259 | ||
7d924c91 | 1260 | tree = pbase_tree_get(entry.oid->hash); |
5379a5c5 JH |
1261 | if (!tree) |
1262 | return; | |
6fda5e51 | 1263 | init_tree_desc(&sub, tree->tree_data, tree->tree_size); |
5379a5c5 | 1264 | |
ce0bd642 | 1265 | add_pbase_object(&sub, down, downlen, fullname); |
5379a5c5 JH |
1266 | pbase_tree_put(tree); |
1267 | } | |
1268 | } | |
1269 | } | |
1d6b38cc | 1270 | |
5379a5c5 JH |
1271 | static unsigned *done_pbase_paths; |
1272 | static int done_pbase_paths_num; | |
1273 | static int done_pbase_paths_alloc; | |
1274 | static int done_pbase_path_pos(unsigned hash) | |
1275 | { | |
1276 | int lo = 0; | |
1277 | int hi = done_pbase_paths_num; | |
1278 | while (lo < hi) { | |
1279 | int mi = (hi + lo) / 2; | |
1280 | if (done_pbase_paths[mi] == hash) | |
1281 | return mi; | |
1282 | if (done_pbase_paths[mi] < hash) | |
1283 | hi = mi; | |
1284 | else | |
1285 | lo = mi + 1; | |
1286 | } | |
1287 | return -lo-1; | |
1288 | } | |
1289 | ||
1290 | static int check_pbase_path(unsigned hash) | |
1291 | { | |
c7b07805 | 1292 | int pos = done_pbase_path_pos(hash); |
5379a5c5 JH |
1293 | if (0 <= pos) |
1294 | return 1; | |
1295 | pos = -pos - 1; | |
25e19407 DD |
1296 | ALLOC_GROW(done_pbase_paths, |
1297 | done_pbase_paths_num + 1, | |
1298 | done_pbase_paths_alloc); | |
5379a5c5 JH |
1299 | done_pbase_paths_num++; |
1300 | if (pos < done_pbase_paths_num) | |
f331ab9d RS |
1301 | MOVE_ARRAY(done_pbase_paths + pos + 1, done_pbase_paths + pos, |
1302 | done_pbase_paths_num - pos - 1); | |
5379a5c5 JH |
1303 | done_pbase_paths[pos] = hash; |
1304 | return 0; | |
1305 | } | |
1306 | ||
bc32fed5 | 1307 | static void add_preferred_base_object(const char *name) |
5379a5c5 JH |
1308 | { |
1309 | struct pbase_tree *it; | |
8a5a8d6c | 1310 | int cmplen; |
68fb36eb | 1311 | unsigned hash = pack_name_hash(name); |
5379a5c5 | 1312 | |
8a5a8d6c | 1313 | if (!num_preferred_base || check_pbase_path(hash)) |
5379a5c5 JH |
1314 | return; |
1315 | ||
8a5a8d6c | 1316 | cmplen = name_cmp_len(name); |
5379a5c5 JH |
1317 | for (it = pbase_tree; it; it = it->next) { |
1318 | if (cmplen == 0) { | |
bc32fed5 | 1319 | add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1); |
5379a5c5 JH |
1320 | } |
1321 | else { | |
1322 | struct tree_desc tree; | |
6fda5e51 | 1323 | init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size); |
ce0bd642 | 1324 | add_pbase_object(&tree, name, cmplen, name); |
7a979d99 | 1325 | } |
3f9ac8d2 | 1326 | } |
3f9ac8d2 JH |
1327 | } |
1328 | ||
7a979d99 | 1329 | static void add_preferred_base(unsigned char *sha1) |
3f9ac8d2 | 1330 | { |
5379a5c5 JH |
1331 | struct pbase_tree *it; |
1332 | void *data; | |
1333 | unsigned long size; | |
1334 | unsigned char tree_sha1[20]; | |
1d6b38cc | 1335 | |
8d1d8f83 JH |
1336 | if (window <= num_preferred_base++) |
1337 | return; | |
1338 | ||
5379a5c5 JH |
1339 | data = read_object_with_reference(sha1, tree_type, &size, tree_sha1); |
1340 | if (!data) | |
7a979d99 | 1341 | return; |
5379a5c5 JH |
1342 | |
1343 | for (it = pbase_tree; it; it = it->next) { | |
a89fccd2 | 1344 | if (!hashcmp(it->pcache.sha1, tree_sha1)) { |
5379a5c5 JH |
1345 | free(data); |
1346 | return; | |
1347 | } | |
1348 | } | |
1349 | ||
1350 | it = xcalloc(1, sizeof(*it)); | |
1351 | it->next = pbase_tree; | |
1352 | pbase_tree = it; | |
1353 | ||
e702496e | 1354 | hashcpy(it->pcache.sha1, tree_sha1); |
5379a5c5 JH |
1355 | it->pcache.tree_data = data; |
1356 | it->pcache.tree_size = size; | |
3f9ac8d2 JH |
1357 | } |
1358 | ||
0ef95f72 NP |
1359 | static void cleanup_preferred_base(void) |
1360 | { | |
1361 | struct pbase_tree *it; | |
1362 | unsigned i; | |
1363 | ||
1364 | it = pbase_tree; | |
1365 | pbase_tree = NULL; | |
1366 | while (it) { | |
1367 | struct pbase_tree *this = it; | |
1368 | it = this->next; | |
1369 | free(this->pcache.tree_data); | |
1370 | free(this); | |
1371 | } | |
1372 | ||
1373 | for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) { | |
1374 | if (!pbase_tree_cache[i]) | |
1375 | continue; | |
1376 | free(pbase_tree_cache[i]->tree_data); | |
6a83d902 | 1377 | FREE_AND_NULL(pbase_tree_cache[i]); |
0ef95f72 NP |
1378 | } |
1379 | ||
6a83d902 | 1380 | FREE_AND_NULL(done_pbase_paths); |
0ef95f72 NP |
1381 | done_pbase_paths_num = done_pbase_paths_alloc = 0; |
1382 | } | |
1383 | ||
c323ac7d LT |
1384 | static void check_object(struct object_entry *entry) |
1385 | { | |
5c49c116 | 1386 | if (entry->in_pack) { |
780e6e73 | 1387 | struct packed_git *p = entry->in_pack; |
03e79c88 | 1388 | struct pack_window *w_curs = NULL; |
5c49c116 NP |
1389 | const unsigned char *base_ref = NULL; |
1390 | struct object_entry *base_entry; | |
1391 | unsigned long used, used_0; | |
ef49a7a0 | 1392 | unsigned long avail; |
5c49c116 NP |
1393 | off_t ofs; |
1394 | unsigned char *buf, c; | |
780e6e73 | 1395 | |
6777a59f | 1396 | buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail); |
ab7cd7bb | 1397 | |
5c49c116 | 1398 | /* |
fa736f72 NP |
1399 | * We want in_pack_type even if we do not reuse delta |
1400 | * since non-delta representations could still be reused. | |
ab7cd7bb | 1401 | */ |
09ded04b | 1402 | used = unpack_object_header_buffer(buf, avail, |
5c49c116 NP |
1403 | &entry->in_pack_type, |
1404 | &entry->size); | |
03d66015 NP |
1405 | if (used == 0) |
1406 | goto give_up; | |
ab7cd7bb | 1407 | |
5c49c116 NP |
1408 | /* |
1409 | * Determine if this is a delta and if so whether we can | |
1410 | * reuse it or not. Otherwise let's find out as cheaply as | |
1411 | * possible what the actual type and size for this object is. | |
3f9ac8d2 | 1412 | */ |
5c49c116 NP |
1413 | switch (entry->in_pack_type) { |
1414 | default: | |
1415 | /* Not a delta hence we've already got all we need. */ | |
1416 | entry->type = entry->in_pack_type; | |
1417 | entry->in_pack_header_size = used; | |
03d66015 NP |
1418 | if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB) |
1419 | goto give_up; | |
5c49c116 NP |
1420 | unuse_pack(&w_curs); |
1421 | return; | |
1422 | case OBJ_REF_DELTA: | |
a7de7130 | 1423 | if (reuse_delta && !entry->preferred_base) |
5c49c116 NP |
1424 | base_ref = use_pack(p, &w_curs, |
1425 | entry->in_pack_offset + used, NULL); | |
1426 | entry->in_pack_header_size = used + 20; | |
1427 | break; | |
1428 | case OBJ_OFS_DELTA: | |
1429 | buf = use_pack(p, &w_curs, | |
1430 | entry->in_pack_offset + used, NULL); | |
1431 | used_0 = 0; | |
1432 | c = buf[used_0++]; | |
1433 | ofs = c & 127; | |
1434 | while (c & 128) { | |
1435 | ofs += 1; | |
03d66015 NP |
1436 | if (!ofs || MSB(ofs, 7)) { |
1437 | error("delta base offset overflow in pack for %s", | |
e6a492b7 | 1438 | oid_to_hex(&entry->idx.oid)); |
03d66015 NP |
1439 | goto give_up; |
1440 | } | |
5c49c116 NP |
1441 | c = buf[used_0++]; |
1442 | ofs = (ofs << 7) + (c & 127); | |
780e6e73 | 1443 | } |
5c49c116 | 1444 | ofs = entry->in_pack_offset - ofs; |
03d66015 NP |
1445 | if (ofs <= 0 || ofs >= entry->in_pack_offset) { |
1446 | error("delta base offset out of bound for %s", | |
e6a492b7 | 1447 | oid_to_hex(&entry->idx.oid)); |
03d66015 NP |
1448 | goto give_up; |
1449 | } | |
a7de7130 | 1450 | if (reuse_delta && !entry->preferred_base) { |
3449f8c4 NP |
1451 | struct revindex_entry *revidx; |
1452 | revidx = find_pack_revindex(p, ofs); | |
08698b1e NP |
1453 | if (!revidx) |
1454 | goto give_up; | |
3449f8c4 NP |
1455 | base_ref = nth_packed_object_sha1(p, revidx->nr); |
1456 | } | |
5c49c116 NP |
1457 | entry->in_pack_header_size = used + used_0; |
1458 | break; | |
780e6e73 | 1459 | } |
780e6e73 | 1460 | |
2834bc27 | 1461 | if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) { |
5c49c116 NP |
1462 | /* |
1463 | * If base_ref was set above that means we wish to | |
1464 | * reuse delta data, and we even found that base | |
1465 | * in the list of objects we want to pack. Goodie! | |
1466 | * | |
1467 | * Depth value does not matter - find_deltas() will | |
1468 | * never consider reused delta as the base object to | |
1469 | * deltify other objects against, in order to avoid | |
1470 | * circular deltas. | |
3f9ac8d2 | 1471 | */ |
780e6e73 | 1472 | entry->type = entry->in_pack_type; |
5c49c116 | 1473 | entry->delta = base_entry; |
64bd76b1 | 1474 | entry->delta_size = entry->size; |
15b4d577 JH |
1475 | entry->delta_sibling = base_entry->delta_child; |
1476 | base_entry->delta_child = entry; | |
5c49c116 NP |
1477 | unuse_pack(&w_curs); |
1478 | return; | |
1479 | } | |
ab7cd7bb | 1480 | |
5c49c116 NP |
1481 | if (entry->type) { |
1482 | /* | |
1483 | * This must be a delta and we already know what the | |
1484 | * final object type is. Let's extract the actual | |
1485 | * object size from the delta header. | |
1486 | */ | |
1487 | entry->size = get_size_from_delta(p, &w_curs, | |
1488 | entry->in_pack_offset + entry->in_pack_header_size); | |
03d66015 NP |
1489 | if (entry->size == 0) |
1490 | goto give_up; | |
5c49c116 | 1491 | unuse_pack(&w_curs); |
3f9ac8d2 JH |
1492 | return; |
1493 | } | |
5c49c116 NP |
1494 | |
1495 | /* | |
1496 | * No choice but to fall back to the recursive delta walk | |
1497 | * with sha1_object_info() to find about the object type | |
1498 | * at this point... | |
1499 | */ | |
03d66015 | 1500 | give_up: |
5c49c116 | 1501 | unuse_pack(&w_curs); |
36e4d74a | 1502 | } |
3f9ac8d2 | 1503 | |
e6a492b7 | 1504 | entry->type = sha1_object_info(entry->idx.oid.hash, &entry->size); |
6d6f9cdd SP |
1505 | /* |
1506 | * The error condition is checked in prepare_pack(). This is | |
1507 | * to permit a missing preferred base object to be ignored | |
1508 | * as a preferred base. Doing so can result in a larger | |
1509 | * pack file, but the transfer will still take place. | |
1510 | */ | |
3f9ac8d2 JH |
1511 | } |
1512 | ||
5c49c116 NP |
1513 | static int pack_offset_sort(const void *_a, const void *_b) |
1514 | { | |
1515 | const struct object_entry *a = *(struct object_entry **)_a; | |
1516 | const struct object_entry *b = *(struct object_entry **)_b; | |
1517 | ||
1518 | /* avoid filesystem trashing with loose objects */ | |
1519 | if (!a->in_pack && !b->in_pack) | |
e6a492b7 | 1520 | return oidcmp(&a->idx.oid, &b->idx.oid); |
5c49c116 NP |
1521 | |
1522 | if (a->in_pack < b->in_pack) | |
1523 | return -1; | |
1524 | if (a->in_pack > b->in_pack) | |
1525 | return 1; | |
1526 | return a->in_pack_offset < b->in_pack_offset ? -1 : | |
1527 | (a->in_pack_offset > b->in_pack_offset); | |
1528 | } | |
1529 | ||
4cf2143e JK |
1530 | /* |
1531 | * Drop an on-disk delta we were planning to reuse. Naively, this would | |
1532 | * just involve blanking out the "delta" field, but we have to deal | |
1533 | * with some extra book-keeping: | |
1534 | * | |
1535 | * 1. Removing ourselves from the delta_sibling linked list. | |
1536 | * | |
1537 | * 2. Updating our size/type to the non-delta representation. These were | |
1538 | * either not recorded initially (size) or overwritten with the delta type | |
1539 | * (type) when check_object() decided to reuse the delta. | |
7dbabbbe JK |
1540 | * |
1541 | * 3. Resetting our delta depth, as we are now a base object. | |
4cf2143e JK |
1542 | */ |
1543 | static void drop_reused_delta(struct object_entry *entry) | |
1544 | { | |
1545 | struct object_entry **p = &entry->delta->delta_child; | |
1546 | struct object_info oi = OBJECT_INFO_INIT; | |
1547 | ||
1548 | while (*p) { | |
1549 | if (*p == entry) | |
1550 | *p = (*p)->delta_sibling; | |
1551 | else | |
1552 | p = &(*p)->delta_sibling; | |
1553 | } | |
1554 | entry->delta = NULL; | |
7dbabbbe | 1555 | entry->depth = 0; |
4cf2143e JK |
1556 | |
1557 | oi.sizep = &entry->size; | |
1558 | oi.typep = &entry->type; | |
1559 | if (packed_object_info(entry->in_pack, entry->in_pack_offset, &oi) < 0) { | |
1560 | /* | |
1561 | * We failed to get the info from this pack for some reason; | |
1562 | * fall back to sha1_object_info, which may find another copy. | |
1563 | * And if that fails, the error will be recorded in entry->type | |
1564 | * and dealt with in prepare_pack(). | |
1565 | */ | |
e6a492b7 | 1566 | entry->type = sha1_object_info(entry->idx.oid.hash, |
1567 | &entry->size); | |
4cf2143e JK |
1568 | } |
1569 | } | |
1570 | ||
1571 | /* | |
1572 | * Follow the chain of deltas from this entry onward, throwing away any links | |
1573 | * that cause us to hit a cycle (as determined by the DFS state flags in | |
1574 | * the entries). | |
7dbabbbe JK |
1575 | * |
1576 | * We also detect too-long reused chains that would violate our --depth | |
1577 | * limit. | |
4cf2143e JK |
1578 | */ |
1579 | static void break_delta_chains(struct object_entry *entry) | |
1580 | { | |
42b766d7 JK |
1581 | /* |
1582 | * The actual depth of each object we will write is stored as an int, | |
1583 | * as it cannot exceed our int "depth" limit. But before we break | |
1584 | * changes based no that limit, we may potentially go as deep as the | |
1585 | * number of objects, which is elsewhere bounded to a uint32_t. | |
1586 | */ | |
1587 | uint32_t total_depth; | |
1588 | struct object_entry *cur, *next; | |
1589 | ||
1590 | for (cur = entry, total_depth = 0; | |
1591 | cur; | |
1592 | cur = cur->delta, total_depth++) { | |
1593 | if (cur->dfs_state == DFS_DONE) { | |
1594 | /* | |
1595 | * We've already seen this object and know it isn't | |
1596 | * part of a cycle. We do need to append its depth | |
1597 | * to our count. | |
1598 | */ | |
1599 | total_depth += cur->depth; | |
1600 | break; | |
1601 | } | |
4cf2143e | 1602 | |
4cf2143e | 1603 | /* |
42b766d7 JK |
1604 | * We break cycles before looping, so an ACTIVE state (or any |
1605 | * other cruft which made its way into the state variable) | |
1606 | * is a bug. | |
4cf2143e | 1607 | */ |
42b766d7 JK |
1608 | if (cur->dfs_state != DFS_NONE) |
1609 | die("BUG: confusing delta dfs state in first pass: %d", | |
1610 | cur->dfs_state); | |
4cf2143e | 1611 | |
4cf2143e | 1612 | /* |
42b766d7 JK |
1613 | * Now we know this is the first time we've seen the object. If |
1614 | * it's not a delta, we're done traversing, but we'll mark it | |
1615 | * done to save time on future traversals. | |
4cf2143e | 1616 | */ |
42b766d7 JK |
1617 | if (!cur->delta) { |
1618 | cur->dfs_state = DFS_DONE; | |
1619 | break; | |
1620 | } | |
4cf2143e | 1621 | |
4cf2143e | 1622 | /* |
42b766d7 JK |
1623 | * Mark ourselves as active and see if the next step causes |
1624 | * us to cycle to another active object. It's important to do | |
1625 | * this _before_ we loop, because it impacts where we make the | |
1626 | * cut, and thus how our total_depth counter works. | |
1627 | * E.g., We may see a partial loop like: | |
1628 | * | |
1629 | * A -> B -> C -> D -> B | |
1630 | * | |
1631 | * Cutting B->C breaks the cycle. But now the depth of A is | |
1632 | * only 1, and our total_depth counter is at 3. The size of the | |
1633 | * error is always one less than the size of the cycle we | |
1634 | * broke. Commits C and D were "lost" from A's chain. | |
1635 | * | |
1636 | * If we instead cut D->B, then the depth of A is correct at 3. | |
1637 | * We keep all commits in the chain that we examined. | |
4cf2143e | 1638 | */ |
42b766d7 JK |
1639 | cur->dfs_state = DFS_ACTIVE; |
1640 | if (cur->delta->dfs_state == DFS_ACTIVE) { | |
1641 | drop_reused_delta(cur); | |
1642 | cur->dfs_state = DFS_DONE; | |
1643 | break; | |
7dbabbbe | 1644 | } |
42b766d7 | 1645 | } |
7dbabbbe | 1646 | |
42b766d7 JK |
1647 | /* |
1648 | * And now that we've gone all the way to the bottom of the chain, we | |
1649 | * need to clear the active flags and set the depth fields as | |
1650 | * appropriate. Unlike the loop above, which can quit when it drops a | |
1651 | * delta, we need to keep going to look for more depth cuts. So we need | |
1652 | * an extra "next" pointer to keep going after we reset cur->delta. | |
1653 | */ | |
1654 | for (cur = entry; cur; cur = next) { | |
1655 | next = cur->delta; | |
4cf2143e | 1656 | |
42b766d7 JK |
1657 | /* |
1658 | * We should have a chain of zero or more ACTIVE states down to | |
1659 | * a final DONE. We can quit after the DONE, because either it | |
1660 | * has no bases, or we've already handled them in a previous | |
1661 | * call. | |
1662 | */ | |
1663 | if (cur->dfs_state == DFS_DONE) | |
1664 | break; | |
1665 | else if (cur->dfs_state != DFS_ACTIVE) | |
1666 | die("BUG: confusing delta dfs state in second pass: %d", | |
1667 | cur->dfs_state); | |
4cf2143e | 1668 | |
4cf2143e | 1669 | /* |
42b766d7 JK |
1670 | * If the total_depth is more than depth, then we need to snip |
1671 | * the chain into two or more smaller chains that don't exceed | |
1672 | * the maximum depth. Most of the resulting chains will contain | |
1673 | * (depth + 1) entries (i.e., depth deltas plus one base), and | |
1674 | * the last chain (i.e., the one containing entry) will contain | |
1675 | * whatever entries are left over, namely | |
1676 | * (total_depth % (depth + 1)) of them. | |
1677 | * | |
1678 | * Since we are iterating towards decreasing depth, we need to | |
1679 | * decrement total_depth as we go, and we need to write to the | |
1680 | * entry what its final depth will be after all of the | |
1681 | * snipping. Since we're snipping into chains of length (depth | |
1682 | * + 1) entries, the final depth of an entry will be its | |
1683 | * original depth modulo (depth + 1). Any time we encounter an | |
1684 | * entry whose final depth is supposed to be zero, we snip it | |
1685 | * from its delta base, thereby making it so. | |
4cf2143e | 1686 | */ |
42b766d7 JK |
1687 | cur->depth = (total_depth--) % (depth + 1); |
1688 | if (!cur->depth) | |
1689 | drop_reused_delta(cur); | |
1690 | ||
1691 | cur->dfs_state = DFS_DONE; | |
4cf2143e JK |
1692 | } |
1693 | } | |
1694 | ||
c323ac7d LT |
1695 | static void get_object_details(void) |
1696 | { | |
7cadf491 | 1697 | uint32_t i; |
5c49c116 NP |
1698 | struct object_entry **sorted_by_offset; |
1699 | ||
2834bc27 VM |
1700 | sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *)); |
1701 | for (i = 0; i < to_pack.nr_objects; i++) | |
1702 | sorted_by_offset[i] = to_pack.objects + i; | |
9ed0d8d6 | 1703 | QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort); |
c323ac7d | 1704 | |
2834bc27 | 1705 | for (i = 0; i < to_pack.nr_objects; i++) { |
15366280 JH |
1706 | struct object_entry *entry = sorted_by_offset[i]; |
1707 | check_object(entry); | |
754980d0 | 1708 | if (big_file_threshold < entry->size) |
15366280 JH |
1709 | entry->no_try_delta = 1; |
1710 | } | |
3449f8c4 | 1711 | |
4cf2143e JK |
1712 | /* |
1713 | * This must happen in a second pass, since we rely on the delta | |
1714 | * information for the whole list being completed. | |
1715 | */ | |
1716 | for (i = 0; i < to_pack.nr_objects; i++) | |
1717 | break_delta_chains(&to_pack.objects[i]); | |
1718 | ||
5c49c116 | 1719 | free(sorted_by_offset); |
c323ac7d LT |
1720 | } |
1721 | ||
b904166c NP |
1722 | /* |
1723 | * We search for deltas in a list sorted by type, by filename hash, and then | |
1724 | * by size, so that we see progressively smaller and smaller files. | |
1725 | * That's because we prefer deltas to be from the bigger file | |
1726 | * to the smaller -- deletes are potentially cheaper, but perhaps | |
1727 | * more importantly, the bigger file is likely the more recent | |
1728 | * one. The deepest deltas are therefore the oldest objects which are | |
1729 | * less susceptible to be accessed often. | |
1730 | */ | |
9668cf59 | 1731 | static int type_size_sort(const void *_a, const void *_b) |
c323ac7d | 1732 | { |
9668cf59 NP |
1733 | const struct object_entry *a = *(struct object_entry **)_a; |
1734 | const struct object_entry *b = *(struct object_entry **)_b; | |
1735 | ||
c323ac7d | 1736 | if (a->type > b->type) |
27225f2e | 1737 | return -1; |
b904166c | 1738 | if (a->type < b->type) |
27225f2e | 1739 | return 1; |
b904166c | 1740 | if (a->hash > b->hash) |
7a979d99 | 1741 | return -1; |
b904166c | 1742 | if (a->hash < b->hash) |
7a979d99 | 1743 | return 1; |
b904166c | 1744 | if (a->preferred_base > b->preferred_base) |
c323ac7d | 1745 | return -1; |
b904166c NP |
1746 | if (a->preferred_base < b->preferred_base) |
1747 | return 1; | |
c323ac7d | 1748 | if (a->size > b->size) |
b904166c NP |
1749 | return -1; |
1750 | if (a->size < b->size) | |
c323ac7d | 1751 | return 1; |
b904166c | 1752 | return a < b ? -1 : (a > b); /* newest first */ |
c323ac7d LT |
1753 | } |
1754 | ||
1755 | struct unpacked { | |
1756 | struct object_entry *entry; | |
1757 | void *data; | |
f6c7081a | 1758 | struct delta_index *index; |
5a235b5e | 1759 | unsigned depth; |
c323ac7d LT |
1760 | }; |
1761 | ||
d250626c NP |
1762 | static int delta_cacheable(unsigned long src_size, unsigned long trg_size, |
1763 | unsigned long delta_size) | |
074b2eea MK |
1764 | { |
1765 | if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size) | |
1766 | return 0; | |
1767 | ||
e3dfddb3 MK |
1768 | if (delta_size < cache_max_small_delta_size) |
1769 | return 1; | |
1770 | ||
074b2eea MK |
1771 | /* cache delta, if objects are large enough compared to delta size */ |
1772 | if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10)) | |
1773 | return 1; | |
1774 | ||
1775 | return 0; | |
1776 | } | |
1777 | ||
7eb151d6 | 1778 | #ifndef NO_PTHREADS |
8ecce684 | 1779 | |
44626dc7 | 1780 | static pthread_mutex_t read_mutex; |
8ecce684 NP |
1781 | #define read_lock() pthread_mutex_lock(&read_mutex) |
1782 | #define read_unlock() pthread_mutex_unlock(&read_mutex) | |
1783 | ||
44626dc7 | 1784 | static pthread_mutex_t cache_mutex; |
3c701839 NP |
1785 | #define cache_lock() pthread_mutex_lock(&cache_mutex) |
1786 | #define cache_unlock() pthread_mutex_unlock(&cache_mutex) | |
1787 | ||
44626dc7 | 1788 | static pthread_mutex_t progress_mutex; |
8ecce684 NP |
1789 | #define progress_lock() pthread_mutex_lock(&progress_mutex) |
1790 | #define progress_unlock() pthread_mutex_unlock(&progress_mutex) | |
1791 | ||
1792 | #else | |
1793 | ||
e1ef8673 JH |
1794 | #define read_lock() (void)0 |
1795 | #define read_unlock() (void)0 | |
1796 | #define cache_lock() (void)0 | |
1797 | #define cache_unlock() (void)0 | |
1798 | #define progress_lock() (void)0 | |
1799 | #define progress_unlock() (void)0 | |
8ecce684 NP |
1800 | |
1801 | #endif | |
1802 | ||
f6c7081a | 1803 | static int try_delta(struct unpacked *trg, struct unpacked *src, |
ef0316fc | 1804 | unsigned max_depth, unsigned long *mem_usage) |
c323ac7d | 1805 | { |
f6c7081a NP |
1806 | struct object_entry *trg_entry = trg->entry; |
1807 | struct object_entry *src_entry = src->entry; | |
560b25a8 | 1808 | unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz; |
c83f032e | 1809 | unsigned ref_depth; |
21666f1a | 1810 | enum object_type type; |
c323ac7d LT |
1811 | void *delta_buf; |
1812 | ||
1813 | /* Don't bother doing diffs between different types */ | |
f6c7081a | 1814 | if (trg_entry->type != src_entry->type) |
c323ac7d LT |
1815 | return -1; |
1816 | ||
51d1e83f | 1817 | /* |
15f07e06 JK |
1818 | * We do not bother to try a delta that we discarded on an |
1819 | * earlier try, but only when reusing delta data. Note that | |
1820 | * src_entry that is marked as the preferred_base should always | |
1821 | * be considered, as even if we produce a suboptimal delta against | |
1822 | * it, we will still save the transfer cost, as we already know | |
1823 | * the other side has it and we won't send src_entry at all. | |
51d1e83f | 1824 | */ |
a7de7130 | 1825 | if (reuse_delta && trg_entry->in_pack && |
e9195b58 | 1826 | trg_entry->in_pack == src_entry->in_pack && |
15f07e06 | 1827 | !src_entry->preferred_base && |
e9195b58 JH |
1828 | trg_entry->in_pack_type != OBJ_REF_DELTA && |
1829 | trg_entry->in_pack_type != OBJ_OFS_DELTA) | |
51d1e83f LT |
1830 | return 0; |
1831 | ||
898b14ce | 1832 | /* Let's not bust the allowed depth. */ |
5a235b5e | 1833 | if (src->depth >= max_depth) |
d116a45a | 1834 | return 0; |
c323ac7d | 1835 | |
c3b06a69 | 1836 | /* Now some size filtering heuristics. */ |
560b25a8 | 1837 | trg_size = trg_entry->size; |
c83f032e NP |
1838 | if (!trg_entry->delta) { |
1839 | max_size = trg_size/2 - 20; | |
1840 | ref_depth = 1; | |
1841 | } else { | |
1842 | max_size = trg_entry->delta_size; | |
5a235b5e | 1843 | ref_depth = trg->depth; |
c83f032e | 1844 | } |
720fe22d | 1845 | max_size = (uint64_t)max_size * (max_depth - src->depth) / |
c83f032e | 1846 | (max_depth - ref_depth + 1); |
c3b06a69 NP |
1847 | if (max_size == 0) |
1848 | return 0; | |
f6c7081a | 1849 | src_size = src_entry->size; |
560b25a8 | 1850 | sizediff = src_size < trg_size ? trg_size - src_size : 0; |
27225f2e | 1851 | if (sizediff >= max_size) |
f527cb8c | 1852 | return 0; |
a1dab41a BD |
1853 | if (trg_size < src_size / 32) |
1854 | return 0; | |
f6c7081a | 1855 | |
560b25a8 NP |
1856 | /* Load data if not already done */ |
1857 | if (!trg->data) { | |
8ecce684 | 1858 | read_lock(); |
e6a492b7 | 1859 | trg->data = read_sha1_file(trg_entry->idx.oid.hash, &type, |
1860 | &sz); | |
8ecce684 | 1861 | read_unlock(); |
2e3404c3 JH |
1862 | if (!trg->data) |
1863 | die("object %s cannot be read", | |
e6a492b7 | 1864 | oid_to_hex(&trg_entry->idx.oid)); |
560b25a8 NP |
1865 | if (sz != trg_size) |
1866 | die("object %s inconsistent object length (%lu vs %lu)", | |
e6a492b7 | 1867 | oid_to_hex(&trg_entry->idx.oid), sz, |
1868 | trg_size); | |
ef0316fc | 1869 | *mem_usage += sz; |
560b25a8 NP |
1870 | } |
1871 | if (!src->data) { | |
8ecce684 | 1872 | read_lock(); |
e6a492b7 | 1873 | src->data = read_sha1_file(src_entry->idx.oid.hash, &type, |
1874 | &sz); | |
8ecce684 | 1875 | read_unlock(); |
71064a95 NP |
1876 | if (!src->data) { |
1877 | if (src_entry->preferred_base) { | |
1878 | static int warned = 0; | |
1879 | if (!warned++) | |
1880 | warning("object %s cannot be read", | |
e6a492b7 | 1881 | oid_to_hex(&src_entry->idx.oid)); |
71064a95 NP |
1882 | /* |
1883 | * Those objects are not included in the | |
1884 | * resulting pack. Be resilient and ignore | |
1885 | * them if they can't be read, in case the | |
1886 | * pack could be created nevertheless. | |
1887 | */ | |
1888 | return 0; | |
1889 | } | |
2e3404c3 | 1890 | die("object %s cannot be read", |
e6a492b7 | 1891 | oid_to_hex(&src_entry->idx.oid)); |
71064a95 | 1892 | } |
560b25a8 NP |
1893 | if (sz != src_size) |
1894 | die("object %s inconsistent object length (%lu vs %lu)", | |
e6a492b7 | 1895 | oid_to_hex(&src_entry->idx.oid), sz, |
1896 | src_size); | |
ef0316fc | 1897 | *mem_usage += sz; |
560b25a8 NP |
1898 | } |
1899 | if (!src->index) { | |
1900 | src->index = create_delta_index(src->data, src_size); | |
a588d88a MK |
1901 | if (!src->index) { |
1902 | static int warned = 0; | |
1903 | if (!warned++) | |
1904 | warning("suboptimal pack - out of memory"); | |
1905 | return 0; | |
1906 | } | |
ef0316fc | 1907 | *mem_usage += sizeof_delta_index(src->index); |
560b25a8 NP |
1908 | } |
1909 | ||
1910 | delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size); | |
c323ac7d | 1911 | if (!delta_buf) |
75c42d8c | 1912 | return 0; |
f6c7081a | 1913 | |
9e2d57a0 | 1914 | if (trg_entry->delta) { |
848d732c BD |
1915 | /* Prefer only shallower same-sized deltas. */ |
1916 | if (delta_size == trg_entry->delta_size && | |
5a235b5e | 1917 | src->depth + 1 >= trg->depth) { |
848d732c BD |
1918 | free(delta_buf); |
1919 | return 0; | |
1920 | } | |
074b2eea | 1921 | } |
9e2d57a0 | 1922 | |
3c701839 NP |
1923 | /* |
1924 | * Handle memory allocation outside of the cache | |
1925 | * accounting lock. Compiler will optimize the strangeness | |
7eb151d6 | 1926 | * away when NO_PTHREADS is defined. |
3c701839 | 1927 | */ |
8e0f7003 | 1928 | free(trg_entry->delta_data); |
3c701839 | 1929 | cache_lock(); |
9e2d57a0 NP |
1930 | if (trg_entry->delta_data) { |
1931 | delta_cache_size -= trg_entry->delta_size; | |
9e2d57a0 NP |
1932 | trg_entry->delta_data = NULL; |
1933 | } | |
d250626c | 1934 | if (delta_cacheable(src_size, trg_size, delta_size)) { |
b7a28f78 | 1935 | delta_cache_size += delta_size; |
3c701839 NP |
1936 | cache_unlock(); |
1937 | trg_entry->delta_data = xrealloc(delta_buf, delta_size); | |
1938 | } else { | |
1939 | cache_unlock(); | |
074b2eea | 1940 | free(delta_buf); |
3c701839 NP |
1941 | } |
1942 | ||
b7a28f78 NP |
1943 | trg_entry->delta = src_entry; |
1944 | trg_entry->delta_size = delta_size; | |
1945 | trg->depth = src->depth + 1; | |
1946 | ||
f6c7081a | 1947 | return 1; |
c323ac7d LT |
1948 | } |
1949 | ||
898b14ce | 1950 | static unsigned int check_delta_limit(struct object_entry *me, unsigned int n) |
b2504a0d | 1951 | { |
898b14ce NP |
1952 | struct object_entry *child = me->delta_child; |
1953 | unsigned int m = n; | |
1954 | while (child) { | |
1955 | unsigned int c = check_delta_limit(child, n + 1); | |
1956 | if (m < c) | |
1957 | m = c; | |
1958 | child = child->delta_sibling; | |
1959 | } | |
1960 | return m; | |
b2504a0d NP |
1961 | } |
1962 | ||
75ad235c | 1963 | static unsigned long free_unpacked(struct unpacked *n) |
a97773ce | 1964 | { |
ef0316fc | 1965 | unsigned long freed_mem = sizeof_delta_index(n->index); |
a97773ce BD |
1966 | free_delta_index(n->index); |
1967 | n->index = NULL; | |
1968 | if (n->data) { | |
ef0316fc | 1969 | freed_mem += n->entry->size; |
6a83d902 | 1970 | FREE_AND_NULL(n->data); |
a97773ce BD |
1971 | } |
1972 | n->entry = NULL; | |
7d7baa5e | 1973 | n->depth = 0; |
ef0316fc | 1974 | return freed_mem; |
a97773ce BD |
1975 | } |
1976 | ||
384b32c0 | 1977 | static void find_deltas(struct object_entry **list, unsigned *list_size, |
e334977d | 1978 | int window, int depth, unsigned *processed) |
c323ac7d | 1979 | { |
384b32c0 | 1980 | uint32_t i, idx = 0, count = 0; |
7cadf491 | 1981 | struct unpacked *array; |
ef0316fc | 1982 | unsigned long mem_usage = 0; |
c323ac7d | 1983 | |
19d4b416 | 1984 | array = xcalloc(window, sizeof(struct unpacked)); |
21fcd1bd | 1985 | |
384b32c0 | 1986 | for (;;) { |
421b488a | 1987 | struct object_entry *entry; |
c323ac7d | 1988 | struct unpacked *n = array + idx; |
ef0316fc | 1989 | int j, max_depth, best_base = -1; |
c323ac7d | 1990 | |
384b32c0 NP |
1991 | progress_lock(); |
1992 | if (!*list_size) { | |
1993 | progress_unlock(); | |
1994 | break; | |
1995 | } | |
421b488a | 1996 | entry = *list++; |
384b32c0 NP |
1997 | (*list_size)--; |
1998 | if (!entry->preferred_base) { | |
1999 | (*processed)++; | |
2000 | display_progress(progress_state, *processed); | |
2001 | } | |
2002 | progress_unlock(); | |
2003 | ||
ef0316fc | 2004 | mem_usage -= free_unpacked(n); |
c323ac7d | 2005 | n->entry = entry; |
ab7cd7bb | 2006 | |
a97773ce | 2007 | while (window_memory_limit && |
ef0316fc | 2008 | mem_usage > window_memory_limit && |
a97773ce BD |
2009 | count > 1) { |
2010 | uint32_t tail = (idx + window - count) % window; | |
75ad235c | 2011 | mem_usage -= free_unpacked(array + tail); |
a97773ce BD |
2012 | count--; |
2013 | } | |
2014 | ||
75d39853 NP |
2015 | /* We do not compute delta to *create* objects we are not |
2016 | * going to pack. | |
2017 | */ | |
2018 | if (entry->preferred_base) | |
2019 | goto next; | |
2020 | ||
898b14ce NP |
2021 | /* |
2022 | * If the current object is at pack edge, take the depth the | |
2023 | * objects that depend on the current object into account | |
2024 | * otherwise they would become too deep. | |
2025 | */ | |
2026 | max_depth = depth; | |
2027 | if (entry->delta_child) { | |
2028 | max_depth -= check_delta_limit(entry, 0); | |
2029 | if (max_depth <= 0) | |
2030 | goto next; | |
2031 | } | |
2032 | ||
78817c15 LT |
2033 | j = window; |
2034 | while (--j > 0) { | |
77639870 | 2035 | int ret; |
7cadf491 | 2036 | uint32_t other_idx = idx + j; |
c323ac7d | 2037 | struct unpacked *m; |
78817c15 LT |
2038 | if (other_idx >= window) |
2039 | other_idx -= window; | |
c323ac7d LT |
2040 | m = array + other_idx; |
2041 | if (!m->entry) | |
2042 | break; | |
ef0316fc | 2043 | ret = try_delta(n, m, max_depth, &mem_usage); |
77639870 | 2044 | if (ret < 0) |
c323ac7d | 2045 | break; |
77639870 JH |
2046 | else if (ret > 0) |
2047 | best_base = other_idx; | |
c323ac7d | 2048 | } |
898b14ce | 2049 | |
ed4a9031 NP |
2050 | /* |
2051 | * If we decided to cache the delta data, then it is best | |
2052 | * to compress it right away. First because we have to do | |
2053 | * it anyway, and doing it here while we're threaded will | |
2054 | * save a lot of time in the non threaded write phase, | |
2055 | * as well as allow for caching more deltas within | |
2056 | * the same cache size limit. | |
2057 | * ... | |
2058 | * But only if not writing to stdout, since in that case | |
2059 | * the network is most likely throttling writes anyway, | |
2060 | * and therefore it is best to go to the write phase ASAP | |
2061 | * instead, as we can afford spending more time compressing | |
2062 | * between writes at that moment. | |
2063 | */ | |
2064 | if (entry->delta_data && !pack_to_stdout) { | |
2065 | entry->z_delta_size = do_compress(&entry->delta_data, | |
2066 | entry->delta_size); | |
2067 | cache_lock(); | |
2068 | delta_cache_size -= entry->delta_size; | |
2069 | delta_cache_size += entry->z_delta_size; | |
2070 | cache_unlock(); | |
2071 | } | |
2072 | ||
70ca1a3f JH |
2073 | /* if we made n a delta, and if n is already at max |
2074 | * depth, leaving it in the window is pointless. we | |
2075 | * should evict it first. | |
70ca1a3f | 2076 | */ |
70baf5d4 | 2077 | if (entry->delta && max_depth <= n->depth) |
70ca1a3f | 2078 | continue; |
ff45715c | 2079 | |
77639870 JH |
2080 | /* |
2081 | * Move the best delta base up in the window, after the | |
2082 | * currently deltified object, to keep it longer. It will | |
2083 | * be the first base object to be attempted next. | |
2084 | */ | |
2085 | if (entry->delta) { | |
2086 | struct unpacked swap = array[best_base]; | |
2087 | int dist = (window + idx - best_base) % window; | |
2088 | int dst = best_base; | |
2089 | while (dist--) { | |
2090 | int src = (dst + 1) % window; | |
2091 | array[dst] = array[src]; | |
2092 | dst = src; | |
2093 | } | |
2094 | array[dst] = swap; | |
2095 | } | |
2096 | ||
898b14ce | 2097 | next: |
521a4f4c | 2098 | idx++; |
a97773ce BD |
2099 | if (count + 1 < window) |
2100 | count++; | |
521a4f4c LT |
2101 | if (idx >= window) |
2102 | idx = 0; | |
384b32c0 | 2103 | } |
adee7bdf | 2104 | |
f6c7081a | 2105 | for (i = 0; i < window; ++i) { |
ff45715c | 2106 | free_delta_index(array[i].index); |
adee7bdf | 2107 | free(array[i].data); |
f6c7081a | 2108 | } |
adee7bdf | 2109 | free(array); |
c323ac7d LT |
2110 | } |
2111 | ||
7eb151d6 | 2112 | #ifndef NO_PTHREADS |
8ecce684 | 2113 | |
a9a74636 NP |
2114 | static void try_to_free_from_threads(size_t size) |
2115 | { | |
2116 | read_lock(); | |
7c3ecb32 | 2117 | release_pack_memory(size); |
a9a74636 NP |
2118 | read_unlock(); |
2119 | } | |
2120 | ||
bc9b2175 | 2121 | static try_to_free_t old_try_to_free_routine; |
851c34b0 | 2122 | |
50f22ada JS |
2123 | /* |
2124 | * The main thread waits on the condition that (at least) one of the workers | |
2125 | * has stopped working (which is indicated in the .working member of | |
2126 | * struct thread_params). | |
2127 | * When a work thread has completed its work, it sets .working to 0 and | |
2128 | * signals the main thread and waits on the condition that .data_ready | |
2129 | * becomes 1. | |
2130 | */ | |
2131 | ||
8ecce684 NP |
2132 | struct thread_params { |
2133 | pthread_t thread; | |
2134 | struct object_entry **list; | |
2135 | unsigned list_size; | |
384b32c0 | 2136 | unsigned remaining; |
8ecce684 NP |
2137 | int window; |
2138 | int depth; | |
50f22ada JS |
2139 | int working; |
2140 | int data_ready; | |
2141 | pthread_mutex_t mutex; | |
2142 | pthread_cond_t cond; | |
8ecce684 NP |
2143 | unsigned *processed; |
2144 | }; | |
2145 | ||
44626dc7 AH |
2146 | static pthread_cond_t progress_cond; |
2147 | ||
2148 | /* | |
2149 | * Mutex and conditional variable can't be statically-initialized on Windows. | |
2150 | */ | |
2151 | static void init_threaded_search(void) | |
2152 | { | |
93749194 | 2153 | init_recursive_mutex(&read_mutex); |
44626dc7 AH |
2154 | pthread_mutex_init(&cache_mutex, NULL); |
2155 | pthread_mutex_init(&progress_mutex, NULL); | |
2156 | pthread_cond_init(&progress_cond, NULL); | |
851c34b0 | 2157 | old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads); |
44626dc7 AH |
2158 | } |
2159 | ||
2160 | static void cleanup_threaded_search(void) | |
2161 | { | |
851c34b0 | 2162 | set_try_to_free_routine(old_try_to_free_routine); |
44626dc7 AH |
2163 | pthread_cond_destroy(&progress_cond); |
2164 | pthread_mutex_destroy(&read_mutex); | |
2165 | pthread_mutex_destroy(&cache_mutex); | |
2166 | pthread_mutex_destroy(&progress_mutex); | |
2167 | } | |
c2a33679 | 2168 | |
8ecce684 NP |
2169 | static void *threaded_find_deltas(void *arg) |
2170 | { | |
c2a33679 NP |
2171 | struct thread_params *me = arg; |
2172 | ||
0c2ad00b | 2173 | progress_lock(); |
50f22ada | 2174 | while (me->remaining) { |
0c2ad00b MÅ |
2175 | progress_unlock(); |
2176 | ||
384b32c0 | 2177 | find_deltas(me->list, &me->remaining, |
c2a33679 | 2178 | me->window, me->depth, me->processed); |
50f22ada JS |
2179 | |
2180 | progress_lock(); | |
2181 | me->working = 0; | |
2182 | pthread_cond_signal(&progress_cond); | |
2183 | progress_unlock(); | |
2184 | ||
2185 | /* | |
2186 | * We must not set ->data_ready before we wait on the | |
2187 | * condition because the main thread may have set it to 1 | |
2188 | * before we get here. In order to be sure that new | |
2189 | * work is available if we see 1 in ->data_ready, it | |
2190 | * was initialized to 0 before this thread was spawned | |
2191 | * and we reset it to 0 right away. | |
2192 | */ | |
2193 | pthread_mutex_lock(&me->mutex); | |
2194 | while (!me->data_ready) | |
2195 | pthread_cond_wait(&me->cond, &me->mutex); | |
2196 | me->data_ready = 0; | |
2197 | pthread_mutex_unlock(&me->mutex); | |
0c2ad00b MÅ |
2198 | |
2199 | progress_lock(); | |
c2a33679 | 2200 | } |
0c2ad00b | 2201 | progress_unlock(); |
50f22ada JS |
2202 | /* leave ->working 1 so that this doesn't get more work assigned */ |
2203 | return NULL; | |
8ecce684 NP |
2204 | } |
2205 | ||
8ecce684 NP |
2206 | static void ll_find_deltas(struct object_entry **list, unsigned list_size, |
2207 | int window, int depth, unsigned *processed) | |
2208 | { | |
dcda3614 | 2209 | struct thread_params *p; |
384b32c0 | 2210 | int i, ret, active_threads = 0; |
c2a33679 | 2211 | |
44626dc7 AH |
2212 | init_threaded_search(); |
2213 | ||
367f4a43 | 2214 | if (delta_search_threads <= 1) { |
384b32c0 | 2215 | find_deltas(list, &list_size, window, depth, processed); |
44626dc7 | 2216 | cleanup_threaded_search(); |
367f4a43 NP |
2217 | return; |
2218 | } | |
43cc2b42 | 2219 | if (progress > pack_to_stdout) |
b6c29915 | 2220 | fprintf(stderr, "Delta compression using up to %d threads.\n", |
43cc2b42 | 2221 | delta_search_threads); |
dcda3614 | 2222 | p = xcalloc(delta_search_threads, sizeof(*p)); |
367f4a43 | 2223 | |
50f22ada | 2224 | /* Partition the work amongst work threads. */ |
367f4a43 | 2225 | for (i = 0; i < delta_search_threads; i++) { |
50f22ada JS |
2226 | unsigned sub_size = list_size / (delta_search_threads - i); |
2227 | ||
bf874896 NP |
2228 | /* don't use too small segments or no deltas will be found */ |
2229 | if (sub_size < 2*window && i+1 < delta_search_threads) | |
2230 | sub_size = 0; | |
2231 | ||
8ecce684 NP |
2232 | p[i].window = window; |
2233 | p[i].depth = depth; | |
2234 | p[i].processed = processed; | |
50f22ada JS |
2235 | p[i].working = 1; |
2236 | p[i].data_ready = 0; | |
c2a33679 | 2237 | |
59921b4b | 2238 | /* try to split chunks on "path" boundaries */ |
6fc74703 NP |
2239 | while (sub_size && sub_size < list_size && |
2240 | list[sub_size]->hash && | |
384b32c0 NP |
2241 | list[sub_size]->hash == list[sub_size-1]->hash) |
2242 | sub_size++; | |
2243 | ||
50f22ada JS |
2244 | p[i].list = list; |
2245 | p[i].list_size = sub_size; | |
2246 | p[i].remaining = sub_size; | |
59921b4b | 2247 | |
384b32c0 NP |
2248 | list += sub_size; |
2249 | list_size -= sub_size; | |
2250 | } | |
2251 | ||
50f22ada JS |
2252 | /* Start work threads. */ |
2253 | for (i = 0; i < delta_search_threads; i++) { | |
2254 | if (!p[i].list_size) | |
2255 | continue; | |
68e6a4f8 JS |
2256 | pthread_mutex_init(&p[i].mutex, NULL); |
2257 | pthread_cond_init(&p[i].cond, NULL); | |
50f22ada JS |
2258 | ret = pthread_create(&p[i].thread, NULL, |
2259 | threaded_find_deltas, &p[i]); | |
2260 | if (ret) | |
2261 | die("unable to create thread: %s", strerror(ret)); | |
2262 | active_threads++; | |
2263 | } | |
2264 | ||
384b32c0 NP |
2265 | /* |
2266 | * Now let's wait for work completion. Each time a thread is done | |
2267 | * with its work, we steal half of the remaining work from the | |
2268 | * thread with the largest number of unprocessed objects and give | |
2269 | * it to that newly idle thread. This ensure good load balancing | |
2270 | * until the remaining object list segments are simply too short | |
2271 | * to be worth splitting anymore. | |
2272 | */ | |
50f22ada JS |
2273 | while (active_threads) { |
2274 | struct thread_params *target = NULL; | |
384b32c0 NP |
2275 | struct thread_params *victim = NULL; |
2276 | unsigned sub_size = 0; | |
384b32c0 NP |
2277 | |
2278 | progress_lock(); | |
50f22ada JS |
2279 | for (;;) { |
2280 | for (i = 0; !target && i < delta_search_threads; i++) | |
2281 | if (!p[i].working) | |
2282 | target = &p[i]; | |
2283 | if (target) | |
2284 | break; | |
2285 | pthread_cond_wait(&progress_cond, &progress_mutex); | |
2286 | } | |
2287 | ||
384b32c0 NP |
2288 | for (i = 0; i < delta_search_threads; i++) |
2289 | if (p[i].remaining > 2*window && | |
2290 | (!victim || victim->remaining < p[i].remaining)) | |
2291 | victim = &p[i]; | |
2292 | if (victim) { | |
2293 | sub_size = victim->remaining / 2; | |
2294 | list = victim->list + victim->list_size - sub_size; | |
2295 | while (sub_size && list[0]->hash && | |
2296 | list[0]->hash == list[-1]->hash) { | |
2297 | list++; | |
2298 | sub_size--; | |
2299 | } | |
eb9688ff NP |
2300 | if (!sub_size) { |
2301 | /* | |
2302 | * It is possible for some "paths" to have | |
2303 | * so many objects that no hash boundary | |
2304 | * might be found. Let's just steal the | |
2305 | * exact half in that case. | |
2306 | */ | |
2307 | sub_size = victim->remaining / 2; | |
2308 | list -= sub_size; | |
2309 | } | |
384b32c0 NP |
2310 | target->list = list; |
2311 | victim->list_size -= sub_size; | |
2312 | victim->remaining -= sub_size; | |
2313 | } | |
384b32c0 NP |
2314 | target->list_size = sub_size; |
2315 | target->remaining = sub_size; | |
50f22ada JS |
2316 | target->working = 1; |
2317 | progress_unlock(); | |
2318 | ||
2319 | pthread_mutex_lock(&target->mutex); | |
2320 | target->data_ready = 1; | |
2321 | pthread_cond_signal(&target->cond); | |
2322 | pthread_mutex_unlock(&target->mutex); | |
c2a33679 | 2323 | |
384b32c0 | 2324 | if (!sub_size) { |
b81d9af7 | 2325 | pthread_join(target->thread, NULL); |
50f22ada JS |
2326 | pthread_cond_destroy(&target->cond); |
2327 | pthread_mutex_destroy(&target->mutex); | |
384b32c0 | 2328 | active_threads--; |
c2a33679 | 2329 | } |
50f22ada | 2330 | } |
44626dc7 | 2331 | cleanup_threaded_search(); |
dcda3614 | 2332 | free(p); |
8ecce684 NP |
2333 | } |
2334 | ||
2335 | #else | |
384b32c0 | 2336 | #define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p) |
8ecce684 NP |
2337 | #endif |
2338 | ||
b773ddea JK |
2339 | static void add_tag_chain(const struct object_id *oid) |
2340 | { | |
2341 | struct tag *tag; | |
2342 | ||
2343 | /* | |
2344 | * We catch duplicates already in add_object_entry(), but we'd | |
2345 | * prefer to do this extra check to avoid having to parse the | |
2346 | * tag at all if we already know that it's being packed (e.g., if | |
2347 | * it was included via bitmaps, we would not have parsed it | |
2348 | * previously). | |
2349 | */ | |
2350 | if (packlist_find(&to_pack, oid->hash, NULL)) | |
2351 | return; | |
2352 | ||
d3101b53 | 2353 | tag = lookup_tag(oid); |
b773ddea JK |
2354 | while (1) { |
2355 | if (!tag || parse_tag(tag) || !tag->tagged) | |
2356 | die("unable to pack objects reachable from tag %s", | |
2357 | oid_to_hex(oid)); | |
2358 | ||
2359 | add_object_entry(tag->object.oid.hash, OBJ_TAG, NULL, 0); | |
2360 | ||
2361 | if (tag->tagged->type != OBJ_TAG) | |
2362 | return; | |
2363 | ||
2364 | tag = (struct tag *)tag->tagged; | |
2365 | } | |
2366 | } | |
2367 | ||
d155254c | 2368 | static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data) |
f0a24aa5 | 2369 | { |
d155254c | 2370 | struct object_id peeled; |
f0a24aa5 | 2371 | |
59556548 | 2372 | if (starts_with(path, "refs/tags/") && /* is a tag? */ |
d155254c MH |
2373 | !peel_ref(path, peeled.hash) && /* peelable? */ |
2374 | packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */ | |
b773ddea | 2375 | add_tag_chain(oid); |
f0a24aa5 SP |
2376 | return 0; |
2377 | } | |
2378 | ||
f3123c4a JH |
2379 | static void prepare_pack(int window, int depth) |
2380 | { | |
9668cf59 | 2381 | struct object_entry **delta_list; |
6e1c2344 RJ |
2382 | uint32_t i, nr_deltas; |
2383 | unsigned n; | |
9668cf59 | 2384 | |
3f9ac8d2 | 2385 | get_object_details(); |
9668cf59 | 2386 | |
0e8189e2 NP |
2387 | /* |
2388 | * If we're locally repacking then we need to be doubly careful | |
2389 | * from now on in order to make sure no stealth corruption gets | |
2390 | * propagated to the new pack. Clients receiving streamed packs | |
2391 | * should validate everything they get anyway so no need to incur | |
2392 | * the additional cost here in that case. | |
2393 | */ | |
2394 | if (!pack_to_stdout) | |
2395 | do_check_packed_object_crc = 1; | |
2396 | ||
2834bc27 | 2397 | if (!to_pack.nr_objects || !window || !depth) |
9668cf59 NP |
2398 | return; |
2399 | ||
b32fa95f | 2400 | ALLOC_ARRAY(delta_list, to_pack.nr_objects); |
75d39853 NP |
2401 | nr_deltas = n = 0; |
2402 | ||
2834bc27 VM |
2403 | for (i = 0; i < to_pack.nr_objects; i++) { |
2404 | struct object_entry *entry = to_pack.objects + i; | |
75d39853 NP |
2405 | |
2406 | if (entry->delta) | |
2407 | /* This happens if we decided to reuse existing | |
a7de7130 | 2408 | * delta from a pack. "reuse_delta &&" is implied. |
75d39853 NP |
2409 | */ |
2410 | continue; | |
2411 | ||
2412 | if (entry->size < 50) | |
2413 | continue; | |
2414 | ||
2415 | if (entry->no_try_delta) | |
2416 | continue; | |
2417 | ||
6d6f9cdd | 2418 | if (!entry->preferred_base) { |
75d39853 | 2419 | nr_deltas++; |
6d6f9cdd SP |
2420 | if (entry->type < 0) |
2421 | die("unable to get type of object %s", | |
e6a492b7 | 2422 | oid_to_hex(&entry->idx.oid)); |
eede9f42 NP |
2423 | } else { |
2424 | if (entry->type < 0) { | |
2425 | /* | |
2426 | * This object is not found, but we | |
2427 | * don't have to include it anyway. | |
2428 | */ | |
2429 | continue; | |
2430 | } | |
6d6f9cdd | 2431 | } |
75d39853 NP |
2432 | |
2433 | delta_list[n++] = entry; | |
2434 | } | |
2435 | ||
2f8b8947 | 2436 | if (nr_deltas && n > 1) { |
e334977d NP |
2437 | unsigned nr_done = 0; |
2438 | if (progress) | |
754dbc43 | 2439 | progress_state = start_progress(_("Compressing objects"), |
dc6a0757 | 2440 | nr_deltas); |
9ed0d8d6 | 2441 | QSORT(delta_list, n, type_size_sort); |
8ecce684 | 2442 | ll_find_deltas(delta_list, n, window+1, depth, &nr_done); |
4d4fcc54 | 2443 | stop_progress(&progress_state); |
e334977d NP |
2444 | if (nr_done != nr_deltas) |
2445 | die("inconsistency with delta count"); | |
75d39853 | 2446 | } |
9668cf59 | 2447 | free(delta_list); |
f3123c4a JH |
2448 | } |
2449 | ||
ef90d6d4 | 2450 | static int git_pack_config(const char *k, const char *v, void *cb) |
4812a93a | 2451 | { |
eeefa7c9 | 2452 | if (!strcmp(k, "pack.window")) { |
4812a93a JK |
2453 | window = git_config_int(k, v); |
2454 | return 0; | |
2455 | } | |
a97773ce BD |
2456 | if (!strcmp(k, "pack.windowmemory")) { |
2457 | window_memory_limit = git_config_ulong(k, v); | |
2458 | return 0; | |
2459 | } | |
2460 | if (!strcmp(k, "pack.depth")) { | |
842aaf93 TT |
2461 | depth = git_config_int(k, v); |
2462 | return 0; | |
2463 | } | |
074b2eea MK |
2464 | if (!strcmp(k, "pack.deltacachesize")) { |
2465 | max_delta_cache_size = git_config_int(k, v); | |
2466 | return 0; | |
2467 | } | |
e3dfddb3 MK |
2468 | if (!strcmp(k, "pack.deltacachelimit")) { |
2469 | cache_max_small_delta_size = git_config_int(k, v); | |
2470 | return 0; | |
2471 | } | |
ae4f07fb VM |
2472 | if (!strcmp(k, "pack.writebitmaphashcache")) { |
2473 | if (git_config_bool(k, v)) | |
2474 | write_bitmap_options |= BITMAP_OPT_HASH_CACHE; | |
2475 | else | |
2476 | write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE; | |
2477 | } | |
6b8fda2d | 2478 | if (!strcmp(k, "pack.usebitmaps")) { |
645c432d | 2479 | use_bitmap_index_default = git_config_bool(k, v); |
6b8fda2d VM |
2480 | return 0; |
2481 | } | |
693b86ff NP |
2482 | if (!strcmp(k, "pack.threads")) { |
2483 | delta_search_threads = git_config_int(k, v); | |
833e3df1 | 2484 | if (delta_search_threads < 0) |
693b86ff NP |
2485 | die("invalid number of threads specified (%d)", |
2486 | delta_search_threads); | |
7eb151d6 | 2487 | #ifdef NO_PTHREADS |
2e96d815 | 2488 | if (delta_search_threads != 1) { |
693b86ff | 2489 | warning("no threads support, ignoring %s", k); |
2e96d815 ÆAB |
2490 | delta_search_threads = 0; |
2491 | } | |
693b86ff NP |
2492 | #endif |
2493 | return 0; | |
2494 | } | |
4d00bda2 | 2495 | if (!strcmp(k, "pack.indexversion")) { |
ebcfb379 JH |
2496 | pack_idx_opts.version = git_config_int(k, v); |
2497 | if (pack_idx_opts.version > 2) | |
6e1c2344 | 2498 | die("bad pack.indexversion=%"PRIu32, |
ebcfb379 | 2499 | pack_idx_opts.version); |
4d00bda2 NP |
2500 | return 0; |
2501 | } | |
ef90d6d4 | 2502 | return git_default_config(k, v, cb); |
4812a93a JK |
2503 | } |
2504 | ||
b5d97e6b | 2505 | static void read_object_list_from_stdin(void) |
c323ac7d | 2506 | { |
b5d97e6b JH |
2507 | char line[40 + 1 + PATH_MAX + 2]; |
2508 | unsigned char sha1[20]; | |
b2504a0d | 2509 | |
da93d12b | 2510 | for (;;) { |
da93d12b LT |
2511 | if (!fgets(line, sizeof(line), stdin)) { |
2512 | if (feof(stdin)) | |
2513 | break; | |
2514 | if (!ferror(stdin)) | |
2515 | die("fgets returned NULL, not EOF, not error!"); | |
687dd75c | 2516 | if (errno != EINTR) |
d824cbba | 2517 | die_errno("fgets"); |
687dd75c JH |
2518 | clearerr(stdin); |
2519 | continue; | |
da93d12b | 2520 | } |
7a979d99 JH |
2521 | if (line[0] == '-') { |
2522 | if (get_sha1_hex(line+1, sha1)) | |
2523 | die("expected edge sha1, got garbage:\n %s", | |
b5d97e6b | 2524 | line); |
8d1d8f83 | 2525 | add_preferred_base(sha1); |
7a979d99 | 2526 | continue; |
21fcd1bd | 2527 | } |
c323ac7d | 2528 | if (get_sha1_hex(line, sha1)) |
ef07618f | 2529 | die("expected sha1, got garbage:\n %s", line); |
b5d97e6b | 2530 | |
bc32fed5 JH |
2531 | add_preferred_base_object(line+41); |
2532 | add_object_entry(sha1, 0, line+41, 0); | |
c323ac7d | 2533 | } |
b5d97e6b JH |
2534 | } |
2535 | ||
08cdfb13 JH |
2536 | #define OBJECT_ADDED (1u<<20) |
2537 | ||
11c211fa | 2538 | static void show_commit(struct commit *commit, void *data) |
b5d97e6b | 2539 | { |
ed1c9977 | 2540 | add_object_entry(commit->object.oid.hash, OBJ_COMMIT, NULL, 0); |
08cdfb13 | 2541 | commit->object.flags |= OBJECT_ADDED; |
7cc8f971 VM |
2542 | |
2543 | if (write_bitmap_index) | |
2544 | index_commit_for_bitmap(commit); | |
b5d97e6b JH |
2545 | } |
2546 | ||
de1e67d0 | 2547 | static void show_object(struct object *obj, const char *name, void *data) |
b5d97e6b | 2548 | { |
8d2dfc49 | 2549 | add_preferred_base_object(name); |
ed1c9977 | 2550 | add_object_entry(obj->oid.hash, obj->type, name, 0); |
8d2dfc49 | 2551 | obj->flags |= OBJECT_ADDED; |
b5d97e6b JH |
2552 | } |
2553 | ||
8d1d8f83 JH |
2554 | static void show_edge(struct commit *commit) |
2555 | { | |
ed1c9977 | 2556 | add_preferred_base(commit->object.oid.hash); |
8d1d8f83 JH |
2557 | } |
2558 | ||
08cdfb13 JH |
2559 | struct in_pack_object { |
2560 | off_t offset; | |
2561 | struct object *object; | |
2562 | }; | |
2563 | ||
2564 | struct in_pack { | |
071bcaab RJ |
2565 | unsigned int alloc; |
2566 | unsigned int nr; | |
08cdfb13 JH |
2567 | struct in_pack_object *array; |
2568 | }; | |
2569 | ||
2570 | static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack) | |
2571 | { | |
ed1c9977 | 2572 | in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p); |
08cdfb13 JH |
2573 | in_pack->array[in_pack->nr].object = object; |
2574 | in_pack->nr++; | |
2575 | } | |
2576 | ||
2577 | /* | |
2578 | * Compare the objects in the offset order, in order to emulate the | |
f18d244a | 2579 | * "git rev-list --objects" output that produced the pack originally. |
08cdfb13 JH |
2580 | */ |
2581 | static int ofscmp(const void *a_, const void *b_) | |
2582 | { | |
2583 | struct in_pack_object *a = (struct in_pack_object *)a_; | |
2584 | struct in_pack_object *b = (struct in_pack_object *)b_; | |
2585 | ||
2586 | if (a->offset < b->offset) | |
2587 | return -1; | |
2588 | else if (a->offset > b->offset) | |
2589 | return 1; | |
2590 | else | |
f2fd0760 | 2591 | return oidcmp(&a->object->oid, &b->object->oid); |
08cdfb13 JH |
2592 | } |
2593 | ||
2594 | static void add_objects_in_unpacked_packs(struct rev_info *revs) | |
2595 | { | |
2596 | struct packed_git *p; | |
2597 | struct in_pack in_pack; | |
2598 | uint32_t i; | |
2599 | ||
2600 | memset(&in_pack, 0, sizeof(in_pack)); | |
2601 | ||
2602 | for (p = packed_git; p; p = p->next) { | |
2603 | const unsigned char *sha1; | |
2604 | struct object *o; | |
2605 | ||
79bc4c71 | 2606 | if (!p->pack_local || p->pack_keep) |
08cdfb13 JH |
2607 | continue; |
2608 | if (open_pack_index(p)) | |
2609 | die("cannot open pack index"); | |
2610 | ||
2611 | ALLOC_GROW(in_pack.array, | |
2612 | in_pack.nr + p->num_objects, | |
2613 | in_pack.alloc); | |
2614 | ||
2615 | for (i = 0; i < p->num_objects; i++) { | |
2616 | sha1 = nth_packed_object_sha1(p, i); | |
2617 | o = lookup_unknown_object(sha1); | |
2618 | if (!(o->flags & OBJECT_ADDED)) | |
2619 | mark_in_pack_object(o, p, &in_pack); | |
2620 | o->flags |= OBJECT_ADDED; | |
2621 | } | |
2622 | } | |
2623 | ||
2624 | if (in_pack.nr) { | |
9ed0d8d6 | 2625 | QSORT(in_pack.array, in_pack.nr, ofscmp); |
08cdfb13 JH |
2626 | for (i = 0; i < in_pack.nr; i++) { |
2627 | struct object *o = in_pack.array[i].object; | |
ed1c9977 | 2628 | add_object_entry(o->oid.hash, o->type, "", 0); |
08cdfb13 JH |
2629 | } |
2630 | } | |
2631 | free(in_pack.array); | |
2632 | } | |
2633 | ||
76c1d9a0 | 2634 | static int add_loose_object(const struct object_id *oid, const char *path, |
e26a8c47 JK |
2635 | void *data) |
2636 | { | |
76c1d9a0 | 2637 | enum object_type type = sha1_object_info(oid->hash, NULL); |
e26a8c47 JK |
2638 | |
2639 | if (type < 0) { | |
2640 | warning("loose object at %s could not be examined", path); | |
2641 | return 0; | |
2642 | } | |
2643 | ||
76c1d9a0 | 2644 | add_object_entry(oid->hash, type, "", 0); |
e26a8c47 JK |
2645 | return 0; |
2646 | } | |
2647 | ||
2648 | /* | |
2649 | * We actually don't even have to worry about reachability here. | |
2650 | * add_object_entry will weed out duplicates, so we just add every | |
2651 | * loose object we find. | |
2652 | */ | |
2653 | static void add_unreachable_loose_objects(void) | |
2654 | { | |
2655 | for_each_loose_file_in_objdir(get_object_directory(), | |
2656 | add_loose_object, | |
2657 | NULL, NULL, NULL); | |
2658 | } | |
2659 | ||
094085e3 BC |
2660 | static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1) |
2661 | { | |
2662 | static struct packed_git *last_found = (void *)1; | |
2663 | struct packed_git *p; | |
2664 | ||
2665 | p = (last_found != (void *)1) ? last_found : packed_git; | |
2666 | ||
2667 | while (p) { | |
2668 | if ((!p->pack_local || p->pack_keep) && | |
2669 | find_pack_entry_one(sha1, p)) { | |
2670 | last_found = p; | |
2671 | return 1; | |
2672 | } | |
2673 | if (p == last_found) | |
2674 | p = packed_git; | |
2675 | else | |
2676 | p = p->next; | |
2677 | if (p == last_found) | |
2678 | p = p->next; | |
2679 | } | |
2680 | return 0; | |
2681 | } | |
2682 | ||
abcb8655 JK |
2683 | /* |
2684 | * Store a list of sha1s that are should not be discarded | |
2685 | * because they are either written too recently, or are | |
2686 | * reachable from another object that was. | |
2687 | * | |
2688 | * This is filled by get_object_list. | |
2689 | */ | |
910650d2 | 2690 | static struct oid_array recent_objects; |
abcb8655 | 2691 | |
4ce3621a | 2692 | static int loosened_object_can_be_discarded(const struct object_id *oid, |
dddbad72 | 2693 | timestamp_t mtime) |
d0d46abc JK |
2694 | { |
2695 | if (!unpack_unreachable_expiration) | |
2696 | return 0; | |
2697 | if (mtime > unpack_unreachable_expiration) | |
2698 | return 0; | |
910650d2 | 2699 | if (oid_array_lookup(&recent_objects, oid) >= 0) |
abcb8655 | 2700 | return 0; |
d0d46abc JK |
2701 | return 1; |
2702 | } | |
2703 | ||
ca11b212 NP |
2704 | static void loosen_unused_packed_objects(struct rev_info *revs) |
2705 | { | |
2706 | struct packed_git *p; | |
2707 | uint32_t i; | |
4ce3621a | 2708 | struct object_id oid; |
ca11b212 NP |
2709 | |
2710 | for (p = packed_git; p; p = p->next) { | |
79bc4c71 | 2711 | if (!p->pack_local || p->pack_keep) |
ca11b212 NP |
2712 | continue; |
2713 | ||
2714 | if (open_pack_index(p)) | |
2715 | die("cannot open pack index"); | |
2716 | ||
2717 | for (i = 0; i < p->num_objects; i++) { | |
4ce3621a | 2718 | nth_packed_object_oid(&oid, p, i); |
2719 | if (!packlist_find(&to_pack, oid.hash, NULL) && | |
2720 | !has_sha1_pack_kept_or_nonlocal(oid.hash) && | |
2721 | !loosened_object_can_be_discarded(&oid, p->mtime)) | |
2722 | if (force_object_loose(oid.hash, p->mtime)) | |
ca11b212 NP |
2723 | die("unable to force loose object"); |
2724 | } | |
2725 | } | |
2726 | } | |
2727 | ||
69e4b342 | 2728 | /* |
645c432d KS |
2729 | * This tracks any options which pack-reuse code expects to be on, or which a |
2730 | * reader of the pack might not understand, and which would therefore prevent | |
2731 | * blind reuse of what we have on disk. | |
69e4b342 JK |
2732 | */ |
2733 | static int pack_options_allow_reuse(void) | |
2734 | { | |
9df4a607 JK |
2735 | return pack_to_stdout && |
2736 | allow_ofs_delta && | |
2737 | !ignore_packed_keep && | |
2738 | (!local || !have_non_local_packs) && | |
2739 | !incremental; | |
69e4b342 JK |
2740 | } |
2741 | ||
6b8fda2d VM |
2742 | static int get_object_list_from_bitmap(struct rev_info *revs) |
2743 | { | |
2744 | if (prepare_bitmap_walk(revs) < 0) | |
2745 | return -1; | |
2746 | ||
69e4b342 JK |
2747 | if (pack_options_allow_reuse() && |
2748 | !reuse_partial_packfile_from_bitmap( | |
6b8fda2d VM |
2749 | &reuse_packfile, |
2750 | &reuse_packfile_objects, | |
2751 | &reuse_packfile_offset)) { | |
2752 | assert(reuse_packfile_objects); | |
2753 | nr_result += reuse_packfile_objects; | |
78d2214e | 2754 | display_progress(progress_state, nr_result); |
6b8fda2d VM |
2755 | } |
2756 | ||
2757 | traverse_bitmap_commit_list(&add_object_entry_from_bitmap); | |
2758 | return 0; | |
2759 | } | |
2760 | ||
abcb8655 | 2761 | static void record_recent_object(struct object *obj, |
de1e67d0 | 2762 | const char *name, |
abcb8655 JK |
2763 | void *data) |
2764 | { | |
910650d2 | 2765 | oid_array_append(&recent_objects, &obj->oid); |
abcb8655 JK |
2766 | } |
2767 | ||
2768 | static void record_recent_commit(struct commit *commit, void *data) | |
2769 | { | |
910650d2 | 2770 | oid_array_append(&recent_objects, &commit->object.oid); |
abcb8655 JK |
2771 | } |
2772 | ||
8d1d8f83 | 2773 | static void get_object_list(int ac, const char **av) |
b5d97e6b JH |
2774 | { |
2775 | struct rev_info revs; | |
2776 | char line[1000]; | |
b5d97e6b JH |
2777 | int flags = 0; |
2778 | ||
b5d97e6b JH |
2779 | init_revisions(&revs, NULL); |
2780 | save_commit_buffer = 0; | |
b5d97e6b JH |
2781 | setup_revisions(ac, av, &revs, NULL); |
2782 | ||
b790e0f6 NTND |
2783 | /* make sure shallows are read */ |
2784 | is_repository_shallow(); | |
2785 | ||
b5d97e6b JH |
2786 | while (fgets(line, sizeof(line), stdin) != NULL) { |
2787 | int len = strlen(line); | |
872c930d | 2788 | if (len && line[len - 1] == '\n') |
b5d97e6b JH |
2789 | line[--len] = 0; |
2790 | if (!len) | |
2791 | break; | |
2792 | if (*line == '-') { | |
2793 | if (!strcmp(line, "--not")) { | |
2794 | flags ^= UNINTERESTING; | |
7cc8f971 | 2795 | write_bitmap_index = 0; |
b5d97e6b JH |
2796 | continue; |
2797 | } | |
b790e0f6 | 2798 | if (starts_with(line, "--shallow ")) { |
e92b848c | 2799 | struct object_id oid; |
2800 | if (get_oid_hex(line + 10, &oid)) | |
b790e0f6 | 2801 | die("not an SHA-1 '%s'", line + 10); |
e92b848c | 2802 | register_shallow(&oid); |
f7f91086 | 2803 | use_bitmap_index = 0; |
b790e0f6 NTND |
2804 | continue; |
2805 | } | |
b5d97e6b JH |
2806 | die("not a rev '%s'", line); |
2807 | } | |
8e676e8b | 2808 | if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME)) |
b5d97e6b JH |
2809 | die("bad revision '%s'", line); |
2810 | } | |
2811 | ||
6b8fda2d VM |
2812 | if (use_bitmap_index && !get_object_list_from_bitmap(&revs)) |
2813 | return; | |
2814 | ||
3d51e1b5 MK |
2815 | if (prepare_revision_walk(&revs)) |
2816 | die("revision walk setup failed"); | |
e76a5fb4 | 2817 | mark_edges_uninteresting(&revs, show_edge); |
11c211fa | 2818 | traverse_commit_list(&revs, show_commit, show_object, NULL); |
08cdfb13 | 2819 | |
abcb8655 JK |
2820 | if (unpack_unreachable_expiration) { |
2821 | revs.ignore_missing_links = 1; | |
2822 | if (add_unseen_recent_objects_to_traversal(&revs, | |
2823 | unpack_unreachable_expiration)) | |
2824 | die("unable to add recent objects"); | |
2825 | if (prepare_revision_walk(&revs)) | |
2826 | die("revision walk setup failed"); | |
2827 | traverse_commit_list(&revs, record_recent_commit, | |
2828 | record_recent_object, NULL); | |
2829 | } | |
2830 | ||
08cdfb13 JH |
2831 | if (keep_unreachable) |
2832 | add_objects_in_unpacked_packs(&revs); | |
e26a8c47 JK |
2833 | if (pack_loose_unreachable) |
2834 | add_unreachable_loose_objects(); | |
ca11b212 NP |
2835 | if (unpack_unreachable) |
2836 | loosen_unused_packed_objects(&revs); | |
abcb8655 | 2837 | |
910650d2 | 2838 | oid_array_clear(&recent_objects); |
b5d97e6b JH |
2839 | } |
2840 | ||
99fb6e04 NTND |
2841 | static int option_parse_index_version(const struct option *opt, |
2842 | const char *arg, int unset) | |
2843 | { | |
2844 | char *c; | |
2845 | const char *val = arg; | |
2846 | pack_idx_opts.version = strtoul(val, &c, 10); | |
2847 | if (pack_idx_opts.version > 2) | |
2848 | die(_("unsupported index version %s"), val); | |
2849 | if (*c == ',' && c[1]) | |
2850 | pack_idx_opts.off32_limit = strtoul(c+1, &c, 0); | |
2851 | if (*c || pack_idx_opts.off32_limit & 0x80000000) | |
2852 | die(_("bad index version '%s'"), val); | |
2853 | return 0; | |
2854 | } | |
2855 | ||
7e52f566 JK |
2856 | static int option_parse_unpack_unreachable(const struct option *opt, |
2857 | const char *arg, int unset) | |
2858 | { | |
2859 | if (unset) { | |
2860 | unpack_unreachable = 0; | |
2861 | unpack_unreachable_expiration = 0; | |
2862 | } | |
2863 | else { | |
2864 | unpack_unreachable = 1; | |
2865 | if (arg) | |
2866 | unpack_unreachable_expiration = approxidate(arg); | |
2867 | } | |
2868 | return 0; | |
2869 | } | |
2870 | ||
b5d97e6b JH |
2871 | int cmd_pack_objects(int argc, const char **argv, const char *prefix) |
2872 | { | |
b5d97e6b | 2873 | int use_internal_rev_list = 0; |
8d1d8f83 | 2874 | int thin = 0; |
2dacf26d | 2875 | int shallow = 0; |
4f366275 | 2876 | int all_progress_implied = 0; |
edfbb2aa | 2877 | struct argv_array rp = ARGV_ARRAY_INIT; |
99fb6e04 | 2878 | int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0; |
c90f9e13 | 2879 | int rev_list_index = 0; |
99fb6e04 NTND |
2880 | struct option pack_objects_options[] = { |
2881 | OPT_SET_INT('q', "quiet", &progress, | |
4c688120 | 2882 | N_("do not show progress meter"), 0), |
99fb6e04 | 2883 | OPT_SET_INT(0, "progress", &progress, |
4c688120 | 2884 | N_("show progress meter"), 1), |
99fb6e04 | 2885 | OPT_SET_INT(0, "all-progress", &progress, |
4c688120 | 2886 | N_("show progress meter during object writing phase"), 2), |
99fb6e04 NTND |
2887 | OPT_BOOL(0, "all-progress-implied", |
2888 | &all_progress_implied, | |
4c688120 NTND |
2889 | N_("similar to --all-progress when progress meter is shown")), |
2890 | { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"), | |
2891 | N_("write the pack index file in the specified idx format version"), | |
99fb6e04 | 2892 | 0, option_parse_index_version }, |
2a514ed8 CB |
2893 | OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit, |
2894 | N_("maximum size of each output pack file")), | |
99fb6e04 | 2895 | OPT_BOOL(0, "local", &local, |
4c688120 | 2896 | N_("ignore borrowed objects from alternate object store")), |
99fb6e04 | 2897 | OPT_BOOL(0, "incremental", &incremental, |
4c688120 | 2898 | N_("ignore packed objects")), |
99fb6e04 | 2899 | OPT_INTEGER(0, "window", &window, |
4c688120 | 2900 | N_("limit pack window by objects")), |
2a514ed8 CB |
2901 | OPT_MAGNITUDE(0, "window-memory", &window_memory_limit, |
2902 | N_("limit pack window by memory in addition to object limit")), | |
99fb6e04 | 2903 | OPT_INTEGER(0, "depth", &depth, |
4c688120 | 2904 | N_("maximum length of delta chain allowed in the resulting pack")), |
99fb6e04 | 2905 | OPT_BOOL(0, "reuse-delta", &reuse_delta, |
4c688120 | 2906 | N_("reuse existing deltas")), |
99fb6e04 | 2907 | OPT_BOOL(0, "reuse-object", &reuse_object, |
4c688120 | 2908 | N_("reuse existing objects")), |
99fb6e04 | 2909 | OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta, |
4c688120 | 2910 | N_("use OFS_DELTA objects")), |
99fb6e04 | 2911 | OPT_INTEGER(0, "threads", &delta_search_threads, |
4c688120 | 2912 | N_("use threads when searching for best delta matches")), |
99fb6e04 | 2913 | OPT_BOOL(0, "non-empty", &non_empty, |
4c688120 | 2914 | N_("do not create an empty pack output")), |
99fb6e04 | 2915 | OPT_BOOL(0, "revs", &use_internal_rev_list, |
4c688120 | 2916 | N_("read revision arguments from standard input")), |
99fb6e04 | 2917 | { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL, |
4c688120 | 2918 | N_("limit the objects to those that are not yet packed"), |
99fb6e04 NTND |
2919 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 }, |
2920 | { OPTION_SET_INT, 0, "all", &rev_list_all, NULL, | |
4c688120 | 2921 | N_("include objects reachable from any reference"), |
99fb6e04 NTND |
2922 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 }, |
2923 | { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL, | |
4c688120 | 2924 | N_("include objects referred by reflog entries"), |
99fb6e04 | 2925 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 }, |
c90f9e13 JK |
2926 | { OPTION_SET_INT, 0, "indexed-objects", &rev_list_index, NULL, |
2927 | N_("include objects referred to by the index"), | |
2928 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 }, | |
99fb6e04 | 2929 | OPT_BOOL(0, "stdout", &pack_to_stdout, |
4c688120 | 2930 | N_("output pack to stdout")), |
99fb6e04 | 2931 | OPT_BOOL(0, "include-tag", &include_tag, |
4c688120 | 2932 | N_("include tag objects that refer to objects to be packed")), |
99fb6e04 | 2933 | OPT_BOOL(0, "keep-unreachable", &keep_unreachable, |
4c688120 | 2934 | N_("keep unreachable objects")), |
e26a8c47 JK |
2935 | OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable, |
2936 | N_("pack loose unreachable objects")), | |
4c688120 NTND |
2937 | { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"), |
2938 | N_("unpack unreachable objects newer than <time>"), | |
7e52f566 | 2939 | PARSE_OPT_OPTARG, option_parse_unpack_unreachable }, |
99fb6e04 | 2940 | OPT_BOOL(0, "thin", &thin, |
4c688120 | 2941 | N_("create thin packs")), |
2dacf26d | 2942 | OPT_BOOL(0, "shallow", &shallow, |
2943 | N_("create packs suitable for shallow fetches")), | |
99fb6e04 | 2944 | OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep, |
4c688120 | 2945 | N_("ignore packs that have companion .keep file")), |
99fb6e04 | 2946 | OPT_INTEGER(0, "compression", &pack_compression_level, |
4c688120 | 2947 | N_("pack compression level")), |
99fb6e04 | 2948 | OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents, |
4c688120 | 2949 | N_("do not hide commits by grafts"), 0), |
6b8fda2d VM |
2950 | OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index, |
2951 | N_("use a bitmap index if available to speed up counting objects")), | |
7cc8f971 VM |
2952 | OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index, |
2953 | N_("write a bitmap index together with the pack index")), | |
99fb6e04 NTND |
2954 | OPT_END(), |
2955 | }; | |
8d1d8f83 | 2956 | |
afc711b8 | 2957 | check_replace_refs = 0; |
dae556bd | 2958 | |
ebcfb379 | 2959 | reset_pack_idx_option(&pack_idx_opts); |
ef90d6d4 | 2960 | git_config(git_pack_config, NULL); |
b5d97e6b JH |
2961 | |
2962 | progress = isatty(2); | |
99fb6e04 NTND |
2963 | argc = parse_options(argc, argv, prefix, pack_objects_options, |
2964 | pack_usage, 0); | |
b5d97e6b | 2965 | |
99fb6e04 NTND |
2966 | if (argc) { |
2967 | base_name = argv[0]; | |
2968 | argc--; | |
b5d97e6b | 2969 | } |
99fb6e04 NTND |
2970 | if (pack_to_stdout != !base_name || argc) |
2971 | usage_with_options(pack_usage, pack_objects_options); | |
b5d97e6b | 2972 | |
edfbb2aa | 2973 | argv_array_push(&rp, "pack-objects"); |
99fb6e04 NTND |
2974 | if (thin) { |
2975 | use_internal_rev_list = 1; | |
2dacf26d | 2976 | argv_array_push(&rp, shallow |
2977 | ? "--objects-edge-aggressive" | |
2978 | : "--objects-edge"); | |
99fb6e04 | 2979 | } else |
edfbb2aa | 2980 | argv_array_push(&rp, "--objects"); |
b5d97e6b | 2981 | |
99fb6e04 NTND |
2982 | if (rev_list_all) { |
2983 | use_internal_rev_list = 1; | |
edfbb2aa | 2984 | argv_array_push(&rp, "--all"); |
99fb6e04 NTND |
2985 | } |
2986 | if (rev_list_reflog) { | |
2987 | use_internal_rev_list = 1; | |
edfbb2aa | 2988 | argv_array_push(&rp, "--reflog"); |
99fb6e04 | 2989 | } |
c90f9e13 JK |
2990 | if (rev_list_index) { |
2991 | use_internal_rev_list = 1; | |
2992 | argv_array_push(&rp, "--indexed-objects"); | |
99fb6e04 NTND |
2993 | } |
2994 | if (rev_list_unpacked) { | |
2995 | use_internal_rev_list = 1; | |
edfbb2aa | 2996 | argv_array_push(&rp, "--unpacked"); |
99fb6e04 | 2997 | } |
b5d97e6b | 2998 | |
99fb6e04 NTND |
2999 | if (!reuse_object) |
3000 | reuse_delta = 0; | |
3001 | if (pack_compression_level == -1) | |
3002 | pack_compression_level = Z_DEFAULT_COMPRESSION; | |
3003 | else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION) | |
3004 | die("bad pack compression level %d", pack_compression_level); | |
0c45d258 JH |
3005 | |
3006 | if (!delta_search_threads) /* --threads=0 means autodetect */ | |
3007 | delta_search_threads = online_cpus(); | |
3008 | ||
99fb6e04 NTND |
3009 | #ifdef NO_PTHREADS |
3010 | if (delta_search_threads != 1) | |
2b34e486 | 3011 | warning("no threads support, ignoring --threads"); |
99fb6e04 | 3012 | #endif |
2b84b5a8 JS |
3013 | if (!pack_to_stdout && !pack_size_limit) |
3014 | pack_size_limit = pack_size_limit_cfg; | |
01c12a23 DH |
3015 | if (pack_to_stdout && pack_size_limit) |
3016 | die("--max-pack-size cannot be used to build a pack for transfer."); | |
07cf0f24 NP |
3017 | if (pack_size_limit && pack_size_limit < 1024*1024) { |
3018 | warning("minimum pack size limit is 1 MiB"); | |
3019 | pack_size_limit = 1024*1024; | |
3020 | } | |
01c12a23 | 3021 | |
8d1d8f83 JH |
3022 | if (!pack_to_stdout && thin) |
3023 | die("--thin cannot be used to build an indexable pack."); | |
b5d97e6b | 3024 | |
ca11b212 NP |
3025 | if (keep_unreachable && unpack_unreachable) |
3026 | die("--keep-unreachable and --unpack-unreachable are incompatible."); | |
b1e757f3 JK |
3027 | if (!rev_list_all || !rev_list_reflog || !rev_list_index) |
3028 | unpack_unreachable_expiration = 0; | |
ca11b212 | 3029 | |
645c432d KS |
3030 | /* |
3031 | * "soft" reasons not to use bitmaps - for on-disk repack by default we want | |
3032 | * | |
3033 | * - to produce good pack (with bitmap index not-yet-packed objects are | |
3034 | * packed in suboptimal order). | |
3035 | * | |
3036 | * - to use more robust pack-generation codepath (avoiding possible | |
3037 | * bugs in bitmap code and possible bitmap index corruption). | |
3038 | */ | |
3039 | if (!pack_to_stdout) | |
3040 | use_bitmap_index_default = 0; | |
3041 | ||
3042 | if (use_bitmap_index < 0) | |
3043 | use_bitmap_index = use_bitmap_index_default; | |
3044 | ||
3045 | /* "hard" reasons not to use bitmaps; these just won't work at all */ | |
3046 | if (!use_internal_rev_list || (!pack_to_stdout && write_bitmap_index) || is_repository_shallow()) | |
6b8fda2d VM |
3047 | use_bitmap_index = 0; |
3048 | ||
7cc8f971 VM |
3049 | if (pack_to_stdout || !rev_list_all) |
3050 | write_bitmap_index = 0; | |
3051 | ||
4f366275 NP |
3052 | if (progress && all_progress_implied) |
3053 | progress = 2; | |
3054 | ||
b5d97e6b | 3055 | prepare_packed_git(); |
56dfeb62 JK |
3056 | if (ignore_packed_keep) { |
3057 | struct packed_git *p; | |
3058 | for (p = packed_git; p; p = p->next) | |
3059 | if (p->pack_local && p->pack_keep) | |
3060 | break; | |
3061 | if (!p) /* no keep-able packs found */ | |
3062 | ignore_packed_keep = 0; | |
3063 | } | |
3064 | if (local) { | |
3065 | /* | |
3066 | * unlike ignore_packed_keep above, we do not want to | |
3067 | * unset "local" based on looking at packs, as it | |
3068 | * also covers non-local objects | |
3069 | */ | |
3070 | struct packed_git *p; | |
3071 | for (p = packed_git; p; p = p->next) { | |
3072 | if (!p->pack_local) { | |
3073 | have_non_local_packs = 1; | |
3074 | break; | |
3075 | } | |
3076 | } | |
3077 | } | |
b5d97e6b | 3078 | |
13aaf148 | 3079 | if (progress) |
754dbc43 | 3080 | progress_state = start_progress(_("Counting objects"), 0); |
b5d97e6b JH |
3081 | if (!use_internal_rev_list) |
3082 | read_object_list_from_stdin(); | |
8d1d8f83 | 3083 | else { |
edfbb2aa JK |
3084 | get_object_list(rp.argc, rp.argv); |
3085 | argv_array_clear(&rp); | |
8d1d8f83 | 3086 | } |
0ef95f72 | 3087 | cleanup_preferred_base(); |
d155254c MH |
3088 | if (include_tag && nr_result) |
3089 | for_each_ref(add_ref_tag, NULL); | |
4d4fcc54 | 3090 | stop_progress(&progress_state); |
96a02f8f | 3091 | |
f0b0af1b | 3092 | if (non_empty && !nr_result) |
1c4a2912 | 3093 | return 0; |
f7ae6a93 NP |
3094 | if (nr_result) |
3095 | prepare_pack(window, depth); | |
d01fb92f | 3096 | write_pack_file(); |
ab7cd7bb | 3097 | if (progress) |
6e1c2344 RJ |
3098 | fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32")," |
3099 | " reused %"PRIu32" (delta %"PRIu32")\n", | |
67c08ce1 | 3100 | written, written_delta, reused, reused_delta); |
c323ac7d LT |
3101 | return 0; |
3102 | } |