builtin-pack-objects.c 47.1 KB
Newer Older
1
#include "builtin.h"
2
#include "cache.h"
3
#include "attr.h"
4
#include "object.h"
5 6 7 8
#include "blob.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
9
#include "delta.h"
10
#include "pack.h"
11
#include "csum-file.h"
J
Junio C Hamano 已提交
12
#include "tree-walk.h"
13 14 15
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
N
Nicolas Pitre 已提交
16
#include "progress.h"
17

18
static const char pack_usage[] = "\
19 20 21
git-pack-objects [{ -q | --progress | --all-progress }] \n\
	[--max-pack-size=N] [--local] [--incremental] \n\
	[--window=N] [--window-memory=N] [--depth=N] \n\
22 23 24
	[--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] \n\
	[--non-empty] [--revs [--unpacked | --all]*] [--reflog] \n\
	[--stdout | base-name] [<ref-list | <object-list]";
25 26

struct object_entry {
G
Geert Bosch 已提交
27
	struct pack_idx_entry idx;
28 29
	unsigned long size;	/* uncompressed size */
	struct packed_git *in_pack; 	/* already in pack */
30
	off_t in_pack_offset;
31
	struct object_entry *delta;	/* delta base object */
32
	struct object_entry *delta_child; /* deltified objects who bases me */
33 34 35
	struct object_entry *delta_sibling; /* other deltified objects who
					     * uses the same base as me
					     */
36
	void *delta_data;	/* cached delta (uncompressed) */
37
	unsigned long delta_size;	/* delta data size (uncompressed) */
38
	unsigned int hash;	/* name hint hash */
39 40 41 42
	enum object_type type;
	enum object_type in_pack_type;	/* could be delta */
	unsigned char in_pack_header_size;
	unsigned char preferred_base; /* we do not pack this, but is available
43
				       * to be used as the base object to delta
44 45
				       * objects against.
				       */
46
	unsigned char no_try_delta;
47 48
};

49
/*
50
 * Objects we are going to pack are collected in objects array (dynamically
51 52 53 54
 * expanded).  nr_objects & nr_alloc controls this array.  They are stored
 * in the order we see -- typically rev-list --objects order that gives us
 * nice "minimum seek" order.
 */
55
static struct object_entry *objects;
56 57
static struct object_entry **written_list;
static uint32_t nr_objects, nr_alloc, nr_result, nr_written;
58

59
static int non_empty;
60
static int no_reuse_delta, no_reuse_object;
61 62
static int local;
static int incremental;
63
static int allow_ofs_delta;
64 65
static const char *pack_tmp_name, *idx_tmp_name;
static char tmpname[PATH_MAX];
66
static const char *base_name;
J
Junio C Hamano 已提交
67
static int progress = 1;
68
static int window = 10;
69
static uint32_t pack_size_limit;
70
static int depth = 50;
71
static int pack_to_stdout;
72
static int num_preferred_base;
N
Nicolas Pitre 已提交
73
static struct progress progress_state;
74 75
static int pack_compression_level = Z_DEFAULT_COMPRESSION;
static int pack_compression_seen;
76

77 78
static unsigned long delta_cache_size = 0;
static unsigned long max_delta_cache_size = 0;
79
static unsigned long cache_max_small_delta_size = 1000;
80

81 82 83
static unsigned long window_memory_usage = 0;
static unsigned long window_memory_limit = 0;

84 85
/*
 * The object names in objects array are hashed with this hashtable,
86
 * to help looking up the entry by object name.
87 88
 * This hashtable is built after all the objects are seen.
 */
89 90
static int *object_ix;
static int object_ix_hashsz;
91 92 93 94 95

/*
 * Pack index for existing packs give us easy access to the offsets into
 * corresponding pack file where each object's data starts, but the entries
 * do not store the size of the compressed representation (uncompressed
96 97 98 99 100 101 102 103 104
 * size is easily available by examining the pack entry header).  It is
 * also rather expensive to find the sha1 for an object given its offset.
 *
 * We build a hashtable of existing packs (pack_revindex), and keep reverse
 * index here -- pack index file is sorted by object name mapping to offset;
 * this pack_revindex[].revindex array is a list of offset/index_nr pairs
 * ordered by offset, so if you know the offset of an object, next offset
 * is where its packed representation ends and the index_nr can be used to
 * get the object sha1 from the main index.
105
 */
106
struct revindex_entry {
107
	off_t offset;
108 109
	unsigned int nr;
};
110 111
struct pack_revindex {
	struct packed_git *p;
112 113 114
	struct revindex_entry *revindex;
};
static struct  pack_revindex *pack_revindex;
115
static int pack_revindex_hashsz;
116 117 118 119

/*
 * stats
 */
120 121
static uint32_t written, written_delta;
static uint32_t reused, reused_delta;
122 123 124

static int pack_revindex_ix(struct packed_git *p)
{
L
Luck, Tony 已提交
125
	unsigned long ui = (unsigned long)p;
126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
	int i;

	ui = ui ^ (ui >> 16); /* defeat structure alignment */
	i = (int)(ui % pack_revindex_hashsz);
	while (pack_revindex[i].p) {
		if (pack_revindex[i].p == p)
			return i;
		if (++i == pack_revindex_hashsz)
			i = 0;
	}
	return -1 - i;
}

static void prepare_pack_ix(void)
{
	int num;
	struct packed_git *p;
	for (num = 0, p = packed_git; p; p = p->next)
		num++;
	if (!num)
		return;
	pack_revindex_hashsz = num * 11;
	pack_revindex = xcalloc(sizeof(*pack_revindex), pack_revindex_hashsz);
	for (p = packed_git; p; p = p->next) {
		num = pack_revindex_ix(p);
		num = - 1 - num;
		pack_revindex[num].p = p;
	}
	/* revindex elements are lazily initialized */
}

static int cmp_offset(const void *a_, const void *b_)
{
159 160 161
	const struct revindex_entry *a = a_;
	const struct revindex_entry *b = b_;
	return (a->offset < b->offset) ? -1 : (a->offset > b->offset) ? 1 : 0;
162 163 164 165 166 167 168 169
}

/*
 * Ordered list of offsets of objects in the pack.
 */
static void prepare_pack_revindex(struct pack_revindex *rix)
{
	struct packed_git *p = rix->p;
N
Nicolas Pitre 已提交
170
	int num_ent = p->num_objects;
171
	int i;
172
	const char *index = p->index_data;
173

174
	rix->revindex = xmalloc(sizeof(*rix->revindex) * (num_ent + 1));
175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
	index += 4 * 256;

	if (p->index_version > 1) {
		const uint32_t *off_32 =
			(uint32_t *)(index + 8 + p->num_objects * (20 + 4));
		const uint32_t *off_64 = off_32 + p->num_objects;
		for (i = 0; i < num_ent; i++) {
			uint32_t off = ntohl(*off_32++);
			if (!(off & 0x80000000)) {
				rix->revindex[i].offset = off;
			} else {
				rix->revindex[i].offset =
					((uint64_t)ntohl(*off_64++)) << 32;
				rix->revindex[i].offset |=
					ntohl(*off_64++);
			}
			rix->revindex[i].nr = i;
		}
	} else {
		for (i = 0; i < num_ent; i++) {
			uint32_t hl = *((uint32_t *)(index + 24 * i));
			rix->revindex[i].offset = ntohl(hl);
			rix->revindex[i].nr = i;
		}
199
	}
200

201 202 203
	/* This knows the pack format -- the 20-byte trailer
	 * follows immediately after the last object data.
	 */
204 205 206
	rix->revindex[num_ent].offset = p->pack_size - 20;
	rix->revindex[num_ent].nr = -1;
	qsort(rix->revindex, num_ent, sizeof(*rix->revindex), cmp_offset);
207 208
}

209
static struct revindex_entry * find_packed_object(struct packed_git *p,
210
						  off_t ofs)
211 212 213 214
{
	int num;
	int lo, hi;
	struct pack_revindex *rix;
215
	struct revindex_entry *revindex;
216 217 218 219 220 221 222 223
	num = pack_revindex_ix(p);
	if (num < 0)
		die("internal error: pack revindex uninitialized");
	rix = &pack_revindex[num];
	if (!rix->revindex)
		prepare_pack_revindex(rix);
	revindex = rix->revindex;
	lo = 0;
N
Nicolas Pitre 已提交
224
	hi = p->num_objects + 1;
225 226
	do {
		int mi = (lo + hi) / 2;
227 228
		if (revindex[mi].offset == ofs) {
			return revindex + mi;
229
		}
230
		else if (ofs < revindex[mi].offset)
231 232 233 234 235 236 237
			hi = mi;
		else
			lo = mi + 1;
	} while (lo < hi);
	die("internal error: pack revindex corrupt");
}

238 239
static const unsigned char *find_packed_object_name(struct packed_git *p,
						    off_t ofs)
240 241
{
	struct revindex_entry *entry = find_packed_object(p, ofs);
242
	return nth_packed_object_sha1(p, entry->nr);
243 244
}

245 246 247
static void *delta_against(void *buf, unsigned long size, struct object_entry *entry)
{
	unsigned long othersize, delta_size;
248
	enum object_type type;
G
Geert Bosch 已提交
249
	void *otherbuf = read_sha1_file(entry->delta->idx.sha1, &type, &othersize);
250 251 252
	void *delta_buf;

	if (!otherbuf)
G
Geert Bosch 已提交
253
		die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
254
        delta_buf = diff_delta(otherbuf, othersize,
255
			       buf, size, &delta_size, 0);
256
        if (!delta_buf || delta_size != entry->delta_size)
J
Junio C Hamano 已提交
257
		die("delta size changed");
258 259 260 261 262
        free(buf);
        free(otherbuf);
	return delta_buf;
}

263 264 265 266 267 268 269 270 271
/*
 * The per-object header is a pretty dense thing, which is
 *  - first byte: low four bits are "size", then three bits of "type",
 *    and the high bit is "size continues".
 *  - each byte afterwards: low seven bits are size continuation,
 *    with the high bit being "size continues"
 */
static int encode_header(enum object_type type, unsigned long size, unsigned char *hdr)
{
272
	int n = 1;
273 274
	unsigned char c;

275
	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
276 277
		die("bad type %d", type);

278 279 280
	c = (type << 4) | (size & 15);
	size >>= 4;
	while (size) {
281
		*hdr++ = c | 0x80;
282 283 284
		c = size & 0x7f;
		size >>= 7;
		n++;
285 286 287 288 289
	}
	*hdr = c;
	return n;
}

290 291 292 293
/*
 * we are going to reuse the existing object data as is.  make
 * sure it is not corrupt.
 */
294 295
static int check_pack_inflate(struct packed_git *p,
		struct pack_window **w_curs,
296 297
		off_t offset,
		off_t len,
298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319
		unsigned long expect)
{
	z_stream stream;
	unsigned char fakebuf[4096], *in;
	int st;

	memset(&stream, 0, sizeof(stream));
	inflateInit(&stream);
	do {
		in = use_pack(p, w_curs, offset, &stream.avail_in);
		stream.next_in = in;
		stream.next_out = fakebuf;
		stream.avail_out = sizeof(fakebuf);
		st = inflate(&stream, Z_FINISH);
		offset += stream.next_in - in;
	} while (st == Z_OK || st == Z_BUF_ERROR);
	inflateEnd(&stream);
	return (st == Z_STREAM_END &&
		stream.total_out == expect &&
		stream.total_in == len) ? 0 : -1;
}

320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341
static int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
			  off_t offset, off_t len, unsigned int nr)
{
	const uint32_t *index_crc;
	uint32_t data_crc = crc32(0, Z_NULL, 0);

	do {
		unsigned int avail;
		void *data = use_pack(p, w_curs, offset, &avail);
		if (avail > len)
			avail = len;
		data_crc = crc32(data_crc, data, avail);
		offset += avail;
		len -= avail;
	} while (len);

	index_crc = p->index_data;
	index_crc += 2 + 256 + p->num_objects * (20/4) + nr;

	return data_crc != ntohl(*index_crc);
}

342 343 344
static void copy_pack_data(struct sha1file *f,
		struct packed_git *p,
		struct pack_window **w_curs,
345 346
		off_t offset,
		off_t len)
347 348 349 350 351 352 353
{
	unsigned char *in;
	unsigned int avail;

	while (len) {
		in = use_pack(p, w_curs, offset, &avail);
		if (avail > len)
354
			avail = (unsigned int)len;
355 356 357 358 359 360
		sha1write(f, in, avail);
		offset += avail;
		len -= avail;
	}
}

361
static unsigned long write_object(struct sha1file *f,
362 363
				  struct object_entry *entry,
				  off_t write_offset)
364 365
{
	unsigned long size;
366
	enum object_type type;
367
	void *buf;
368
	unsigned char header[10];
369
	unsigned char dheader[10];
370 371
	unsigned hdrlen;
	off_t datalen;
372
	enum object_type obj_type;
373
	int to_reuse = 0;
374 375 376 377 378 379 380 381
	/* write limit if limited packsize and not first object */
	unsigned long limit = pack_size_limit && nr_written ?
				pack_size_limit - write_offset : 0;
				/* no if no delta */
	int usable_delta =	!entry->delta ? 0 :
				/* yes if unlimited packfile */
				!pack_size_limit ? 1 :
				/* no if base written to previous pack */
G
Geert Bosch 已提交
382
				entry->delta->idx.offset == (off_t)-1 ? 0 :
383 384 385
				/* otherwise double-check written to this
				 * pack,  like we do below
				 */
G
Geert Bosch 已提交
386
				entry->delta->idx.offset ? 1 : 0;
387

388 389 390
	if (!pack_to_stdout)
		crc32_begin(f);

391
	obj_type = entry->type;
392 393 394
	if (no_reuse_object)
		to_reuse = 0;	/* explicit */
	else if (!entry->in_pack)
395
		to_reuse = 0;	/* can't reuse what we don't have */
396
	else if (obj_type == OBJ_REF_DELTA || obj_type == OBJ_OFS_DELTA)
397 398 399
				/* check_object() decided it for us ... */
		to_reuse = usable_delta;
				/* ... but pack split may override that */
400 401 402 403 404 405 406 407 408
	else if (obj_type != entry->in_pack_type)
		to_reuse = 0;	/* pack has delta which is unusable */
	else if (entry->delta)
		to_reuse = 0;	/* we want to pack afresh */
	else
		to_reuse = 1;	/* we have it in-pack undeltified,
				 * and we do not need to deltify it.
				 */

409
	if (!to_reuse) {
410 411 412
		z_stream stream;
		unsigned long maxsize;
		void *out;
N
Nicolas Pitre 已提交
413
		if (!usable_delta) {
G
Geert Bosch 已提交
414
			buf = read_sha1_file(entry->idx.sha1, &obj_type, &size);
N
Nicolas Pitre 已提交
415
			if (!buf)
G
Geert Bosch 已提交
416
				die("unable to read %s", sha1_to_hex(entry->idx.sha1));
N
Nicolas Pitre 已提交
417
		} else if (entry->delta_data) {
418
			size = entry->delta_size;
N
Nicolas Pitre 已提交
419 420
			buf = entry->delta_data;
			entry->delta_data = NULL;
G
Geert Bosch 已提交
421
			obj_type = (allow_ofs_delta && entry->delta->idx.offset) ?
422
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
423
		} else {
G
Geert Bosch 已提交
424
			buf = read_sha1_file(entry->idx.sha1, &type, &size);
425
			if (!buf)
G
Geert Bosch 已提交
426
				die("unable to read %s", sha1_to_hex(entry->idx.sha1));
N
Nicolas Pitre 已提交
427 428
			buf = delta_against(buf, size, entry);
			size = entry->delta_size;
G
Geert Bosch 已提交
429
			obj_type = (allow_ofs_delta && entry->delta->idx.offset) ?
N
Nicolas Pitre 已提交
430
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
431
		}
432 433 434 435 436 437 438 439 440 441 442 443 444 445 446
		/* compress the data to store and put compressed length in datalen */
		memset(&stream, 0, sizeof(stream));
		deflateInit(&stream, pack_compression_level);
		maxsize = deflateBound(&stream, size);
		out = xmalloc(maxsize);
		/* Compress it */
		stream.next_in = buf;
		stream.avail_in = size;
		stream.next_out = out;
		stream.avail_out = maxsize;
		while (deflate(&stream, Z_FINISH) == Z_OK)
			/* nothing */;
		deflateEnd(&stream);
		datalen = stream.total_out;
		deflateEnd(&stream);
447 448
		/*
		 * The object header is a byte of 'type' followed by zero or
449
		 * more bytes of length.
450 451 452
		 */
		hdrlen = encode_header(obj_type, size, header);

453 454 455 456 457 458
		if (obj_type == OBJ_OFS_DELTA) {
			/*
			 * Deltas with relative base contain an additional
			 * encoding of the relative offset for the delta
			 * base from this object's position in the pack.
			 */
G
Geert Bosch 已提交
459
			off_t ofs = entry->idx.offset - entry->delta->idx.offset;
460 461
			unsigned pos = sizeof(dheader) - 1;
			dheader[pos] = ofs & 127;
462
			while (ofs >>= 7)
463 464 465 466 467 468 469 470 471
				dheader[--pos] = 128 | (--ofs & 127);
			if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
				free(out);
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
			sha1write(f, dheader + pos, sizeof(dheader) - pos);
			hdrlen += sizeof(dheader) - pos;
472 473 474 475 476
		} else if (obj_type == OBJ_REF_DELTA) {
			/*
			 * Deltas with a base reference contain
			 * an additional 20 bytes for the base sha1.
			 */
477 478 479 480 481 482
			if (limit && hdrlen + 20 + datalen + 20 >= limit) {
				free(out);
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
G
Geert Bosch 已提交
483
			sha1write(f, entry->delta->idx.sha1, 20);
484
			hdrlen += 20;
485 486 487 488 489 490 491
		} else {
			if (limit && hdrlen + datalen + 20 >= limit) {
				free(out);
				free(buf);
				return 0;
			}
			sha1write(f, header, hdrlen);
492
		}
493 494
		sha1write(f, out, datalen);
		free(out);
495
		free(buf);
496
	}
497 498
	else {
		struct packed_git *p = entry->in_pack;
499
		struct pack_window *w_curs = NULL;
500
		struct revindex_entry *revidx;
501
		off_t offset;
502

503
		if (entry->delta) {
G
Geert Bosch 已提交
504
			obj_type = (allow_ofs_delta && entry->delta->idx.offset) ?
505 506 507 508
				OBJ_OFS_DELTA : OBJ_REF_DELTA;
			reused_delta++;
		}
		hdrlen = encode_header(obj_type, entry->size, header);
509 510 511 512 513
		offset = entry->in_pack_offset;
		revidx = find_packed_object(p, offset);
		datalen = revidx[1].offset - offset;
		if (!pack_to_stdout && p->index_version > 1 &&
		    check_pack_crc(p, &w_curs, offset, datalen, revidx->nr))
G
Geert Bosch 已提交
514
			die("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
515 516
		offset += entry->in_pack_header_size;
		datalen -= entry->in_pack_header_size;
517
		if (obj_type == OBJ_OFS_DELTA) {
G
Geert Bosch 已提交
518
			off_t ofs = entry->idx.offset - entry->delta->idx.offset;
519 520 521 522 523 524 525 526 527 528 529 530 531
			unsigned pos = sizeof(dheader) - 1;
			dheader[pos] = ofs & 127;
			while (ofs >>= 7)
				dheader[--pos] = 128 | (--ofs & 127);
			if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit)
				return 0;
			sha1write(f, header, hdrlen);
			sha1write(f, dheader + pos, sizeof(dheader) - pos);
			hdrlen += sizeof(dheader) - pos;
		} else if (obj_type == OBJ_REF_DELTA) {
			if (limit && hdrlen + 20 + datalen + 20 >= limit)
				return 0;
			sha1write(f, header, hdrlen);
G
Geert Bosch 已提交
532
			sha1write(f, entry->delta->idx.sha1, 20);
533 534 535 536 537 538 539
			hdrlen += 20;
		} else {
			if (limit && hdrlen + datalen + 20 >= limit)
				return 0;
			sha1write(f, header, hdrlen);
		}

540 541
		if (!pack_to_stdout && p->index_version == 1 &&
		    check_pack_inflate(p, &w_curs, offset, datalen, entry->size))
G
Geert Bosch 已提交
542
			die("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
543
		copy_pack_data(f, p, &w_curs, offset, datalen);
544
		unuse_pack(&w_curs);
545
		reused++;
546
	}
547
	if (usable_delta)
548
		written_delta++;
549
	written++;
550
	if (!pack_to_stdout)
G
Geert Bosch 已提交
551
		entry->idx.crc32 = crc32_end(f);
552 553 554
	return hdrlen + datalen;
}

555
static off_t write_one(struct sha1file *f,
556
			       struct object_entry *e,
557
			       off_t offset)
558
{
559 560 561
	unsigned long size;

	/* offset is non zero if object is written already. */
G
Geert Bosch 已提交
562
	if (e->idx.offset || e->preferred_base)
563
		return offset;
564 565

	/* if we are deltified, write out base object first. */
566
	if (e->delta) {
567
		offset = write_one(f, e->delta, offset);
568 569 570
		if (!offset)
			return 0;
	}
571

G
Geert Bosch 已提交
572
	e->idx.offset = offset;
573 574
	size = write_object(f, e, offset);
	if (!size) {
G
Geert Bosch 已提交
575
		e->idx.offset = 0;
576 577
		return 0;
	}
578
	written_list[nr_written++] = e;
579 580 581 582 583

	/* make sure off_t is sufficiently large not to wrap */
	if (offset > offset + size)
		die("pack too large for current definition of off_t");
	return offset + size;
584 585
}

586 587 588
static int open_object_dir_tmp(const char *path)
{
    snprintf(tmpname, sizeof(tmpname), "%s/%s", get_object_directory(), path);
589
    return xmkstemp(tmpname);
590 591
}

G
Geert Bosch 已提交
592
/* forward declaration for write_pack_file */
593 594 595
static int adjust_perm(const char *path, mode_t mode);

static void write_pack_file(void)
596
{
597
	uint32_t i = 0, j;
598
	struct sha1file *f;
599
	off_t offset, offset_one, last_obj_offset = 0;
600
	struct pack_header hdr;
601 602
	int do_progress = progress >> pack_to_stdout;
	uint32_t nr_remaining = nr_result;
603

604 605
	if (do_progress)
		start_progress(&progress_state, "Writing %u objects...", "", nr_result);
606
	written_list = xmalloc(nr_objects * sizeof(struct object_entry *));
607

608
	do {
G
Geert Bosch 已提交
609 610
		unsigned char sha1[20];

611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
		if (pack_to_stdout) {
			f = sha1fd(1, "<stdout>");
		} else {
			int fd = open_object_dir_tmp("tmp_pack_XXXXXX");
			pack_tmp_name = xstrdup(tmpname);
			f = sha1fd(fd, pack_tmp_name);
		}

		hdr.hdr_signature = htonl(PACK_SIGNATURE);
		hdr.hdr_version = htonl(PACK_VERSION);
		hdr.hdr_entries = htonl(nr_remaining);
		sha1write(f, &hdr, sizeof(hdr));
		offset = sizeof(hdr);
		nr_written = 0;
		for (; i < nr_objects; i++) {
			last_obj_offset = offset;
			offset_one = write_one(f, objects + i, offset);
			if (!offset_one)
				break;
			offset = offset_one;
			if (do_progress)
				display_progress(&progress_state, written);
		}
634

635 636 637 638 639
		/*
		 * Did we write the wrong # entries in the header?
		 * If so, rewrite it like in fast-import
		 */
		if (pack_to_stdout || nr_written == nr_remaining) {
G
Geert Bosch 已提交
640
			sha1close(f, sha1, 1);
641
		} else {
G
Geert Bosch 已提交
642 643
			sha1close(f, sha1, 0);
			fixup_pack_header_footer(f->fd, sha1, pack_tmp_name, nr_written);
644 645 646 647
			close(f->fd);
		}

		if (!pack_to_stdout) {
648 649 650 651 652
			mode_t mode = umask(0);

			umask(mode);
			mode = 0444 & ~mode;

G
Geert Bosch 已提交
653 654
			idx_tmp_name = write_idx_file(NULL,
				(struct pack_idx_entry **) written_list, nr_written, sha1);
655
			snprintf(tmpname, sizeof(tmpname), "%s-%s.pack",
G
Geert Bosch 已提交
656
				 base_name, sha1_to_hex(sha1));
657 658 659 660 661 662 663
			if (adjust_perm(pack_tmp_name, mode))
				die("unable to make temporary pack file readable: %s",
				    strerror(errno));
			if (rename(pack_tmp_name, tmpname))
				die("unable to rename temporary pack file: %s",
				    strerror(errno));
			snprintf(tmpname, sizeof(tmpname), "%s-%s.idx",
G
Geert Bosch 已提交
664
				 base_name, sha1_to_hex(sha1));
665 666 667 668 669 670
			if (adjust_perm(idx_tmp_name, mode))
				die("unable to make temporary index file readable: %s",
				    strerror(errno));
			if (rename(idx_tmp_name, tmpname))
				die("unable to rename temporary index file: %s",
				    strerror(errno));
G
Geert Bosch 已提交
671
			puts(sha1_to_hex(sha1));
672 673 674 675
		}

		/* mark written objects as written to previous pack */
		for (j = 0; j < nr_written; j++) {
G
Geert Bosch 已提交
676
			written_list[j]->idx.offset = (off_t)-1;
677 678 679 680 681
		}
		nr_remaining -= nr_written;
	} while (nr_remaining && i < nr_objects);

	free(written_list);
682
	if (do_progress)
N
Nicolas Pitre 已提交
683
		stop_progress(&progress_state);
684
	if (written != nr_result)
685
		die("wrote %u objects while expecting %u", written, nr_result);
686 687 688 689 690 691
	/*
	 * We have scanned through [0 ... i).  Since we have written
	 * the correct number of objects,  the remaining [i ... nr_objects)
	 * items must be either already written (due to out-of-order delta base)
	 * or a preferred base.  Count those which are neither and complain if any.
	 */
692 693
	for (j = 0; i < nr_objects; i++) {
		struct object_entry *e = objects + i;
G
Geert Bosch 已提交
694
		j += !e->idx.offset && !e->preferred_base;
695
	}
696 697
	if (j)
		die("wrote %u objects as expected but %u unwritten", written, j);
698 699
}

700 701 702 703 704 705 706
static int locate_object_entry_hash(const unsigned char *sha1)
{
	int i;
	unsigned int ui;
	memcpy(&ui, sha1, sizeof(unsigned int));
	i = ui % object_ix_hashsz;
	while (0 < object_ix[i]) {
G
Geert Bosch 已提交
707
		if (!hashcmp(sha1, objects[object_ix[i] - 1].idx.sha1))
708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
			return i;
		if (++i == object_ix_hashsz)
			i = 0;
	}
	return -1 - i;
}

static struct object_entry *locate_object_entry(const unsigned char *sha1)
{
	int i;

	if (!object_ix_hashsz)
		return NULL;

	i = locate_object_entry_hash(sha1);
	if (0 <= i)
		return &objects[object_ix[i]-1];
	return NULL;
}

static void rehash_objects(void)
729
{
730
	uint32_t i;
731 732 733 734 735 736
	struct object_entry *oe;

	object_ix_hashsz = nr_objects * 3;
	if (object_ix_hashsz < 1024)
		object_ix_hashsz = 1024;
	object_ix = xrealloc(object_ix, sizeof(int) * object_ix_hashsz);
737
	memset(object_ix, 0, sizeof(int) * object_ix_hashsz);
738
	for (i = 0, oe = objects; i < nr_objects; i++, oe++) {
G
Geert Bosch 已提交
739
		int ix = locate_object_entry_hash(oe->idx.sha1);
740 741 742 743 744 745 746
		if (0 <= ix)
			continue;
		ix = -1 - ix;
		object_ix[ix] = i + 1;
	}
}

747
static unsigned name_hash(const char *name)
748
{
749 750 751
	unsigned char c;
	unsigned hash = 0;

752 753 754
	if (!name)
		return 0;

755
	/*
756 757 758
	 * This effectively just creates a sortable number from the
	 * last sixteen non-whitespace characters. Last characters
	 * count "most", so things that end in ".c" sort together.
759
	 */
760 761 762 763 764
	while ((c = *name++) != 0) {
		if (isspace(c))
			continue;
		hash = (hash >> 2) + (c << 24);
	}
765 766 767
	return hash;
}

768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789
static void setup_delta_attr_check(struct git_attr_check *check)
{
	static struct git_attr *attr_delta;

	if (!attr_delta)
		attr_delta = git_attr("delta", 5);

	check[0].attr = attr_delta;
}

static int no_try_delta(const char *path)
{
	struct git_attr_check check[1];

	setup_delta_attr_check(check);
	if (git_checkattr(path, ARRAY_SIZE(check), check))
		return 0;
	if (ATTR_FALSE(check->value))
		return 1;
	return 0;
}

790
static int add_object_entry(const unsigned char *sha1, enum object_type type,
791
			    const char *name, int exclude)
792 793
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
794
	struct packed_git *p, *found_pack = NULL;
795
	off_t found_offset = 0;
N
Nicolas Pitre 已提交
796
	int ix;
797
	unsigned hash = name_hash(name);
N
Nicolas Pitre 已提交
798 799 800 801 802

	ix = nr_objects ? locate_object_entry_hash(sha1) : -1;
	if (ix >= 0) {
		if (exclude) {
			entry = objects + object_ix[ix] - 1;
803 804
			if (!entry->preferred_base)
				nr_result--;
N
Nicolas Pitre 已提交
805 806 807 808
			entry->preferred_base = 1;
		}
		return 0;
	}
809

810 811 812 813 814 815
	for (p = packed_git; p; p = p->next) {
		off_t offset = find_pack_entry_one(sha1, p);
		if (offset) {
			if (!found_pack) {
				found_offset = offset;
				found_pack = p;
L
Linus Torvalds 已提交
816
			}
817 818 819 820 821 822
			if (exclude)
				break;
			if (incremental)
				return 0;
			if (local && !p->pack_local)
				return 0;
L
Linus Torvalds 已提交
823 824
		}
	}
825

N
Nicolas Pitre 已提交
826 827
	if (nr_objects >= nr_alloc) {
		nr_alloc = (nr_alloc  + 1024) * 3 / 2;
828
		objects = xrealloc(objects, nr_alloc * sizeof(*entry));
829
	}
N
Nicolas Pitre 已提交
830 831

	entry = objects + nr_objects++;
832
	memset(entry, 0, sizeof(*entry));
G
Geert Bosch 已提交
833
	hashcpy(entry->idx.sha1, sha1);
834
	entry->hash = hash;
835 836
	if (type)
		entry->type = type;
N
Nicolas Pitre 已提交
837 838
	if (exclude)
		entry->preferred_base = 1;
839 840
	else
		nr_result++;
N
Nicolas Pitre 已提交
841 842 843 844
	if (found_pack) {
		entry->in_pack = found_pack;
		entry->in_pack_offset = found_offset;
	}
845 846 847

	if (object_ix_hashsz * 3 <= nr_objects * 4)
		rehash_objects();
N
Nicolas Pitre 已提交
848 849
	else
		object_ix[-1 - ix] = nr_objects;
850

N
Nicolas Pitre 已提交
851 852
	if (progress)
		display_progress(&progress_state, nr_objects);
N
Nicolas Pitre 已提交
853

854 855 856
	if (name && no_try_delta(name))
		entry->no_try_delta = 1;

N
Nicolas Pitre 已提交
857
	return 1;
858 859
}

860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892
struct pbase_tree_cache {
	unsigned char sha1[20];
	int ref;
	int temporary;
	void *tree_data;
	unsigned long tree_size;
};

static struct pbase_tree_cache *(pbase_tree_cache[256]);
static int pbase_tree_cache_ix(const unsigned char *sha1)
{
	return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
}
static int pbase_tree_cache_ix_incr(int ix)
{
	return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
}

static struct pbase_tree {
	struct pbase_tree *next;
	/* This is a phony "cache" entry; we are not
	 * going to evict it nor find it through _get()
	 * mechanism -- this is for the toplevel node that
	 * would almost always change with any commit.
	 */
	struct pbase_tree_cache pcache;
} *pbase_tree;

static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
{
	struct pbase_tree_cache *ent, *nent;
	void *data;
	unsigned long size;
893
	enum object_type type;
894 895 896 897 898 899 900 901 902 903
	int neigh;
	int my_ix = pbase_tree_cache_ix(sha1);
	int available_ix = -1;

	/* pbase-tree-cache acts as a limited hashtable.
	 * your object will be found at your index or within a few
	 * slots after that slot if it is cached.
	 */
	for (neigh = 0; neigh < 8; neigh++) {
		ent = pbase_tree_cache[my_ix];
904
		if (ent && !hashcmp(ent->sha1, sha1)) {
905 906 907 908 909 910 911 912 913 914 915 916 917 918 919
			ent->ref++;
			return ent;
		}
		else if (((available_ix < 0) && (!ent || !ent->ref)) ||
			 ((0 <= available_ix) &&
			  (!ent && pbase_tree_cache[available_ix])))
			available_ix = my_ix;
		if (!ent)
			break;
		my_ix = pbase_tree_cache_ix_incr(my_ix);
	}

	/* Did not find one.  Either we got a bogus request or
	 * we need to read and perhaps cache.
	 */
920
	data = read_sha1_file(sha1, &type, &size);
921 922
	if (!data)
		return NULL;
923
	if (type != OBJ_TREE) {
924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945
		free(data);
		return NULL;
	}

	/* We need to either cache or return a throwaway copy */

	if (available_ix < 0)
		ent = NULL;
	else {
		ent = pbase_tree_cache[available_ix];
		my_ix = available_ix;
	}

	if (!ent) {
		nent = xmalloc(sizeof(*nent));
		nent->temporary = (available_ix < 0);
	}
	else {
		/* evict and reuse */
		free(ent->tree_data);
		nent = ent;
	}
946
	hashcpy(nent->sha1, sha1);
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974
	nent->tree_data = data;
	nent->tree_size = size;
	nent->ref = 1;
	if (!nent->temporary)
		pbase_tree_cache[my_ix] = nent;
	return nent;
}

static void pbase_tree_put(struct pbase_tree_cache *cache)
{
	if (!cache->temporary) {
		cache->ref--;
		return;
	}
	free(cache->tree_data);
	free(cache);
}

static int name_cmp_len(const char *name)
{
	int i;
	for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
		;
	return i;
}

static void add_pbase_object(struct tree_desc *tree,
			     const char *name,
975 976
			     int cmplen,
			     const char *fullname)
977
{
978
	struct name_entry entry;
979
	int cmp;
980 981

	while (tree_entry(tree,&entry)) {
982 983 984
		cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
		      memcmp(name, entry.path, cmplen);
		if (cmp > 0)
985
			continue;
986 987
		if (cmp < 0)
			return;
988
		if (name[cmplen] != '/') {
989 990
			add_object_entry(entry.sha1,
					 S_ISDIR(entry.mode) ? OBJ_TREE : OBJ_BLOB,
991
					 fullname, 1);
992 993
			return;
		}
994
		if (S_ISDIR(entry.mode)) {
995
			struct tree_desc sub;
996 997 998 999
			struct pbase_tree_cache *tree;
			const char *down = name+cmplen+1;
			int downlen = name_cmp_len(down);

1000
			tree = pbase_tree_get(entry.sha1);
1001 1002
			if (!tree)
				return;
1003
			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1004

1005
			add_pbase_object(&sub, down, downlen, fullname);
1006 1007 1008 1009
			pbase_tree_put(tree);
		}
	}
}
1010

1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050
static unsigned *done_pbase_paths;
static int done_pbase_paths_num;
static int done_pbase_paths_alloc;
static int done_pbase_path_pos(unsigned hash)
{
	int lo = 0;
	int hi = done_pbase_paths_num;
	while (lo < hi) {
		int mi = (hi + lo) / 2;
		if (done_pbase_paths[mi] == hash)
			return mi;
		if (done_pbase_paths[mi] < hash)
			hi = mi;
		else
			lo = mi + 1;
	}
	return -lo-1;
}

static int check_pbase_path(unsigned hash)
{
	int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
	if (0 <= pos)
		return 1;
	pos = -pos - 1;
	if (done_pbase_paths_alloc <= done_pbase_paths_num) {
		done_pbase_paths_alloc = alloc_nr(done_pbase_paths_alloc);
		done_pbase_paths = xrealloc(done_pbase_paths,
					    done_pbase_paths_alloc *
					    sizeof(unsigned));
	}
	done_pbase_paths_num++;
	if (pos < done_pbase_paths_num)
		memmove(done_pbase_paths + pos + 1,
			done_pbase_paths + pos,
			(done_pbase_paths_num - pos - 1) * sizeof(unsigned));
	done_pbase_paths[pos] = hash;
	return 0;
}

1051
static void add_preferred_base_object(const char *name)
1052 1053
{
	struct pbase_tree *it;
1054
	int cmplen;
1055
	unsigned hash = name_hash(name);
1056

1057
	if (!num_preferred_base || check_pbase_path(hash))
1058 1059
		return;

1060
	cmplen = name_cmp_len(name);
1061 1062
	for (it = pbase_tree; it; it = it->next) {
		if (cmplen == 0) {
1063
			add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
1064 1065 1066
		}
		else {
			struct tree_desc tree;
1067
			init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1068
			add_pbase_object(&tree, name, cmplen, name);
1069
		}
1070 1071 1072
	}
}

1073
static void add_preferred_base(unsigned char *sha1)
1074
{
1075 1076 1077 1078
	struct pbase_tree *it;
	void *data;
	unsigned long size;
	unsigned char tree_sha1[20];
1079

1080 1081 1082
	if (window <= num_preferred_base++)
		return;

1083 1084
	data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
	if (!data)
1085
		return;
1086 1087

	for (it = pbase_tree; it; it = it->next) {
1088
		if (!hashcmp(it->pcache.sha1, tree_sha1)) {
1089 1090 1091 1092 1093 1094 1095 1096 1097
			free(data);
			return;
		}
	}

	it = xcalloc(1, sizeof(*it));
	it->next = pbase_tree;
	pbase_tree = it;

1098
	hashcpy(it->pcache.sha1, tree_sha1);
1099 1100
	it->pcache.tree_data = data;
	it->pcache.tree_size = size;
1101 1102
}

1103 1104
static void check_object(struct object_entry *entry)
{
1105
	if (entry->in_pack) {
1106
		struct packed_git *p = entry->in_pack;
1107
		struct pack_window *w_curs = NULL;
1108 1109 1110
		const unsigned char *base_ref = NULL;
		struct object_entry *base_entry;
		unsigned long used, used_0;
1111
		unsigned int avail;
1112 1113
		off_t ofs;
		unsigned char *buf, c;
1114

1115
		buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1116

1117
		/*
1118 1119
		 * We want in_pack_type even if we do not reuse delta
		 * since non-delta representations could still be reused.
1120
		 */
1121
		used = unpack_object_header_gently(buf, avail,
1122 1123
						   &entry->in_pack_type,
						   &entry->size);
1124

1125 1126 1127 1128
		/*
		 * Determine if this is a delta and if so whether we can
		 * reuse it or not.  Otherwise let's find out as cheaply as
		 * possible what the actual type and size for this object is.
1129
		 */
1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152
		switch (entry->in_pack_type) {
		default:
			/* Not a delta hence we've already got all we need. */
			entry->type = entry->in_pack_type;
			entry->in_pack_header_size = used;
			unuse_pack(&w_curs);
			return;
		case OBJ_REF_DELTA:
			if (!no_reuse_delta && !entry->preferred_base)
				base_ref = use_pack(p, &w_curs,
						entry->in_pack_offset + used, NULL);
			entry->in_pack_header_size = used + 20;
			break;
		case OBJ_OFS_DELTA:
			buf = use_pack(p, &w_curs,
				       entry->in_pack_offset + used, NULL);
			used_0 = 0;
			c = buf[used_0++];
			ofs = c & 127;
			while (c & 128) {
				ofs += 1;
				if (!ofs || MSB(ofs, 7))
					die("delta base offset overflow in pack for %s",
G
Geert Bosch 已提交
1153
					    sha1_to_hex(entry->idx.sha1));
1154 1155
				c = buf[used_0++];
				ofs = (ofs << 7) + (c & 127);
1156
			}
1157 1158
			if (ofs >= entry->in_pack_offset)
				die("delta base offset out of bound for %s",
G
Geert Bosch 已提交
1159
				    sha1_to_hex(entry->idx.sha1));
1160 1161 1162 1163 1164
			ofs = entry->in_pack_offset - ofs;
			if (!no_reuse_delta && !entry->preferred_base)
				base_ref = find_packed_object_name(p, ofs);
			entry->in_pack_header_size = used + used_0;
			break;
1165 1166
		}

1167 1168 1169 1170 1171 1172 1173 1174 1175 1176
		if (base_ref && (base_entry = locate_object_entry(base_ref))) {
			/*
			 * If base_ref was set above that means we wish to
			 * reuse delta data, and we even found that base
			 * in the list of objects we want to pack. Goodie!
			 *
			 * Depth value does not matter - find_deltas() will
			 * never consider reused delta as the base object to
			 * deltify other objects against, in order to avoid
			 * circular deltas.
1177
			 */
1178
			entry->type = entry->in_pack_type;
1179
			entry->delta = base_entry;
1180 1181
			entry->delta_sibling = base_entry->delta_child;
			base_entry->delta_child = entry;
1182 1183 1184
			unuse_pack(&w_curs);
			return;
		}
1185

1186 1187 1188 1189 1190 1191 1192 1193 1194
		if (entry->type) {
			/*
			 * This must be a delta and we already know what the
			 * final object type is.  Let's extract the actual
			 * object size from the delta header.
			 */
			entry->size = get_size_from_delta(p, &w_curs,
					entry->in_pack_offset + entry->in_pack_header_size);
			unuse_pack(&w_curs);
1195 1196
			return;
		}
1197 1198 1199 1200 1201 1202 1203

		/*
		 * No choice but to fall back to the recursive delta walk
		 * with sha1_object_info() to find about the object type
		 * at this point...
		 */
		unuse_pack(&w_curs);
1204
	}
1205

G
Geert Bosch 已提交
1206
	entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
1207
	if (entry->type < 0)
1208
		die("unable to get type of object %s",
G
Geert Bosch 已提交
1209
		    sha1_to_hex(entry->idx.sha1));
1210 1211
}

1212 1213 1214 1215 1216 1217 1218
static int pack_offset_sort(const void *_a, const void *_b)
{
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;

	/* avoid filesystem trashing with loose objects */
	if (!a->in_pack && !b->in_pack)
G
Geert Bosch 已提交
1219
		return hashcmp(a->idx.sha1, b->idx.sha1);
1220 1221 1222 1223 1224 1225 1226 1227 1228

	if (a->in_pack < b->in_pack)
		return -1;
	if (a->in_pack > b->in_pack)
		return 1;
	return a->in_pack_offset < b->in_pack_offset ? -1 :
			(a->in_pack_offset > b->in_pack_offset);
}

1229 1230
static void get_object_details(void)
{
1231
	uint32_t i;
1232 1233 1234 1235 1236 1237
	struct object_entry **sorted_by_offset;

	sorted_by_offset = xcalloc(nr_objects, sizeof(struct object_entry *));
	for (i = 0; i < nr_objects; i++)
		sorted_by_offset[i] = objects + i;
	qsort(sorted_by_offset, nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
1238

1239
	prepare_pack_ix();
1240 1241 1242
	for (i = 0; i < nr_objects; i++)
		check_object(sorted_by_offset[i]);
	free(sorted_by_offset);
1243 1244
}

1245
static int type_size_sort(const void *_a, const void *_b)
1246
{
1247 1248 1249
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;

1250 1251 1252 1253
	if (a->type < b->type)
		return -1;
	if (a->type > b->type)
		return 1;
1254 1255 1256 1257
	if (a->hash < b->hash)
		return -1;
	if (a->hash > b->hash)
		return 1;
1258 1259 1260 1261
	if (a->preferred_base < b->preferred_base)
		return -1;
	if (a->preferred_base > b->preferred_base)
		return 1;
1262 1263 1264 1265
	if (a->size < b->size)
		return -1;
	if (a->size > b->size)
		return 1;
1266
	return a > b ? -1 : (a < b);  /* newest last */
1267 1268 1269 1270 1271
}

struct unpacked {
	struct object_entry *entry;
	void *data;
1272
	struct delta_index *index;
1273
	unsigned depth;
1274 1275
};

1276 1277
static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
			   unsigned long delta_size)
1278 1279 1280 1281
{
	if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
		return 0;

1282 1283 1284
	if (delta_size < cache_max_small_delta_size)
		return 1;

1285 1286 1287 1288 1289 1290 1291
	/* cache delta, if objects are large enough compared to delta size */
	if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
		return 1;

	return 0;
}

1292
/*
1293 1294 1295 1296 1297 1298
 * We search for deltas _backwards_ in a list sorted by type and
 * by size, so that we see progressively smaller and smaller files.
 * That's because we prefer deltas to be from the bigger file
 * to the smaller - deletes are potentially cheaper, but perhaps
 * more importantly, the bigger file is likely the more recent
 * one.
1299
 */
1300
static int try_delta(struct unpacked *trg, struct unpacked *src,
1301
		     unsigned max_depth)
1302
{
1303 1304
	struct object_entry *trg_entry = trg->entry;
	struct object_entry *src_entry = src->entry;
1305
	unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1306
	unsigned ref_depth;
1307
	enum object_type type;
1308 1309 1310
	void *delta_buf;

	/* Don't bother doing diffs between different types */
1311
	if (trg_entry->type != src_entry->type)
1312 1313
		return -1;

1314 1315 1316
	/* We do not compute delta to *create* objects we are not
	 * going to pack.
	 */
1317
	if (trg_entry->preferred_base)
1318
		return -1;
1319

1320 1321
	/*
	 * We do not bother to try a delta that we discarded
1322
	 * on an earlier try, but only when reusing delta data.
1323
	 */
1324
	if (!no_reuse_delta && trg_entry->in_pack &&
1325 1326 1327
	    trg_entry->in_pack == src_entry->in_pack &&
	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
1328 1329
		return 0;

1330
	/* Let's not bust the allowed depth. */
1331
	if (src->depth >= max_depth)
1332
		return 0;
1333

1334
	/* Now some size filtering heuristics. */
1335
	trg_size = trg_entry->size;
1336 1337 1338 1339 1340
	if (!trg_entry->delta) {
		max_size = trg_size/2 - 20;
		ref_depth = 1;
	} else {
		max_size = trg_entry->delta_size;
1341
		ref_depth = trg->depth;
1342
	}
1343
	max_size = max_size * (max_depth - src->depth) /
1344
						(max_depth - ref_depth + 1);
1345 1346
	if (max_size == 0)
		return 0;
1347
	src_size = src_entry->size;
1348
	sizediff = src_size < trg_size ? trg_size - src_size : 0;
1349
	if (sizediff >= max_size)
1350
		return 0;
1351 1352
	if (trg_size < src_size / 32)
		return 0;
1353

1354 1355
	/* Load data if not already done */
	if (!trg->data) {
G
Geert Bosch 已提交
1356
		trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
1357 1358
		if (sz != trg_size)
			die("object %s inconsistent object length (%lu vs %lu)",
G
Geert Bosch 已提交
1359
			    sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
1360
		window_memory_usage += sz;
1361 1362
	}
	if (!src->data) {
G
Geert Bosch 已提交
1363
		src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
1364 1365
		if (sz != src_size)
			die("object %s inconsistent object length (%lu vs %lu)",
G
Geert Bosch 已提交
1366
			    sha1_to_hex(src_entry->idx.sha1), sz, src_size);
1367
		window_memory_usage += sz;
1368 1369 1370
	}
	if (!src->index) {
		src->index = create_delta_index(src->data, src_size);
1371 1372 1373 1374 1375 1376
		if (!src->index) {
			static int warned = 0;
			if (!warned++)
				warning("suboptimal pack - out of memory");
			return 0;
		}
1377
		window_memory_usage += sizeof_delta_index(src->index);
1378 1379 1380
	}

	delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1381
	if (!delta_buf)
1382
		return 0;
1383

1384
	if (trg_entry->delta_data) {
1385 1386
		/* Prefer only shallower same-sized deltas. */
		if (delta_size == trg_entry->delta_size &&
1387
		    src->depth + 1 >= trg->depth) {
1388 1389 1390
			free(delta_buf);
			return 0;
		}
1391 1392
		delta_cache_size -= trg_entry->delta_size;
		free(trg_entry->delta_data);
1393
		trg_entry->delta_data = NULL;
1394
	}
1395 1396
	trg_entry->delta = src_entry;
	trg_entry->delta_size = delta_size;
1397
	trg->depth = src->depth + 1;
1398

1399
	if (delta_cacheable(src_size, trg_size, delta_size)) {
1400 1401 1402 1403
		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
		delta_cache_size += trg_entry->delta_size;
	} else
		free(delta_buf);
1404
	return 1;
1405 1406
}

1407
static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1408
{
1409 1410 1411 1412 1413 1414 1415 1416 1417
	struct object_entry *child = me->delta_child;
	unsigned int m = n;
	while (child) {
		unsigned int c = check_delta_limit(child, n + 1);
		if (m < c)
			m = c;
		child = child->delta_sibling;
	}
	return m;
1418 1419
}

1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430
static void free_unpacked(struct unpacked *n)
{
	window_memory_usage -= sizeof_delta_index(n->index);
	free_delta_index(n->index);
	n->index = NULL;
	if (n->data) {
		free(n->data);
		n->data = NULL;
		window_memory_usage -= n->entry->size;
	}
	n->entry = NULL;
1431
	n->depth = 0;
1432 1433
}

1434
static void find_deltas(struct object_entry **list, int window, int depth)
1435
{
1436
	uint32_t i = nr_objects, idx = 0, count = 0, processed = 0;
1437
	unsigned int array_size = window * sizeof(struct unpacked);
1438
	struct unpacked *array;
1439
	int max_depth;
1440

1441 1442 1443
	if (!nr_objects)
		return;
	array = xmalloc(array_size);
1444
	memset(array, 0, array_size);
1445 1446
	if (progress)
		start_progress(&progress_state, "Deltifying %u objects...", "", nr_result);
1447

1448 1449
	do {
		struct object_entry *entry = list[--i];
1450 1451 1452
		struct unpacked *n = array + idx;
		int j;

1453 1454 1455
		if (!entry->preferred_base)
			processed++;

N
Nicolas Pitre 已提交
1456 1457
		if (progress)
			display_progress(&progress_state, processed);
1458 1459 1460

		if (entry->delta)
			/* This happens if we decided to reuse existing
1461
			 * delta from a pack.  "!no_reuse_delta &&" is implied.
1462 1463 1464
			 */
			continue;

1465 1466
		if (entry->size < 50)
			continue;
1467 1468 1469 1470

		if (entry->no_try_delta)
			continue;

1471
		free_unpacked(n);
1472
		n->entry = entry;
1473

1474 1475 1476 1477 1478 1479 1480 1481
		while (window_memory_limit &&
		       window_memory_usage > window_memory_limit &&
		       count > 1) {
			uint32_t tail = (idx + window - count) % window;
			free_unpacked(array + tail);
			count--;
		}

1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493
		/*
		 * If the current object is at pack edge, take the depth the
		 * objects that depend on the current object into account
		 * otherwise they would become too deep.
		 */
		max_depth = depth;
		if (entry->delta_child) {
			max_depth -= check_delta_limit(entry, 0);
			if (max_depth <= 0)
				goto next;
		}

L
Linus Torvalds 已提交
1494 1495
		j = window;
		while (--j > 0) {
1496
			uint32_t other_idx = idx + j;
1497
			struct unpacked *m;
L
Linus Torvalds 已提交
1498 1499
			if (other_idx >= window)
				other_idx -= window;
1500 1501 1502
			m = array + other_idx;
			if (!m->entry)
				break;
1503
			if (try_delta(n, m, max_depth) < 0)
1504 1505
				break;
		}
1506

1507 1508 1509 1510
		/* if we made n a delta, and if n is already at max
		 * depth, leaving it in the window is pointless.  we
		 * should evict it first.
		 */
1511
		if (entry->delta && depth <= n->depth)
1512
			continue;
1513

1514
		next:
1515
		idx++;
1516 1517
		if (count + 1 < window)
			count++;
1518 1519
		if (idx >= window)
			idx = 0;
1520
	} while (i > 0);
1521

1522
	if (progress)
N
Nicolas Pitre 已提交
1523
		stop_progress(&progress_state);
1524

1525
	for (i = 0; i < window; ++i) {
1526
		free_delta_index(array[i].index);
1527
		free(array[i].data);
1528
	}
1529
	free(array);
1530 1531
}

1532 1533
static void prepare_pack(int window, int depth)
{
1534 1535 1536
	struct object_entry **delta_list;
	uint32_t i;

1537
	get_object_details();
1538 1539 1540 1541 1542 1543 1544 1545 1546 1547

	if (!window || !depth)
		return;

	delta_list = xmalloc(nr_objects * sizeof(*delta_list));
	for (i = 0; i < nr_objects; i++)
		delta_list[i] = objects + i;
	qsort(delta_list, nr_objects, sizeof(*delta_list), type_size_sort);
	find_deltas(delta_list, window+1, depth);
	free(delta_list);
1548 1549
}

1550 1551 1552 1553 1554 1555
static int git_pack_config(const char *k, const char *v)
{
	if(!strcmp(k, "pack.window")) {
		window = git_config_int(k, v);
		return 0;
	}
1556 1557 1558 1559 1560
	if (!strcmp(k, "pack.windowmemory")) {
		window_memory_limit = git_config_ulong(k, v);
		return 0;
	}
	if (!strcmp(k, "pack.depth")) {
1561 1562 1563
		depth = git_config_int(k, v);
		return 0;
	}
1564 1565 1566 1567 1568 1569 1570 1571 1572 1573
	if (!strcmp(k, "pack.compression")) {
		int level = git_config_int(k, v);
		if (level == -1)
			level = Z_DEFAULT_COMPRESSION;
		else if (level < 0 || level > Z_BEST_COMPRESSION)
			die("bad pack compression level %d", level);
		pack_compression_level = level;
		pack_compression_seen = 1;
		return 0;
	}
1574 1575 1576 1577
	if (!strcmp(k, "pack.deltacachesize")) {
		max_delta_cache_size = git_config_int(k, v);
		return 0;
	}
1578 1579 1580 1581
	if (!strcmp(k, "pack.deltacachelimit")) {
		cache_max_small_delta_size = git_config_int(k, v);
		return 0;
	}
1582 1583 1584
	return git_default_config(k, v);
}

1585
static void read_object_list_from_stdin(void)
1586
{
1587 1588
	char line[40 + 1 + PATH_MAX + 2];
	unsigned char sha1[20];
1589

1590 1591 1592 1593 1594 1595
	for (;;) {
		if (!fgets(line, sizeof(line), stdin)) {
			if (feof(stdin))
				break;
			if (!ferror(stdin))
				die("fgets returned NULL, not EOF, not error!");
1596 1597 1598 1599
			if (errno != EINTR)
				die("fgets: %s", strerror(errno));
			clearerr(stdin);
			continue;
1600
		}
1601 1602 1603
		if (line[0] == '-') {
			if (get_sha1_hex(line+1, sha1))
				die("expected edge sha1, got garbage:\n %s",
1604
				    line);
1605
			add_preferred_base(sha1);
1606
			continue;
1607
		}
1608
		if (get_sha1_hex(line, sha1))
1609
			die("expected sha1, got garbage:\n %s", line);
1610

1611 1612
		add_preferred_base_object(line+41);
		add_object_entry(sha1, 0, line+41, 0);
1613
	}
1614 1615 1616 1617
}

static void show_commit(struct commit *commit)
{
1618
	add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
1619 1620 1621 1622
}

static void show_object(struct object_array_entry *p)
{
1623 1624
	add_preferred_base_object(p->name);
	add_object_entry(p->item->sha1, p->item->type, p->name, 0);
1625 1626
}

1627 1628 1629 1630 1631 1632
static void show_edge(struct commit *commit)
{
	add_preferred_base(commit->object.sha1);
}

static void get_object_list(int ac, const char **av)
1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660
{
	struct rev_info revs;
	char line[1000];
	int flags = 0;

	init_revisions(&revs, NULL);
	save_commit_buffer = 0;
	track_object_refs = 0;
	setup_revisions(ac, av, &revs, NULL);

	while (fgets(line, sizeof(line), stdin) != NULL) {
		int len = strlen(line);
		if (line[len - 1] == '\n')
			line[--len] = 0;
		if (!len)
			break;
		if (*line == '-') {
			if (!strcmp(line, "--not")) {
				flags ^= UNINTERESTING;
				continue;
			}
			die("not a rev '%s'", line);
		}
		if (handle_revision_arg(line, &revs, flags, 1))
			die("bad revision '%s'", line);
	}

	prepare_revision_walk(&revs);
1661
	mark_edges_uninteresting(revs.commits, &revs, show_edge);
1662 1663 1664
	traverse_commit_list(&revs, show_commit, show_object);
}

J
Junio C Hamano 已提交
1665 1666 1667 1668 1669 1670 1671
static int adjust_perm(const char *path, mode_t mode)
{
	if (chmod(path, mode))
		return -1;
	return adjust_shared_perm(path);
}

1672 1673 1674
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
	int use_internal_rev_list = 0;
1675
	int thin = 0;
1676
	uint32_t i;
1677 1678
	const char **rp_av;
	int rp_ac_alloc = 64;
1679 1680
	int rp_ac;

1681 1682
	rp_av = xcalloc(rp_ac_alloc, sizeof(*rp_av));

1683 1684 1685
	rp_av[0] = "pack-objects";
	rp_av[1] = "--objects"; /* --thin will make it --objects-edge */
	rp_ac = 2;
1686 1687

	git_config(git_pack_config);
1688 1689
	if (!pack_compression_seen && core_compression_seen)
		pack_compression_level = core_compression_level;
1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709

	progress = isatty(2);
	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];

		if (*arg != '-')
			break;

		if (!strcmp("--non-empty", arg)) {
			non_empty = 1;
			continue;
		}
		if (!strcmp("--local", arg)) {
			local = 1;
			continue;
		}
		if (!strcmp("--incremental", arg)) {
			incremental = 1;
			continue;
		}
1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721
		if (!prefixcmp(arg, "--compression=")) {
			char *end;
			int level = strtoul(arg+14, &end, 0);
			if (!arg[14] || *end)
				usage(pack_usage);
			if (level == -1)
				level = Z_DEFAULT_COMPRESSION;
			else if (level < 0 || level > Z_BEST_COMPRESSION)
				die("bad pack compression level %d", level);
			pack_compression_level = level;
			continue;
		}
1722 1723 1724 1725 1726 1727 1728
		if (!prefixcmp(arg, "--max-pack-size=")) {
			char *end;
			pack_size_limit = strtoul(arg+16, &end, 0) * 1024 * 1024;
			if (!arg[16] || *end)
				usage(pack_usage);
			continue;
		}
1729
		if (!prefixcmp(arg, "--window=")) {
1730 1731 1732 1733 1734 1735
			char *end;
			window = strtoul(arg+9, &end, 0);
			if (!arg[9] || *end)
				usage(pack_usage);
			continue;
		}
1736 1737 1738 1739 1740
		if (!prefixcmp(arg, "--window-memory=")) {
			if (!git_parse_ulong(arg+16, &window_memory_limit))
				usage(pack_usage);
			continue;
		}
1741
		if (!prefixcmp(arg, "--depth=")) {
1742 1743 1744 1745 1746 1747 1748 1749 1750 1751
			char *end;
			depth = strtoul(arg+8, &end, 0);
			if (!arg[8] || *end)
				usage(pack_usage);
			continue;
		}
		if (!strcmp("--progress", arg)) {
			progress = 1;
			continue;
		}
1752 1753 1754 1755
		if (!strcmp("--all-progress", arg)) {
			progress = 2;
			continue;
		}
1756 1757 1758 1759 1760 1761 1762 1763
		if (!strcmp("-q", arg)) {
			progress = 0;
			continue;
		}
		if (!strcmp("--no-reuse-delta", arg)) {
			no_reuse_delta = 1;
			continue;
		}
1764 1765 1766 1767
		if (!strcmp("--no-reuse-object", arg)) {
			no_reuse_object = no_reuse_delta = 1;
			continue;
		}
1768
		if (!strcmp("--delta-base-offset", arg)) {
1769
			allow_ofs_delta = 1;
1770 1771
			continue;
		}
1772 1773 1774 1775 1776 1777 1778 1779
		if (!strcmp("--stdout", arg)) {
			pack_to_stdout = 1;
			continue;
		}
		if (!strcmp("--revs", arg)) {
			use_internal_rev_list = 1;
			continue;
		}
1780
		if (!strcmp("--unpacked", arg) ||
1781
		    !prefixcmp(arg, "--unpacked=") ||
1782
		    !strcmp("--reflog", arg) ||
1783 1784
		    !strcmp("--all", arg)) {
			use_internal_rev_list = 1;
1785 1786 1787 1788 1789
			if (rp_ac >= rp_ac_alloc - 1) {
				rp_ac_alloc = alloc_nr(rp_ac_alloc);
				rp_av = xrealloc(rp_av,
						 rp_ac_alloc * sizeof(*rp_av));
			}
1790
			rp_av[rp_ac++] = arg;
1791 1792
			continue;
		}
1793 1794 1795 1796
		if (!strcmp("--thin", arg)) {
			use_internal_rev_list = 1;
			thin = 1;
			rp_av[1] = "--objects-edge";
1797
			continue;
1798 1799 1800
		}
		if (!prefixcmp(arg, "--index-version=")) {
			char *c;
G
Geert Bosch 已提交
1801 1802
			pack_idx_default_version = strtoul(arg + 16, &c, 10);
			if (pack_idx_default_version > 2)
1803 1804
				die("bad %s", arg);
			if (*c == ',')
G
Geert Bosch 已提交
1805 1806
				pack_idx_off32_limit = strtoul(c+1, &c, 0);
			if (*c || pack_idx_off32_limit & 0x80000000)
1807 1808
				die("bad %s", arg);
			continue;
1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831
		}
		usage(pack_usage);
	}

	/* Traditionally "pack-objects [options] base extra" failed;
	 * we would however want to take refs parameter that would
	 * have been given to upstream rev-list ourselves, which means
	 * we somehow want to say what the base name is.  So the
	 * syntax would be:
	 *
	 * pack-objects [options] base <refs...>
	 *
	 * in other words, we would treat the first non-option as the
	 * base_name and send everything else to the internal revision
	 * walker.
	 */

	if (!pack_to_stdout)
		base_name = argv[i++];

	if (pack_to_stdout != !base_name)
		usage(pack_usage);

1832 1833 1834
	if (pack_to_stdout && pack_size_limit)
		die("--max-pack-size cannot be used to build a pack for transfer.");

1835 1836
	if (!pack_to_stdout && thin)
		die("--thin cannot be used to build an indexable pack.");
1837 1838 1839

	prepare_packed_git();

1840 1841 1842
	if (progress)
		start_progress(&progress_state, "Generating pack...",
			       "Counting objects: ", 0);
1843 1844
	if (!use_internal_rev_list)
		read_object_list_from_stdin();
1845 1846 1847 1848
	else {
		rp_av[rp_ac] = NULL;
		get_object_list(rp_ac, rp_av);
	}
N
Nicolas Pitre 已提交
1849 1850
	if (progress) {
		stop_progress(&progress_state);
1851
		fprintf(stderr, "Done counting %u objects.\n", nr_objects);
N
Nicolas Pitre 已提交
1852 1853
	}

1854
	if (non_empty && !nr_result)
1855
		return 0;
1856
	if (progress && (nr_objects != nr_result))
1857
		fprintf(stderr, "Result has %u objects.\n", nr_result);
1858 1859
	if (nr_result)
		prepare_pack(window, depth);
1860
	write_pack_file();
1861
	if (progress)
1862
		fprintf(stderr, "Total %u (delta %u), reused %u (delta %u)\n",
1863
			written, written_delta, reused, reused_delta);
1864 1865
	return 0;
}