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