9 static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
12 unsigned char sha1[20];
13 unsigned long size; /* uncompressed size */
14 unsigned long offset; /* offset into the final pack file;
15 * nonzero if already written.
17 unsigned int depth; /* delta depth */
18 unsigned int delta_limit; /* base adjustment for in-pack delta */
19 unsigned int hash; /* name hint hash */
20 enum object_type type;
21 enum object_type in_pack_type; /* could be delta */
22 unsigned long delta_size; /* delta data size (uncompressed) */
23 struct object_entry *delta; /* delta base object */
24 struct packed_git *in_pack; /* already in pack */
25 unsigned int in_pack_offset;
26 struct object_entry *delta_child; /* delitified objects who bases me */
27 struct object_entry *delta_sibling; /* other deltified objects who
28 * uses the same base as me
30 int preferred_base; /* we do not pack this, but is encouraged to
31 * be used as the base objectto delta huge
34 int based_on_preferred; /* current delta candidate is a preferred
35 * one, or delta against a preferred one.
40 * Objects we are going to pack are colected in objects array (dynamically
41 * expanded). nr_objects & nr_alloc controls this array. They are stored
42 * in the order we see -- typically rev-list --objects order that gives us
43 * nice "minimum seek" order.
45 * sorted-by-sha ans sorted-by-type are arrays of pointers that point at
46 * elements in the objects array. The former is used to build the pack
47 * index (lists object names in the ascending order to help offset lookup),
48 * and the latter is used to group similar things together by try_delta()
52 static unsigned char object_list_sha1[20];
53 static int non_empty = 0;
54 static int no_reuse_delta = 0;
56 static int incremental = 0;
57 static struct object_entry **sorted_by_sha, **sorted_by_type;
58 static struct object_entry *objects = NULL;
59 static int nr_objects = 0, nr_alloc = 0, nr_result = 0;
60 static const char *base_name;
61 static unsigned char pack_file_sha1[20];
62 static int progress = 1;
65 * The object names in objects array are hashed with this hashtable,
66 * to help looking up the entry by object name. Binary search from
67 * sorted_by_sha is also possible but this was easier to code and faster.
68 * This hashtable is built after all the objects are seen.
70 static int *object_ix = NULL;
71 static int object_ix_hashsz = 0;
74 * Pack index for existing packs give us easy access to the offsets into
75 * corresponding pack file where each object's data starts, but the entries
76 * do not store the size of the compressed representation (uncompressed
77 * size is easily available by examining the pack entry header). We build
78 * a hashtable of existing packs (pack_revindex), and keep reverse index
79 * here -- pack index file is sorted by object name mapping to offset; this
80 * pack_revindex[].revindex array is an ordered list of offsets, so if you
81 * know the offset of an object, next offset is where its packed
82 * representation ends.
84 struct pack_revindex {
86 unsigned long *revindex;
87 } *pack_revindex = NULL;
88 static int pack_revindex_hashsz = 0;
93 static int written = 0;
94 static int written_delta = 0;
95 static int reused = 0;
96 static int reused_delta = 0;
98 static int pack_revindex_ix(struct packed_git *p)
100 unsigned int ui = (unsigned int) p;
103 ui = ui ^ (ui >> 16); /* defeat structure alignment */
104 i = (int)(ui % pack_revindex_hashsz);
105 while (pack_revindex[i].p) {
106 if (pack_revindex[i].p == p)
108 if (++i == pack_revindex_hashsz)
114 static void prepare_pack_ix(void)
117 struct packed_git *p;
118 for (num = 0, p = packed_git; p; p = p->next)
122 pack_revindex_hashsz = num * 11;
123 pack_revindex = xcalloc(sizeof(*pack_revindex), pack_revindex_hashsz);
124 for (p = packed_git; p; p = p->next) {
125 num = pack_revindex_ix(p);
127 pack_revindex[num].p = p;
129 /* revindex elements are lazily initialized */
132 static int cmp_offset(const void *a_, const void *b_)
134 unsigned long a = *(unsigned long *) a_;
135 unsigned long b = *(unsigned long *) b_;
145 * Ordered list of offsets of objects in the pack.
147 static void prepare_pack_revindex(struct pack_revindex *rix)
149 struct packed_git *p = rix->p;
150 int num_ent = num_packed_objects(p);
152 void *index = p->index_base + 256;
154 rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
155 for (i = 0; i < num_ent; i++) {
156 long hl = *((long *)(index + 24 * i));
157 rix->revindex[i] = ntohl(hl);
159 /* This knows the pack format -- the 20-byte trailer
160 * follows immediately after the last object data.
162 rix->revindex[num_ent] = p->pack_size - 20;
163 qsort(rix->revindex, num_ent, sizeof(unsigned long), cmp_offset);
166 static unsigned long find_packed_object_size(struct packed_git *p,
171 struct pack_revindex *rix;
172 unsigned long *revindex;
173 num = pack_revindex_ix(p);
175 die("internal error: pack revindex uninitialized");
176 rix = &pack_revindex[num];
178 prepare_pack_revindex(rix);
179 revindex = rix->revindex;
181 hi = num_packed_objects(p) + 1;
183 int mi = (lo + hi) / 2;
184 if (revindex[mi] == ofs) {
185 return revindex[mi+1] - ofs;
187 else if (ofs < revindex[mi])
192 die("internal error: pack revindex corrupt");
195 static void *delta_against(void *buf, unsigned long size, struct object_entry *entry)
197 unsigned long othersize, delta_size;
199 void *otherbuf = read_sha1_file(entry->delta->sha1, type, &othersize);
203 die("unable to read %s", sha1_to_hex(entry->delta->sha1));
204 delta_buf = diff_delta(otherbuf, othersize,
205 buf, size, &delta_size, 0);
206 if (!delta_buf || delta_size != entry->delta_size)
207 die("delta size changed");
214 * The per-object header is a pretty dense thing, which is
215 * - first byte: low four bits are "size", then three bits of "type",
216 * and the high bit is "size continues".
217 * - each byte afterwards: low seven bits are size continuation,
218 * with the high bit being "size continues"
220 static int encode_header(enum object_type type, unsigned long size, unsigned char *hdr)
225 if (type < OBJ_COMMIT || type > OBJ_DELTA)
226 die("bad type %d", type);
228 c = (type << 4) | (size & 15);
240 static unsigned long write_object(struct sha1file *f,
241 struct object_entry *entry)
246 unsigned char header[10];
247 unsigned hdrlen, datalen;
248 enum object_type obj_type;
251 if (entry->preferred_base)
254 obj_type = entry->type;
255 if (! entry->in_pack)
256 to_reuse = 0; /* can't reuse what we don't have */
257 else if (obj_type == OBJ_DELTA)
258 to_reuse = 1; /* check_object() decided it for us */
259 else if (obj_type != entry->in_pack_type)
260 to_reuse = 0; /* pack has delta which is unusable */
261 else if (entry->delta)
262 to_reuse = 0; /* we want to pack afresh */
264 to_reuse = 1; /* we have it in-pack undeltified,
265 * and we do not need to deltify it.
269 buf = read_sha1_file(entry->sha1, type, &size);
271 die("unable to read %s", sha1_to_hex(entry->sha1));
272 if (size != entry->size)
273 die("object %s size inconsistency (%lu vs %lu)",
274 sha1_to_hex(entry->sha1), size, entry->size);
276 buf = delta_against(buf, size, entry);
277 size = entry->delta_size;
278 obj_type = OBJ_DELTA;
281 * The object header is a byte of 'type' followed by zero or
282 * more bytes of length. For deltas, the 20 bytes of delta
285 hdrlen = encode_header(obj_type, size, header);
286 sha1write(f, header, hdrlen);
289 sha1write(f, entry->delta, 20);
292 datalen = sha1write_compressed(f, buf, size);
296 struct packed_git *p = entry->in_pack;
299 datalen = find_packed_object_size(p, entry->in_pack_offset);
300 buf = p->pack_base + entry->in_pack_offset;
301 sha1write(f, buf, datalen);
303 hdrlen = 0; /* not really */
304 if (obj_type == OBJ_DELTA)
308 if (obj_type == OBJ_DELTA)
311 return hdrlen + datalen;
314 static unsigned long write_one(struct sha1file *f,
315 struct object_entry *e,
316 unsigned long offset)
319 /* offset starts from header size and cannot be zero
320 * if it is written already.
324 offset += write_object(f, e);
325 /* if we are deltified, write out its base object. */
327 offset = write_one(f, e->delta, offset);
331 static void write_pack_file(void)
335 unsigned long offset;
336 struct pack_header hdr;
339 f = sha1fd(1, "<stdout>");
341 f = sha1create("%s-%s.%s", base_name,
342 sha1_to_hex(object_list_sha1), "pack");
343 hdr.hdr_signature = htonl(PACK_SIGNATURE);
344 hdr.hdr_version = htonl(PACK_VERSION);
345 hdr.hdr_entries = htonl(nr_result);
346 sha1write(f, &hdr, sizeof(hdr));
347 offset = sizeof(hdr);
348 for (i = 0; i < nr_objects; i++)
349 offset = write_one(f, objects + i, offset);
351 sha1close(f, pack_file_sha1, 1);
354 static void write_index_file(void)
357 struct sha1file *f = sha1create("%s-%s.%s", base_name,
358 sha1_to_hex(object_list_sha1), "idx");
359 struct object_entry **list = sorted_by_sha;
360 struct object_entry **last = list + nr_result;
361 unsigned int array[256];
364 * Write the first-level table (the list is sorted,
365 * but we use a 256-entry lookup to be able to avoid
366 * having to do eight extra binary search iterations).
368 for (i = 0; i < 256; i++) {
369 struct object_entry **next = list;
370 while (next < last) {
371 struct object_entry *entry = *next;
372 if (entry->sha1[0] != i)
376 array[i] = htonl(next - sorted_by_sha);
379 sha1write(f, array, 256 * sizeof(int));
382 * Write the actual SHA1 entries..
384 list = sorted_by_sha;
385 for (i = 0; i < nr_result; i++) {
386 struct object_entry *entry = *list++;
387 unsigned int offset = htonl(entry->offset);
388 sha1write(f, &offset, 4);
389 sha1write(f, entry->sha1, 20);
391 sha1write(f, pack_file_sha1, 20);
392 sha1close(f, NULL, 1);
395 static int locate_object_entry_hash(const unsigned char *sha1)
399 memcpy(&ui, sha1, sizeof(unsigned int));
400 i = ui % object_ix_hashsz;
401 while (0 < object_ix[i]) {
402 if (!memcmp(sha1, objects[object_ix[i]-1].sha1, 20))
404 if (++i == object_ix_hashsz)
410 static struct object_entry *locate_object_entry(const unsigned char *sha1)
414 if (!object_ix_hashsz)
417 i = locate_object_entry_hash(sha1);
419 return &objects[object_ix[i]-1];
423 static void rehash_objects(void)
426 struct object_entry *oe;
428 object_ix_hashsz = nr_objects * 3;
429 if (object_ix_hashsz < 1024)
430 object_ix_hashsz = 1024;
431 object_ix = xrealloc(object_ix, sizeof(int) * object_ix_hashsz);
432 object_ix = memset(object_ix, 0, sizeof(int) * object_ix_hashsz);
433 for (i = 0, oe = objects; i < nr_objects; i++, oe++) {
434 int ix = locate_object_entry_hash(oe->sha1);
438 object_ix[ix] = i + 1;
443 struct name_path *up;
448 static unsigned name_hash(struct name_path *path, const char *name)
450 struct name_path *p = path;
451 const char *n = name + strlen(name);
454 if (n != name && n[-1] == '\n')
456 while (name <= --n) {
457 unsigned char c = *n;
458 hash = hash * 11 + c;
460 for (p = path; p; p = p->up) {
461 hash = hash * 11 + '/';
462 n = p->elem + p->len;
463 while (p->elem <= --n) {
464 unsigned char c = *n;
465 hash = hash * 11 + c;
471 static int add_object_entry(const unsigned char *sha1, unsigned hash, int exclude)
473 unsigned int idx = nr_objects;
474 struct object_entry *entry;
475 struct packed_git *p;
476 unsigned int found_offset = 0;
477 struct packed_git *found_pack = NULL;
481 for (p = packed_git; p; p = p->next) {
483 if (find_pack_entry_one(sha1, &e, p)) {
486 if (local && !p->pack_local)
489 found_offset = e.offset;
495 if ((entry = locate_object_entry(sha1)) != NULL)
498 if (idx >= nr_alloc) {
499 unsigned int needed = (idx + 1024) * 3 / 2;
500 objects = xrealloc(objects, needed * sizeof(*entry));
503 entry = objects + idx;
504 nr_objects = idx + 1;
505 memset(entry, 0, sizeof(*entry));
506 memcpy(entry->sha1, sha1, 20);
509 if (object_ix_hashsz * 3 <= nr_objects * 4)
512 ix = locate_object_entry_hash(entry->sha1);
514 die("internal error in object hashing.");
515 object_ix[-1 - ix] = idx + 1;
521 entry->preferred_base = 1;
524 entry->in_pack = found_pack;
525 entry->in_pack_offset = found_offset;
531 static void add_pbase_tree(struct tree_desc *tree, struct name_path *up)
534 const unsigned char *sha1;
540 sha1 = tree_entry_extract(tree, &name, &mode);
541 update_tree_entry(tree);
542 if (!has_sha1_file(sha1))
544 if (sha1_object_info(sha1, type, &size))
547 hash = name_hash(up, name);
548 if (!add_object_entry(sha1, hash, 1))
551 if (!strcmp(type, "tree")) {
552 struct tree_desc sub;
556 elem = read_sha1_file(sha1, type, &sub.size);
561 me.len = strlen(name);
562 add_pbase_tree(&sub, &me);
569 static void add_preferred_base(unsigned char *sha1)
571 struct tree_desc tree;
574 elem = read_object_with_reference(sha1, "tree", &tree.size, NULL);
578 if (add_object_entry(sha1, name_hash(NULL, ""), 1))
579 add_pbase_tree(&tree, NULL);
583 static void check_object(struct object_entry *entry)
587 if (entry->in_pack && !entry->preferred_base) {
588 unsigned char base[20];
590 struct object_entry *base_entry;
592 /* We want in_pack_type even if we do not reuse delta.
593 * There is no point not reusing non-delta representations.
595 check_reuse_pack_delta(entry->in_pack,
596 entry->in_pack_offset,
598 &entry->in_pack_type);
600 /* Check if it is delta, and the base is also an object
601 * we are going to pack. If so we will reuse the existing
604 if (!no_reuse_delta &&
605 entry->in_pack_type == OBJ_DELTA &&
606 (base_entry = locate_object_entry(base)) &&
607 (!base_entry->preferred_base)) {
609 /* Depth value does not matter - find_deltas()
610 * will never consider reused delta as the
611 * base object to deltify other objects
612 * against, in order to avoid circular deltas.
615 /* uncompressed size of the delta data */
616 entry->size = entry->delta_size = size;
617 entry->delta = base_entry;
618 entry->type = OBJ_DELTA;
620 entry->delta_sibling = base_entry->delta_child;
621 base_entry->delta_child = entry;
625 /* Otherwise we would do the usual */
628 if (sha1_object_info(entry->sha1, type, &entry->size))
629 die("unable to get type of object %s",
630 sha1_to_hex(entry->sha1));
632 if (!strcmp(type, "commit")) {
633 entry->type = OBJ_COMMIT;
634 } else if (!strcmp(type, "tree")) {
635 entry->type = OBJ_TREE;
636 } else if (!strcmp(type, "blob")) {
637 entry->type = OBJ_BLOB;
638 } else if (!strcmp(type, "tag")) {
639 entry->type = OBJ_TAG;
641 die("unable to pack object %s of type %s",
642 sha1_to_hex(entry->sha1), type);
645 static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
647 struct object_entry *child = me->delta_child;
650 unsigned int c = check_delta_limit(child, n + 1);
653 child = child->delta_sibling;
658 static void get_object_details(void)
661 struct object_entry *entry;
664 for (i = 0, entry = objects; i < nr_objects; i++, entry++)
667 if (nr_objects == nr_result) {
669 * Depth of objects that depend on the entry -- this
670 * is subtracted from depth-max to break too deep
671 * delta chain because of delta data reusing.
672 * However, we loosen this restriction when we know we
673 * are creating a thin pack -- it will have to be
674 * expanded on the other end anyway, so do not
675 * artificially cut the delta chain and let it go as
678 for (i = 0, entry = objects; i < nr_objects; i++, entry++)
679 if (!entry->delta && entry->delta_child)
681 check_delta_limit(entry, 1);
685 typedef int (*entry_sort_t)(const struct object_entry *, const struct object_entry *);
687 static entry_sort_t current_sort;
689 static int sort_comparator(const void *_a, const void *_b)
691 struct object_entry *a = *(struct object_entry **)_a;
692 struct object_entry *b = *(struct object_entry **)_b;
693 return current_sort(a,b);
696 static struct object_entry **create_sorted_list(entry_sort_t sort)
698 struct object_entry **list = xmalloc(nr_objects * sizeof(struct object_entry *));
701 for (i = 0; i < nr_objects; i++)
702 list[i] = objects + i;
704 qsort(list, nr_objects, sizeof(struct object_entry *), sort_comparator);
708 static int sha1_sort(const struct object_entry *a, const struct object_entry *b)
710 return memcmp(a->sha1, b->sha1, 20);
713 static struct object_entry **create_final_object_list()
715 struct object_entry **list;
718 for (i = nr_result = 0; i < nr_objects; i++)
719 if (!objects[i].preferred_base)
721 list = xmalloc(nr_result * sizeof(struct object_entry *));
722 for (i = j = 0; i < nr_objects; i++) {
723 if (!objects[i].preferred_base)
724 list[j++] = objects + i;
726 current_sort = sha1_sort;
727 qsort(list, nr_result, sizeof(struct object_entry *), sort_comparator);
731 static int type_size_sort(const struct object_entry *a, const struct object_entry *b)
733 if (a->type < b->type)
735 if (a->type > b->type)
737 if (a->hash < b->hash)
739 if (a->hash > b->hash)
741 if (a->preferred_base < b->preferred_base)
743 if (a->preferred_base > b->preferred_base)
745 if (a->size < b->size)
747 if (a->size > b->size)
749 return a < b ? -1 : (a > b);
753 struct object_entry *entry;
758 * We search for deltas _backwards_ in a list sorted by type and
759 * by size, so that we see progressively smaller and smaller files.
760 * That's because we prefer deltas to be from the bigger file
761 * to the smaller - deletes are potentially cheaper, but perhaps
762 * more importantly, the bigger file is likely the more recent
765 static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_depth)
767 struct object_entry *cur_entry = cur->entry;
768 struct object_entry *old_entry = old->entry;
769 int old_preferred = (old_entry->preferred_base ||
770 old_entry->based_on_preferred);
771 unsigned long size, oldsize, delta_size, sizediff;
775 /* Don't bother doing diffs between different types */
776 if (cur_entry->type != old_entry->type)
779 /* We do not compute delta to *create* objects we are not
782 if (cur_entry->preferred_base)
785 /* If the current object is at pack edge, take the depth the
786 * objects that depend on the current object into account --
787 * otherwise they would become too deep.
789 if (cur_entry->delta_child) {
790 if (max_depth <= cur_entry->delta_limit)
792 max_depth -= cur_entry->delta_limit;
795 size = cur_entry->size;
798 oldsize = old_entry->size;
799 sizediff = oldsize > size ? oldsize - size : size - oldsize;
800 if (sizediff > size / 8)
802 if (old_entry->depth >= max_depth)
808 * We always delta from the bigger to the smaller, since that's
809 * more space-efficient (deletes don't have to say _what_ they
812 max_size = size / 2 - 20;
813 if (cur_entry->delta) {
814 if (cur_entry->based_on_preferred) {
816 max_size = cur_entry->delta_size-1;
818 /* trying with non-preferred one when we
819 * already have a delta based on preferred
824 else if (!old_preferred)
825 max_size = cur_entry->delta_size-1;
827 /* otherwise... even if delta with a
828 * preferred one produces a bigger result than
829 * what we currently have, which is based on a
830 * non-preferred one, it is OK.
834 if (sizediff >= max_size)
836 delta_buf = diff_delta(old->data, oldsize,
837 cur->data, size, &delta_size, max_size);
840 cur_entry->delta = old_entry;
841 cur_entry->delta_size = delta_size;
842 cur_entry->depth = old_entry->depth + 1;
843 cur_entry->based_on_preferred = old_preferred;
848 static void find_deltas(struct object_entry **list, int window, int depth)
851 unsigned int array_size = window * sizeof(struct unpacked);
852 struct unpacked *array = xmalloc(array_size);
855 memset(array, 0, array_size);
858 eye_candy = i - (nr_objects / 20);
861 struct object_entry *entry = list[i];
862 struct unpacked *n = array + idx;
867 if (progress && i <= eye_candy) {
868 eye_candy -= nr_objects / 20;
873 /* This happens if we decided to reuse existing
874 * delta from a pack. "!no_reuse_delta &&" is implied.
880 n->data = read_sha1_file(entry->sha1, type, &size);
881 if (size != entry->size)
882 die("object %s inconsistent object length (%lu vs %lu)", sha1_to_hex(entry->sha1), size, entry->size);
886 unsigned int other_idx = idx + j;
888 if (other_idx >= window)
890 m = array + other_idx;
893 if (try_delta(n, m, depth) < 0)
901 for (i = 0; i < window; ++i)
906 static void prepare_pack(int window, int depth)
909 fprintf(stderr, "Packing %d objects", nr_result);
910 get_object_details();
914 sorted_by_type = create_sorted_list(type_size_sort);
916 find_deltas(sorted_by_type, window+1, depth);
922 static int reuse_cached_pack(unsigned char *sha1, int pack_to_stdout)
924 static const char cache[] = "pack-cache/pack-%s.%s";
925 char *cached_pack, *cached_idx;
926 int ifd, ofd, ifd_ix = -1;
928 cached_pack = git_path(cache, sha1_to_hex(sha1), "pack");
929 ifd = open(cached_pack, O_RDONLY);
933 if (!pack_to_stdout) {
934 cached_idx = git_path(cache, sha1_to_hex(sha1), "idx");
935 ifd_ix = open(cached_idx, O_RDONLY);
943 fprintf(stderr, "Reusing %d objects pack %s\n", nr_objects,
946 if (pack_to_stdout) {
953 snprintf(name, sizeof(name),
954 "%s-%s.%s", base_name, sha1_to_hex(sha1), "pack");
955 ofd = open(name, O_CREAT | O_EXCL | O_WRONLY, 0666);
957 die("unable to open %s (%s)", name, strerror(errno));
958 if (copy_fd(ifd, ofd))
962 snprintf(name, sizeof(name),
963 "%s-%s.%s", base_name, sha1_to_hex(sha1), "idx");
964 ofd = open(name, O_CREAT | O_EXCL | O_WRONLY, 0666);
966 die("unable to open %s (%s)", name, strerror(errno));
967 if (copy_fd(ifd_ix, ofd))
970 puts(sha1_to_hex(sha1));
976 int main(int argc, char **argv)
979 char line[PATH_MAX + 20];
980 int window = 10, depth = 10, pack_to_stdout = 0;
981 struct object_entry **list;
983 struct timeval prev_tv;
985 int eye_candy_incr = 500;
988 setup_git_directory();
990 for (i = 1; i < argc; i++) {
991 const char *arg = argv[i];
994 if (!strcmp("--non-empty", arg)) {
998 if (!strcmp("--local", arg)) {
1002 if (!strcmp("--incremental", arg)) {
1006 if (!strncmp("--window=", arg, 9)) {
1008 window = strtoul(arg+9, &end, 0);
1009 if (!arg[9] || *end)
1013 if (!strncmp("--depth=", arg, 8)) {
1015 depth = strtoul(arg+8, &end, 0);
1016 if (!arg[8] || *end)
1020 if (!strcmp("-q", arg)) {
1024 if (!strcmp("--no-reuse-delta", arg)) {
1028 if (!strcmp("--stdout", arg)) {
1039 if (pack_to_stdout != !base_name)
1042 prepare_packed_git();
1044 fprintf(stderr, "Generating pack...\n");
1045 gettimeofday(&prev_tv, NULL);
1047 while (fgets(line, sizeof(line), stdin) != NULL) {
1048 unsigned char sha1[20];
1050 if (progress && (eye_candy <= nr_objects)) {
1051 fprintf(stderr, "Counting objects...%d\r", nr_objects);
1052 if (eye_candy && (50 <= eye_candy_incr)) {
1055 gettimeofday(&tv, NULL);
1056 time_diff = (tv.tv_sec - prev_tv.tv_sec);
1058 time_diff += (tv.tv_usec - prev_tv.tv_usec);
1059 if ((1 << 9) < time_diff)
1060 eye_candy_incr += 50;
1061 else if (50 < eye_candy_incr)
1062 eye_candy_incr -= 50;
1064 eye_candy += eye_candy_incr;
1066 if (line[0] == '-') {
1067 if (get_sha1_hex(line+1, sha1))
1068 die("expected edge sha1, got garbage:\n %s",
1070 add_preferred_base(sha1);
1073 if (get_sha1_hex(line, sha1))
1074 die("expected sha1, got garbage:\n %s", line);
1075 add_object_entry(sha1, name_hash(NULL, line+41), 0);
1078 fprintf(stderr, "Done counting %d objects.\n", nr_objects);
1079 if (non_empty && !nr_objects)
1082 sorted_by_sha = create_final_object_list();
1084 list = sorted_by_sha;
1085 for (i = 0; i < nr_result; i++) {
1086 struct object_entry *entry = *list++;
1087 SHA1_Update(&ctx, entry->sha1, 20);
1089 SHA1_Final(object_list_sha1, &ctx);
1090 if (progress && (nr_objects != nr_result))
1091 fprintf(stderr, "Result has %d objects.\n", nr_result);
1093 if (reuse_cached_pack(object_list_sha1, pack_to_stdout))
1096 prepare_pack(window, depth);
1097 if (!pack_to_stdout) {
1099 puts(sha1_to_hex(object_list_sha1));
1103 fprintf(stderr, "Total %d, written %d (delta %d), reused %d (delta %d)\n",
1104 nr_result, written, written_delta, reused, reused_delta);