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