pack-bitmap: add support for bitmap indexes
[git/git.git] / builtin / pack-objects.c
CommitLineData
5d4a6003 1#include "builtin.h"
c323ac7d 2#include "cache.h"
a74db82e 3#include "attr.h"
c323ac7d 4#include "object.h"
8e440259
PE
5#include "blob.h"
6#include "commit.h"
7#include "tag.h"
8#include "tree.h"
c323ac7d 9#include "delta.h"
a733cb60 10#include "pack.h"
3449f8c4 11#include "pack-revindex.h"
c38138cd 12#include "csum-file.h"
1b0c7174 13#include "tree-walk.h"
b5d97e6b
JH
14#include "diff.h"
15#include "revision.h"
16#include "list-objects.h"
2834bc27 17#include "pack-objects.h"
96a02f8f 18#include "progress.h"
f0a24aa5 19#include "refs.h"
cf2ba13a 20#include "streaming.h"
93749194 21#include "thread-utils.h"
8ecce684 22
99fb6e04 23static const char *pack_usage[] = {
4c688120
NTND
24 N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
25 N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
99fb6e04
NTND
26 NULL
27};
c323ac7d 28
3f9ac8d2 29/*
2834bc27
VM
30 * Objects we are going to pack are collected in the `to_pack` structure.
31 * It contains an array (dynamically expanded) of the object data, and a map
32 * that can resolve SHA1s to their position in the array.
3f9ac8d2 33 */
2834bc27
VM
34static struct packing_data to_pack;
35
79814f42 36static struct pack_idx_entry **written_list;
2834bc27 37static uint32_t nr_result, nr_written;
3f9ac8d2 38
96f1e58f 39static int non_empty;
a7de7130 40static int reuse_delta = 1, reuse_object = 1;
e5e9714a 41static int keep_unreachable, unpack_unreachable, include_tag;
7e52f566 42static unsigned long unpack_unreachable_expiration;
96f1e58f
DR
43static int local;
44static int incremental;
e96fb9b8 45static int ignore_packed_keep;
be6b1914 46static int allow_ofs_delta;
ebcfb379 47static struct pack_idx_option pack_idx_opts;
d01fb92f 48static const char *base_name;
024701f1 49static int progress = 1;
4812a93a 50static int window = 10;
568508e7 51static unsigned long pack_size_limit;
618e613a 52static int depth = 50;
43cc2b42 53static int delta_search_threads;
df6d6101 54static int pack_to_stdout;
8d1d8f83 55static int num_preferred_base;
dc6a0757 56static struct progress *progress_state;
960ccca6
DH
57static int pack_compression_level = Z_DEFAULT_COMPRESSION;
58static int pack_compression_seen;
c323ac7d 59
074b2eea 60static unsigned long delta_cache_size = 0;
5749b0b2 61static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
e3dfddb3 62static unsigned long cache_max_small_delta_size = 1000;
074b2eea 63
a97773ce
BD
64static unsigned long window_memory_limit = 0;
65
3f9ac8d2
JH
66/*
67 * stats
68 */
7cadf491
SP
69static uint32_t written, written_delta;
70static uint32_t reused, reused_delta;
3f9ac8d2 71
3613f9b4 72static void *get_delta(struct object_entry *entry)
c323ac7d 73{
3613f9b4
NP
74 unsigned long size, base_size, delta_size;
75 void *buf, *base_buf, *delta_buf;
21666f1a 76 enum object_type type;
c323ac7d 77
3613f9b4
NP
78 buf = read_sha1_file(entry->idx.sha1, &type, &size);
79 if (!buf)
80 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
81 base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
82 if (!base_buf)
aa7e44bf 83 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
3613f9b4 84 delta_buf = diff_delta(base_buf, base_size,
dcde55bc 85 buf, size, &delta_size, 0);
3613f9b4 86 if (!delta_buf || delta_size != entry->delta_size)
a6080a0a 87 die("delta size changed");
3613f9b4
NP
88 free(buf);
89 free(base_buf);
c323ac7d
LT
90 return delta_buf;
91}
92
30ebb40a
NP
93static unsigned long do_compress(void **pptr, unsigned long size)
94{
ef49a7a0 95 git_zstream stream;
30ebb40a
NP
96 void *in, *out;
97 unsigned long maxsize;
98
99 memset(&stream, 0, sizeof(stream));
55bb5c91 100 git_deflate_init(&stream, pack_compression_level);
225a6f10 101 maxsize = git_deflate_bound(&stream, size);
30ebb40a
NP
102
103 in = *pptr;
104 out = xmalloc(maxsize);
105 *pptr = out;
106
107 stream.next_in = in;
108 stream.avail_in = size;
109 stream.next_out = out;
110 stream.avail_out = maxsize;
55bb5c91 111 while (git_deflate(&stream, Z_FINISH) == Z_OK)
30ebb40a 112 ; /* nothing */
55bb5c91 113 git_deflate_end(&stream);
30ebb40a
NP
114
115 free(in);
116 return stream.total_out;
117}
118
cf2ba13a
NTND
119static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
120 const unsigned char *sha1)
121{
122 git_zstream stream;
123 unsigned char ibuf[1024 * 16];
124 unsigned char obuf[1024 * 16];
125 unsigned long olen = 0;
126
127 memset(&stream, 0, sizeof(stream));
128 git_deflate_init(&stream, pack_compression_level);
129
130 for (;;) {
131 ssize_t readlen;
132 int zret = Z_OK;
133 readlen = read_istream(st, ibuf, sizeof(ibuf));
134 if (readlen == -1)
135 die(_("unable to read %s"), sha1_to_hex(sha1));
136
137 stream.next_in = ibuf;
138 stream.avail_in = readlen;
139 while ((stream.avail_in || readlen == 0) &&
140 (zret == Z_OK || zret == Z_BUF_ERROR)) {
141 stream.next_out = obuf;
142 stream.avail_out = sizeof(obuf);
143 zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
144 sha1write(f, obuf, stream.next_out - obuf);
145 olen += stream.next_out - obuf;
146 }
147 if (stream.avail_in)
148 die(_("deflate error (%d)"), zret);
149 if (readlen == 0) {
150 if (zret != Z_STREAM_END)
151 die(_("deflate error (%d)"), zret);
152 break;
153 }
154 }
155 git_deflate_end(&stream);
156 return olen;
157}
158
780e6e73
NP
159/*
160 * we are going to reuse the existing object data as is. make
161 * sure it is not corrupt.
162 */
079afb18
SP
163static int check_pack_inflate(struct packed_git *p,
164 struct pack_window **w_curs,
6777a59f
SP
165 off_t offset,
166 off_t len,
079afb18
SP
167 unsigned long expect)
168{
ef49a7a0 169 git_zstream stream;
079afb18
SP
170 unsigned char fakebuf[4096], *in;
171 int st;
172
173 memset(&stream, 0, sizeof(stream));
39c68542 174 git_inflate_init(&stream);
079afb18
SP
175 do {
176 in = use_pack(p, w_curs, offset, &stream.avail_in);
177 stream.next_in = in;
178 stream.next_out = fakebuf;
179 stream.avail_out = sizeof(fakebuf);
39c68542 180 st = git_inflate(&stream, Z_FINISH);
079afb18
SP
181 offset += stream.next_in - in;
182 } while (st == Z_OK || st == Z_BUF_ERROR);
39c68542 183 git_inflate_end(&stream);
079afb18
SP
184 return (st == Z_STREAM_END &&
185 stream.total_out == expect &&
186 stream.total_in == len) ? 0 : -1;
187}
188
189static void copy_pack_data(struct sha1file *f,
190 struct packed_git *p,
191 struct pack_window **w_curs,
6777a59f
SP
192 off_t offset,
193 off_t len)
079afb18
SP
194{
195 unsigned char *in;
ef49a7a0 196 unsigned long avail;
079afb18
SP
197
198 while (len) {
199 in = use_pack(p, w_curs, offset, &avail);
200 if (avail > len)
ef49a7a0 201 avail = (unsigned long)len;
079afb18
SP
202 sha1write(f, in, avail);
203 offset += avail;
204 len -= avail;
205 }
206}
207
1b4bb16b 208/* Return 0 if we will bust the pack-size limit */
c9018b03
NTND
209static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
210 unsigned long limit, int usable_delta)
c323ac7d 211{
c9018b03 212 unsigned long size, datalen;
2c5ef824 213 unsigned char header[10], dheader[10];
6777a59f 214 unsigned hdrlen;
2c5ef824 215 enum object_type type;
c9018b03 216 void *buf;
cf2ba13a 217 struct git_istream *st = NULL;
c9018b03
NTND
218
219 if (!usable_delta) {
cf2ba13a
NTND
220 if (entry->type == OBJ_BLOB &&
221 entry->size > big_file_threshold &&
222 (st = open_istream(entry->idx.sha1, &type, &size, NULL)) != NULL)
223 buf = NULL;
224 else {
225 buf = read_sha1_file(entry->idx.sha1, &type, &size);
226 if (!buf)
227 die(_("unable to read %s"), sha1_to_hex(entry->idx.sha1));
228 }
c9018b03
NTND
229 /*
230 * make sure no cached delta data remains from a
231 * previous attempt before a pack split occurred.
232 */
233 free(entry->delta_data);
234 entry->delta_data = NULL;
235 entry->z_delta_size = 0;
236 } else if (entry->delta_data) {
237 size = entry->delta_size;
238 buf = entry->delta_data;
239 entry->delta_data = NULL;
240 type = (allow_ofs_delta && entry->delta->idx.offset) ?
241 OBJ_OFS_DELTA : OBJ_REF_DELTA;
242 } else {
243 buf = get_delta(entry);
244 size = entry->delta_size;
245 type = (allow_ofs_delta && entry->delta->idx.offset) ?
246 OBJ_OFS_DELTA : OBJ_REF_DELTA;
247 }
248
cf2ba13a
NTND
249 if (st) /* large blob case, just assume we don't compress well */
250 datalen = size;
251 else if (entry->z_delta_size)
c9018b03
NTND
252 datalen = entry->z_delta_size;
253 else
254 datalen = do_compress(&buf, size);
255
256 /*
257 * The object header is a byte of 'type' followed by zero or
258 * more bytes of length.
259 */
260 hdrlen = encode_in_pack_object_header(type, size, header);
261
262 if (type == OBJ_OFS_DELTA) {
263 /*
264 * Deltas with relative base contain an additional
265 * encoding of the relative offset for the delta
266 * base from this object's position in the pack.
267 */
268 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
269 unsigned pos = sizeof(dheader) - 1;
270 dheader[pos] = ofs & 127;
271 while (ofs >>= 7)
272 dheader[--pos] = 128 | (--ofs & 127);
273 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
cf2ba13a
NTND
274 if (st)
275 close_istream(st);
c9018b03
NTND
276 free(buf);
277 return 0;
278 }
279 sha1write(f, header, hdrlen);
280 sha1write(f, dheader + pos, sizeof(dheader) - pos);
281 hdrlen += sizeof(dheader) - pos;
282 } else if (type == OBJ_REF_DELTA) {
283 /*
284 * Deltas with a base reference contain
285 * an additional 20 bytes for the base sha1.
286 */
287 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
cf2ba13a
NTND
288 if (st)
289 close_istream(st);
c9018b03
NTND
290 free(buf);
291 return 0;
292 }
293 sha1write(f, header, hdrlen);
294 sha1write(f, entry->delta->idx.sha1, 20);
295 hdrlen += 20;
296 } else {
297 if (limit && hdrlen + datalen + 20 >= limit) {
cf2ba13a
NTND
298 if (st)
299 close_istream(st);
c9018b03
NTND
300 free(buf);
301 return 0;
302 }
303 sha1write(f, header, hdrlen);
304 }
cf2ba13a
NTND
305 if (st) {
306 datalen = write_large_blob_data(st, f, entry->idx.sha1);
307 close_istream(st);
308 } else {
309 sha1write(f, buf, datalen);
310 free(buf);
311 }
c9018b03
NTND
312
313 return hdrlen + datalen;
314}
315
316/* Return 0 if we will bust the pack-size limit */
317static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
318 unsigned long limit, int usable_delta)
319{
320 struct packed_git *p = entry->in_pack;
321 struct pack_window *w_curs = NULL;
322 struct revindex_entry *revidx;
323 off_t offset;
324 enum object_type type = entry->type;
325 unsigned long datalen;
326 unsigned char header[10], dheader[10];
327 unsigned hdrlen;
328
329 if (entry->delta)
330 type = (allow_ofs_delta && entry->delta->idx.offset) ?
331 OBJ_OFS_DELTA : OBJ_REF_DELTA;
332 hdrlen = encode_in_pack_object_header(type, entry->size, header);
333
334 offset = entry->in_pack_offset;
335 revidx = find_pack_revindex(p, offset);
336 datalen = revidx[1].offset - offset;
337 if (!pack_to_stdout && p->index_version > 1 &&
338 check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
339 error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
340 unuse_pack(&w_curs);
341 return write_no_reuse_object(f, entry, limit, usable_delta);
342 }
343
344 offset += entry->in_pack_header_size;
345 datalen -= entry->in_pack_header_size;
346
347 if (!pack_to_stdout && p->index_version == 1 &&
348 check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
349 error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
350 unuse_pack(&w_curs);
351 return write_no_reuse_object(f, entry, limit, usable_delta);
352 }
353
354 if (type == OBJ_OFS_DELTA) {
355 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
356 unsigned pos = sizeof(dheader) - 1;
357 dheader[pos] = ofs & 127;
358 while (ofs >>= 7)
359 dheader[--pos] = 128 | (--ofs & 127);
360 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
361 unuse_pack(&w_curs);
362 return 0;
363 }
364 sha1write(f, header, hdrlen);
365 sha1write(f, dheader + pos, sizeof(dheader) - pos);
366 hdrlen += sizeof(dheader) - pos;
367 reused_delta++;
368 } else if (type == OBJ_REF_DELTA) {
369 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
370 unuse_pack(&w_curs);
371 return 0;
372 }
373 sha1write(f, header, hdrlen);
374 sha1write(f, entry->delta->idx.sha1, 20);
375 hdrlen += 20;
376 reused_delta++;
377 } else {
378 if (limit && hdrlen + datalen + 20 >= limit) {
379 unuse_pack(&w_curs);
380 return 0;
381 }
382 sha1write(f, header, hdrlen);
383 }
384 copy_pack_data(f, p, &w_curs, offset, datalen);
385 unuse_pack(&w_curs);
386 reused++;
387 return hdrlen + datalen;
388}
389
390/* Return 0 if we will bust the pack-size limit */
391static unsigned long write_object(struct sha1file *f,
392 struct object_entry *entry,
393 off_t write_offset)
394{
395 unsigned long limit, len;
2c5ef824 396 int usable_delta, to_reuse;
c323ac7d 397
78d1e84f
NP
398 if (!pack_to_stdout)
399 crc32_begin(f);
400
a2430dde 401 /* apply size limit if limited packsize and not first object */
a1e4760f
NP
402 if (!pack_size_limit || !nr_written)
403 limit = 0;
404 else if (pack_size_limit <= write_offset)
405 /*
406 * the earlier object did not fit the limit; avoid
407 * mistaking this with unlimited (i.e. limit = 0).
408 */
409 limit = 1;
410 else
411 limit = pack_size_limit - write_offset;
2c5ef824
NP
412
413 if (!entry->delta)
414 usable_delta = 0; /* no delta */
415 else if (!pack_size_limit)
416 usable_delta = 1; /* unlimited packfile */
417 else if (entry->delta->idx.offset == (off_t)-1)
418 usable_delta = 0; /* base was written to another pack */
419 else if (entry->delta->idx.offset)
420 usable_delta = 1; /* base already exists in this pack */
421 else
422 usable_delta = 0; /* base could end up in another pack */
423
a7de7130 424 if (!reuse_object)
fa736f72
NP
425 to_reuse = 0; /* explicit */
426 else if (!entry->in_pack)
ab7cd7bb 427 to_reuse = 0; /* can't reuse what we don't have */
c9018b03 428 else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
17b08f2c
DH
429 /* check_object() decided it for us ... */
430 to_reuse = usable_delta;
431 /* ... but pack split may override that */
c9018b03 432 else if (entry->type != entry->in_pack_type)
ab7cd7bb
JH
433 to_reuse = 0; /* pack has delta which is unusable */
434 else if (entry->delta)
435 to_reuse = 0; /* we want to pack afresh */
436 else
437 to_reuse = 1; /* we have it in-pack undeltified,
438 * and we do not need to deltify it.
439 */
440
c9018b03
NTND
441 if (!to_reuse)
442 len = write_no_reuse_object(f, entry, limit, usable_delta);
443 else
444 len = write_reuse_object(f, entry, limit, usable_delta);
445 if (!len)
446 return 0;
64bd76b1 447
17b08f2c 448 if (usable_delta)
ab7cd7bb 449 written_delta++;
3f9ac8d2 450 written++;
78d1e84f 451 if (!pack_to_stdout)
aa7e44bf 452 entry->idx.crc32 = crc32_end(f);
c9018b03 453 return len;
c323ac7d
LT
454}
455
f63c79db
JH
456enum write_one_status {
457 WRITE_ONE_SKIP = -1, /* already written */
458 WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
459 WRITE_ONE_WRITTEN = 1, /* normal */
460 WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
461};
462
463static enum write_one_status write_one(struct sha1file *f,
464 struct object_entry *e,
465 off_t *offset)
9d5ab962 466{
d7dd0223 467 unsigned long size;
f63c79db 468 int recursing;
d7dd0223 469
f63c79db
JH
470 /*
471 * we set offset to 1 (which is an impossible value) to mark
472 * the fact that this object is involved in "write its base
473 * first before writing a deltified object" recursion.
474 */
475 recursing = (e->idx.offset == 1);
476 if (recursing) {
477 warning("recursive delta detected for object %s",
478 sha1_to_hex(e->idx.sha1));
479 return WRITE_ONE_RECURSIVE;
480 } else if (e->idx.offset || e->preferred_base) {
481 /* offset is non zero if object is written already. */
482 return WRITE_ONE_SKIP;
483 }
d7dd0223 484
720c9f7b 485 /* if we are deltified, write out base object first. */
f63c79db
JH
486 if (e->delta) {
487 e->idx.offset = 1; /* now recurse */
488 switch (write_one(f, e->delta, offset)) {
489 case WRITE_ONE_RECURSIVE:
490 /* we cannot depend on this one */
491 e->delta = NULL;
492 break;
493 default:
494 break;
495 case WRITE_ONE_BREAK:
496 e->idx.offset = recursing;
497 return WRITE_ONE_BREAK;
498 }
499 }
d7dd0223 500
6ed7f25e
NP
501 e->idx.offset = *offset;
502 size = write_object(f, e, *offset);
17b08f2c 503 if (!size) {
f63c79db
JH
504 e->idx.offset = recursing;
505 return WRITE_ONE_BREAK;
17b08f2c 506 }
79814f42 507 written_list[nr_written++] = &e->idx;
d7dd0223
NP
508
509 /* make sure off_t is sufficiently large not to wrap */
c03c8315 510 if (signed_add_overflows(*offset, size))
d7dd0223 511 die("pack too large for current definition of off_t");
6ed7f25e 512 *offset += size;
f63c79db 513 return WRITE_ONE_WRITTEN;
9d5ab962
JH
514}
515
1b4bb16b
JH
516static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
517 void *cb_data)
518{
519 unsigned char peeled[20];
2834bc27 520 struct object_entry *entry = packlist_find(&to_pack, sha1, NULL);
1b4bb16b
JH
521
522 if (entry)
523 entry->tagged = 1;
524 if (!peel_ref(path, peeled)) {
2834bc27 525 entry = packlist_find(&to_pack, peeled, NULL);
1b4bb16b
JH
526 if (entry)
527 entry->tagged = 1;
528 }
529 return 0;
530}
531
be126818 532static inline void add_to_write_order(struct object_entry **wo,
92bef1a1 533 unsigned int *endp,
1b4bb16b
JH
534 struct object_entry *e)
535{
536 if (e->filled)
537 return;
538 wo[(*endp)++] = e;
539 e->filled = 1;
540}
541
542static void add_descendants_to_write_order(struct object_entry **wo,
92bef1a1 543 unsigned int *endp,
1b4bb16b
JH
544 struct object_entry *e)
545{
f380872f
DM
546 int add_to_order = 1;
547 while (e) {
548 if (add_to_order) {
549 struct object_entry *s;
550 /* add this node... */
551 add_to_write_order(wo, endp, e);
552 /* all its siblings... */
553 for (s = e->delta_sibling; s; s = s->delta_sibling) {
554 add_to_write_order(wo, endp, s);
555 }
556 }
557 /* drop down a level to add left subtree nodes if possible */
558 if (e->delta_child) {
559 add_to_order = 1;
560 e = e->delta_child;
561 } else {
562 add_to_order = 0;
563 /* our sibling might have some children, it is next */
564 if (e->delta_sibling) {
565 e = e->delta_sibling;
566 continue;
567 }
568 /* go back to our parent node */
569 e = e->delta;
570 while (e && !e->delta_sibling) {
571 /* we're on the right side of a subtree, keep
572 * going up until we can go right again */
573 e = e->delta;
574 }
575 if (!e) {
576 /* done- we hit our original root node */
577 return;
578 }
579 /* pass it off to sibling at this level */
580 e = e->delta_sibling;
581 }
582 };
1b4bb16b
JH
583}
584
585static void add_family_to_write_order(struct object_entry **wo,
92bef1a1 586 unsigned int *endp,
1b4bb16b
JH
587 struct object_entry *e)
588{
589 struct object_entry *root;
590
591 for (root = e; root->delta; root = root->delta)
592 ; /* nothing */
1b4bb16b
JH
593 add_descendants_to_write_order(wo, endp, root);
594}
595
596static struct object_entry **compute_write_order(void)
597{
38d4debb 598 unsigned int i, wo_end, last_untagged;
1b4bb16b 599
2834bc27
VM
600 struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo));
601 struct object_entry *objects = to_pack.objects;
1b4bb16b 602
2834bc27 603 for (i = 0; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
604 objects[i].tagged = 0;
605 objects[i].filled = 0;
606 objects[i].delta_child = NULL;
607 objects[i].delta_sibling = NULL;
608 }
609
610 /*
611 * Fully connect delta_child/delta_sibling network.
612 * Make sure delta_sibling is sorted in the original
613 * recency order.
614 */
2834bc27 615 for (i = to_pack.nr_objects; i > 0;) {
92bef1a1 616 struct object_entry *e = &objects[--i];
1b4bb16b
JH
617 if (!e->delta)
618 continue;
619 /* Mark me as the first child */
620 e->delta_sibling = e->delta->delta_child;
621 e->delta->delta_child = e;
622 }
623
624 /*
625 * Mark objects that are at the tip of tags.
626 */
627 for_each_tag_ref(mark_tagged, NULL);
628
629 /*
38d4debb 630 * Give the objects in the original recency order until
1b4bb16b
JH
631 * we see a tagged tip.
632 */
2834bc27 633 for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
634 if (objects[i].tagged)
635 break;
636 add_to_write_order(wo, &wo_end, &objects[i]);
637 }
38d4debb 638 last_untagged = i;
1b4bb16b
JH
639
640 /*
641 * Then fill all the tagged tips.
642 */
2834bc27 643 for (; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
644 if (objects[i].tagged)
645 add_to_write_order(wo, &wo_end, &objects[i]);
646 }
647
648 /*
649 * And then all remaining commits and tags.
650 */
2834bc27 651 for (i = last_untagged; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
652 if (objects[i].type != OBJ_COMMIT &&
653 objects[i].type != OBJ_TAG)
654 continue;
655 add_to_write_order(wo, &wo_end, &objects[i]);
656 }
657
658 /*
659 * And then all the trees.
660 */
2834bc27 661 for (i = last_untagged; i < to_pack.nr_objects; i++) {
1b4bb16b
JH
662 if (objects[i].type != OBJ_TREE)
663 continue;
664 add_to_write_order(wo, &wo_end, &objects[i]);
665 }
666
667 /*
668 * Finally all the rest in really tight order
669 */
2834bc27 670 for (i = last_untagged; i < to_pack.nr_objects; i++) {
38d4debb
DM
671 if (!objects[i].filled)
672 add_family_to_write_order(wo, &wo_end, &objects[i]);
673 }
674
2834bc27
VM
675 if (wo_end != to_pack.nr_objects)
676 die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
1b4bb16b
JH
677
678 return wo;
679}
680
d01fb92f 681static void write_pack_file(void)
c323ac7d 682{
ebe27b13 683 uint32_t i = 0, j;
d22b9290 684 struct sha1file *f;
6ed7f25e 685 off_t offset;
ebe27b13 686 uint32_t nr_remaining = nr_result;
f746bae8 687 time_t last_mtime = 0;
1b4bb16b 688 struct object_entry **write_order;
81a216a5 689
bcd7954e 690 if (progress > pack_to_stdout)
dc6a0757 691 progress_state = start_progress("Writing objects", nr_result);
2834bc27 692 written_list = xmalloc(to_pack.nr_objects * sizeof(*written_list));
1b4bb16b 693 write_order = compute_write_order();
183bdb2c 694
ebe27b13 695 do {
aa7e44bf 696 unsigned char sha1[20];
7ba502c4 697 char *pack_tmp_name = NULL;
aa7e44bf 698
cdf9db3c 699 if (pack_to_stdout)
2a128d63 700 f = sha1fd_throughput(1, "<stdout>", progress_state);
cdf9db3c
JH
701 else
702 f = create_tmp_packfile(&pack_tmp_name);
ebe27b13 703
c0ad4657
JH
704 offset = write_pack_header(f, nr_remaining);
705 if (!offset)
706 die_errno("unable to write pack header");
ebe27b13 707 nr_written = 0;
2834bc27 708 for (; i < to_pack.nr_objects; i++) {
1b4bb16b 709 struct object_entry *e = write_order[i];
cddec4f8 710 if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
720c9f7b
NP
711 break;
712 display_progress(progress_state, written);
713 }
c553ca25 714
ebe27b13
DH
715 /*
716 * Did we write the wrong # entries in the header?
717 * If so, rewrite it like in fast-import
718 */
54352bb2
LT
719 if (pack_to_stdout) {
720 sha1close(f, sha1, CSUM_CLOSE);
721 } else if (nr_written == nr_remaining) {
722 sha1close(f, sha1, CSUM_FSYNC);
ebe27b13 723 } else {
ac0463ed 724 int fd = sha1close(f, sha1, 0);
abeb40e5 725 fixup_pack_header_footer(fd, sha1, pack_tmp_name,
ac0463ed 726 nr_written, sha1, offset);
7ba502c4 727 close(fd);
ebe27b13
DH
728 }
729
730 if (!pack_to_stdout) {
f746bae8 731 struct stat st;
3bb72562 732 char tmpname[PATH_MAX];
d01fb92f 733
f746bae8
NP
734 /*
735 * Packs are runtime accessed in their mtime
736 * order since newer packs are more likely to contain
737 * younger objects. So if we are creating multiple
738 * packs then we should modify the mtime of later ones
739 * to preserve this property.
740 */
0e990530 741 if (stat(pack_tmp_name, &st) < 0) {
f746bae8 742 warning("failed to stat %s: %s",
0e990530 743 pack_tmp_name, strerror(errno));
f746bae8
NP
744 } else if (!last_mtime) {
745 last_mtime = st.st_mtime;
746 } else {
747 struct utimbuf utb;
748 utb.actime = st.st_atime;
749 utb.modtime = --last_mtime;
0e990530 750 if (utime(pack_tmp_name, &utb) < 0)
f746bae8
NP
751 warning("failed utime() on %s: %s",
752 tmpname, strerror(errno));
753 }
754
0e990530
JH
755 /* Enough space for "-<sha-1>.pack"? */
756 if (sizeof(tmpname) <= strlen(base_name) + 50)
757 die("pack base name '%s' too long", base_name);
758 snprintf(tmpname, sizeof(tmpname), "%s-", base_name);
759 finish_tmp_packfile(tmpname, pack_tmp_name,
760 written_list, nr_written,
761 &pack_idx_opts, sha1);
7ba502c4 762 free(pack_tmp_name);
aa7e44bf 763 puts(sha1_to_hex(sha1));
ebe27b13
DH
764 }
765
766 /* mark written objects as written to previous pack */
767 for (j = 0; j < nr_written; j++) {
79814f42 768 written_list[j]->offset = (off_t)-1;
ebe27b13
DH
769 }
770 nr_remaining -= nr_written;
2834bc27 771 } while (nr_remaining && i < to_pack.nr_objects);
ebe27b13
DH
772
773 free(written_list);
1b4bb16b 774 free(write_order);
4d4fcc54 775 stop_progress(&progress_state);
67c08ce1 776 if (written != nr_result)
6e1c2344
RJ
777 die("wrote %"PRIu32" objects while expecting %"PRIu32,
778 written, nr_result);
c323ac7d
LT
779}
780
a74db82e
JH
781static void setup_delta_attr_check(struct git_attr_check *check)
782{
783 static struct git_attr *attr_delta;
784
785 if (!attr_delta)
7fb0eaa2 786 attr_delta = git_attr("delta");
a74db82e
JH
787
788 check[0].attr = attr_delta;
789}
790
791static int no_try_delta(const char *path)
792{
793 struct git_attr_check check[1];
794
795 setup_delta_attr_check(check);
d932f4eb 796 if (git_check_attr(path, ARRAY_SIZE(check), check))
a74db82e
JH
797 return 0;
798 if (ATTR_FALSE(check->value))
799 return 1;
800 return 0;
801}
802
5c49c116 803static int add_object_entry(const unsigned char *sha1, enum object_type type,
bc32fed5 804 const char *name, int exclude)
c323ac7d 805{
c323ac7d 806 struct object_entry *entry;
29b734e4 807 struct packed_git *p, *found_pack = NULL;
6777a59f 808 off_t found_offset = 0;
68fb36eb 809 uint32_t hash = pack_name_hash(name);
2834bc27 810 uint32_t index_pos;
29b734e4 811
2834bc27
VM
812 entry = packlist_find(&to_pack, sha1, &index_pos);
813 if (entry) {
29b734e4 814 if (exclude) {
81a216a5
NP
815 if (!entry->preferred_base)
816 nr_result--;
29b734e4
NP
817 entry->preferred_base = 1;
818 }
819 return 0;
820 }
c323ac7d 821
daae0625
BC
822 if (!exclude && local && has_loose_object_nonlocal(sha1))
823 return 0;
824
5c49c116
NP
825 for (p = packed_git; p; p = p->next) {
826 off_t offset = find_pack_entry_one(sha1, p);
827 if (offset) {
828 if (!found_pack) {
4c080182 829 if (!is_pack_valid(p)) {
58a6a9cc 830 warning("packfile %s cannot be accessed", p->pack_name);
4c080182
JK
831 continue;
832 }
5c49c116
NP
833 found_offset = offset;
834 found_pack = p;
64560374 835 }
5c49c116
NP
836 if (exclude)
837 break;
838 if (incremental)
839 return 0;
840 if (local && !p->pack_local)
841 return 0;
e96fb9b8
BC
842 if (ignore_packed_keep && p->pack_local && p->pack_keep)
843 return 0;
64560374
LT
844 }
845 }
eb019375 846
2834bc27 847 entry = packlist_alloc(&to_pack, sha1, index_pos);
27225f2e 848 entry->hash = hash;
5c49c116
NP
849 if (type)
850 entry->type = type;
29b734e4
NP
851 if (exclude)
852 entry->preferred_base = 1;
81a216a5
NP
853 else
854 nr_result++;
29b734e4
NP
855 if (found_pack) {
856 entry->in_pack = found_pack;
857 entry->in_pack_offset = found_offset;
858 }
7a979d99 859
2834bc27 860 display_progress(progress_state, to_pack.nr_objects);
29b734e4 861
a74db82e
JH
862 if (name && no_try_delta(name))
863 entry->no_try_delta = 1;
864
29b734e4 865 return 1;
c323ac7d
LT
866}
867
5379a5c5
JH
868struct pbase_tree_cache {
869 unsigned char sha1[20];
870 int ref;
871 int temporary;
872 void *tree_data;
873 unsigned long tree_size;
874};
875
876static struct pbase_tree_cache *(pbase_tree_cache[256]);
877static int pbase_tree_cache_ix(const unsigned char *sha1)
878{
879 return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
880}
881static int pbase_tree_cache_ix_incr(int ix)
882{
883 return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
884}
885
886static struct pbase_tree {
887 struct pbase_tree *next;
888 /* This is a phony "cache" entry; we are not
889 * going to evict it nor find it through _get()
890 * mechanism -- this is for the toplevel node that
891 * would almost always change with any commit.
892 */
893 struct pbase_tree_cache pcache;
894} *pbase_tree;
895
896static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
897{
898 struct pbase_tree_cache *ent, *nent;
899 void *data;
900 unsigned long size;
21666f1a 901 enum object_type type;
5379a5c5
JH
902 int neigh;
903 int my_ix = pbase_tree_cache_ix(sha1);
904 int available_ix = -1;
905
906 /* pbase-tree-cache acts as a limited hashtable.
907 * your object will be found at your index or within a few
908 * slots after that slot if it is cached.
909 */
910 for (neigh = 0; neigh < 8; neigh++) {
911 ent = pbase_tree_cache[my_ix];
a89fccd2 912 if (ent && !hashcmp(ent->sha1, sha1)) {
5379a5c5
JH
913 ent->ref++;
914 return ent;
915 }
916 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
917 ((0 <= available_ix) &&
918 (!ent && pbase_tree_cache[available_ix])))
919 available_ix = my_ix;
920 if (!ent)
921 break;
922 my_ix = pbase_tree_cache_ix_incr(my_ix);
923 }
924
925 /* Did not find one. Either we got a bogus request or
926 * we need to read and perhaps cache.
927 */
21666f1a 928 data = read_sha1_file(sha1, &type, &size);
5379a5c5
JH
929 if (!data)
930 return NULL;
21666f1a 931 if (type != OBJ_TREE) {
5379a5c5
JH
932 free(data);
933 return NULL;
934 }
935
936 /* We need to either cache or return a throwaway copy */
937
938 if (available_ix < 0)
939 ent = NULL;
940 else {
941 ent = pbase_tree_cache[available_ix];
942 my_ix = available_ix;
943 }
944
945 if (!ent) {
946 nent = xmalloc(sizeof(*nent));
947 nent->temporary = (available_ix < 0);
948 }
949 else {
950 /* evict and reuse */
951 free(ent->tree_data);
952 nent = ent;
953 }
e702496e 954 hashcpy(nent->sha1, sha1);
5379a5c5
JH
955 nent->tree_data = data;
956 nent->tree_size = size;
957 nent->ref = 1;
958 if (!nent->temporary)
959 pbase_tree_cache[my_ix] = nent;
960 return nent;
961}
962
963static void pbase_tree_put(struct pbase_tree_cache *cache)
964{
965 if (!cache->temporary) {
966 cache->ref--;
967 return;
968 }
969 free(cache->tree_data);
970 free(cache);
971}
972
973static int name_cmp_len(const char *name)
974{
975 int i;
976 for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
977 ;
978 return i;
979}
980
981static void add_pbase_object(struct tree_desc *tree,
5379a5c5 982 const char *name,
ce0bd642
LT
983 int cmplen,
984 const char *fullname)
3f9ac8d2 985{
4c068a98 986 struct name_entry entry;
8a5a8d6c 987 int cmp;
4c068a98
LT
988
989 while (tree_entry(tree,&entry)) {
1211be6b
LT
990 if (S_ISGITLINK(entry.mode))
991 continue;
0de16337 992 cmp = tree_entry_len(&entry) != cmplen ? 1 :
8a5a8d6c
NP
993 memcmp(name, entry.path, cmplen);
994 if (cmp > 0)
7a979d99 995 continue;
8a5a8d6c
NP
996 if (cmp < 0)
997 return;
5379a5c5 998 if (name[cmplen] != '/') {
5c49c116 999 add_object_entry(entry.sha1,
4d1012c3 1000 object_type(entry.mode),
bc32fed5 1001 fullname, 1);
5379a5c5
JH
1002 return;
1003 }
8a5a8d6c 1004 if (S_ISDIR(entry.mode)) {
7a979d99 1005 struct tree_desc sub;
5379a5c5
JH
1006 struct pbase_tree_cache *tree;
1007 const char *down = name+cmplen+1;
1008 int downlen = name_cmp_len(down);
1009
4c068a98 1010 tree = pbase_tree_get(entry.sha1);
5379a5c5
JH
1011 if (!tree)
1012 return;
6fda5e51 1013 init_tree_desc(&sub, tree->tree_data, tree->tree_size);
5379a5c5 1014
ce0bd642 1015 add_pbase_object(&sub, down, downlen, fullname);
5379a5c5
JH
1016 pbase_tree_put(tree);
1017 }
1018 }
1019}
1d6b38cc 1020
5379a5c5
JH
1021static unsigned *done_pbase_paths;
1022static int done_pbase_paths_num;
1023static int done_pbase_paths_alloc;
1024static int done_pbase_path_pos(unsigned hash)
1025{
1026 int lo = 0;
1027 int hi = done_pbase_paths_num;
1028 while (lo < hi) {
1029 int mi = (hi + lo) / 2;
1030 if (done_pbase_paths[mi] == hash)
1031 return mi;
1032 if (done_pbase_paths[mi] < hash)
1033 hi = mi;
1034 else
1035 lo = mi + 1;
1036 }
1037 return -lo-1;
1038}
1039
1040static int check_pbase_path(unsigned hash)
1041{
1042 int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
1043 if (0 <= pos)
1044 return 1;
1045 pos = -pos - 1;
1046 if (done_pbase_paths_alloc <= done_pbase_paths_num) {
1047 done_pbase_paths_alloc = alloc_nr(done_pbase_paths_alloc);
1048 done_pbase_paths = xrealloc(done_pbase_paths,
1049 done_pbase_paths_alloc *
1050 sizeof(unsigned));
1051 }
1052 done_pbase_paths_num++;
1053 if (pos < done_pbase_paths_num)
1054 memmove(done_pbase_paths + pos + 1,
1055 done_pbase_paths + pos,
1056 (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
1057 done_pbase_paths[pos] = hash;
1058 return 0;
1059}
1060
bc32fed5 1061static void add_preferred_base_object(const char *name)
5379a5c5
JH
1062{
1063 struct pbase_tree *it;
8a5a8d6c 1064 int cmplen;
68fb36eb 1065 unsigned hash = pack_name_hash(name);
5379a5c5 1066
8a5a8d6c 1067 if (!num_preferred_base || check_pbase_path(hash))
5379a5c5
JH
1068 return;
1069
8a5a8d6c 1070 cmplen = name_cmp_len(name);
5379a5c5
JH
1071 for (it = pbase_tree; it; it = it->next) {
1072 if (cmplen == 0) {
bc32fed5 1073 add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
5379a5c5
JH
1074 }
1075 else {
1076 struct tree_desc tree;
6fda5e51 1077 init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
ce0bd642 1078 add_pbase_object(&tree, name, cmplen, name);
7a979d99 1079 }
3f9ac8d2 1080 }
3f9ac8d2
JH
1081}
1082
7a979d99 1083static void add_preferred_base(unsigned char *sha1)
3f9ac8d2 1084{
5379a5c5
JH
1085 struct pbase_tree *it;
1086 void *data;
1087 unsigned long size;
1088 unsigned char tree_sha1[20];
1d6b38cc 1089
8d1d8f83
JH
1090 if (window <= num_preferred_base++)
1091 return;
1092
5379a5c5
JH
1093 data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
1094 if (!data)
7a979d99 1095 return;
5379a5c5
JH
1096
1097 for (it = pbase_tree; it; it = it->next) {
a89fccd2 1098 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
5379a5c5
JH
1099 free(data);
1100 return;
1101 }
1102 }
1103
1104 it = xcalloc(1, sizeof(*it));
1105 it->next = pbase_tree;
1106 pbase_tree = it;
1107
e702496e 1108 hashcpy(it->pcache.sha1, tree_sha1);
5379a5c5
JH
1109 it->pcache.tree_data = data;
1110 it->pcache.tree_size = size;
3f9ac8d2
JH
1111}
1112
0ef95f72
NP
1113static void cleanup_preferred_base(void)
1114{
1115 struct pbase_tree *it;
1116 unsigned i;
1117
1118 it = pbase_tree;
1119 pbase_tree = NULL;
1120 while (it) {
1121 struct pbase_tree *this = it;
1122 it = this->next;
1123 free(this->pcache.tree_data);
1124 free(this);
1125 }
1126
1127 for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
1128 if (!pbase_tree_cache[i])
1129 continue;
1130 free(pbase_tree_cache[i]->tree_data);
1131 free(pbase_tree_cache[i]);
1132 pbase_tree_cache[i] = NULL;
1133 }
1134
1135 free(done_pbase_paths);
1136 done_pbase_paths = NULL;
1137 done_pbase_paths_num = done_pbase_paths_alloc = 0;
1138}
1139
c323ac7d
LT
1140static void check_object(struct object_entry *entry)
1141{
5c49c116 1142 if (entry->in_pack) {
780e6e73 1143 struct packed_git *p = entry->in_pack;
03e79c88 1144 struct pack_window *w_curs = NULL;
5c49c116
NP
1145 const unsigned char *base_ref = NULL;
1146 struct object_entry *base_entry;
1147 unsigned long used, used_0;
ef49a7a0 1148 unsigned long avail;
5c49c116
NP
1149 off_t ofs;
1150 unsigned char *buf, c;
780e6e73 1151
6777a59f 1152 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
ab7cd7bb 1153
5c49c116 1154 /*
fa736f72
NP
1155 * We want in_pack_type even if we do not reuse delta
1156 * since non-delta representations could still be reused.
ab7cd7bb 1157 */
09ded04b 1158 used = unpack_object_header_buffer(buf, avail,
5c49c116
NP
1159 &entry->in_pack_type,
1160 &entry->size);
03d66015
NP
1161 if (used == 0)
1162 goto give_up;
ab7cd7bb 1163
5c49c116
NP
1164 /*
1165 * Determine if this is a delta and if so whether we can
1166 * reuse it or not. Otherwise let's find out as cheaply as
1167 * possible what the actual type and size for this object is.
3f9ac8d2 1168 */
5c49c116
NP
1169 switch (entry->in_pack_type) {
1170 default:
1171 /* Not a delta hence we've already got all we need. */
1172 entry->type = entry->in_pack_type;
1173 entry->in_pack_header_size = used;
03d66015
NP
1174 if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
1175 goto give_up;
5c49c116
NP
1176 unuse_pack(&w_curs);
1177 return;
1178 case OBJ_REF_DELTA:
a7de7130 1179 if (reuse_delta && !entry->preferred_base)
5c49c116
NP
1180 base_ref = use_pack(p, &w_curs,
1181 entry->in_pack_offset + used, NULL);
1182 entry->in_pack_header_size = used + 20;
1183 break;
1184 case OBJ_OFS_DELTA:
1185 buf = use_pack(p, &w_curs,
1186 entry->in_pack_offset + used, NULL);
1187 used_0 = 0;
1188 c = buf[used_0++];
1189 ofs = c & 127;
1190 while (c & 128) {
1191 ofs += 1;
03d66015
NP
1192 if (!ofs || MSB(ofs, 7)) {
1193 error("delta base offset overflow in pack for %s",
1194 sha1_to_hex(entry->idx.sha1));
1195 goto give_up;
1196 }
5c49c116
NP
1197 c = buf[used_0++];
1198 ofs = (ofs << 7) + (c & 127);
780e6e73 1199 }
5c49c116 1200 ofs = entry->in_pack_offset - ofs;
03d66015
NP
1201 if (ofs <= 0 || ofs >= entry->in_pack_offset) {
1202 error("delta base offset out of bound for %s",
1203 sha1_to_hex(entry->idx.sha1));
1204 goto give_up;
1205 }
a7de7130 1206 if (reuse_delta && !entry->preferred_base) {
3449f8c4
NP
1207 struct revindex_entry *revidx;
1208 revidx = find_pack_revindex(p, ofs);
08698b1e
NP
1209 if (!revidx)
1210 goto give_up;
3449f8c4
NP
1211 base_ref = nth_packed_object_sha1(p, revidx->nr);
1212 }
5c49c116
NP
1213 entry->in_pack_header_size = used + used_0;
1214 break;
780e6e73 1215 }
780e6e73 1216
2834bc27 1217 if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
5c49c116
NP
1218 /*
1219 * If base_ref was set above that means we wish to
1220 * reuse delta data, and we even found that base
1221 * in the list of objects we want to pack. Goodie!
1222 *
1223 * Depth value does not matter - find_deltas() will
1224 * never consider reused delta as the base object to
1225 * deltify other objects against, in order to avoid
1226 * circular deltas.
3f9ac8d2 1227 */
780e6e73 1228 entry->type = entry->in_pack_type;
5c49c116 1229 entry->delta = base_entry;
64bd76b1 1230 entry->delta_size = entry->size;
15b4d577
JH
1231 entry->delta_sibling = base_entry->delta_child;
1232 base_entry->delta_child = entry;
5c49c116
NP
1233 unuse_pack(&w_curs);
1234 return;
1235 }
ab7cd7bb 1236
5c49c116
NP
1237 if (entry->type) {
1238 /*
1239 * This must be a delta and we already know what the
1240 * final object type is. Let's extract the actual
1241 * object size from the delta header.
1242 */
1243 entry->size = get_size_from_delta(p, &w_curs,
1244 entry->in_pack_offset + entry->in_pack_header_size);
03d66015
NP
1245 if (entry->size == 0)
1246 goto give_up;
5c49c116 1247 unuse_pack(&w_curs);
3f9ac8d2
JH
1248 return;
1249 }
5c49c116
NP
1250
1251 /*
1252 * No choice but to fall back to the recursive delta walk
1253 * with sha1_object_info() to find about the object type
1254 * at this point...
1255 */
03d66015 1256 give_up:
5c49c116 1257 unuse_pack(&w_curs);
36e4d74a 1258 }
3f9ac8d2 1259
aa7e44bf 1260 entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
6d6f9cdd
SP
1261 /*
1262 * The error condition is checked in prepare_pack(). This is
1263 * to permit a missing preferred base object to be ignored
1264 * as a preferred base. Doing so can result in a larger
1265 * pack file, but the transfer will still take place.
1266 */
3f9ac8d2
JH
1267}
1268
5c49c116
NP
1269static int pack_offset_sort(const void *_a, const void *_b)
1270{
1271 const struct object_entry *a = *(struct object_entry **)_a;
1272 const struct object_entry *b = *(struct object_entry **)_b;
1273
1274 /* avoid filesystem trashing with loose objects */
1275 if (!a->in_pack && !b->in_pack)
aa7e44bf 1276 return hashcmp(a->idx.sha1, b->idx.sha1);
5c49c116
NP
1277
1278 if (a->in_pack < b->in_pack)
1279 return -1;
1280 if (a->in_pack > b->in_pack)
1281 return 1;
1282 return a->in_pack_offset < b->in_pack_offset ? -1 :
1283 (a->in_pack_offset > b->in_pack_offset);
1284}
1285
c323ac7d
LT
1286static void get_object_details(void)
1287{
7cadf491 1288 uint32_t i;
5c49c116
NP
1289 struct object_entry **sorted_by_offset;
1290
2834bc27
VM
1291 sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
1292 for (i = 0; i < to_pack.nr_objects; i++)
1293 sorted_by_offset[i] = to_pack.objects + i;
1294 qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
c323ac7d 1295
2834bc27 1296 for (i = 0; i < to_pack.nr_objects; i++) {
15366280
JH
1297 struct object_entry *entry = sorted_by_offset[i];
1298 check_object(entry);
754980d0 1299 if (big_file_threshold < entry->size)
15366280
JH
1300 entry->no_try_delta = 1;
1301 }
3449f8c4 1302
5c49c116 1303 free(sorted_by_offset);
c323ac7d
LT
1304}
1305
b904166c
NP
1306/*
1307 * We search for deltas in a list sorted by type, by filename hash, and then
1308 * by size, so that we see progressively smaller and smaller files.
1309 * That's because we prefer deltas to be from the bigger file
1310 * to the smaller -- deletes are potentially cheaper, but perhaps
1311 * more importantly, the bigger file is likely the more recent
1312 * one. The deepest deltas are therefore the oldest objects which are
1313 * less susceptible to be accessed often.
1314 */
9668cf59 1315static int type_size_sort(const void *_a, const void *_b)
c323ac7d 1316{
9668cf59
NP
1317 const struct object_entry *a = *(struct object_entry **)_a;
1318 const struct object_entry *b = *(struct object_entry **)_b;
1319
c323ac7d 1320 if (a->type > b->type)
27225f2e 1321 return -1;
b904166c 1322 if (a->type < b->type)
27225f2e 1323 return 1;
b904166c 1324 if (a->hash > b->hash)
7a979d99 1325 return -1;
b904166c 1326 if (a->hash < b->hash)
7a979d99 1327 return 1;
b904166c 1328 if (a->preferred_base > b->preferred_base)
c323ac7d 1329 return -1;
b904166c
NP
1330 if (a->preferred_base < b->preferred_base)
1331 return 1;
c323ac7d 1332 if (a->size > b->size)
b904166c
NP
1333 return -1;
1334 if (a->size < b->size)
c323ac7d 1335 return 1;
b904166c 1336 return a < b ? -1 : (a > b); /* newest first */
c323ac7d
LT
1337}
1338
1339struct unpacked {
1340 struct object_entry *entry;
1341 void *data;
f6c7081a 1342 struct delta_index *index;
5a235b5e 1343 unsigned depth;
c323ac7d
LT
1344};
1345
d250626c
NP
1346static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1347 unsigned long delta_size)
074b2eea
MK
1348{
1349 if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1350 return 0;
1351
e3dfddb3
MK
1352 if (delta_size < cache_max_small_delta_size)
1353 return 1;
1354
074b2eea
MK
1355 /* cache delta, if objects are large enough compared to delta size */
1356 if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1357 return 1;
1358
1359 return 0;
1360}
1361
7eb151d6 1362#ifndef NO_PTHREADS
8ecce684 1363
44626dc7 1364static pthread_mutex_t read_mutex;
8ecce684
NP
1365#define read_lock() pthread_mutex_lock(&read_mutex)
1366#define read_unlock() pthread_mutex_unlock(&read_mutex)
1367
44626dc7 1368static pthread_mutex_t cache_mutex;
3c701839
NP
1369#define cache_lock() pthread_mutex_lock(&cache_mutex)
1370#define cache_unlock() pthread_mutex_unlock(&cache_mutex)
1371
44626dc7 1372static pthread_mutex_t progress_mutex;
8ecce684
NP
1373#define progress_lock() pthread_mutex_lock(&progress_mutex)
1374#define progress_unlock() pthread_mutex_unlock(&progress_mutex)
1375
1376#else
1377
e1ef8673
JH
1378#define read_lock() (void)0
1379#define read_unlock() (void)0
1380#define cache_lock() (void)0
1381#define cache_unlock() (void)0
1382#define progress_lock() (void)0
1383#define progress_unlock() (void)0
8ecce684
NP
1384
1385#endif
1386
f6c7081a 1387static int try_delta(struct unpacked *trg, struct unpacked *src,
ef0316fc 1388 unsigned max_depth, unsigned long *mem_usage)
c323ac7d 1389{
f6c7081a
NP
1390 struct object_entry *trg_entry = trg->entry;
1391 struct object_entry *src_entry = src->entry;
560b25a8 1392 unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
c83f032e 1393 unsigned ref_depth;
21666f1a 1394 enum object_type type;
c323ac7d
LT
1395 void *delta_buf;
1396
1397 /* Don't bother doing diffs between different types */
f6c7081a 1398 if (trg_entry->type != src_entry->type)
c323ac7d
LT
1399 return -1;
1400
51d1e83f 1401 /*
15f07e06
JK
1402 * We do not bother to try a delta that we discarded on an
1403 * earlier try, but only when reusing delta data. Note that
1404 * src_entry that is marked as the preferred_base should always
1405 * be considered, as even if we produce a suboptimal delta against
1406 * it, we will still save the transfer cost, as we already know
1407 * the other side has it and we won't send src_entry at all.
51d1e83f 1408 */
a7de7130 1409 if (reuse_delta && trg_entry->in_pack &&
e9195b58 1410 trg_entry->in_pack == src_entry->in_pack &&
15f07e06 1411 !src_entry->preferred_base &&
e9195b58
JH
1412 trg_entry->in_pack_type != OBJ_REF_DELTA &&
1413 trg_entry->in_pack_type != OBJ_OFS_DELTA)
51d1e83f
LT
1414 return 0;
1415
898b14ce 1416 /* Let's not bust the allowed depth. */
5a235b5e 1417 if (src->depth >= max_depth)
d116a45a 1418 return 0;
c323ac7d 1419
c3b06a69 1420 /* Now some size filtering heuristics. */
560b25a8 1421 trg_size = trg_entry->size;
c83f032e
NP
1422 if (!trg_entry->delta) {
1423 max_size = trg_size/2 - 20;
1424 ref_depth = 1;
1425 } else {
1426 max_size = trg_entry->delta_size;
5a235b5e 1427 ref_depth = trg->depth;
c83f032e 1428 }
720fe22d 1429 max_size = (uint64_t)max_size * (max_depth - src->depth) /
c83f032e 1430 (max_depth - ref_depth + 1);
c3b06a69
NP
1431 if (max_size == 0)
1432 return 0;
f6c7081a 1433 src_size = src_entry->size;
560b25a8 1434 sizediff = src_size < trg_size ? trg_size - src_size : 0;
27225f2e 1435 if (sizediff >= max_size)
f527cb8c 1436 return 0;
a1dab41a
BD
1437 if (trg_size < src_size / 32)
1438 return 0;
f6c7081a 1439
560b25a8
NP
1440 /* Load data if not already done */
1441 if (!trg->data) {
8ecce684 1442 read_lock();
aa7e44bf 1443 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
8ecce684 1444 read_unlock();
2e3404c3
JH
1445 if (!trg->data)
1446 die("object %s cannot be read",
1447 sha1_to_hex(trg_entry->idx.sha1));
560b25a8
NP
1448 if (sz != trg_size)
1449 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1450 sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
ef0316fc 1451 *mem_usage += sz;
560b25a8
NP
1452 }
1453 if (!src->data) {
8ecce684 1454 read_lock();
aa7e44bf 1455 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
8ecce684 1456 read_unlock();
71064a95
NP
1457 if (!src->data) {
1458 if (src_entry->preferred_base) {
1459 static int warned = 0;
1460 if (!warned++)
1461 warning("object %s cannot be read",
1462 sha1_to_hex(src_entry->idx.sha1));
1463 /*
1464 * Those objects are not included in the
1465 * resulting pack. Be resilient and ignore
1466 * them if they can't be read, in case the
1467 * pack could be created nevertheless.
1468 */
1469 return 0;
1470 }
2e3404c3
JH
1471 die("object %s cannot be read",
1472 sha1_to_hex(src_entry->idx.sha1));
71064a95 1473 }
560b25a8
NP
1474 if (sz != src_size)
1475 die("object %s inconsistent object length (%lu vs %lu)",
aa7e44bf 1476 sha1_to_hex(src_entry->idx.sha1), sz, src_size);
ef0316fc 1477 *mem_usage += sz;
560b25a8
NP
1478 }
1479 if (!src->index) {
1480 src->index = create_delta_index(src->data, src_size);
a588d88a
MK
1481 if (!src->index) {
1482 static int warned = 0;
1483 if (!warned++)
1484 warning("suboptimal pack - out of memory");
1485 return 0;
1486 }
ef0316fc 1487 *mem_usage += sizeof_delta_index(src->index);
560b25a8
NP
1488 }
1489
1490 delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
c323ac7d 1491 if (!delta_buf)
75c42d8c 1492 return 0;
f6c7081a 1493
9e2d57a0 1494 if (trg_entry->delta) {
848d732c
BD
1495 /* Prefer only shallower same-sized deltas. */
1496 if (delta_size == trg_entry->delta_size &&
5a235b5e 1497 src->depth + 1 >= trg->depth) {
848d732c
BD
1498 free(delta_buf);
1499 return 0;
1500 }
074b2eea 1501 }
9e2d57a0 1502
3c701839
NP
1503 /*
1504 * Handle memory allocation outside of the cache
1505 * accounting lock. Compiler will optimize the strangeness
7eb151d6 1506 * away when NO_PTHREADS is defined.
3c701839 1507 */
8e0f7003 1508 free(trg_entry->delta_data);
3c701839 1509 cache_lock();
9e2d57a0
NP
1510 if (trg_entry->delta_data) {
1511 delta_cache_size -= trg_entry->delta_size;
9e2d57a0
NP
1512 trg_entry->delta_data = NULL;
1513 }
d250626c 1514 if (delta_cacheable(src_size, trg_size, delta_size)) {
b7a28f78 1515 delta_cache_size += delta_size;
3c701839
NP
1516 cache_unlock();
1517 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1518 } else {
1519 cache_unlock();
074b2eea 1520 free(delta_buf);
3c701839
NP
1521 }
1522
b7a28f78
NP
1523 trg_entry->delta = src_entry;
1524 trg_entry->delta_size = delta_size;
1525 trg->depth = src->depth + 1;
1526
f6c7081a 1527 return 1;
c323ac7d
LT
1528}
1529
898b14ce 1530static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
b2504a0d 1531{
898b14ce
NP
1532 struct object_entry *child = me->delta_child;
1533 unsigned int m = n;
1534 while (child) {
1535 unsigned int c = check_delta_limit(child, n + 1);
1536 if (m < c)
1537 m = c;
1538 child = child->delta_sibling;
1539 }
1540 return m;
b2504a0d
NP
1541}
1542
75ad235c 1543static unsigned long free_unpacked(struct unpacked *n)
a97773ce 1544{
ef0316fc 1545 unsigned long freed_mem = sizeof_delta_index(n->index);
a97773ce
BD
1546 free_delta_index(n->index);
1547 n->index = NULL;
1548 if (n->data) {
ef0316fc 1549 freed_mem += n->entry->size;
a97773ce
BD
1550 free(n->data);
1551 n->data = NULL;
a97773ce
BD
1552 }
1553 n->entry = NULL;
7d7baa5e 1554 n->depth = 0;
ef0316fc 1555 return freed_mem;
a97773ce
BD
1556}
1557
384b32c0 1558static void find_deltas(struct object_entry **list, unsigned *list_size,
e334977d 1559 int window, int depth, unsigned *processed)
c323ac7d 1560{
384b32c0 1561 uint32_t i, idx = 0, count = 0;
7cadf491 1562 struct unpacked *array;
ef0316fc 1563 unsigned long mem_usage = 0;
c323ac7d 1564
19d4b416 1565 array = xcalloc(window, sizeof(struct unpacked));
21fcd1bd 1566
384b32c0 1567 for (;;) {
421b488a 1568 struct object_entry *entry;
c323ac7d 1569 struct unpacked *n = array + idx;
ef0316fc 1570 int j, max_depth, best_base = -1;
c323ac7d 1571
384b32c0
NP
1572 progress_lock();
1573 if (!*list_size) {
1574 progress_unlock();
1575 break;
1576 }
421b488a 1577 entry = *list++;
384b32c0
NP
1578 (*list_size)--;
1579 if (!entry->preferred_base) {
1580 (*processed)++;
1581 display_progress(progress_state, *processed);
1582 }
1583 progress_unlock();
1584
ef0316fc 1585 mem_usage -= free_unpacked(n);
c323ac7d 1586 n->entry = entry;
ab7cd7bb 1587
a97773ce 1588 while (window_memory_limit &&
ef0316fc 1589 mem_usage > window_memory_limit &&
a97773ce
BD
1590 count > 1) {
1591 uint32_t tail = (idx + window - count) % window;
75ad235c 1592 mem_usage -= free_unpacked(array + tail);
a97773ce
BD
1593 count--;
1594 }
1595
75d39853
NP
1596 /* We do not compute delta to *create* objects we are not
1597 * going to pack.
1598 */
1599 if (entry->preferred_base)
1600 goto next;
1601
898b14ce
NP
1602 /*
1603 * If the current object is at pack edge, take the depth the
1604 * objects that depend on the current object into account
1605 * otherwise they would become too deep.
1606 */
1607 max_depth = depth;
1608 if (entry->delta_child) {
1609 max_depth -= check_delta_limit(entry, 0);
1610 if (max_depth <= 0)
1611 goto next;
1612 }
1613
78817c15
LT
1614 j = window;
1615 while (--j > 0) {
77639870 1616 int ret;
7cadf491 1617 uint32_t other_idx = idx + j;
c323ac7d 1618 struct unpacked *m;
78817c15
LT
1619 if (other_idx >= window)
1620 other_idx -= window;
c323ac7d
LT
1621 m = array + other_idx;
1622 if (!m->entry)
1623 break;
ef0316fc 1624 ret = try_delta(n, m, max_depth, &mem_usage);
77639870 1625 if (ret < 0)
c323ac7d 1626 break;
77639870
JH
1627 else if (ret > 0)
1628 best_base = other_idx;
c323ac7d 1629 }
898b14ce 1630
ed4a9031
NP
1631 /*
1632 * If we decided to cache the delta data, then it is best
1633 * to compress it right away. First because we have to do
1634 * it anyway, and doing it here while we're threaded will
1635 * save a lot of time in the non threaded write phase,
1636 * as well as allow for caching more deltas within
1637 * the same cache size limit.
1638 * ...
1639 * But only if not writing to stdout, since in that case
1640 * the network is most likely throttling writes anyway,
1641 * and therefore it is best to go to the write phase ASAP
1642 * instead, as we can afford spending more time compressing
1643 * between writes at that moment.
1644 */
1645 if (entry->delta_data && !pack_to_stdout) {
1646 entry->z_delta_size = do_compress(&entry->delta_data,
1647 entry->delta_size);
1648 cache_lock();
1649 delta_cache_size -= entry->delta_size;
1650 delta_cache_size += entry->z_delta_size;
1651 cache_unlock();
1652 }
1653
70ca1a3f
JH
1654 /* if we made n a delta, and if n is already at max
1655 * depth, leaving it in the window is pointless. we
1656 * should evict it first.
70ca1a3f 1657 */
70baf5d4 1658 if (entry->delta && max_depth <= n->depth)
70ca1a3f 1659 continue;
ff45715c 1660
77639870
JH
1661 /*
1662 * Move the best delta base up in the window, after the
1663 * currently deltified object, to keep it longer. It will
1664 * be the first base object to be attempted next.
1665 */
1666 if (entry->delta) {
1667 struct unpacked swap = array[best_base];
1668 int dist = (window + idx - best_base) % window;
1669 int dst = best_base;
1670 while (dist--) {
1671 int src = (dst + 1) % window;
1672 array[dst] = array[src];
1673 dst = src;
1674 }
1675 array[dst] = swap;
1676 }
1677
898b14ce 1678 next:
521a4f4c 1679 idx++;
a97773ce
BD
1680 if (count + 1 < window)
1681 count++;
521a4f4c
LT
1682 if (idx >= window)
1683 idx = 0;
384b32c0 1684 }
adee7bdf 1685
f6c7081a 1686 for (i = 0; i < window; ++i) {
ff45715c 1687 free_delta_index(array[i].index);
adee7bdf 1688 free(array[i].data);
f6c7081a 1689 }
adee7bdf 1690 free(array);
c323ac7d
LT
1691}
1692
7eb151d6 1693#ifndef NO_PTHREADS
8ecce684 1694
a9a74636
NP
1695static void try_to_free_from_threads(size_t size)
1696{
1697 read_lock();
7c3ecb32 1698 release_pack_memory(size);
a9a74636
NP
1699 read_unlock();
1700}
1701
bc9b2175 1702static try_to_free_t old_try_to_free_routine;
851c34b0 1703
50f22ada
JS
1704/*
1705 * The main thread waits on the condition that (at least) one of the workers
1706 * has stopped working (which is indicated in the .working member of
1707 * struct thread_params).
1708 * When a work thread has completed its work, it sets .working to 0 and
1709 * signals the main thread and waits on the condition that .data_ready
1710 * becomes 1.
1711 */
1712
8ecce684
NP
1713struct thread_params {
1714 pthread_t thread;
1715 struct object_entry **list;
1716 unsigned list_size;
384b32c0 1717 unsigned remaining;
8ecce684
NP
1718 int window;
1719 int depth;
50f22ada
JS
1720 int working;
1721 int data_ready;
1722 pthread_mutex_t mutex;
1723 pthread_cond_t cond;
8ecce684
NP
1724 unsigned *processed;
1725};
1726
44626dc7
AH
1727static pthread_cond_t progress_cond;
1728
1729/*
1730 * Mutex and conditional variable can't be statically-initialized on Windows.
1731 */
1732static void init_threaded_search(void)
1733{
93749194 1734 init_recursive_mutex(&read_mutex);
44626dc7
AH
1735 pthread_mutex_init(&cache_mutex, NULL);
1736 pthread_mutex_init(&progress_mutex, NULL);
1737 pthread_cond_init(&progress_cond, NULL);
851c34b0 1738 old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
44626dc7
AH
1739}
1740
1741static void cleanup_threaded_search(void)
1742{
851c34b0 1743 set_try_to_free_routine(old_try_to_free_routine);
44626dc7
AH
1744 pthread_cond_destroy(&progress_cond);
1745 pthread_mutex_destroy(&read_mutex);
1746 pthread_mutex_destroy(&cache_mutex);
1747 pthread_mutex_destroy(&progress_mutex);
1748}
c2a33679 1749
8ecce684
NP
1750static void *threaded_find_deltas(void *arg)
1751{
c2a33679
NP
1752 struct thread_params *me = arg;
1753
50f22ada 1754 while (me->remaining) {
384b32c0 1755 find_deltas(me->list, &me->remaining,
c2a33679 1756 me->window, me->depth, me->processed);
50f22ada
JS
1757
1758 progress_lock();
1759 me->working = 0;
1760 pthread_cond_signal(&progress_cond);
1761 progress_unlock();
1762
1763 /*
1764 * We must not set ->data_ready before we wait on the
1765 * condition because the main thread may have set it to 1
1766 * before we get here. In order to be sure that new
1767 * work is available if we see 1 in ->data_ready, it
1768 * was initialized to 0 before this thread was spawned
1769 * and we reset it to 0 right away.
1770 */
1771 pthread_mutex_lock(&me->mutex);
1772 while (!me->data_ready)
1773 pthread_cond_wait(&me->cond, &me->mutex);
1774 me->data_ready = 0;
1775 pthread_mutex_unlock(&me->mutex);
c2a33679 1776 }
50f22ada
JS
1777 /* leave ->working 1 so that this doesn't get more work assigned */
1778 return NULL;
8ecce684
NP
1779}
1780
8ecce684
NP
1781static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1782 int window, int depth, unsigned *processed)
1783{
dcda3614 1784 struct thread_params *p;
384b32c0 1785 int i, ret, active_threads = 0;
c2a33679 1786
44626dc7
AH
1787 init_threaded_search();
1788
ef055571
NP
1789 if (!delta_search_threads) /* --threads=0 means autodetect */
1790 delta_search_threads = online_cpus();
367f4a43 1791 if (delta_search_threads <= 1) {
384b32c0 1792 find_deltas(list, &list_size, window, depth, processed);
44626dc7 1793 cleanup_threaded_search();
367f4a43
NP
1794 return;
1795 }
43cc2b42 1796 if (progress > pack_to_stdout)
b6c29915 1797 fprintf(stderr, "Delta compression using up to %d threads.\n",
43cc2b42 1798 delta_search_threads);
dcda3614 1799 p = xcalloc(delta_search_threads, sizeof(*p));
367f4a43 1800
50f22ada 1801 /* Partition the work amongst work threads. */
367f4a43 1802 for (i = 0; i < delta_search_threads; i++) {
50f22ada
JS
1803 unsigned sub_size = list_size / (delta_search_threads - i);
1804
bf874896
NP
1805 /* don't use too small segments or no deltas will be found */
1806 if (sub_size < 2*window && i+1 < delta_search_threads)
1807 sub_size = 0;
1808
8ecce684
NP
1809 p[i].window = window;
1810 p[i].depth = depth;
1811 p[i].processed = processed;
50f22ada
JS
1812 p[i].working = 1;
1813 p[i].data_ready = 0;
c2a33679 1814
59921b4b 1815 /* try to split chunks on "path" boundaries */
6fc74703
NP
1816 while (sub_size && sub_size < list_size &&
1817 list[sub_size]->hash &&
384b32c0
NP
1818 list[sub_size]->hash == list[sub_size-1]->hash)
1819 sub_size++;
1820
50f22ada
JS
1821 p[i].list = list;
1822 p[i].list_size = sub_size;
1823 p[i].remaining = sub_size;
59921b4b 1824
384b32c0
NP
1825 list += sub_size;
1826 list_size -= sub_size;
1827 }
1828
50f22ada
JS
1829 /* Start work threads. */
1830 for (i = 0; i < delta_search_threads; i++) {
1831 if (!p[i].list_size)
1832 continue;
68e6a4f8
JS
1833 pthread_mutex_init(&p[i].mutex, NULL);
1834 pthread_cond_init(&p[i].cond, NULL);
50f22ada
JS
1835 ret = pthread_create(&p[i].thread, NULL,
1836 threaded_find_deltas, &p[i]);
1837 if (ret)
1838 die("unable to create thread: %s", strerror(ret));
1839 active_threads++;
1840 }
1841
384b32c0
NP
1842 /*
1843 * Now let's wait for work completion. Each time a thread is done
1844 * with its work, we steal half of the remaining work from the
1845 * thread with the largest number of unprocessed objects and give
1846 * it to that newly idle thread. This ensure good load balancing
1847 * until the remaining object list segments are simply too short
1848 * to be worth splitting anymore.
1849 */
50f22ada
JS
1850 while (active_threads) {
1851 struct thread_params *target = NULL;
384b32c0
NP
1852 struct thread_params *victim = NULL;
1853 unsigned sub_size = 0;
384b32c0
NP
1854
1855 progress_lock();
50f22ada
JS
1856 for (;;) {
1857 for (i = 0; !target && i < delta_search_threads; i++)
1858 if (!p[i].working)
1859 target = &p[i];
1860 if (target)
1861 break;
1862 pthread_cond_wait(&progress_cond, &progress_mutex);
1863 }
1864
384b32c0
NP
1865 for (i = 0; i < delta_search_threads; i++)
1866 if (p[i].remaining > 2*window &&
1867 (!victim || victim->remaining < p[i].remaining))
1868 victim = &p[i];
1869 if (victim) {
1870 sub_size = victim->remaining / 2;
1871 list = victim->list + victim->list_size - sub_size;
1872 while (sub_size && list[0]->hash &&
1873 list[0]->hash == list[-1]->hash) {
1874 list++;
1875 sub_size--;
1876 }
eb9688ff
NP
1877 if (!sub_size) {
1878 /*
1879 * It is possible for some "paths" to have
1880 * so many objects that no hash boundary
1881 * might be found. Let's just steal the
1882 * exact half in that case.
1883 */
1884 sub_size = victim->remaining / 2;
1885 list -= sub_size;
1886 }
384b32c0
NP
1887 target->list = list;
1888 victim->list_size -= sub_size;
1889 victim->remaining -= sub_size;
1890 }
384b32c0
NP
1891 target->list_size = sub_size;
1892 target->remaining = sub_size;
50f22ada
JS
1893 target->working = 1;
1894 progress_unlock();
1895
1896 pthread_mutex_lock(&target->mutex);
1897 target->data_ready = 1;
1898 pthread_cond_signal(&target->cond);
1899 pthread_mutex_unlock(&target->mutex);
c2a33679 1900
384b32c0 1901 if (!sub_size) {
b81d9af7 1902 pthread_join(target->thread, NULL);
50f22ada
JS
1903 pthread_cond_destroy(&target->cond);
1904 pthread_mutex_destroy(&target->mutex);
384b32c0 1905 active_threads--;
c2a33679 1906 }
50f22ada 1907 }
44626dc7 1908 cleanup_threaded_search();
dcda3614 1909 free(p);
8ecce684
NP
1910}
1911
1912#else
384b32c0 1913#define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
8ecce684
NP
1914#endif
1915
f0a24aa5
SP
1916static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
1917{
1918 unsigned char peeled[20];
1919
1920 if (!prefixcmp(path, "refs/tags/") && /* is a tag? */
1921 !peel_ref(path, peeled) && /* peelable? */
2834bc27 1922 packlist_find(&to_pack, peeled, NULL)) /* object packed? */
f0a24aa5
SP
1923 add_object_entry(sha1, OBJ_TAG, NULL, 0);
1924 return 0;
1925}
1926
f3123c4a
JH
1927static void prepare_pack(int window, int depth)
1928{
9668cf59 1929 struct object_entry **delta_list;
6e1c2344
RJ
1930 uint32_t i, nr_deltas;
1931 unsigned n;
9668cf59 1932
3f9ac8d2 1933 get_object_details();
9668cf59 1934
0e8189e2
NP
1935 /*
1936 * If we're locally repacking then we need to be doubly careful
1937 * from now on in order to make sure no stealth corruption gets
1938 * propagated to the new pack. Clients receiving streamed packs
1939 * should validate everything they get anyway so no need to incur
1940 * the additional cost here in that case.
1941 */
1942 if (!pack_to_stdout)
1943 do_check_packed_object_crc = 1;
1944
2834bc27 1945 if (!to_pack.nr_objects || !window || !depth)
9668cf59
NP
1946 return;
1947
2834bc27 1948 delta_list = xmalloc(to_pack.nr_objects * sizeof(*delta_list));
75d39853
NP
1949 nr_deltas = n = 0;
1950
2834bc27
VM
1951 for (i = 0; i < to_pack.nr_objects; i++) {
1952 struct object_entry *entry = to_pack.objects + i;
75d39853
NP
1953
1954 if (entry->delta)
1955 /* This happens if we decided to reuse existing
a7de7130 1956 * delta from a pack. "reuse_delta &&" is implied.
75d39853
NP
1957 */
1958 continue;
1959
1960 if (entry->size < 50)
1961 continue;
1962
1963 if (entry->no_try_delta)
1964 continue;
1965
6d6f9cdd 1966 if (!entry->preferred_base) {
75d39853 1967 nr_deltas++;
6d6f9cdd
SP
1968 if (entry->type < 0)
1969 die("unable to get type of object %s",
1970 sha1_to_hex(entry->idx.sha1));
eede9f42
NP
1971 } else {
1972 if (entry->type < 0) {
1973 /*
1974 * This object is not found, but we
1975 * don't have to include it anyway.
1976 */
1977 continue;
1978 }
6d6f9cdd 1979 }
75d39853
NP
1980
1981 delta_list[n++] = entry;
1982 }
1983
2f8b8947 1984 if (nr_deltas && n > 1) {
e334977d
NP
1985 unsigned nr_done = 0;
1986 if (progress)
dc6a0757
NP
1987 progress_state = start_progress("Compressing objects",
1988 nr_deltas);
75d39853 1989 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
8ecce684 1990 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
4d4fcc54 1991 stop_progress(&progress_state);
e334977d
NP
1992 if (nr_done != nr_deltas)
1993 die("inconsistency with delta count");
75d39853 1994 }
9668cf59 1995 free(delta_list);
f3123c4a
JH
1996}
1997
ef90d6d4 1998static int git_pack_config(const char *k, const char *v, void *cb)
4812a93a 1999{
eeefa7c9 2000 if (!strcmp(k, "pack.window")) {
4812a93a
JK
2001 window = git_config_int(k, v);
2002 return 0;
2003 }
a97773ce
BD
2004 if (!strcmp(k, "pack.windowmemory")) {
2005 window_memory_limit = git_config_ulong(k, v);
2006 return 0;
2007 }
2008 if (!strcmp(k, "pack.depth")) {
842aaf93
TT
2009 depth = git_config_int(k, v);
2010 return 0;
2011 }
960ccca6
DH
2012 if (!strcmp(k, "pack.compression")) {
2013 int level = git_config_int(k, v);
2014 if (level == -1)
2015 level = Z_DEFAULT_COMPRESSION;
2016 else if (level < 0 || level > Z_BEST_COMPRESSION)
2017 die("bad pack compression level %d", level);
2018 pack_compression_level = level;
2019 pack_compression_seen = 1;
2020 return 0;
2021 }
074b2eea
MK
2022 if (!strcmp(k, "pack.deltacachesize")) {
2023 max_delta_cache_size = git_config_int(k, v);
2024 return 0;
2025 }
e3dfddb3
MK
2026 if (!strcmp(k, "pack.deltacachelimit")) {
2027 cache_max_small_delta_size = git_config_int(k, v);
2028 return 0;
2029 }
693b86ff
NP
2030 if (!strcmp(k, "pack.threads")) {
2031 delta_search_threads = git_config_int(k, v);
833e3df1 2032 if (delta_search_threads < 0)
693b86ff
NP
2033 die("invalid number of threads specified (%d)",
2034 delta_search_threads);
7eb151d6 2035#ifdef NO_PTHREADS
833e3df1 2036 if (delta_search_threads != 1)
693b86ff
NP
2037 warning("no threads support, ignoring %s", k);
2038#endif
2039 return 0;
2040 }
4d00bda2 2041 if (!strcmp(k, "pack.indexversion")) {
ebcfb379
JH
2042 pack_idx_opts.version = git_config_int(k, v);
2043 if (pack_idx_opts.version > 2)
6e1c2344 2044 die("bad pack.indexversion=%"PRIu32,
ebcfb379 2045 pack_idx_opts.version);
4d00bda2
NP
2046 return 0;
2047 }
ef90d6d4 2048 return git_default_config(k, v, cb);
4812a93a
JK
2049}
2050
b5d97e6b 2051static void read_object_list_from_stdin(void)
c323ac7d 2052{
b5d97e6b
JH
2053 char line[40 + 1 + PATH_MAX + 2];
2054 unsigned char sha1[20];
b2504a0d 2055
da93d12b 2056 for (;;) {
da93d12b
LT
2057 if (!fgets(line, sizeof(line), stdin)) {
2058 if (feof(stdin))
2059 break;
2060 if (!ferror(stdin))
2061 die("fgets returned NULL, not EOF, not error!");
687dd75c 2062 if (errno != EINTR)
d824cbba 2063 die_errno("fgets");
687dd75c
JH
2064 clearerr(stdin);
2065 continue;
da93d12b 2066 }
7a979d99
JH
2067 if (line[0] == '-') {
2068 if (get_sha1_hex(line+1, sha1))
2069 die("expected edge sha1, got garbage:\n %s",
b5d97e6b 2070 line);
8d1d8f83 2071 add_preferred_base(sha1);
7a979d99 2072 continue;
21fcd1bd 2073 }
c323ac7d 2074 if (get_sha1_hex(line, sha1))
ef07618f 2075 die("expected sha1, got garbage:\n %s", line);
b5d97e6b 2076
bc32fed5
JH
2077 add_preferred_base_object(line+41);
2078 add_object_entry(sha1, 0, line+41, 0);
c323ac7d 2079 }
b5d97e6b
JH
2080}
2081
08cdfb13
JH
2082#define OBJECT_ADDED (1u<<20)
2083
11c211fa 2084static void show_commit(struct commit *commit, void *data)
b5d97e6b 2085{
bc32fed5 2086 add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
08cdfb13 2087 commit->object.flags |= OBJECT_ADDED;
b5d97e6b
JH
2088}
2089
49473672
JH
2090static void show_object(struct object *obj,
2091 const struct name_path *path, const char *last,
2092 void *data)
b5d97e6b 2093{
cf2ab916
LT
2094 char *name = path_name(path, last);
2095
8d2dfc49
LT
2096 add_preferred_base_object(name);
2097 add_object_entry(obj->sha1, obj->type, name, 0);
2098 obj->flags |= OBJECT_ADDED;
2099
2100 /*
2101 * We will have generated the hash from the name,
2102 * but not saved a pointer to it - we can free it
2103 */
2104 free((char *)name);
b5d97e6b
JH
2105}
2106
8d1d8f83
JH
2107static void show_edge(struct commit *commit)
2108{
2109 add_preferred_base(commit->object.sha1);
2110}
2111
08cdfb13
JH
2112struct in_pack_object {
2113 off_t offset;
2114 struct object *object;
2115};
2116
2117struct in_pack {
2118 int alloc;
2119 int nr;
2120 struct in_pack_object *array;
2121};
2122
2123static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
2124{
2125 in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
2126 in_pack->array[in_pack->nr].object = object;
2127 in_pack->nr++;
2128}
2129
2130/*
2131 * Compare the objects in the offset order, in order to emulate the
f18d244a 2132 * "git rev-list --objects" output that produced the pack originally.
08cdfb13
JH
2133 */
2134static int ofscmp(const void *a_, const void *b_)
2135{
2136 struct in_pack_object *a = (struct in_pack_object *)a_;
2137 struct in_pack_object *b = (struct in_pack_object *)b_;
2138
2139 if (a->offset < b->offset)
2140 return -1;
2141 else if (a->offset > b->offset)
2142 return 1;
2143 else
2144 return hashcmp(a->object->sha1, b->object->sha1);
2145}
2146
2147static void add_objects_in_unpacked_packs(struct rev_info *revs)
2148{
2149 struct packed_git *p;
2150 struct in_pack in_pack;
2151 uint32_t i;
2152
2153 memset(&in_pack, 0, sizeof(in_pack));
2154
2155 for (p = packed_git; p; p = p->next) {
2156 const unsigned char *sha1;
2157 struct object *o;
2158
79bc4c71 2159 if (!p->pack_local || p->pack_keep)
08cdfb13
JH
2160 continue;
2161 if (open_pack_index(p))
2162 die("cannot open pack index");
2163
2164 ALLOC_GROW(in_pack.array,
2165 in_pack.nr + p->num_objects,
2166 in_pack.alloc);
2167
2168 for (i = 0; i < p->num_objects; i++) {
2169 sha1 = nth_packed_object_sha1(p, i);
2170 o = lookup_unknown_object(sha1);
2171 if (!(o->flags & OBJECT_ADDED))
2172 mark_in_pack_object(o, p, &in_pack);
2173 o->flags |= OBJECT_ADDED;
2174 }
2175 }
2176
2177 if (in_pack.nr) {
2178 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
2179 ofscmp);
2180 for (i = 0; i < in_pack.nr; i++) {
2181 struct object *o = in_pack.array[i].object;
2182 add_object_entry(o->sha1, o->type, "", 0);
2183 }
2184 }
2185 free(in_pack.array);
2186}
2187
094085e3
BC
2188static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
2189{
2190 static struct packed_git *last_found = (void *)1;
2191 struct packed_git *p;
2192
2193 p = (last_found != (void *)1) ? last_found : packed_git;
2194
2195 while (p) {
2196 if ((!p->pack_local || p->pack_keep) &&
2197 find_pack_entry_one(sha1, p)) {
2198 last_found = p;
2199 return 1;
2200 }
2201 if (p == last_found)
2202 p = packed_git;
2203 else
2204 p = p->next;
2205 if (p == last_found)
2206 p = p->next;
2207 }
2208 return 0;
2209}
2210
ca11b212
NP
2211static void loosen_unused_packed_objects(struct rev_info *revs)
2212{
2213 struct packed_git *p;
2214 uint32_t i;
2215 const unsigned char *sha1;
2216
2217 for (p = packed_git; p; p = p->next) {
79bc4c71 2218 if (!p->pack_local || p->pack_keep)
ca11b212
NP
2219 continue;
2220
7e52f566
JK
2221 if (unpack_unreachable_expiration &&
2222 p->mtime < unpack_unreachable_expiration)
2223 continue;
2224
ca11b212
NP
2225 if (open_pack_index(p))
2226 die("cannot open pack index");
2227
2228 for (i = 0; i < p->num_objects; i++) {
2229 sha1 = nth_packed_object_sha1(p, i);
2834bc27 2230 if (!packlist_find(&to_pack, sha1, NULL) &&
094085e3 2231 !has_sha1_pack_kept_or_nonlocal(sha1))
ca11b212
NP
2232 if (force_object_loose(sha1, p->mtime))
2233 die("unable to force loose object");
2234 }
2235 }
2236}
2237
8d1d8f83 2238static void get_object_list(int ac, const char **av)
b5d97e6b
JH
2239{
2240 struct rev_info revs;
2241 char line[1000];
b5d97e6b
JH
2242 int flags = 0;
2243
b5d97e6b
JH
2244 init_revisions(&revs, NULL);
2245 save_commit_buffer = 0;
b5d97e6b
JH
2246 setup_revisions(ac, av, &revs, NULL);
2247
b5d97e6b
JH
2248 while (fgets(line, sizeof(line), stdin) != NULL) {
2249 int len = strlen(line);
872c930d 2250 if (len && line[len - 1] == '\n')
b5d97e6b
JH
2251 line[--len] = 0;
2252 if (!len)
2253 break;
2254 if (*line == '-') {
2255 if (!strcmp(line, "--not")) {
2256 flags ^= UNINTERESTING;
2257 continue;
2258 }
2259 die("not a rev '%s'", line);
2260 }
8e676e8b 2261 if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
b5d97e6b
JH
2262 die("bad revision '%s'", line);
2263 }
2264
3d51e1b5
MK
2265 if (prepare_revision_walk(&revs))
2266 die("revision walk setup failed");
e76a5fb4 2267 mark_edges_uninteresting(&revs, show_edge);
11c211fa 2268 traverse_commit_list(&revs, show_commit, show_object, NULL);
08cdfb13
JH
2269
2270 if (keep_unreachable)
2271 add_objects_in_unpacked_packs(&revs);
ca11b212
NP
2272 if (unpack_unreachable)
2273 loosen_unused_packed_objects(&revs);
b5d97e6b
JH
2274}
2275
99fb6e04
NTND
2276static int option_parse_index_version(const struct option *opt,
2277 const char *arg, int unset)
2278{
2279 char *c;
2280 const char *val = arg;
2281 pack_idx_opts.version = strtoul(val, &c, 10);
2282 if (pack_idx_opts.version > 2)
2283 die(_("unsupported index version %s"), val);
2284 if (*c == ',' && c[1])
2285 pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2286 if (*c || pack_idx_opts.off32_limit & 0x80000000)
2287 die(_("bad index version '%s'"), val);
2288 return 0;
2289}
2290
7e52f566
JK
2291static int option_parse_unpack_unreachable(const struct option *opt,
2292 const char *arg, int unset)
2293{
2294 if (unset) {
2295 unpack_unreachable = 0;
2296 unpack_unreachable_expiration = 0;
2297 }
2298 else {
2299 unpack_unreachable = 1;
2300 if (arg)
2301 unpack_unreachable_expiration = approxidate(arg);
2302 }
2303 return 0;
2304}
2305
99fb6e04
NTND
2306static int option_parse_ulong(const struct option *opt,
2307 const char *arg, int unset)
2308{
2309 if (unset)
2310 die(_("option %s does not accept negative form"),
2311 opt->long_name);
2312
2313 if (!git_parse_ulong(arg, opt->value))
2314 die(_("unable to parse value '%s' for option %s"),
2315 arg, opt->long_name);
2316 return 0;
2317}
2318
2319#define OPT_ULONG(s, l, v, h) \
2320 { OPTION_CALLBACK, (s), (l), (v), "n", (h), \
2321 PARSE_OPT_NONEG, option_parse_ulong }
2322
b5d97e6b
JH
2323int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2324{
b5d97e6b 2325 int use_internal_rev_list = 0;
8d1d8f83 2326 int thin = 0;
4f366275 2327 int all_progress_implied = 0;
99fb6e04
NTND
2328 const char *rp_av[6];
2329 int rp_ac = 0;
2330 int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2331 struct option pack_objects_options[] = {
2332 OPT_SET_INT('q', "quiet", &progress,
4c688120 2333 N_("do not show progress meter"), 0),
99fb6e04 2334 OPT_SET_INT(0, "progress", &progress,
4c688120 2335 N_("show progress meter"), 1),
99fb6e04 2336 OPT_SET_INT(0, "all-progress", &progress,
4c688120 2337 N_("show progress meter during object writing phase"), 2),
99fb6e04
NTND
2338 OPT_BOOL(0, "all-progress-implied",
2339 &all_progress_implied,
4c688120
NTND
2340 N_("similar to --all-progress when progress meter is shown")),
2341 { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
2342 N_("write the pack index file in the specified idx format version"),
99fb6e04
NTND
2343 0, option_parse_index_version },
2344 OPT_ULONG(0, "max-pack-size", &pack_size_limit,
4c688120 2345 N_("maximum size of each output pack file")),
99fb6e04 2346 OPT_BOOL(0, "local", &local,
4c688120 2347 N_("ignore borrowed objects from alternate object store")),
99fb6e04 2348 OPT_BOOL(0, "incremental", &incremental,
4c688120 2349 N_("ignore packed objects")),
99fb6e04 2350 OPT_INTEGER(0, "window", &window,
4c688120 2351 N_("limit pack window by objects")),
99fb6e04 2352 OPT_ULONG(0, "window-memory", &window_memory_limit,
4c688120 2353 N_("limit pack window by memory in addition to object limit")),
99fb6e04 2354 OPT_INTEGER(0, "depth", &depth,
4c688120 2355 N_("maximum length of delta chain allowed in the resulting pack")),
99fb6e04 2356 OPT_BOOL(0, "reuse-delta", &reuse_delta,
4c688120 2357 N_("reuse existing deltas")),
99fb6e04 2358 OPT_BOOL(0, "reuse-object", &reuse_object,
4c688120 2359 N_("reuse existing objects")),
99fb6e04 2360 OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
4c688120 2361 N_("use OFS_DELTA objects")),
99fb6e04 2362 OPT_INTEGER(0, "threads", &delta_search_threads,
4c688120 2363 N_("use threads when searching for best delta matches")),
99fb6e04 2364 OPT_BOOL(0, "non-empty", &non_empty,
4c688120 2365 N_("do not create an empty pack output")),
99fb6e04 2366 OPT_BOOL(0, "revs", &use_internal_rev_list,
4c688120 2367 N_("read revision arguments from standard input")),
99fb6e04 2368 { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
4c688120 2369 N_("limit the objects to those that are not yet packed"),
99fb6e04
NTND
2370 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2371 { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
4c688120 2372 N_("include objects reachable from any reference"),
99fb6e04
NTND
2373 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2374 { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
4c688120 2375 N_("include objects referred by reflog entries"),
99fb6e04
NTND
2376 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2377 OPT_BOOL(0, "stdout", &pack_to_stdout,
4c688120 2378 N_("output pack to stdout")),
99fb6e04 2379 OPT_BOOL(0, "include-tag", &include_tag,
4c688120 2380 N_("include tag objects that refer to objects to be packed")),
99fb6e04 2381 OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
4c688120
NTND
2382 N_("keep unreachable objects")),
2383 { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
2384 N_("unpack unreachable objects newer than <time>"),
7e52f566 2385 PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
99fb6e04 2386 OPT_BOOL(0, "thin", &thin,
4c688120 2387 N_("create thin packs")),
99fb6e04 2388 OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
4c688120 2389 N_("ignore packs that have companion .keep file")),
99fb6e04 2390 OPT_INTEGER(0, "compression", &pack_compression_level,
4c688120 2391 N_("pack compression level")),
99fb6e04 2392 OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
4c688120 2393 N_("do not hide commits by grafts"), 0),
99fb6e04
NTND
2394 OPT_END(),
2395 };
8d1d8f83 2396
dae556bd
CC
2397 read_replace_refs = 0;
2398
ebcfb379 2399 reset_pack_idx_option(&pack_idx_opts);
ef90d6d4 2400 git_config(git_pack_config, NULL);
960ccca6
DH
2401 if (!pack_compression_seen && core_compression_seen)
2402 pack_compression_level = core_compression_level;
b5d97e6b
JH
2403
2404 progress = isatty(2);
99fb6e04
NTND
2405 argc = parse_options(argc, argv, prefix, pack_objects_options,
2406 pack_usage, 0);
b5d97e6b 2407
99fb6e04
NTND
2408 if (argc) {
2409 base_name = argv[0];
2410 argc--;
b5d97e6b 2411 }
99fb6e04
NTND
2412 if (pack_to_stdout != !base_name || argc)
2413 usage_with_options(pack_usage, pack_objects_options);
b5d97e6b 2414
99fb6e04
NTND
2415 rp_av[rp_ac++] = "pack-objects";
2416 if (thin) {
2417 use_internal_rev_list = 1;
2418 rp_av[rp_ac++] = "--objects-edge";
2419 } else
2420 rp_av[rp_ac++] = "--objects";
b5d97e6b 2421
99fb6e04
NTND
2422 if (rev_list_all) {
2423 use_internal_rev_list = 1;
2424 rp_av[rp_ac++] = "--all";
2425 }
2426 if (rev_list_reflog) {
2427 use_internal_rev_list = 1;
2428 rp_av[rp_ac++] = "--reflog";
2429 }
2430 if (rev_list_unpacked) {
2431 use_internal_rev_list = 1;
2432 rp_av[rp_ac++] = "--unpacked";
2433 }
b5d97e6b 2434
99fb6e04
NTND
2435 if (!reuse_object)
2436 reuse_delta = 0;
2437 if (pack_compression_level == -1)
2438 pack_compression_level = Z_DEFAULT_COMPRESSION;
2439 else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2440 die("bad pack compression level %d", pack_compression_level);
2441#ifdef NO_PTHREADS
2442 if (delta_search_threads != 1)
2b34e486 2443 warning("no threads support, ignoring --threads");
99fb6e04 2444#endif
2b84b5a8
JS
2445 if (!pack_to_stdout && !pack_size_limit)
2446 pack_size_limit = pack_size_limit_cfg;
01c12a23
DH
2447 if (pack_to_stdout && pack_size_limit)
2448 die("--max-pack-size cannot be used to build a pack for transfer.");
07cf0f24
NP
2449 if (pack_size_limit && pack_size_limit < 1024*1024) {
2450 warning("minimum pack size limit is 1 MiB");
2451 pack_size_limit = 1024*1024;
2452 }
01c12a23 2453
8d1d8f83
JH
2454 if (!pack_to_stdout && thin)
2455 die("--thin cannot be used to build an indexable pack.");
b5d97e6b 2456
ca11b212
NP
2457 if (keep_unreachable && unpack_unreachable)
2458 die("--keep-unreachable and --unpack-unreachable are incompatible.");
2459
4f366275
NP
2460 if (progress && all_progress_implied)
2461 progress = 2;
2462
b5d97e6b
JH
2463 prepare_packed_git();
2464
13aaf148 2465 if (progress)
dc6a0757 2466 progress_state = start_progress("Counting objects", 0);
b5d97e6b
JH
2467 if (!use_internal_rev_list)
2468 read_object_list_from_stdin();
8d1d8f83
JH
2469 else {
2470 rp_av[rp_ac] = NULL;
2471 get_object_list(rp_ac, rp_av);
2472 }
0ef95f72 2473 cleanup_preferred_base();
f0a24aa5
SP
2474 if (include_tag && nr_result)
2475 for_each_ref(add_ref_tag, NULL);
4d4fcc54 2476 stop_progress(&progress_state);
96a02f8f 2477
f0b0af1b 2478 if (non_empty && !nr_result)
1c4a2912 2479 return 0;
f7ae6a93
NP
2480 if (nr_result)
2481 prepare_pack(window, depth);
d01fb92f 2482 write_pack_file();
ab7cd7bb 2483 if (progress)
6e1c2344
RJ
2484 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2485 " reused %"PRIu32" (delta %"PRIu32")\n",
67c08ce1 2486 written, written_delta, reused, reused_delta);
c323ac7d
LT
2487 return 0;
2488}