git-svn: use SVN::Ra::get_dir2 when possible
[git/gitweb.git] / builtin / pack-objects.c
blob78c659a6b44f73db70b32ae5f3fc032e7a5c639b
1 #include "builtin.h"
2 #include "cache.h"
3 #include "attr.h"
4 #include "object.h"
5 #include "blob.h"
6 #include "commit.h"
7 #include "tag.h"
8 #include "tree.h"
9 #include "delta.h"
10 #include "pack.h"
11 #include "pack-revindex.h"
12 #include "csum-file.h"
13 #include "tree-walk.h"
14 #include "diff.h"
15 #include "revision.h"
16 #include "list-objects.h"
17 #include "pack-objects.h"
18 #include "progress.h"
19 #include "refs.h"
20 #include "streaming.h"
21 #include "thread-utils.h"
22 #include "pack-bitmap.h"
24 static const char *pack_usage[] = {
25 N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
26 N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
27 NULL
31 * Objects we are going to pack are collected in the `to_pack` structure.
32 * It contains an array (dynamically expanded) of the object data, and a map
33 * that can resolve SHA1s to their position in the array.
35 static struct packing_data to_pack;
37 static struct pack_idx_entry **written_list;
38 static uint32_t nr_result, nr_written;
40 static int non_empty;
41 static int reuse_delta = 1, reuse_object = 1;
42 static int keep_unreachable, unpack_unreachable, include_tag;
43 static unsigned long unpack_unreachable_expiration;
44 static int local;
45 static int incremental;
46 static int ignore_packed_keep;
47 static int allow_ofs_delta;
48 static struct pack_idx_option pack_idx_opts;
49 static const char *base_name;
50 static int progress = 1;
51 static int window = 10;
52 static unsigned long pack_size_limit;
53 static int depth = 50;
54 static int delta_search_threads;
55 static int pack_to_stdout;
56 static int num_preferred_base;
57 static struct progress *progress_state;
58 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
59 static int pack_compression_seen;
61 static struct packed_git *reuse_packfile;
62 static uint32_t reuse_packfile_objects;
63 static off_t reuse_packfile_offset;
65 static int use_bitmap_index = 1;
66 static int write_bitmap_index;
67 static uint16_t write_bitmap_options;
69 static unsigned long delta_cache_size = 0;
70 static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
71 static unsigned long cache_max_small_delta_size = 1000;
73 static unsigned long window_memory_limit = 0;
76 * stats
78 static uint32_t written, written_delta;
79 static uint32_t reused, reused_delta;
82 * Indexed commits
84 static struct commit **indexed_commits;
85 static unsigned int indexed_commits_nr;
86 static unsigned int indexed_commits_alloc;
88 static void index_commit_for_bitmap(struct commit *commit)
90 if (indexed_commits_nr >= indexed_commits_alloc) {
91 indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
92 REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
95 indexed_commits[indexed_commits_nr++] = commit;
98 static void *get_delta(struct object_entry *entry)
100 unsigned long size, base_size, delta_size;
101 void *buf, *base_buf, *delta_buf;
102 enum object_type type;
104 buf = read_sha1_file(entry->idx.sha1, &type, &size);
105 if (!buf)
106 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
107 base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
108 if (!base_buf)
109 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
110 delta_buf = diff_delta(base_buf, base_size,
111 buf, size, &delta_size, 0);
112 if (!delta_buf || delta_size != entry->delta_size)
113 die("delta size changed");
114 free(buf);
115 free(base_buf);
116 return delta_buf;
119 static unsigned long do_compress(void **pptr, unsigned long size)
121 git_zstream stream;
122 void *in, *out;
123 unsigned long maxsize;
125 memset(&stream, 0, sizeof(stream));
126 git_deflate_init(&stream, pack_compression_level);
127 maxsize = git_deflate_bound(&stream, size);
129 in = *pptr;
130 out = xmalloc(maxsize);
131 *pptr = out;
133 stream.next_in = in;
134 stream.avail_in = size;
135 stream.next_out = out;
136 stream.avail_out = maxsize;
137 while (git_deflate(&stream, Z_FINISH) == Z_OK)
138 ; /* nothing */
139 git_deflate_end(&stream);
141 free(in);
142 return stream.total_out;
145 static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
146 const unsigned char *sha1)
148 git_zstream stream;
149 unsigned char ibuf[1024 * 16];
150 unsigned char obuf[1024 * 16];
151 unsigned long olen = 0;
153 memset(&stream, 0, sizeof(stream));
154 git_deflate_init(&stream, pack_compression_level);
156 for (;;) {
157 ssize_t readlen;
158 int zret = Z_OK;
159 readlen = read_istream(st, ibuf, sizeof(ibuf));
160 if (readlen == -1)
161 die(_("unable to read %s"), sha1_to_hex(sha1));
163 stream.next_in = ibuf;
164 stream.avail_in = readlen;
165 while ((stream.avail_in || readlen == 0) &&
166 (zret == Z_OK || zret == Z_BUF_ERROR)) {
167 stream.next_out = obuf;
168 stream.avail_out = sizeof(obuf);
169 zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
170 sha1write(f, obuf, stream.next_out - obuf);
171 olen += stream.next_out - obuf;
173 if (stream.avail_in)
174 die(_("deflate error (%d)"), zret);
175 if (readlen == 0) {
176 if (zret != Z_STREAM_END)
177 die(_("deflate error (%d)"), zret);
178 break;
181 git_deflate_end(&stream);
182 return olen;
186 * we are going to reuse the existing object data as is. make
187 * sure it is not corrupt.
189 static int check_pack_inflate(struct packed_git *p,
190 struct pack_window **w_curs,
191 off_t offset,
192 off_t len,
193 unsigned long expect)
195 git_zstream stream;
196 unsigned char fakebuf[4096], *in;
197 int st;
199 memset(&stream, 0, sizeof(stream));
200 git_inflate_init(&stream);
201 do {
202 in = use_pack(p, w_curs, offset, &stream.avail_in);
203 stream.next_in = in;
204 stream.next_out = fakebuf;
205 stream.avail_out = sizeof(fakebuf);
206 st = git_inflate(&stream, Z_FINISH);
207 offset += stream.next_in - in;
208 } while (st == Z_OK || st == Z_BUF_ERROR);
209 git_inflate_end(&stream);
210 return (st == Z_STREAM_END &&
211 stream.total_out == expect &&
212 stream.total_in == len) ? 0 : -1;
215 static void copy_pack_data(struct sha1file *f,
216 struct packed_git *p,
217 struct pack_window **w_curs,
218 off_t offset,
219 off_t len)
221 unsigned char *in;
222 unsigned long avail;
224 while (len) {
225 in = use_pack(p, w_curs, offset, &avail);
226 if (avail > len)
227 avail = (unsigned long)len;
228 sha1write(f, in, avail);
229 offset += avail;
230 len -= avail;
234 /* Return 0 if we will bust the pack-size limit */
235 static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
236 unsigned long limit, int usable_delta)
238 unsigned long size, datalen;
239 unsigned char header[10], dheader[10];
240 unsigned hdrlen;
241 enum object_type type;
242 void *buf;
243 struct git_istream *st = NULL;
245 if (!usable_delta) {
246 if (entry->type == OBJ_BLOB &&
247 entry->size > big_file_threshold &&
248 (st = open_istream(entry->idx.sha1, &type, &size, NULL)) != NULL)
249 buf = NULL;
250 else {
251 buf = read_sha1_file(entry->idx.sha1, &type, &size);
252 if (!buf)
253 die(_("unable to read %s"), sha1_to_hex(entry->idx.sha1));
256 * make sure no cached delta data remains from a
257 * previous attempt before a pack split occurred.
259 free(entry->delta_data);
260 entry->delta_data = NULL;
261 entry->z_delta_size = 0;
262 } else if (entry->delta_data) {
263 size = entry->delta_size;
264 buf = entry->delta_data;
265 entry->delta_data = NULL;
266 type = (allow_ofs_delta && entry->delta->idx.offset) ?
267 OBJ_OFS_DELTA : OBJ_REF_DELTA;
268 } else {
269 buf = get_delta(entry);
270 size = entry->delta_size;
271 type = (allow_ofs_delta && entry->delta->idx.offset) ?
272 OBJ_OFS_DELTA : OBJ_REF_DELTA;
275 if (st) /* large blob case, just assume we don't compress well */
276 datalen = size;
277 else if (entry->z_delta_size)
278 datalen = entry->z_delta_size;
279 else
280 datalen = do_compress(&buf, size);
283 * The object header is a byte of 'type' followed by zero or
284 * more bytes of length.
286 hdrlen = encode_in_pack_object_header(type, size, header);
288 if (type == OBJ_OFS_DELTA) {
290 * Deltas with relative base contain an additional
291 * encoding of the relative offset for the delta
292 * base from this object's position in the pack.
294 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
295 unsigned pos = sizeof(dheader) - 1;
296 dheader[pos] = ofs & 127;
297 while (ofs >>= 7)
298 dheader[--pos] = 128 | (--ofs & 127);
299 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
300 if (st)
301 close_istream(st);
302 free(buf);
303 return 0;
305 sha1write(f, header, hdrlen);
306 sha1write(f, dheader + pos, sizeof(dheader) - pos);
307 hdrlen += sizeof(dheader) - pos;
308 } else if (type == OBJ_REF_DELTA) {
310 * Deltas with a base reference contain
311 * an additional 20 bytes for the base sha1.
313 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
314 if (st)
315 close_istream(st);
316 free(buf);
317 return 0;
319 sha1write(f, header, hdrlen);
320 sha1write(f, entry->delta->idx.sha1, 20);
321 hdrlen += 20;
322 } else {
323 if (limit && hdrlen + datalen + 20 >= limit) {
324 if (st)
325 close_istream(st);
326 free(buf);
327 return 0;
329 sha1write(f, header, hdrlen);
331 if (st) {
332 datalen = write_large_blob_data(st, f, entry->idx.sha1);
333 close_istream(st);
334 } else {
335 sha1write(f, buf, datalen);
336 free(buf);
339 return hdrlen + datalen;
342 /* Return 0 if we will bust the pack-size limit */
343 static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
344 unsigned long limit, int usable_delta)
346 struct packed_git *p = entry->in_pack;
347 struct pack_window *w_curs = NULL;
348 struct revindex_entry *revidx;
349 off_t offset;
350 enum object_type type = entry->type;
351 unsigned long datalen;
352 unsigned char header[10], dheader[10];
353 unsigned hdrlen;
355 if (entry->delta)
356 type = (allow_ofs_delta && entry->delta->idx.offset) ?
357 OBJ_OFS_DELTA : OBJ_REF_DELTA;
358 hdrlen = encode_in_pack_object_header(type, entry->size, header);
360 offset = entry->in_pack_offset;
361 revidx = find_pack_revindex(p, offset);
362 datalen = revidx[1].offset - offset;
363 if (!pack_to_stdout && p->index_version > 1 &&
364 check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
365 error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
366 unuse_pack(&w_curs);
367 return write_no_reuse_object(f, entry, limit, usable_delta);
370 offset += entry->in_pack_header_size;
371 datalen -= entry->in_pack_header_size;
373 if (!pack_to_stdout && p->index_version == 1 &&
374 check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
375 error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
376 unuse_pack(&w_curs);
377 return write_no_reuse_object(f, entry, limit, usable_delta);
380 if (type == OBJ_OFS_DELTA) {
381 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
382 unsigned pos = sizeof(dheader) - 1;
383 dheader[pos] = ofs & 127;
384 while (ofs >>= 7)
385 dheader[--pos] = 128 | (--ofs & 127);
386 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
387 unuse_pack(&w_curs);
388 return 0;
390 sha1write(f, header, hdrlen);
391 sha1write(f, dheader + pos, sizeof(dheader) - pos);
392 hdrlen += sizeof(dheader) - pos;
393 reused_delta++;
394 } else if (type == OBJ_REF_DELTA) {
395 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
396 unuse_pack(&w_curs);
397 return 0;
399 sha1write(f, header, hdrlen);
400 sha1write(f, entry->delta->idx.sha1, 20);
401 hdrlen += 20;
402 reused_delta++;
403 } else {
404 if (limit && hdrlen + datalen + 20 >= limit) {
405 unuse_pack(&w_curs);
406 return 0;
408 sha1write(f, header, hdrlen);
410 copy_pack_data(f, p, &w_curs, offset, datalen);
411 unuse_pack(&w_curs);
412 reused++;
413 return hdrlen + datalen;
416 /* Return 0 if we will bust the pack-size limit */
417 static unsigned long write_object(struct sha1file *f,
418 struct object_entry *entry,
419 off_t write_offset)
421 unsigned long limit, len;
422 int usable_delta, to_reuse;
424 if (!pack_to_stdout)
425 crc32_begin(f);
427 /* apply size limit if limited packsize and not first object */
428 if (!pack_size_limit || !nr_written)
429 limit = 0;
430 else if (pack_size_limit <= write_offset)
432 * the earlier object did not fit the limit; avoid
433 * mistaking this with unlimited (i.e. limit = 0).
435 limit = 1;
436 else
437 limit = pack_size_limit - write_offset;
439 if (!entry->delta)
440 usable_delta = 0; /* no delta */
441 else if (!pack_size_limit)
442 usable_delta = 1; /* unlimited packfile */
443 else if (entry->delta->idx.offset == (off_t)-1)
444 usable_delta = 0; /* base was written to another pack */
445 else if (entry->delta->idx.offset)
446 usable_delta = 1; /* base already exists in this pack */
447 else
448 usable_delta = 0; /* base could end up in another pack */
450 if (!reuse_object)
451 to_reuse = 0; /* explicit */
452 else if (!entry->in_pack)
453 to_reuse = 0; /* can't reuse what we don't have */
454 else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
455 /* check_object() decided it for us ... */
456 to_reuse = usable_delta;
457 /* ... but pack split may override that */
458 else if (entry->type != entry->in_pack_type)
459 to_reuse = 0; /* pack has delta which is unusable */
460 else if (entry->delta)
461 to_reuse = 0; /* we want to pack afresh */
462 else
463 to_reuse = 1; /* we have it in-pack undeltified,
464 * and we do not need to deltify it.
467 if (!to_reuse)
468 len = write_no_reuse_object(f, entry, limit, usable_delta);
469 else
470 len = write_reuse_object(f, entry, limit, usable_delta);
471 if (!len)
472 return 0;
474 if (usable_delta)
475 written_delta++;
476 written++;
477 if (!pack_to_stdout)
478 entry->idx.crc32 = crc32_end(f);
479 return len;
482 enum write_one_status {
483 WRITE_ONE_SKIP = -1, /* already written */
484 WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
485 WRITE_ONE_WRITTEN = 1, /* normal */
486 WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
489 static enum write_one_status write_one(struct sha1file *f,
490 struct object_entry *e,
491 off_t *offset)
493 unsigned long size;
494 int recursing;
497 * we set offset to 1 (which is an impossible value) to mark
498 * the fact that this object is involved in "write its base
499 * first before writing a deltified object" recursion.
501 recursing = (e->idx.offset == 1);
502 if (recursing) {
503 warning("recursive delta detected for object %s",
504 sha1_to_hex(e->idx.sha1));
505 return WRITE_ONE_RECURSIVE;
506 } else if (e->idx.offset || e->preferred_base) {
507 /* offset is non zero if object is written already. */
508 return WRITE_ONE_SKIP;
511 /* if we are deltified, write out base object first. */
512 if (e->delta) {
513 e->idx.offset = 1; /* now recurse */
514 switch (write_one(f, e->delta, offset)) {
515 case WRITE_ONE_RECURSIVE:
516 /* we cannot depend on this one */
517 e->delta = NULL;
518 break;
519 default:
520 break;
521 case WRITE_ONE_BREAK:
522 e->idx.offset = recursing;
523 return WRITE_ONE_BREAK;
527 e->idx.offset = *offset;
528 size = write_object(f, e, *offset);
529 if (!size) {
530 e->idx.offset = recursing;
531 return WRITE_ONE_BREAK;
533 written_list[nr_written++] = &e->idx;
535 /* make sure off_t is sufficiently large not to wrap */
536 if (signed_add_overflows(*offset, size))
537 die("pack too large for current definition of off_t");
538 *offset += size;
539 return WRITE_ONE_WRITTEN;
542 static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
543 void *cb_data)
545 unsigned char peeled[20];
546 struct object_entry *entry = packlist_find(&to_pack, sha1, NULL);
548 if (entry)
549 entry->tagged = 1;
550 if (!peel_ref(path, peeled)) {
551 entry = packlist_find(&to_pack, peeled, NULL);
552 if (entry)
553 entry->tagged = 1;
555 return 0;
558 static inline void add_to_write_order(struct object_entry **wo,
559 unsigned int *endp,
560 struct object_entry *e)
562 if (e->filled)
563 return;
564 wo[(*endp)++] = e;
565 e->filled = 1;
568 static void add_descendants_to_write_order(struct object_entry **wo,
569 unsigned int *endp,
570 struct object_entry *e)
572 int add_to_order = 1;
573 while (e) {
574 if (add_to_order) {
575 struct object_entry *s;
576 /* add this node... */
577 add_to_write_order(wo, endp, e);
578 /* all its siblings... */
579 for (s = e->delta_sibling; s; s = s->delta_sibling) {
580 add_to_write_order(wo, endp, s);
583 /* drop down a level to add left subtree nodes if possible */
584 if (e->delta_child) {
585 add_to_order = 1;
586 e = e->delta_child;
587 } else {
588 add_to_order = 0;
589 /* our sibling might have some children, it is next */
590 if (e->delta_sibling) {
591 e = e->delta_sibling;
592 continue;
594 /* go back to our parent node */
595 e = e->delta;
596 while (e && !e->delta_sibling) {
597 /* we're on the right side of a subtree, keep
598 * going up until we can go right again */
599 e = e->delta;
601 if (!e) {
602 /* done- we hit our original root node */
603 return;
605 /* pass it off to sibling at this level */
606 e = e->delta_sibling;
611 static void add_family_to_write_order(struct object_entry **wo,
612 unsigned int *endp,
613 struct object_entry *e)
615 struct object_entry *root;
617 for (root = e; root->delta; root = root->delta)
618 ; /* nothing */
619 add_descendants_to_write_order(wo, endp, root);
622 static struct object_entry **compute_write_order(void)
624 unsigned int i, wo_end, last_untagged;
626 struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo));
627 struct object_entry *objects = to_pack.objects;
629 for (i = 0; i < to_pack.nr_objects; i++) {
630 objects[i].tagged = 0;
631 objects[i].filled = 0;
632 objects[i].delta_child = NULL;
633 objects[i].delta_sibling = NULL;
637 * Fully connect delta_child/delta_sibling network.
638 * Make sure delta_sibling is sorted in the original
639 * recency order.
641 for (i = to_pack.nr_objects; i > 0;) {
642 struct object_entry *e = &objects[--i];
643 if (!e->delta)
644 continue;
645 /* Mark me as the first child */
646 e->delta_sibling = e->delta->delta_child;
647 e->delta->delta_child = e;
651 * Mark objects that are at the tip of tags.
653 for_each_tag_ref(mark_tagged, NULL);
656 * Give the objects in the original recency order until
657 * we see a tagged tip.
659 for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
660 if (objects[i].tagged)
661 break;
662 add_to_write_order(wo, &wo_end, &objects[i]);
664 last_untagged = i;
667 * Then fill all the tagged tips.
669 for (; i < to_pack.nr_objects; i++) {
670 if (objects[i].tagged)
671 add_to_write_order(wo, &wo_end, &objects[i]);
675 * And then all remaining commits and tags.
677 for (i = last_untagged; i < to_pack.nr_objects; i++) {
678 if (objects[i].type != OBJ_COMMIT &&
679 objects[i].type != OBJ_TAG)
680 continue;
681 add_to_write_order(wo, &wo_end, &objects[i]);
685 * And then all the trees.
687 for (i = last_untagged; i < to_pack.nr_objects; i++) {
688 if (objects[i].type != OBJ_TREE)
689 continue;
690 add_to_write_order(wo, &wo_end, &objects[i]);
694 * Finally all the rest in really tight order
696 for (i = last_untagged; i < to_pack.nr_objects; i++) {
697 if (!objects[i].filled)
698 add_family_to_write_order(wo, &wo_end, &objects[i]);
701 if (wo_end != to_pack.nr_objects)
702 die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
704 return wo;
707 static off_t write_reused_pack(struct sha1file *f)
709 unsigned char buffer[8192];
710 off_t to_write, total;
711 int fd;
713 if (!is_pack_valid(reuse_packfile))
714 die("packfile is invalid: %s", reuse_packfile->pack_name);
716 fd = git_open_noatime(reuse_packfile->pack_name);
717 if (fd < 0)
718 die_errno("unable to open packfile for reuse: %s",
719 reuse_packfile->pack_name);
721 if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
722 die_errno("unable to seek in reused packfile");
724 if (reuse_packfile_offset < 0)
725 reuse_packfile_offset = reuse_packfile->pack_size - 20;
727 total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
729 while (to_write) {
730 int read_pack = xread(fd, buffer, sizeof(buffer));
732 if (read_pack <= 0)
733 die_errno("unable to read from reused packfile");
735 if (read_pack > to_write)
736 read_pack = to_write;
738 sha1write(f, buffer, read_pack);
739 to_write -= read_pack;
742 * We don't know the actual number of objects written,
743 * only how many bytes written, how many bytes total, and
744 * how many objects total. So we can fake it by pretending all
745 * objects we are writing are the same size. This gives us a
746 * smooth progress meter, and at the end it matches the true
747 * answer.
749 written = reuse_packfile_objects *
750 (((double)(total - to_write)) / total);
751 display_progress(progress_state, written);
754 close(fd);
755 written = reuse_packfile_objects;
756 display_progress(progress_state, written);
757 return reuse_packfile_offset - sizeof(struct pack_header);
760 static void write_pack_file(void)
762 uint32_t i = 0, j;
763 struct sha1file *f;
764 off_t offset;
765 uint32_t nr_remaining = nr_result;
766 time_t last_mtime = 0;
767 struct object_entry **write_order;
769 if (progress > pack_to_stdout)
770 progress_state = start_progress(_("Writing objects"), nr_result);
771 written_list = xmalloc(to_pack.nr_objects * sizeof(*written_list));
772 write_order = compute_write_order();
774 do {
775 unsigned char sha1[20];
776 char *pack_tmp_name = NULL;
778 if (pack_to_stdout)
779 f = sha1fd_throughput(1, "<stdout>", progress_state);
780 else
781 f = create_tmp_packfile(&pack_tmp_name);
783 offset = write_pack_header(f, nr_remaining);
785 if (reuse_packfile) {
786 off_t packfile_size;
787 assert(pack_to_stdout);
789 packfile_size = write_reused_pack(f);
790 offset += packfile_size;
793 nr_written = 0;
794 for (; i < to_pack.nr_objects; i++) {
795 struct object_entry *e = write_order[i];
796 if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
797 break;
798 display_progress(progress_state, written);
802 * Did we write the wrong # entries in the header?
803 * If so, rewrite it like in fast-import
805 if (pack_to_stdout) {
806 sha1close(f, sha1, CSUM_CLOSE);
807 } else if (nr_written == nr_remaining) {
808 sha1close(f, sha1, CSUM_FSYNC);
809 } else {
810 int fd = sha1close(f, sha1, 0);
811 fixup_pack_header_footer(fd, sha1, pack_tmp_name,
812 nr_written, sha1, offset);
813 close(fd);
814 write_bitmap_index = 0;
817 if (!pack_to_stdout) {
818 struct stat st;
819 struct strbuf tmpname = STRBUF_INIT;
822 * Packs are runtime accessed in their mtime
823 * order since newer packs are more likely to contain
824 * younger objects. So if we are creating multiple
825 * packs then we should modify the mtime of later ones
826 * to preserve this property.
828 if (stat(pack_tmp_name, &st) < 0) {
829 warning("failed to stat %s: %s",
830 pack_tmp_name, strerror(errno));
831 } else if (!last_mtime) {
832 last_mtime = st.st_mtime;
833 } else {
834 struct utimbuf utb;
835 utb.actime = st.st_atime;
836 utb.modtime = --last_mtime;
837 if (utime(pack_tmp_name, &utb) < 0)
838 warning("failed utime() on %s: %s",
839 pack_tmp_name, strerror(errno));
842 strbuf_addf(&tmpname, "%s-", base_name);
844 if (write_bitmap_index) {
845 bitmap_writer_set_checksum(sha1);
846 bitmap_writer_build_type_index(written_list, nr_written);
849 finish_tmp_packfile(&tmpname, pack_tmp_name,
850 written_list, nr_written,
851 &pack_idx_opts, sha1);
853 if (write_bitmap_index) {
854 strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1));
856 stop_progress(&progress_state);
858 bitmap_writer_show_progress(progress);
859 bitmap_writer_reuse_bitmaps(&to_pack);
860 bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
861 bitmap_writer_build(&to_pack);
862 bitmap_writer_finish(written_list, nr_written,
863 tmpname.buf, write_bitmap_options);
864 write_bitmap_index = 0;
867 strbuf_release(&tmpname);
868 free(pack_tmp_name);
869 puts(sha1_to_hex(sha1));
872 /* mark written objects as written to previous pack */
873 for (j = 0; j < nr_written; j++) {
874 written_list[j]->offset = (off_t)-1;
876 nr_remaining -= nr_written;
877 } while (nr_remaining && i < to_pack.nr_objects);
879 free(written_list);
880 free(write_order);
881 stop_progress(&progress_state);
882 if (written != nr_result)
883 die("wrote %"PRIu32" objects while expecting %"PRIu32,
884 written, nr_result);
887 static void setup_delta_attr_check(struct git_attr_check *check)
889 static struct git_attr *attr_delta;
891 if (!attr_delta)
892 attr_delta = git_attr("delta");
894 check[0].attr = attr_delta;
897 static int no_try_delta(const char *path)
899 struct git_attr_check check[1];
901 setup_delta_attr_check(check);
902 if (git_check_attr(path, ARRAY_SIZE(check), check))
903 return 0;
904 if (ATTR_FALSE(check->value))
905 return 1;
906 return 0;
910 * When adding an object, check whether we have already added it
911 * to our packing list. If so, we can skip. However, if we are
912 * being asked to excludei t, but the previous mention was to include
913 * it, make sure to adjust its flags and tweak our numbers accordingly.
915 * As an optimization, we pass out the index position where we would have
916 * found the item, since that saves us from having to look it up again a
917 * few lines later when we want to add the new entry.
919 static int have_duplicate_entry(const unsigned char *sha1,
920 int exclude,
921 uint32_t *index_pos)
923 struct object_entry *entry;
925 entry = packlist_find(&to_pack, sha1, index_pos);
926 if (!entry)
927 return 0;
929 if (exclude) {
930 if (!entry->preferred_base)
931 nr_result--;
932 entry->preferred_base = 1;
935 return 1;
939 * Check whether we want the object in the pack (e.g., we do not want
940 * objects found in non-local stores if the "--local" option was used).
942 * As a side effect of this check, we will find the packed version of this
943 * object, if any. We therefore pass out the pack information to avoid having
944 * to look it up again later.
946 static int want_object_in_pack(const unsigned char *sha1,
947 int exclude,
948 struct packed_git **found_pack,
949 off_t *found_offset)
951 struct packed_git *p;
953 if (!exclude && local && has_loose_object_nonlocal(sha1))
954 return 0;
956 *found_pack = NULL;
957 *found_offset = 0;
959 for (p = packed_git; p; p = p->next) {
960 off_t offset = find_pack_entry_one(sha1, p);
961 if (offset) {
962 if (!*found_pack) {
963 if (!is_pack_valid(p)) {
964 warning("packfile %s cannot be accessed", p->pack_name);
965 continue;
967 *found_offset = offset;
968 *found_pack = p;
970 if (exclude)
971 return 1;
972 if (incremental)
973 return 0;
974 if (local && !p->pack_local)
975 return 0;
976 if (ignore_packed_keep && p->pack_local && p->pack_keep)
977 return 0;
981 return 1;
984 static void create_object_entry(const unsigned char *sha1,
985 enum object_type type,
986 uint32_t hash,
987 int exclude,
988 int no_try_delta,
989 uint32_t index_pos,
990 struct packed_git *found_pack,
991 off_t found_offset)
993 struct object_entry *entry;
995 entry = packlist_alloc(&to_pack, sha1, index_pos);
996 entry->hash = hash;
997 if (type)
998 entry->type = type;
999 if (exclude)
1000 entry->preferred_base = 1;
1001 else
1002 nr_result++;
1003 if (found_pack) {
1004 entry->in_pack = found_pack;
1005 entry->in_pack_offset = found_offset;
1008 entry->no_try_delta = no_try_delta;
1011 static const char no_closure_warning[] = N_(
1012 "disabling bitmap writing, as some objects are not being packed"
1015 static int add_object_entry(const unsigned char *sha1, enum object_type type,
1016 const char *name, int exclude)
1018 struct packed_git *found_pack;
1019 off_t found_offset;
1020 uint32_t index_pos;
1022 if (have_duplicate_entry(sha1, exclude, &index_pos))
1023 return 0;
1025 if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) {
1026 /* The pack is missing an object, so it will not have closure */
1027 if (write_bitmap_index) {
1028 warning(_(no_closure_warning));
1029 write_bitmap_index = 0;
1031 return 0;
1034 create_object_entry(sha1, type, pack_name_hash(name),
1035 exclude, name && no_try_delta(name),
1036 index_pos, found_pack, found_offset);
1038 display_progress(progress_state, nr_result);
1039 return 1;
1042 static int add_object_entry_from_bitmap(const unsigned char *sha1,
1043 enum object_type type,
1044 int flags, uint32_t name_hash,
1045 struct packed_git *pack, off_t offset)
1047 uint32_t index_pos;
1049 if (have_duplicate_entry(sha1, 0, &index_pos))
1050 return 0;
1052 create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
1054 display_progress(progress_state, nr_result);
1055 return 1;
1058 struct pbase_tree_cache {
1059 unsigned char sha1[20];
1060 int ref;
1061 int temporary;
1062 void *tree_data;
1063 unsigned long tree_size;
1066 static struct pbase_tree_cache *(pbase_tree_cache[256]);
1067 static int pbase_tree_cache_ix(const unsigned char *sha1)
1069 return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
1071 static int pbase_tree_cache_ix_incr(int ix)
1073 return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
1076 static struct pbase_tree {
1077 struct pbase_tree *next;
1078 /* This is a phony "cache" entry; we are not
1079 * going to evict it or find it through _get()
1080 * mechanism -- this is for the toplevel node that
1081 * would almost always change with any commit.
1083 struct pbase_tree_cache pcache;
1084 } *pbase_tree;
1086 static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
1088 struct pbase_tree_cache *ent, *nent;
1089 void *data;
1090 unsigned long size;
1091 enum object_type type;
1092 int neigh;
1093 int my_ix = pbase_tree_cache_ix(sha1);
1094 int available_ix = -1;
1096 /* pbase-tree-cache acts as a limited hashtable.
1097 * your object will be found at your index or within a few
1098 * slots after that slot if it is cached.
1100 for (neigh = 0; neigh < 8; neigh++) {
1101 ent = pbase_tree_cache[my_ix];
1102 if (ent && !hashcmp(ent->sha1, sha1)) {
1103 ent->ref++;
1104 return ent;
1106 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
1107 ((0 <= available_ix) &&
1108 (!ent && pbase_tree_cache[available_ix])))
1109 available_ix = my_ix;
1110 if (!ent)
1111 break;
1112 my_ix = pbase_tree_cache_ix_incr(my_ix);
1115 /* Did not find one. Either we got a bogus request or
1116 * we need to read and perhaps cache.
1118 data = read_sha1_file(sha1, &type, &size);
1119 if (!data)
1120 return NULL;
1121 if (type != OBJ_TREE) {
1122 free(data);
1123 return NULL;
1126 /* We need to either cache or return a throwaway copy */
1128 if (available_ix < 0)
1129 ent = NULL;
1130 else {
1131 ent = pbase_tree_cache[available_ix];
1132 my_ix = available_ix;
1135 if (!ent) {
1136 nent = xmalloc(sizeof(*nent));
1137 nent->temporary = (available_ix < 0);
1139 else {
1140 /* evict and reuse */
1141 free(ent->tree_data);
1142 nent = ent;
1144 hashcpy(nent->sha1, sha1);
1145 nent->tree_data = data;
1146 nent->tree_size = size;
1147 nent->ref = 1;
1148 if (!nent->temporary)
1149 pbase_tree_cache[my_ix] = nent;
1150 return nent;
1153 static void pbase_tree_put(struct pbase_tree_cache *cache)
1155 if (!cache->temporary) {
1156 cache->ref--;
1157 return;
1159 free(cache->tree_data);
1160 free(cache);
1163 static int name_cmp_len(const char *name)
1165 int i;
1166 for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
1168 return i;
1171 static void add_pbase_object(struct tree_desc *tree,
1172 const char *name,
1173 int cmplen,
1174 const char *fullname)
1176 struct name_entry entry;
1177 int cmp;
1179 while (tree_entry(tree,&entry)) {
1180 if (S_ISGITLINK(entry.mode))
1181 continue;
1182 cmp = tree_entry_len(&entry) != cmplen ? 1 :
1183 memcmp(name, entry.path, cmplen);
1184 if (cmp > 0)
1185 continue;
1186 if (cmp < 0)
1187 return;
1188 if (name[cmplen] != '/') {
1189 add_object_entry(entry.sha1,
1190 object_type(entry.mode),
1191 fullname, 1);
1192 return;
1194 if (S_ISDIR(entry.mode)) {
1195 struct tree_desc sub;
1196 struct pbase_tree_cache *tree;
1197 const char *down = name+cmplen+1;
1198 int downlen = name_cmp_len(down);
1200 tree = pbase_tree_get(entry.sha1);
1201 if (!tree)
1202 return;
1203 init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1205 add_pbase_object(&sub, down, downlen, fullname);
1206 pbase_tree_put(tree);
1211 static unsigned *done_pbase_paths;
1212 static int done_pbase_paths_num;
1213 static int done_pbase_paths_alloc;
1214 static int done_pbase_path_pos(unsigned hash)
1216 int lo = 0;
1217 int hi = done_pbase_paths_num;
1218 while (lo < hi) {
1219 int mi = (hi + lo) / 2;
1220 if (done_pbase_paths[mi] == hash)
1221 return mi;
1222 if (done_pbase_paths[mi] < hash)
1223 hi = mi;
1224 else
1225 lo = mi + 1;
1227 return -lo-1;
1230 static int check_pbase_path(unsigned hash)
1232 int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
1233 if (0 <= pos)
1234 return 1;
1235 pos = -pos - 1;
1236 ALLOC_GROW(done_pbase_paths,
1237 done_pbase_paths_num + 1,
1238 done_pbase_paths_alloc);
1239 done_pbase_paths_num++;
1240 if (pos < done_pbase_paths_num)
1241 memmove(done_pbase_paths + pos + 1,
1242 done_pbase_paths + pos,
1243 (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
1244 done_pbase_paths[pos] = hash;
1245 return 0;
1248 static void add_preferred_base_object(const char *name)
1250 struct pbase_tree *it;
1251 int cmplen;
1252 unsigned hash = pack_name_hash(name);
1254 if (!num_preferred_base || check_pbase_path(hash))
1255 return;
1257 cmplen = name_cmp_len(name);
1258 for (it = pbase_tree; it; it = it->next) {
1259 if (cmplen == 0) {
1260 add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
1262 else {
1263 struct tree_desc tree;
1264 init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1265 add_pbase_object(&tree, name, cmplen, name);
1270 static void add_preferred_base(unsigned char *sha1)
1272 struct pbase_tree *it;
1273 void *data;
1274 unsigned long size;
1275 unsigned char tree_sha1[20];
1277 if (window <= num_preferred_base++)
1278 return;
1280 data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
1281 if (!data)
1282 return;
1284 for (it = pbase_tree; it; it = it->next) {
1285 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
1286 free(data);
1287 return;
1291 it = xcalloc(1, sizeof(*it));
1292 it->next = pbase_tree;
1293 pbase_tree = it;
1295 hashcpy(it->pcache.sha1, tree_sha1);
1296 it->pcache.tree_data = data;
1297 it->pcache.tree_size = size;
1300 static void cleanup_preferred_base(void)
1302 struct pbase_tree *it;
1303 unsigned i;
1305 it = pbase_tree;
1306 pbase_tree = NULL;
1307 while (it) {
1308 struct pbase_tree *this = it;
1309 it = this->next;
1310 free(this->pcache.tree_data);
1311 free(this);
1314 for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
1315 if (!pbase_tree_cache[i])
1316 continue;
1317 free(pbase_tree_cache[i]->tree_data);
1318 free(pbase_tree_cache[i]);
1319 pbase_tree_cache[i] = NULL;
1322 free(done_pbase_paths);
1323 done_pbase_paths = NULL;
1324 done_pbase_paths_num = done_pbase_paths_alloc = 0;
1327 static void check_object(struct object_entry *entry)
1329 if (entry->in_pack) {
1330 struct packed_git *p = entry->in_pack;
1331 struct pack_window *w_curs = NULL;
1332 const unsigned char *base_ref = NULL;
1333 struct object_entry *base_entry;
1334 unsigned long used, used_0;
1335 unsigned long avail;
1336 off_t ofs;
1337 unsigned char *buf, c;
1339 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1342 * We want in_pack_type even if we do not reuse delta
1343 * since non-delta representations could still be reused.
1345 used = unpack_object_header_buffer(buf, avail,
1346 &entry->in_pack_type,
1347 &entry->size);
1348 if (used == 0)
1349 goto give_up;
1352 * Determine if this is a delta and if so whether we can
1353 * reuse it or not. Otherwise let's find out as cheaply as
1354 * possible what the actual type and size for this object is.
1356 switch (entry->in_pack_type) {
1357 default:
1358 /* Not a delta hence we've already got all we need. */
1359 entry->type = entry->in_pack_type;
1360 entry->in_pack_header_size = used;
1361 if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
1362 goto give_up;
1363 unuse_pack(&w_curs);
1364 return;
1365 case OBJ_REF_DELTA:
1366 if (reuse_delta && !entry->preferred_base)
1367 base_ref = use_pack(p, &w_curs,
1368 entry->in_pack_offset + used, NULL);
1369 entry->in_pack_header_size = used + 20;
1370 break;
1371 case OBJ_OFS_DELTA:
1372 buf = use_pack(p, &w_curs,
1373 entry->in_pack_offset + used, NULL);
1374 used_0 = 0;
1375 c = buf[used_0++];
1376 ofs = c & 127;
1377 while (c & 128) {
1378 ofs += 1;
1379 if (!ofs || MSB(ofs, 7)) {
1380 error("delta base offset overflow in pack for %s",
1381 sha1_to_hex(entry->idx.sha1));
1382 goto give_up;
1384 c = buf[used_0++];
1385 ofs = (ofs << 7) + (c & 127);
1387 ofs = entry->in_pack_offset - ofs;
1388 if (ofs <= 0 || ofs >= entry->in_pack_offset) {
1389 error("delta base offset out of bound for %s",
1390 sha1_to_hex(entry->idx.sha1));
1391 goto give_up;
1393 if (reuse_delta && !entry->preferred_base) {
1394 struct revindex_entry *revidx;
1395 revidx = find_pack_revindex(p, ofs);
1396 if (!revidx)
1397 goto give_up;
1398 base_ref = nth_packed_object_sha1(p, revidx->nr);
1400 entry->in_pack_header_size = used + used_0;
1401 break;
1404 if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1406 * If base_ref was set above that means we wish to
1407 * reuse delta data, and we even found that base
1408 * in the list of objects we want to pack. Goodie!
1410 * Depth value does not matter - find_deltas() will
1411 * never consider reused delta as the base object to
1412 * deltify other objects against, in order to avoid
1413 * circular deltas.
1415 entry->type = entry->in_pack_type;
1416 entry->delta = base_entry;
1417 entry->delta_size = entry->size;
1418 entry->delta_sibling = base_entry->delta_child;
1419 base_entry->delta_child = entry;
1420 unuse_pack(&w_curs);
1421 return;
1424 if (entry->type) {
1426 * This must be a delta and we already know what the
1427 * final object type is. Let's extract the actual
1428 * object size from the delta header.
1430 entry->size = get_size_from_delta(p, &w_curs,
1431 entry->in_pack_offset + entry->in_pack_header_size);
1432 if (entry->size == 0)
1433 goto give_up;
1434 unuse_pack(&w_curs);
1435 return;
1439 * No choice but to fall back to the recursive delta walk
1440 * with sha1_object_info() to find about the object type
1441 * at this point...
1443 give_up:
1444 unuse_pack(&w_curs);
1447 entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
1449 * The error condition is checked in prepare_pack(). This is
1450 * to permit a missing preferred base object to be ignored
1451 * as a preferred base. Doing so can result in a larger
1452 * pack file, but the transfer will still take place.
1456 static int pack_offset_sort(const void *_a, const void *_b)
1458 const struct object_entry *a = *(struct object_entry **)_a;
1459 const struct object_entry *b = *(struct object_entry **)_b;
1461 /* avoid filesystem trashing with loose objects */
1462 if (!a->in_pack && !b->in_pack)
1463 return hashcmp(a->idx.sha1, b->idx.sha1);
1465 if (a->in_pack < b->in_pack)
1466 return -1;
1467 if (a->in_pack > b->in_pack)
1468 return 1;
1469 return a->in_pack_offset < b->in_pack_offset ? -1 :
1470 (a->in_pack_offset > b->in_pack_offset);
1473 static void get_object_details(void)
1475 uint32_t i;
1476 struct object_entry **sorted_by_offset;
1478 sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
1479 for (i = 0; i < to_pack.nr_objects; i++)
1480 sorted_by_offset[i] = to_pack.objects + i;
1481 qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
1483 for (i = 0; i < to_pack.nr_objects; i++) {
1484 struct object_entry *entry = sorted_by_offset[i];
1485 check_object(entry);
1486 if (big_file_threshold < entry->size)
1487 entry->no_try_delta = 1;
1490 free(sorted_by_offset);
1494 * We search for deltas in a list sorted by type, by filename hash, and then
1495 * by size, so that we see progressively smaller and smaller files.
1496 * That's because we prefer deltas to be from the bigger file
1497 * to the smaller -- deletes are potentially cheaper, but perhaps
1498 * more importantly, the bigger file is likely the more recent
1499 * one. The deepest deltas are therefore the oldest objects which are
1500 * less susceptible to be accessed often.
1502 static int type_size_sort(const void *_a, const void *_b)
1504 const struct object_entry *a = *(struct object_entry **)_a;
1505 const struct object_entry *b = *(struct object_entry **)_b;
1507 if (a->type > b->type)
1508 return -1;
1509 if (a->type < b->type)
1510 return 1;
1511 if (a->hash > b->hash)
1512 return -1;
1513 if (a->hash < b->hash)
1514 return 1;
1515 if (a->preferred_base > b->preferred_base)
1516 return -1;
1517 if (a->preferred_base < b->preferred_base)
1518 return 1;
1519 if (a->size > b->size)
1520 return -1;
1521 if (a->size < b->size)
1522 return 1;
1523 return a < b ? -1 : (a > b); /* newest first */
1526 struct unpacked {
1527 struct object_entry *entry;
1528 void *data;
1529 struct delta_index *index;
1530 unsigned depth;
1533 static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1534 unsigned long delta_size)
1536 if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1537 return 0;
1539 if (delta_size < cache_max_small_delta_size)
1540 return 1;
1542 /* cache delta, if objects are large enough compared to delta size */
1543 if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1544 return 1;
1546 return 0;
1549 #ifndef NO_PTHREADS
1551 static pthread_mutex_t read_mutex;
1552 #define read_lock() pthread_mutex_lock(&read_mutex)
1553 #define read_unlock() pthread_mutex_unlock(&read_mutex)
1555 static pthread_mutex_t cache_mutex;
1556 #define cache_lock() pthread_mutex_lock(&cache_mutex)
1557 #define cache_unlock() pthread_mutex_unlock(&cache_mutex)
1559 static pthread_mutex_t progress_mutex;
1560 #define progress_lock() pthread_mutex_lock(&progress_mutex)
1561 #define progress_unlock() pthread_mutex_unlock(&progress_mutex)
1563 #else
1565 #define read_lock() (void)0
1566 #define read_unlock() (void)0
1567 #define cache_lock() (void)0
1568 #define cache_unlock() (void)0
1569 #define progress_lock() (void)0
1570 #define progress_unlock() (void)0
1572 #endif
1574 static int try_delta(struct unpacked *trg, struct unpacked *src,
1575 unsigned max_depth, unsigned long *mem_usage)
1577 struct object_entry *trg_entry = trg->entry;
1578 struct object_entry *src_entry = src->entry;
1579 unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1580 unsigned ref_depth;
1581 enum object_type type;
1582 void *delta_buf;
1584 /* Don't bother doing diffs between different types */
1585 if (trg_entry->type != src_entry->type)
1586 return -1;
1589 * We do not bother to try a delta that we discarded on an
1590 * earlier try, but only when reusing delta data. Note that
1591 * src_entry that is marked as the preferred_base should always
1592 * be considered, as even if we produce a suboptimal delta against
1593 * it, we will still save the transfer cost, as we already know
1594 * the other side has it and we won't send src_entry at all.
1596 if (reuse_delta && trg_entry->in_pack &&
1597 trg_entry->in_pack == src_entry->in_pack &&
1598 !src_entry->preferred_base &&
1599 trg_entry->in_pack_type != OBJ_REF_DELTA &&
1600 trg_entry->in_pack_type != OBJ_OFS_DELTA)
1601 return 0;
1603 /* Let's not bust the allowed depth. */
1604 if (src->depth >= max_depth)
1605 return 0;
1607 /* Now some size filtering heuristics. */
1608 trg_size = trg_entry->size;
1609 if (!trg_entry->delta) {
1610 max_size = trg_size/2 - 20;
1611 ref_depth = 1;
1612 } else {
1613 max_size = trg_entry->delta_size;
1614 ref_depth = trg->depth;
1616 max_size = (uint64_t)max_size * (max_depth - src->depth) /
1617 (max_depth - ref_depth + 1);
1618 if (max_size == 0)
1619 return 0;
1620 src_size = src_entry->size;
1621 sizediff = src_size < trg_size ? trg_size - src_size : 0;
1622 if (sizediff >= max_size)
1623 return 0;
1624 if (trg_size < src_size / 32)
1625 return 0;
1627 /* Load data if not already done */
1628 if (!trg->data) {
1629 read_lock();
1630 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
1631 read_unlock();
1632 if (!trg->data)
1633 die("object %s cannot be read",
1634 sha1_to_hex(trg_entry->idx.sha1));
1635 if (sz != trg_size)
1636 die("object %s inconsistent object length (%lu vs %lu)",
1637 sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
1638 *mem_usage += sz;
1640 if (!src->data) {
1641 read_lock();
1642 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
1643 read_unlock();
1644 if (!src->data) {
1645 if (src_entry->preferred_base) {
1646 static int warned = 0;
1647 if (!warned++)
1648 warning("object %s cannot be read",
1649 sha1_to_hex(src_entry->idx.sha1));
1651 * Those objects are not included in the
1652 * resulting pack. Be resilient and ignore
1653 * them if they can't be read, in case the
1654 * pack could be created nevertheless.
1656 return 0;
1658 die("object %s cannot be read",
1659 sha1_to_hex(src_entry->idx.sha1));
1661 if (sz != src_size)
1662 die("object %s inconsistent object length (%lu vs %lu)",
1663 sha1_to_hex(src_entry->idx.sha1), sz, src_size);
1664 *mem_usage += sz;
1666 if (!src->index) {
1667 src->index = create_delta_index(src->data, src_size);
1668 if (!src->index) {
1669 static int warned = 0;
1670 if (!warned++)
1671 warning("suboptimal pack - out of memory");
1672 return 0;
1674 *mem_usage += sizeof_delta_index(src->index);
1677 delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1678 if (!delta_buf)
1679 return 0;
1681 if (trg_entry->delta) {
1682 /* Prefer only shallower same-sized deltas. */
1683 if (delta_size == trg_entry->delta_size &&
1684 src->depth + 1 >= trg->depth) {
1685 free(delta_buf);
1686 return 0;
1691 * Handle memory allocation outside of the cache
1692 * accounting lock. Compiler will optimize the strangeness
1693 * away when NO_PTHREADS is defined.
1695 free(trg_entry->delta_data);
1696 cache_lock();
1697 if (trg_entry->delta_data) {
1698 delta_cache_size -= trg_entry->delta_size;
1699 trg_entry->delta_data = NULL;
1701 if (delta_cacheable(src_size, trg_size, delta_size)) {
1702 delta_cache_size += delta_size;
1703 cache_unlock();
1704 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1705 } else {
1706 cache_unlock();
1707 free(delta_buf);
1710 trg_entry->delta = src_entry;
1711 trg_entry->delta_size = delta_size;
1712 trg->depth = src->depth + 1;
1714 return 1;
1717 static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1719 struct object_entry *child = me->delta_child;
1720 unsigned int m = n;
1721 while (child) {
1722 unsigned int c = check_delta_limit(child, n + 1);
1723 if (m < c)
1724 m = c;
1725 child = child->delta_sibling;
1727 return m;
1730 static unsigned long free_unpacked(struct unpacked *n)
1732 unsigned long freed_mem = sizeof_delta_index(n->index);
1733 free_delta_index(n->index);
1734 n->index = NULL;
1735 if (n->data) {
1736 freed_mem += n->entry->size;
1737 free(n->data);
1738 n->data = NULL;
1740 n->entry = NULL;
1741 n->depth = 0;
1742 return freed_mem;
1745 static void find_deltas(struct object_entry **list, unsigned *list_size,
1746 int window, int depth, unsigned *processed)
1748 uint32_t i, idx = 0, count = 0;
1749 struct unpacked *array;
1750 unsigned long mem_usage = 0;
1752 array = xcalloc(window, sizeof(struct unpacked));
1754 for (;;) {
1755 struct object_entry *entry;
1756 struct unpacked *n = array + idx;
1757 int j, max_depth, best_base = -1;
1759 progress_lock();
1760 if (!*list_size) {
1761 progress_unlock();
1762 break;
1764 entry = *list++;
1765 (*list_size)--;
1766 if (!entry->preferred_base) {
1767 (*processed)++;
1768 display_progress(progress_state, *processed);
1770 progress_unlock();
1772 mem_usage -= free_unpacked(n);
1773 n->entry = entry;
1775 while (window_memory_limit &&
1776 mem_usage > window_memory_limit &&
1777 count > 1) {
1778 uint32_t tail = (idx + window - count) % window;
1779 mem_usage -= free_unpacked(array + tail);
1780 count--;
1783 /* We do not compute delta to *create* objects we are not
1784 * going to pack.
1786 if (entry->preferred_base)
1787 goto next;
1790 * If the current object is at pack edge, take the depth the
1791 * objects that depend on the current object into account
1792 * otherwise they would become too deep.
1794 max_depth = depth;
1795 if (entry->delta_child) {
1796 max_depth -= check_delta_limit(entry, 0);
1797 if (max_depth <= 0)
1798 goto next;
1801 j = window;
1802 while (--j > 0) {
1803 int ret;
1804 uint32_t other_idx = idx + j;
1805 struct unpacked *m;
1806 if (other_idx >= window)
1807 other_idx -= window;
1808 m = array + other_idx;
1809 if (!m->entry)
1810 break;
1811 ret = try_delta(n, m, max_depth, &mem_usage);
1812 if (ret < 0)
1813 break;
1814 else if (ret > 0)
1815 best_base = other_idx;
1819 * If we decided to cache the delta data, then it is best
1820 * to compress it right away. First because we have to do
1821 * it anyway, and doing it here while we're threaded will
1822 * save a lot of time in the non threaded write phase,
1823 * as well as allow for caching more deltas within
1824 * the same cache size limit.
1825 * ...
1826 * But only if not writing to stdout, since in that case
1827 * the network is most likely throttling writes anyway,
1828 * and therefore it is best to go to the write phase ASAP
1829 * instead, as we can afford spending more time compressing
1830 * between writes at that moment.
1832 if (entry->delta_data && !pack_to_stdout) {
1833 entry->z_delta_size = do_compress(&entry->delta_data,
1834 entry->delta_size);
1835 cache_lock();
1836 delta_cache_size -= entry->delta_size;
1837 delta_cache_size += entry->z_delta_size;
1838 cache_unlock();
1841 /* if we made n a delta, and if n is already at max
1842 * depth, leaving it in the window is pointless. we
1843 * should evict it first.
1845 if (entry->delta && max_depth <= n->depth)
1846 continue;
1849 * Move the best delta base up in the window, after the
1850 * currently deltified object, to keep it longer. It will
1851 * be the first base object to be attempted next.
1853 if (entry->delta) {
1854 struct unpacked swap = array[best_base];
1855 int dist = (window + idx - best_base) % window;
1856 int dst = best_base;
1857 while (dist--) {
1858 int src = (dst + 1) % window;
1859 array[dst] = array[src];
1860 dst = src;
1862 array[dst] = swap;
1865 next:
1866 idx++;
1867 if (count + 1 < window)
1868 count++;
1869 if (idx >= window)
1870 idx = 0;
1873 for (i = 0; i < window; ++i) {
1874 free_delta_index(array[i].index);
1875 free(array[i].data);
1877 free(array);
1880 #ifndef NO_PTHREADS
1882 static void try_to_free_from_threads(size_t size)
1884 read_lock();
1885 release_pack_memory(size);
1886 read_unlock();
1889 static try_to_free_t old_try_to_free_routine;
1892 * The main thread waits on the condition that (at least) one of the workers
1893 * has stopped working (which is indicated in the .working member of
1894 * struct thread_params).
1895 * When a work thread has completed its work, it sets .working to 0 and
1896 * signals the main thread and waits on the condition that .data_ready
1897 * becomes 1.
1900 struct thread_params {
1901 pthread_t thread;
1902 struct object_entry **list;
1903 unsigned list_size;
1904 unsigned remaining;
1905 int window;
1906 int depth;
1907 int working;
1908 int data_ready;
1909 pthread_mutex_t mutex;
1910 pthread_cond_t cond;
1911 unsigned *processed;
1914 static pthread_cond_t progress_cond;
1917 * Mutex and conditional variable can't be statically-initialized on Windows.
1919 static void init_threaded_search(void)
1921 init_recursive_mutex(&read_mutex);
1922 pthread_mutex_init(&cache_mutex, NULL);
1923 pthread_mutex_init(&progress_mutex, NULL);
1924 pthread_cond_init(&progress_cond, NULL);
1925 old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
1928 static void cleanup_threaded_search(void)
1930 set_try_to_free_routine(old_try_to_free_routine);
1931 pthread_cond_destroy(&progress_cond);
1932 pthread_mutex_destroy(&read_mutex);
1933 pthread_mutex_destroy(&cache_mutex);
1934 pthread_mutex_destroy(&progress_mutex);
1937 static void *threaded_find_deltas(void *arg)
1939 struct thread_params *me = arg;
1941 while (me->remaining) {
1942 find_deltas(me->list, &me->remaining,
1943 me->window, me->depth, me->processed);
1945 progress_lock();
1946 me->working = 0;
1947 pthread_cond_signal(&progress_cond);
1948 progress_unlock();
1951 * We must not set ->data_ready before we wait on the
1952 * condition because the main thread may have set it to 1
1953 * before we get here. In order to be sure that new
1954 * work is available if we see 1 in ->data_ready, it
1955 * was initialized to 0 before this thread was spawned
1956 * and we reset it to 0 right away.
1958 pthread_mutex_lock(&me->mutex);
1959 while (!me->data_ready)
1960 pthread_cond_wait(&me->cond, &me->mutex);
1961 me->data_ready = 0;
1962 pthread_mutex_unlock(&me->mutex);
1964 /* leave ->working 1 so that this doesn't get more work assigned */
1965 return NULL;
1968 static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1969 int window, int depth, unsigned *processed)
1971 struct thread_params *p;
1972 int i, ret, active_threads = 0;
1974 init_threaded_search();
1976 if (delta_search_threads <= 1) {
1977 find_deltas(list, &list_size, window, depth, processed);
1978 cleanup_threaded_search();
1979 return;
1981 if (progress > pack_to_stdout)
1982 fprintf(stderr, "Delta compression using up to %d threads.\n",
1983 delta_search_threads);
1984 p = xcalloc(delta_search_threads, sizeof(*p));
1986 /* Partition the work amongst work threads. */
1987 for (i = 0; i < delta_search_threads; i++) {
1988 unsigned sub_size = list_size / (delta_search_threads - i);
1990 /* don't use too small segments or no deltas will be found */
1991 if (sub_size < 2*window && i+1 < delta_search_threads)
1992 sub_size = 0;
1994 p[i].window = window;
1995 p[i].depth = depth;
1996 p[i].processed = processed;
1997 p[i].working = 1;
1998 p[i].data_ready = 0;
2000 /* try to split chunks on "path" boundaries */
2001 while (sub_size && sub_size < list_size &&
2002 list[sub_size]->hash &&
2003 list[sub_size]->hash == list[sub_size-1]->hash)
2004 sub_size++;
2006 p[i].list = list;
2007 p[i].list_size = sub_size;
2008 p[i].remaining = sub_size;
2010 list += sub_size;
2011 list_size -= sub_size;
2014 /* Start work threads. */
2015 for (i = 0; i < delta_search_threads; i++) {
2016 if (!p[i].list_size)
2017 continue;
2018 pthread_mutex_init(&p[i].mutex, NULL);
2019 pthread_cond_init(&p[i].cond, NULL);
2020 ret = pthread_create(&p[i].thread, NULL,
2021 threaded_find_deltas, &p[i]);
2022 if (ret)
2023 die("unable to create thread: %s", strerror(ret));
2024 active_threads++;
2028 * Now let's wait for work completion. Each time a thread is done
2029 * with its work, we steal half of the remaining work from the
2030 * thread with the largest number of unprocessed objects and give
2031 * it to that newly idle thread. This ensure good load balancing
2032 * until the remaining object list segments are simply too short
2033 * to be worth splitting anymore.
2035 while (active_threads) {
2036 struct thread_params *target = NULL;
2037 struct thread_params *victim = NULL;
2038 unsigned sub_size = 0;
2040 progress_lock();
2041 for (;;) {
2042 for (i = 0; !target && i < delta_search_threads; i++)
2043 if (!p[i].working)
2044 target = &p[i];
2045 if (target)
2046 break;
2047 pthread_cond_wait(&progress_cond, &progress_mutex);
2050 for (i = 0; i < delta_search_threads; i++)
2051 if (p[i].remaining > 2*window &&
2052 (!victim || victim->remaining < p[i].remaining))
2053 victim = &p[i];
2054 if (victim) {
2055 sub_size = victim->remaining / 2;
2056 list = victim->list + victim->list_size - sub_size;
2057 while (sub_size && list[0]->hash &&
2058 list[0]->hash == list[-1]->hash) {
2059 list++;
2060 sub_size--;
2062 if (!sub_size) {
2064 * It is possible for some "paths" to have
2065 * so many objects that no hash boundary
2066 * might be found. Let's just steal the
2067 * exact half in that case.
2069 sub_size = victim->remaining / 2;
2070 list -= sub_size;
2072 target->list = list;
2073 victim->list_size -= sub_size;
2074 victim->remaining -= sub_size;
2076 target->list_size = sub_size;
2077 target->remaining = sub_size;
2078 target->working = 1;
2079 progress_unlock();
2081 pthread_mutex_lock(&target->mutex);
2082 target->data_ready = 1;
2083 pthread_cond_signal(&target->cond);
2084 pthread_mutex_unlock(&target->mutex);
2086 if (!sub_size) {
2087 pthread_join(target->thread, NULL);
2088 pthread_cond_destroy(&target->cond);
2089 pthread_mutex_destroy(&target->mutex);
2090 active_threads--;
2093 cleanup_threaded_search();
2094 free(p);
2097 #else
2098 #define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p)
2099 #endif
2101 static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
2103 unsigned char peeled[20];
2105 if (starts_with(path, "refs/tags/") && /* is a tag? */
2106 !peel_ref(path, peeled) && /* peelable? */
2107 packlist_find(&to_pack, peeled, NULL)) /* object packed? */
2108 add_object_entry(sha1, OBJ_TAG, NULL, 0);
2109 return 0;
2112 static void prepare_pack(int window, int depth)
2114 struct object_entry **delta_list;
2115 uint32_t i, nr_deltas;
2116 unsigned n;
2118 get_object_details();
2121 * If we're locally repacking then we need to be doubly careful
2122 * from now on in order to make sure no stealth corruption gets
2123 * propagated to the new pack. Clients receiving streamed packs
2124 * should validate everything they get anyway so no need to incur
2125 * the additional cost here in that case.
2127 if (!pack_to_stdout)
2128 do_check_packed_object_crc = 1;
2130 if (!to_pack.nr_objects || !window || !depth)
2131 return;
2133 delta_list = xmalloc(to_pack.nr_objects * sizeof(*delta_list));
2134 nr_deltas = n = 0;
2136 for (i = 0; i < to_pack.nr_objects; i++) {
2137 struct object_entry *entry = to_pack.objects + i;
2139 if (entry->delta)
2140 /* This happens if we decided to reuse existing
2141 * delta from a pack. "reuse_delta &&" is implied.
2143 continue;
2145 if (entry->size < 50)
2146 continue;
2148 if (entry->no_try_delta)
2149 continue;
2151 if (!entry->preferred_base) {
2152 nr_deltas++;
2153 if (entry->type < 0)
2154 die("unable to get type of object %s",
2155 sha1_to_hex(entry->idx.sha1));
2156 } else {
2157 if (entry->type < 0) {
2159 * This object is not found, but we
2160 * don't have to include it anyway.
2162 continue;
2166 delta_list[n++] = entry;
2169 if (nr_deltas && n > 1) {
2170 unsigned nr_done = 0;
2171 if (progress)
2172 progress_state = start_progress(_("Compressing objects"),
2173 nr_deltas);
2174 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
2175 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
2176 stop_progress(&progress_state);
2177 if (nr_done != nr_deltas)
2178 die("inconsistency with delta count");
2180 free(delta_list);
2183 static int git_pack_config(const char *k, const char *v, void *cb)
2185 if (!strcmp(k, "pack.window")) {
2186 window = git_config_int(k, v);
2187 return 0;
2189 if (!strcmp(k, "pack.windowmemory")) {
2190 window_memory_limit = git_config_ulong(k, v);
2191 return 0;
2193 if (!strcmp(k, "pack.depth")) {
2194 depth = git_config_int(k, v);
2195 return 0;
2197 if (!strcmp(k, "pack.compression")) {
2198 int level = git_config_int(k, v);
2199 if (level == -1)
2200 level = Z_DEFAULT_COMPRESSION;
2201 else if (level < 0 || level > Z_BEST_COMPRESSION)
2202 die("bad pack compression level %d", level);
2203 pack_compression_level = level;
2204 pack_compression_seen = 1;
2205 return 0;
2207 if (!strcmp(k, "pack.deltacachesize")) {
2208 max_delta_cache_size = git_config_int(k, v);
2209 return 0;
2211 if (!strcmp(k, "pack.deltacachelimit")) {
2212 cache_max_small_delta_size = git_config_int(k, v);
2213 return 0;
2215 if (!strcmp(k, "pack.writebitmaphashcache")) {
2216 if (git_config_bool(k, v))
2217 write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
2218 else
2219 write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
2221 if (!strcmp(k, "pack.usebitmaps")) {
2222 use_bitmap_index = git_config_bool(k, v);
2223 return 0;
2225 if (!strcmp(k, "pack.threads")) {
2226 delta_search_threads = git_config_int(k, v);
2227 if (delta_search_threads < 0)
2228 die("invalid number of threads specified (%d)",
2229 delta_search_threads);
2230 #ifdef NO_PTHREADS
2231 if (delta_search_threads != 1)
2232 warning("no threads support, ignoring %s", k);
2233 #endif
2234 return 0;
2236 if (!strcmp(k, "pack.indexversion")) {
2237 pack_idx_opts.version = git_config_int(k, v);
2238 if (pack_idx_opts.version > 2)
2239 die("bad pack.indexversion=%"PRIu32,
2240 pack_idx_opts.version);
2241 return 0;
2243 return git_default_config(k, v, cb);
2246 static void read_object_list_from_stdin(void)
2248 char line[40 + 1 + PATH_MAX + 2];
2249 unsigned char sha1[20];
2251 for (;;) {
2252 if (!fgets(line, sizeof(line), stdin)) {
2253 if (feof(stdin))
2254 break;
2255 if (!ferror(stdin))
2256 die("fgets returned NULL, not EOF, not error!");
2257 if (errno != EINTR)
2258 die_errno("fgets");
2259 clearerr(stdin);
2260 continue;
2262 if (line[0] == '-') {
2263 if (get_sha1_hex(line+1, sha1))
2264 die("expected edge sha1, got garbage:\n %s",
2265 line);
2266 add_preferred_base(sha1);
2267 continue;
2269 if (get_sha1_hex(line, sha1))
2270 die("expected sha1, got garbage:\n %s", line);
2272 add_preferred_base_object(line+41);
2273 add_object_entry(sha1, 0, line+41, 0);
2277 #define OBJECT_ADDED (1u<<20)
2279 static void show_commit(struct commit *commit, void *data)
2281 add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
2282 commit->object.flags |= OBJECT_ADDED;
2284 if (write_bitmap_index)
2285 index_commit_for_bitmap(commit);
2288 static void show_object(struct object *obj,
2289 const struct name_path *path, const char *last,
2290 void *data)
2292 char *name = path_name(path, last);
2294 add_preferred_base_object(name);
2295 add_object_entry(obj->sha1, obj->type, name, 0);
2296 obj->flags |= OBJECT_ADDED;
2299 * We will have generated the hash from the name,
2300 * but not saved a pointer to it - we can free it
2302 free((char *)name);
2305 static void show_edge(struct commit *commit)
2307 add_preferred_base(commit->object.sha1);
2310 struct in_pack_object {
2311 off_t offset;
2312 struct object *object;
2315 struct in_pack {
2316 int alloc;
2317 int nr;
2318 struct in_pack_object *array;
2321 static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
2323 in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
2324 in_pack->array[in_pack->nr].object = object;
2325 in_pack->nr++;
2329 * Compare the objects in the offset order, in order to emulate the
2330 * "git rev-list --objects" output that produced the pack originally.
2332 static int ofscmp(const void *a_, const void *b_)
2334 struct in_pack_object *a = (struct in_pack_object *)a_;
2335 struct in_pack_object *b = (struct in_pack_object *)b_;
2337 if (a->offset < b->offset)
2338 return -1;
2339 else if (a->offset > b->offset)
2340 return 1;
2341 else
2342 return hashcmp(a->object->sha1, b->object->sha1);
2345 static void add_objects_in_unpacked_packs(struct rev_info *revs)
2347 struct packed_git *p;
2348 struct in_pack in_pack;
2349 uint32_t i;
2351 memset(&in_pack, 0, sizeof(in_pack));
2353 for (p = packed_git; p; p = p->next) {
2354 const unsigned char *sha1;
2355 struct object *o;
2357 if (!p->pack_local || p->pack_keep)
2358 continue;
2359 if (open_pack_index(p))
2360 die("cannot open pack index");
2362 ALLOC_GROW(in_pack.array,
2363 in_pack.nr + p->num_objects,
2364 in_pack.alloc);
2366 for (i = 0; i < p->num_objects; i++) {
2367 sha1 = nth_packed_object_sha1(p, i);
2368 o = lookup_unknown_object(sha1);
2369 if (!(o->flags & OBJECT_ADDED))
2370 mark_in_pack_object(o, p, &in_pack);
2371 o->flags |= OBJECT_ADDED;
2375 if (in_pack.nr) {
2376 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
2377 ofscmp);
2378 for (i = 0; i < in_pack.nr; i++) {
2379 struct object *o = in_pack.array[i].object;
2380 add_object_entry(o->sha1, o->type, "", 0);
2383 free(in_pack.array);
2386 static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
2388 static struct packed_git *last_found = (void *)1;
2389 struct packed_git *p;
2391 p = (last_found != (void *)1) ? last_found : packed_git;
2393 while (p) {
2394 if ((!p->pack_local || p->pack_keep) &&
2395 find_pack_entry_one(sha1, p)) {
2396 last_found = p;
2397 return 1;
2399 if (p == last_found)
2400 p = packed_git;
2401 else
2402 p = p->next;
2403 if (p == last_found)
2404 p = p->next;
2406 return 0;
2409 static void loosen_unused_packed_objects(struct rev_info *revs)
2411 struct packed_git *p;
2412 uint32_t i;
2413 const unsigned char *sha1;
2415 for (p = packed_git; p; p = p->next) {
2416 if (!p->pack_local || p->pack_keep)
2417 continue;
2419 if (unpack_unreachable_expiration &&
2420 p->mtime < unpack_unreachable_expiration)
2421 continue;
2423 if (open_pack_index(p))
2424 die("cannot open pack index");
2426 for (i = 0; i < p->num_objects; i++) {
2427 sha1 = nth_packed_object_sha1(p, i);
2428 if (!packlist_find(&to_pack, sha1, NULL) &&
2429 !has_sha1_pack_kept_or_nonlocal(sha1))
2430 if (force_object_loose(sha1, p->mtime))
2431 die("unable to force loose object");
2437 * This tracks any options which a reader of the pack might
2438 * not understand, and which would therefore prevent blind reuse
2439 * of what we have on disk.
2441 static int pack_options_allow_reuse(void)
2443 return allow_ofs_delta;
2446 static int get_object_list_from_bitmap(struct rev_info *revs)
2448 if (prepare_bitmap_walk(revs) < 0)
2449 return -1;
2451 if (pack_options_allow_reuse() &&
2452 !reuse_partial_packfile_from_bitmap(
2453 &reuse_packfile,
2454 &reuse_packfile_objects,
2455 &reuse_packfile_offset)) {
2456 assert(reuse_packfile_objects);
2457 nr_result += reuse_packfile_objects;
2458 display_progress(progress_state, nr_result);
2461 traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
2462 return 0;
2465 static void get_object_list(int ac, const char **av)
2467 struct rev_info revs;
2468 char line[1000];
2469 int flags = 0;
2471 init_revisions(&revs, NULL);
2472 save_commit_buffer = 0;
2473 setup_revisions(ac, av, &revs, NULL);
2475 /* make sure shallows are read */
2476 is_repository_shallow();
2478 while (fgets(line, sizeof(line), stdin) != NULL) {
2479 int len = strlen(line);
2480 if (len && line[len - 1] == '\n')
2481 line[--len] = 0;
2482 if (!len)
2483 break;
2484 if (*line == '-') {
2485 if (!strcmp(line, "--not")) {
2486 flags ^= UNINTERESTING;
2487 write_bitmap_index = 0;
2488 continue;
2490 if (starts_with(line, "--shallow ")) {
2491 unsigned char sha1[20];
2492 if (get_sha1_hex(line + 10, sha1))
2493 die("not an SHA-1 '%s'", line + 10);
2494 register_shallow(sha1);
2495 use_bitmap_index = 0;
2496 continue;
2498 die("not a rev '%s'", line);
2500 if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2501 die("bad revision '%s'", line);
2504 if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
2505 return;
2507 if (prepare_revision_walk(&revs))
2508 die("revision walk setup failed");
2509 mark_edges_uninteresting(&revs, show_edge);
2510 traverse_commit_list(&revs, show_commit, show_object, NULL);
2512 if (keep_unreachable)
2513 add_objects_in_unpacked_packs(&revs);
2514 if (unpack_unreachable)
2515 loosen_unused_packed_objects(&revs);
2518 static int option_parse_index_version(const struct option *opt,
2519 const char *arg, int unset)
2521 char *c;
2522 const char *val = arg;
2523 pack_idx_opts.version = strtoul(val, &c, 10);
2524 if (pack_idx_opts.version > 2)
2525 die(_("unsupported index version %s"), val);
2526 if (*c == ',' && c[1])
2527 pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2528 if (*c || pack_idx_opts.off32_limit & 0x80000000)
2529 die(_("bad index version '%s'"), val);
2530 return 0;
2533 static int option_parse_unpack_unreachable(const struct option *opt,
2534 const char *arg, int unset)
2536 if (unset) {
2537 unpack_unreachable = 0;
2538 unpack_unreachable_expiration = 0;
2540 else {
2541 unpack_unreachable = 1;
2542 if (arg)
2543 unpack_unreachable_expiration = approxidate(arg);
2545 return 0;
2548 static int option_parse_ulong(const struct option *opt,
2549 const char *arg, int unset)
2551 if (unset)
2552 die(_("option %s does not accept negative form"),
2553 opt->long_name);
2555 if (!git_parse_ulong(arg, opt->value))
2556 die(_("unable to parse value '%s' for option %s"),
2557 arg, opt->long_name);
2558 return 0;
2561 #define OPT_ULONG(s, l, v, h) \
2562 { OPTION_CALLBACK, (s), (l), (v), "n", (h), \
2563 PARSE_OPT_NONEG, option_parse_ulong }
2565 int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2567 int use_internal_rev_list = 0;
2568 int thin = 0;
2569 int all_progress_implied = 0;
2570 const char *rp_av[6];
2571 int rp_ac = 0;
2572 int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2573 struct option pack_objects_options[] = {
2574 OPT_SET_INT('q', "quiet", &progress,
2575 N_("do not show progress meter"), 0),
2576 OPT_SET_INT(0, "progress", &progress,
2577 N_("show progress meter"), 1),
2578 OPT_SET_INT(0, "all-progress", &progress,
2579 N_("show progress meter during object writing phase"), 2),
2580 OPT_BOOL(0, "all-progress-implied",
2581 &all_progress_implied,
2582 N_("similar to --all-progress when progress meter is shown")),
2583 { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
2584 N_("write the pack index file in the specified idx format version"),
2585 0, option_parse_index_version },
2586 OPT_ULONG(0, "max-pack-size", &pack_size_limit,
2587 N_("maximum size of each output pack file")),
2588 OPT_BOOL(0, "local", &local,
2589 N_("ignore borrowed objects from alternate object store")),
2590 OPT_BOOL(0, "incremental", &incremental,
2591 N_("ignore packed objects")),
2592 OPT_INTEGER(0, "window", &window,
2593 N_("limit pack window by objects")),
2594 OPT_ULONG(0, "window-memory", &window_memory_limit,
2595 N_("limit pack window by memory in addition to object limit")),
2596 OPT_INTEGER(0, "depth", &depth,
2597 N_("maximum length of delta chain allowed in the resulting pack")),
2598 OPT_BOOL(0, "reuse-delta", &reuse_delta,
2599 N_("reuse existing deltas")),
2600 OPT_BOOL(0, "reuse-object", &reuse_object,
2601 N_("reuse existing objects")),
2602 OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
2603 N_("use OFS_DELTA objects")),
2604 OPT_INTEGER(0, "threads", &delta_search_threads,
2605 N_("use threads when searching for best delta matches")),
2606 OPT_BOOL(0, "non-empty", &non_empty,
2607 N_("do not create an empty pack output")),
2608 OPT_BOOL(0, "revs", &use_internal_rev_list,
2609 N_("read revision arguments from standard input")),
2610 { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
2611 N_("limit the objects to those that are not yet packed"),
2612 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2613 { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
2614 N_("include objects reachable from any reference"),
2615 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2616 { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
2617 N_("include objects referred by reflog entries"),
2618 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2619 OPT_BOOL(0, "stdout", &pack_to_stdout,
2620 N_("output pack to stdout")),
2621 OPT_BOOL(0, "include-tag", &include_tag,
2622 N_("include tag objects that refer to objects to be packed")),
2623 OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
2624 N_("keep unreachable objects")),
2625 { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
2626 N_("unpack unreachable objects newer than <time>"),
2627 PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
2628 OPT_BOOL(0, "thin", &thin,
2629 N_("create thin packs")),
2630 OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
2631 N_("ignore packs that have companion .keep file")),
2632 OPT_INTEGER(0, "compression", &pack_compression_level,
2633 N_("pack compression level")),
2634 OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
2635 N_("do not hide commits by grafts"), 0),
2636 OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
2637 N_("use a bitmap index if available to speed up counting objects")),
2638 OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
2639 N_("write a bitmap index together with the pack index")),
2640 OPT_END(),
2643 check_replace_refs = 0;
2645 reset_pack_idx_option(&pack_idx_opts);
2646 git_config(git_pack_config, NULL);
2647 if (!pack_compression_seen && core_compression_seen)
2648 pack_compression_level = core_compression_level;
2650 progress = isatty(2);
2651 argc = parse_options(argc, argv, prefix, pack_objects_options,
2652 pack_usage, 0);
2654 if (argc) {
2655 base_name = argv[0];
2656 argc--;
2658 if (pack_to_stdout != !base_name || argc)
2659 usage_with_options(pack_usage, pack_objects_options);
2661 rp_av[rp_ac++] = "pack-objects";
2662 if (thin) {
2663 use_internal_rev_list = 1;
2664 rp_av[rp_ac++] = "--objects-edge";
2665 } else
2666 rp_av[rp_ac++] = "--objects";
2668 if (rev_list_all) {
2669 use_internal_rev_list = 1;
2670 rp_av[rp_ac++] = "--all";
2672 if (rev_list_reflog) {
2673 use_internal_rev_list = 1;
2674 rp_av[rp_ac++] = "--reflog";
2676 if (rev_list_unpacked) {
2677 use_internal_rev_list = 1;
2678 rp_av[rp_ac++] = "--unpacked";
2681 if (!reuse_object)
2682 reuse_delta = 0;
2683 if (pack_compression_level == -1)
2684 pack_compression_level = Z_DEFAULT_COMPRESSION;
2685 else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2686 die("bad pack compression level %d", pack_compression_level);
2688 if (!delta_search_threads) /* --threads=0 means autodetect */
2689 delta_search_threads = online_cpus();
2691 #ifdef NO_PTHREADS
2692 if (delta_search_threads != 1)
2693 warning("no threads support, ignoring --threads");
2694 #endif
2695 if (!pack_to_stdout && !pack_size_limit)
2696 pack_size_limit = pack_size_limit_cfg;
2697 if (pack_to_stdout && pack_size_limit)
2698 die("--max-pack-size cannot be used to build a pack for transfer.");
2699 if (pack_size_limit && pack_size_limit < 1024*1024) {
2700 warning("minimum pack size limit is 1 MiB");
2701 pack_size_limit = 1024*1024;
2704 if (!pack_to_stdout && thin)
2705 die("--thin cannot be used to build an indexable pack.");
2707 if (keep_unreachable && unpack_unreachable)
2708 die("--keep-unreachable and --unpack-unreachable are incompatible.");
2710 if (!use_internal_rev_list || !pack_to_stdout || is_repository_shallow())
2711 use_bitmap_index = 0;
2713 if (pack_to_stdout || !rev_list_all)
2714 write_bitmap_index = 0;
2716 if (progress && all_progress_implied)
2717 progress = 2;
2719 prepare_packed_git();
2721 if (progress)
2722 progress_state = start_progress(_("Counting objects"), 0);
2723 if (!use_internal_rev_list)
2724 read_object_list_from_stdin();
2725 else {
2726 rp_av[rp_ac] = NULL;
2727 get_object_list(rp_ac, rp_av);
2729 cleanup_preferred_base();
2730 if (include_tag && nr_result)
2731 for_each_ref(add_ref_tag, NULL);
2732 stop_progress(&progress_state);
2734 if (non_empty && !nr_result)
2735 return 0;
2736 if (nr_result)
2737 prepare_pack(window, depth);
2738 write_pack_file();
2739 if (progress)
2740 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2741 " reused %"PRIu32" (delta %"PRIu32")\n",
2742 written, written_delta, reused, reused_delta);
2743 return 0;