pack-objects.c 86.0 KB
Newer Older
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 8 9 10
#include "blob.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
11
#include "delta.h"
12
#include "pack.h"
13
#include "pack-revindex.h"
14
#include "csum-file.h"
J
Junio C Hamano 已提交
15
#include "tree-walk.h"
16 17 18
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
19 20
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
21
#include "pack-objects.h"
N
Nicolas Pitre 已提交
22
#include "progress.h"
23
#include "refs.h"
24
#include "streaming.h"
25
#include "thread-utils.h"
26
#include "pack-bitmap.h"
27 28
#include "reachable.h"
#include "sha1-array.h"
J
Jeff King 已提交
29
#include "argv-array.h"
30
#include "list.h"
31
#include "packfile.h"
32
#include "object-store.h"
N
Nicolas Pitre 已提交
33

34
#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
35 36 37 38 39 40
#define DELTA(obj) oe_delta(&to_pack, obj)
#define DELTA_CHILD(obj) oe_delta_child(&to_pack, obj)
#define DELTA_SIBLING(obj) oe_delta_sibling(&to_pack, obj)
#define SET_DELTA(obj, val) oe_set_delta(&to_pack, obj, val)
#define SET_DELTA_CHILD(obj, val) oe_set_delta_child(&to_pack, obj, val)
#define SET_DELTA_SIBLING(obj, val) oe_set_delta_sibling(&to_pack, obj, val)
41

42
static const char *pack_usage[] = {
43 44
	N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
	N_("git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"),
45 46
	NULL
};
47

48
/*
49 50 51
 * Objects we are going to pack are collected in the `to_pack` structure.
 * It contains an array (dynamically expanded) of the object data, and a map
 * that can resolve SHA1s to their position in the array.
52
 */
53 54
static struct packing_data to_pack;

55
static struct pack_idx_entry **written_list;
56
static uint32_t nr_result, nr_written;
57

58
static int non_empty;
59
static int reuse_delta = 1, reuse_object = 1;
J
Junio C Hamano 已提交
60
static int keep_unreachable, unpack_unreachable, include_tag;
61
static timestamp_t unpack_unreachable_expiration;
62
static int pack_loose_unreachable;
63
static int local;
64
static int have_non_local_packs;
65
static int incremental;
66
static int ignore_packed_keep;
67
static int allow_ofs_delta;
68
static struct pack_idx_option pack_idx_opts;
69
static const char *base_name;
J
Junio C Hamano 已提交
70
static int progress = 1;
71
static int window = 10;
72
static unsigned long pack_size_limit;
73
static int depth = 50;
74
static int delta_search_threads;
75
static int pack_to_stdout;
76
static int num_preferred_base;
77
static struct progress *progress_state;
78

79 80 81 82
static struct packed_git *reuse_packfile;
static uint32_t reuse_packfile_objects;
static off_t reuse_packfile_offset;

83 84
static int use_bitmap_index_default = 1;
static int use_bitmap_index = -1;
85
static int write_bitmap_index;
86
static uint16_t write_bitmap_options;
87

88 89
static int exclude_promisor_objects;

90
static unsigned long delta_cache_size = 0;
91
static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
92
static unsigned long cache_max_small_delta_size = 1000;
93

94 95
static unsigned long window_memory_limit = 0;

96 97 98
static struct list_objects_filter_options filter_options;

enum missing_action {
99 100 101
	MA_ERROR = 0,      /* fail if any missing objects are encountered */
	MA_ALLOW_ANY,      /* silently allow ALL missing objects */
	MA_ALLOW_PROMISOR, /* silently allow all missing PROMISOR objects */
102 103 104 105
};
static enum missing_action arg_missing_action;
static show_object_fn fn_show_object;

106 107 108
/*
 * stats
 */
109 110
static uint32_t written, written_delta;
static uint32_t reused, reused_delta;
111

112 113 114 115 116 117 118 119 120 121 122
/*
 * Indexed commits
 */
static struct commit **indexed_commits;
static unsigned int indexed_commits_nr;
static unsigned int indexed_commits_alloc;

static void index_commit_for_bitmap(struct commit *commit)
{
	if (indexed_commits_nr >= indexed_commits_alloc) {
		indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
123
		REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
124 125 126 127
	}

	indexed_commits[indexed_commits_nr++] = commit;
}
128

N
Nicolas Pitre 已提交
129
static void *get_delta(struct object_entry *entry)
130
{
N
Nicolas Pitre 已提交
131 132
	unsigned long size, base_size, delta_size;
	void *buf, *base_buf, *delta_buf;
133
	enum object_type type;
134

135
	buf = read_object_file(&entry->idx.oid, &type, &size);
N
Nicolas Pitre 已提交
136
	if (!buf)
137
		die("unable to read %s", oid_to_hex(&entry->idx.oid));
138 139
	base_buf = read_object_file(&DELTA(entry)->idx.oid, &type,
				    &base_size);
N
Nicolas Pitre 已提交
140
	if (!base_buf)
141
		die("unable to read %s",
142
		    oid_to_hex(&DELTA(entry)->idx.oid));
N
Nicolas Pitre 已提交
143
	delta_buf = diff_delta(base_buf, base_size,
144
			       buf, size, &delta_size, 0);
N
Nicolas Pitre 已提交
145
	if (!delta_buf || delta_size != entry->delta_size)
J
Junio C Hamano 已提交
146
		die("delta size changed");
N
Nicolas Pitre 已提交
147 148
	free(buf);
	free(base_buf);
149 150 151
	return delta_buf;
}

152 153
static unsigned long do_compress(void **pptr, unsigned long size)
{
154
	git_zstream stream;
155 156 157
	void *in, *out;
	unsigned long maxsize;

158
	git_deflate_init(&stream, pack_compression_level);
J
Junio C Hamano 已提交
159
	maxsize = git_deflate_bound(&stream, size);
160 161 162 163 164 165 166 167 168

	in = *pptr;
	out = xmalloc(maxsize);
	*pptr = out;

	stream.next_in = in;
	stream.avail_in = size;
	stream.next_out = out;
	stream.avail_out = maxsize;
169
	while (git_deflate(&stream, Z_FINISH) == Z_OK)
170
		; /* nothing */
171
	git_deflate_end(&stream);
172 173 174 175 176

	free(in);
	return stream.total_out;
}

177
static unsigned long write_large_blob_data(struct git_istream *st, struct hashfile *f,
178
					   const struct object_id *oid)
179 180 181 182 183 184 185 186 187 188 189 190 191
{
	git_zstream stream;
	unsigned char ibuf[1024 * 16];
	unsigned char obuf[1024 * 16];
	unsigned long olen = 0;

	git_deflate_init(&stream, pack_compression_level);

	for (;;) {
		ssize_t readlen;
		int zret = Z_OK;
		readlen = read_istream(st, ibuf, sizeof(ibuf));
		if (readlen == -1)
192
			die(_("unable to read %s"), oid_to_hex(oid));
193 194 195 196 197 198 199 200

		stream.next_in = ibuf;
		stream.avail_in = readlen;
		while ((stream.avail_in || readlen == 0) &&
		       (zret == Z_OK || zret == Z_BUF_ERROR)) {
			stream.next_out = obuf;
			stream.avail_out = sizeof(obuf);
			zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
201
			hashwrite(f, obuf, stream.next_out - obuf);
202 203 204 205 206 207 208 209 210 211 212 213 214 215
			olen += stream.next_out - obuf;
		}
		if (stream.avail_in)
			die(_("deflate error (%d)"), zret);
		if (readlen == 0) {
			if (zret != Z_STREAM_END)
				die(_("deflate error (%d)"), zret);
			break;
		}
	}
	git_deflate_end(&stream);
	return olen;
}

216 217 218 219
/*
 * we are going to reuse the existing object data as is.  make
 * sure it is not corrupt.
 */
220 221
static int check_pack_inflate(struct packed_git *p,
		struct pack_window **w_curs,
222 223
		off_t offset,
		off_t len,
224 225
		unsigned long expect)
{
226
	git_zstream stream;
227 228 229 230
	unsigned char fakebuf[4096], *in;
	int st;

	memset(&stream, 0, sizeof(stream));
231
	git_inflate_init(&stream);
232 233 234 235 236
	do {
		in = use_pack(p, w_curs, offset, &stream.avail_in);
		stream.next_in = in;
		stream.next_out = fakebuf;
		stream.avail_out = sizeof(fakebuf);
237
		st = git_inflate(&stream, Z_FINISH);
238 239
		offset += stream.next_in - in;
	} while (st == Z_OK || st == Z_BUF_ERROR);
240
	git_inflate_end(&stream);
241 242 243 244 245
	return (st == Z_STREAM_END &&
		stream.total_out == expect &&
		stream.total_in == len) ? 0 : -1;
}

246
static void copy_pack_data(struct hashfile *f,
247 248
		struct packed_git *p,
		struct pack_window **w_curs,
249 250
		off_t offset,
		off_t len)
251 252
{
	unsigned char *in;
253
	unsigned long avail;
254 255 256 257

	while (len) {
		in = use_pack(p, w_curs, offset, &avail);
		if (avail > len)
258
			avail = (unsigned long)len;
259
		hashwrite(f, in, avail);
260 261 262 263 264
		offset += avail;
		len -= avail;
	}
}

265
/* Return 0 if we will bust the pack-size limit */
266
static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
267
					   unsigned long limit, int usable_delta)
268
{
269
	unsigned long size, datalen;
270 271
	unsigned char header[MAX_PACK_OBJECT_HEADER],
		      dheader[MAX_PACK_OBJECT_HEADER];
272
	unsigned hdrlen;
273
	enum object_type type;
274
	void *buf;
275
	struct git_istream *st = NULL;
276 277

	if (!usable_delta) {
278
		if (oe_type(entry) == OBJ_BLOB &&
279
		    entry->size > big_file_threshold &&
280
		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
281 282
			buf = NULL;
		else {
283
			buf = read_object_file(&entry->idx.oid, &type, &size);
284
			if (!buf)
285 286
				die(_("unable to read %s"),
				    oid_to_hex(&entry->idx.oid));
287
		}
288 289 290 291
		/*
		 * make sure no cached delta data remains from a
		 * previous attempt before a pack split occurred.
		 */
292
		FREE_AND_NULL(entry->delta_data);
293 294 295 296 297
		entry->z_delta_size = 0;
	} else if (entry->delta_data) {
		size = entry->delta_size;
		buf = entry->delta_data;
		entry->delta_data = NULL;
298
		type = (allow_ofs_delta && DELTA(entry)->idx.offset) ?
299 300 301 302
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
	} else {
		buf = get_delta(entry);
		size = entry->delta_size;
303
		type = (allow_ofs_delta && DELTA(entry)->idx.offset) ?
304 305 306
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
	}

307 308 309
	if (st)	/* large blob case, just assume we don't compress well */
		datalen = size;
	else if (entry->z_delta_size)
310 311 312 313 314 315 316 317
		datalen = entry->z_delta_size;
	else
		datalen = do_compress(&buf, size);

	/*
	 * The object header is a byte of 'type' followed by zero or
	 * more bytes of length.
	 */
318 319
	hdrlen = encode_in_pack_object_header(header, sizeof(header),
					      type, size);
320 321 322 323 324 325 326

	if (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.
		 */
327
		off_t ofs = entry->idx.offset - DELTA(entry)->idx.offset;
328 329 330 331 332
		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) {
333 334
			if (st)
				close_istream(st);
335 336 337
			free(buf);
			return 0;
		}
338 339
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
340 341 342 343 344 345 346
		hdrlen += sizeof(dheader) - pos;
	} else if (type == OBJ_REF_DELTA) {
		/*
		 * Deltas with a base reference contain
		 * an additional 20 bytes for the base sha1.
		 */
		if (limit && hdrlen + 20 + datalen + 20 >= limit) {
347 348
			if (st)
				close_istream(st);
349 350 351
			free(buf);
			return 0;
		}
352
		hashwrite(f, header, hdrlen);
353
		hashwrite(f, DELTA(entry)->idx.oid.hash, 20);
354 355 356
		hdrlen += 20;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
357 358
			if (st)
				close_istream(st);
359 360 361
			free(buf);
			return 0;
		}
362
		hashwrite(f, header, hdrlen);
363
	}
364
	if (st) {
365
		datalen = write_large_blob_data(st, f, &entry->idx.oid);
366 367
		close_istream(st);
	} else {
368
		hashwrite(f, buf, datalen);
369 370
		free(buf);
	}
371 372 373 374 375

	return hdrlen + datalen;
}

/* Return 0 if we will bust the pack-size limit */
376
static off_t write_reuse_object(struct hashfile *f, struct object_entry *entry,
377
				unsigned long limit, int usable_delta)
378
{
379
	struct packed_git *p = IN_PACK(entry);
380 381 382
	struct pack_window *w_curs = NULL;
	struct revindex_entry *revidx;
	off_t offset;
383
	enum object_type type = oe_type(entry);
384
	off_t datalen;
385 386
	unsigned char header[MAX_PACK_OBJECT_HEADER],
		      dheader[MAX_PACK_OBJECT_HEADER];
387 388
	unsigned hdrlen;

389 390
	if (DELTA(entry))
		type = (allow_ofs_delta && DELTA(entry)->idx.offset) ?
391
			OBJ_OFS_DELTA : OBJ_REF_DELTA;
392 393
	hdrlen = encode_in_pack_object_header(header, sizeof(header),
					      type, entry->size);
394 395 396 397 398 399

	offset = entry->in_pack_offset;
	revidx = find_pack_revindex(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)) {
400 401
		error("bad packed object CRC for %s",
		      oid_to_hex(&entry->idx.oid));
402 403 404 405 406 407 408 409 410
		unuse_pack(&w_curs);
		return write_no_reuse_object(f, entry, limit, usable_delta);
	}

	offset += entry->in_pack_header_size;
	datalen -= entry->in_pack_header_size;

	if (!pack_to_stdout && p->index_version == 1 &&
	    check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
411 412
		error("corrupt packed object for %s",
		      oid_to_hex(&entry->idx.oid));
413 414 415 416 417
		unuse_pack(&w_curs);
		return write_no_reuse_object(f, entry, limit, usable_delta);
	}

	if (type == OBJ_OFS_DELTA) {
418
		off_t ofs = entry->idx.offset - DELTA(entry)->idx.offset;
419 420 421 422 423 424 425 426
		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) {
			unuse_pack(&w_curs);
			return 0;
		}
427 428
		hashwrite(f, header, hdrlen);
		hashwrite(f, dheader + pos, sizeof(dheader) - pos);
429 430 431 432 433 434 435
		hdrlen += sizeof(dheader) - pos;
		reused_delta++;
	} else if (type == OBJ_REF_DELTA) {
		if (limit && hdrlen + 20 + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
436
		hashwrite(f, header, hdrlen);
437
		hashwrite(f, DELTA(entry)->idx.oid.hash, 20);
438 439 440 441 442 443 444
		hdrlen += 20;
		reused_delta++;
	} else {
		if (limit && hdrlen + datalen + 20 >= limit) {
			unuse_pack(&w_curs);
			return 0;
		}
445
		hashwrite(f, header, hdrlen);
446 447 448 449 450 451 452 453
	}
	copy_pack_data(f, p, &w_curs, offset, datalen);
	unuse_pack(&w_curs);
	reused++;
	return hdrlen + datalen;
}

/* Return 0 if we will bust the pack-size limit */
454
static off_t write_object(struct hashfile *f,
455 456
			  struct object_entry *entry,
			  off_t write_offset)
457
{
458 459
	unsigned long limit;
	off_t len;
460
	int usable_delta, to_reuse;
461

462 463 464
	if (!pack_to_stdout)
		crc32_begin(f);

465
	/* apply size limit if limited packsize and not first object */
466 467 468 469 470 471 472 473 474 475
	if (!pack_size_limit || !nr_written)
		limit = 0;
	else if (pack_size_limit <= write_offset)
		/*
		 * the earlier object did not fit the limit; avoid
		 * mistaking this with unlimited (i.e. limit = 0).
		 */
		limit = 1;
	else
		limit = pack_size_limit - write_offset;
476

477
	if (!DELTA(entry))
478 479 480
		usable_delta = 0;	/* no delta */
	else if (!pack_size_limit)
	       usable_delta = 1;	/* unlimited packfile */
481
	else if (DELTA(entry)->idx.offset == (off_t)-1)
482
		usable_delta = 0;	/* base was written to another pack */
483
	else if (DELTA(entry)->idx.offset)
484 485 486 487
		usable_delta = 1;	/* base already exists in this pack */
	else
		usable_delta = 0;	/* base could end up in another pack */

488
	if (!reuse_object)
489
		to_reuse = 0;	/* explicit */
490
	else if (!IN_PACK(entry))
491
		to_reuse = 0;	/* can't reuse what we don't have */
492 493
	else if (oe_type(entry) == OBJ_REF_DELTA ||
		 oe_type(entry) == OBJ_OFS_DELTA)
494 495 496
				/* check_object() decided it for us ... */
		to_reuse = usable_delta;
				/* ... but pack split may override that */
497
	else if (oe_type(entry) != entry->in_pack_type)
498
		to_reuse = 0;	/* pack has delta which is unusable */
499
	else if (DELTA(entry))
500 501 502 503 504 505
		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.
				 */

506 507 508 509 510 511
	if (!to_reuse)
		len = write_no_reuse_object(f, entry, limit, usable_delta);
	else
		len = write_reuse_object(f, entry, limit, usable_delta);
	if (!len)
		return 0;
512

513
	if (usable_delta)
514
		written_delta++;
515
	written++;
516
	if (!pack_to_stdout)
G
Geert Bosch 已提交
517
		entry->idx.crc32 = crc32_end(f);
518
	return len;
519 520
}

521 522 523 524 525 526 527
enum write_one_status {
	WRITE_ONE_SKIP = -1, /* already written */
	WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
	WRITE_ONE_WRITTEN = 1, /* normal */
	WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
};

528
static enum write_one_status write_one(struct hashfile *f,
529 530
				       struct object_entry *e,
				       off_t *offset)
531
{
532
	off_t size;
533
	int recursing;
534

535 536 537 538 539 540 541 542
	/*
	 * we set offset to 1 (which is an impossible value) to mark
	 * the fact that this object is involved in "write its base
	 * first before writing a deltified object" recursion.
	 */
	recursing = (e->idx.offset == 1);
	if (recursing) {
		warning("recursive delta detected for object %s",
543
			oid_to_hex(&e->idx.oid));
544 545 546 547 548
		return WRITE_ONE_RECURSIVE;
	} else if (e->idx.offset || e->preferred_base) {
		/* offset is non zero if object is written already. */
		return WRITE_ONE_SKIP;
	}
549

550
	/* if we are deltified, write out base object first. */
551
	if (DELTA(e)) {
552
		e->idx.offset = 1; /* now recurse */
553
		switch (write_one(f, DELTA(e), offset)) {
554 555
		case WRITE_ONE_RECURSIVE:
			/* we cannot depend on this one */
556
			SET_DELTA(e, NULL);
557 558 559 560 561 562 563 564
			break;
		default:
			break;
		case WRITE_ONE_BREAK:
			e->idx.offset = recursing;
			return WRITE_ONE_BREAK;
		}
	}
565

566 567
	e->idx.offset = *offset;
	size = write_object(f, e, *offset);
568
	if (!size) {
569 570
		e->idx.offset = recursing;
		return WRITE_ONE_BREAK;
571
	}
572
	written_list[nr_written++] = &e->idx;
573 574

	/* make sure off_t is sufficiently large not to wrap */
575
	if (signed_add_overflows(*offset, size))
576
		die("pack too large for current definition of off_t");
577
	*offset += size;
578
	return WRITE_ONE_WRITTEN;
579 580
}

581
static int mark_tagged(const char *path, const struct object_id *oid, int flag,
582 583
		       void *cb_data)
{
584
	struct object_id peeled;
585
	struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
586 587 588

	if (entry)
		entry->tagged = 1;
589
	if (!peel_ref(path, &peeled)) {
590
		entry = packlist_find(&to_pack, peeled.hash, NULL);
591 592 593 594 595 596
		if (entry)
			entry->tagged = 1;
	}
	return 0;
}

597
static inline void add_to_write_order(struct object_entry **wo,
598
			       unsigned int *endp,
599 600 601 602 603 604 605 606 607
			       struct object_entry *e)
{
	if (e->filled)
		return;
	wo[(*endp)++] = e;
	e->filled = 1;
}

static void add_descendants_to_write_order(struct object_entry **wo,
608
					   unsigned int *endp,
609 610
					   struct object_entry *e)
{
611 612 613 614 615 616 617
	int add_to_order = 1;
	while (e) {
		if (add_to_order) {
			struct object_entry *s;
			/* add this node... */
			add_to_write_order(wo, endp, e);
			/* all its siblings... */
618
			for (s = DELTA_SIBLING(e); s; s = DELTA_SIBLING(s)) {
619 620 621 622
				add_to_write_order(wo, endp, s);
			}
		}
		/* drop down a level to add left subtree nodes if possible */
623
		if (DELTA_CHILD(e)) {
624
			add_to_order = 1;
625
			e = DELTA_CHILD(e);
626 627 628
		} else {
			add_to_order = 0;
			/* our sibling might have some children, it is next */
629 630
			if (DELTA_SIBLING(e)) {
				e = DELTA_SIBLING(e);
631 632 633
				continue;
			}
			/* go back to our parent node */
634 635
			e = DELTA(e);
			while (e && !DELTA_SIBLING(e)) {
636 637
				/* we're on the right side of a subtree, keep
				 * going up until we can go right again */
638
				e = DELTA(e);
639 640 641 642 643 644
			}
			if (!e) {
				/* done- we hit our original root node */
				return;
			}
			/* pass it off to sibling at this level */
645
			e = DELTA_SIBLING(e);
646 647
		}
	};
648 649 650
}

static void add_family_to_write_order(struct object_entry **wo,
651
				      unsigned int *endp,
652 653 654 655
				      struct object_entry *e)
{
	struct object_entry *root;

656
	for (root = e; DELTA(root); root = DELTA(root))
657 658 659 660 661 662
		; /* nothing */
	add_descendants_to_write_order(wo, endp, root);
}

static struct object_entry **compute_write_order(void)
{
663
	unsigned int i, wo_end, last_untagged;
664

J
Jeff King 已提交
665
	struct object_entry **wo;
666
	struct object_entry *objects = to_pack.objects;
667

668
	for (i = 0; i < to_pack.nr_objects; i++) {
669 670
		objects[i].tagged = 0;
		objects[i].filled = 0;
671 672
		SET_DELTA_CHILD(&objects[i], NULL);
		SET_DELTA_SIBLING(&objects[i], NULL);
673 674 675 676 677 678 679
	}

	/*
	 * Fully connect delta_child/delta_sibling network.
	 * Make sure delta_sibling is sorted in the original
	 * recency order.
	 */
680
	for (i = to_pack.nr_objects; i > 0;) {
681
		struct object_entry *e = &objects[--i];
682
		if (!DELTA(e))
683 684
			continue;
		/* Mark me as the first child */
685 686
		e->delta_sibling_idx = DELTA(e)->delta_child_idx;
		SET_DELTA_CHILD(DELTA(e), e);
687 688 689 690 691
	}

	/*
	 * Mark objects that are at the tip of tags.
	 */
692
	for_each_tag_ref(mark_tagged, NULL);
693 694

	/*
695
	 * Give the objects in the original recency order until
696 697
	 * we see a tagged tip.
	 */
J
Jeff King 已提交
698
	ALLOC_ARRAY(wo, to_pack.nr_objects);
699
	for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
700 701 702 703
		if (objects[i].tagged)
			break;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}
704
	last_untagged = i;
705 706 707 708

	/*
	 * Then fill all the tagged tips.
	 */
709
	for (; i < to_pack.nr_objects; i++) {
710 711 712 713 714 715 716
		if (objects[i].tagged)
			add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * And then all remaining commits and tags.
	 */
717
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
718 719
		if (oe_type(&objects[i]) != OBJ_COMMIT &&
		    oe_type(&objects[i]) != OBJ_TAG)
720 721 722 723 724 725 726
			continue;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * And then all the trees.
	 */
727
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
728
		if (oe_type(&objects[i]) != OBJ_TREE)
729 730 731 732 733 734 735
			continue;
		add_to_write_order(wo, &wo_end, &objects[i]);
	}

	/*
	 * Finally all the rest in really tight order
	 */
736
	for (i = last_untagged; i < to_pack.nr_objects; i++) {
737 738 739 740
		if (!objects[i].filled)
			add_family_to_write_order(wo, &wo_end, &objects[i]);
	}

741 742
	if (wo_end != to_pack.nr_objects)
		die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
743 744 745 746

	return wo;
}

747
static off_t write_reused_pack(struct hashfile *f)
748 749
{
	unsigned char buffer[8192];
750
	off_t to_write, total;
751 752 753 754 755
	int fd;

	if (!is_pack_valid(reuse_packfile))
		die("packfile is invalid: %s", reuse_packfile->pack_name);

756
	fd = git_open(reuse_packfile->pack_name);
757 758 759 760 761 762 763 764 765 766
	if (fd < 0)
		die_errno("unable to open packfile for reuse: %s",
			  reuse_packfile->pack_name);

	if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
		die_errno("unable to seek in reused packfile");

	if (reuse_packfile_offset < 0)
		reuse_packfile_offset = reuse_packfile->pack_size - 20;

767
	total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
768 769 770 771 772 773 774 775 776 777

	while (to_write) {
		int read_pack = xread(fd, buffer, sizeof(buffer));

		if (read_pack <= 0)
			die_errno("unable to read from reused packfile");

		if (read_pack > to_write)
			read_pack = to_write;

778
		hashwrite(f, buffer, read_pack);
779
		to_write -= read_pack;
780 781 782 783 784 785 786 787 788 789 790 791

		/*
		 * We don't know the actual number of objects written,
		 * only how many bytes written, how many bytes total, and
		 * how many objects total. So we can fake it by pretending all
		 * objects we are writing are the same size. This gives us a
		 * smooth progress meter, and at the end it matches the true
		 * answer.
		 */
		written = reuse_packfile_objects *
				(((double)(total - to_write)) / total);
		display_progress(progress_state, written);
792 793 794
	}

	close(fd);
795 796
	written = reuse_packfile_objects;
	display_progress(progress_state, written);
797 798 799
	return reuse_packfile_offset - sizeof(struct pack_header);
}

800 801 802 803
static const char no_split_warning[] = N_(
"disabling bitmap writing, packs are split due to pack.packSizeLimit"
);

804
static void write_pack_file(void)
805
{
806
	uint32_t i = 0, j;
807
	struct hashfile *f;
808
	off_t offset;
809
	uint32_t nr_remaining = nr_result;
810
	time_t last_mtime = 0;
811
	struct object_entry **write_order;
812

813
	if (progress > pack_to_stdout)
814
		progress_state = start_progress(_("Writing objects"), nr_result);
J
Jeff King 已提交
815
	ALLOC_ARRAY(written_list, to_pack.nr_objects);
816
	write_order = compute_write_order();
817

818
	do {
819
		struct object_id oid;
820
		char *pack_tmp_name = NULL;
G
Geert Bosch 已提交
821

822
		if (pack_to_stdout)
823
			f = hashfd_throughput(1, "<stdout>", progress_state);
824 825
		else
			f = create_tmp_packfile(&pack_tmp_name);
826

827
		offset = write_pack_header(f, nr_remaining);
828 829 830 831 832 833 834 835 836

		if (reuse_packfile) {
			off_t packfile_size;
			assert(pack_to_stdout);

			packfile_size = write_reused_pack(f);
			offset += packfile_size;
		}

837
		nr_written = 0;
838
		for (; i < to_pack.nr_objects; i++) {
839
			struct object_entry *e = write_order[i];
840
			if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
841 842 843
				break;
			display_progress(progress_state, written);
		}
844

845 846 847 848
		/*
		 * Did we write the wrong # entries in the header?
		 * If so, rewrite it like in fast-import
		 */
849
		if (pack_to_stdout) {
850
			hashclose(f, oid.hash, CSUM_CLOSE);
851
		} else if (nr_written == nr_remaining) {
852
			hashclose(f, oid.hash, CSUM_FSYNC);
853
		} else {
854
			int fd = hashclose(f, oid.hash, 0);
855 856
			fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
						 nr_written, oid.hash, offset);
857
			close(fd);
858 859 860 861
			if (write_bitmap_index) {
				warning(_(no_split_warning));
				write_bitmap_index = 0;
			}
862 863 864
		}

		if (!pack_to_stdout) {
865
			struct stat st;
866
			struct strbuf tmpname = STRBUF_INIT;
867

868 869 870 871 872 873 874
			/*
			 * Packs are runtime accessed in their mtime
			 * order since newer packs are more likely to contain
			 * younger objects.  So if we are creating multiple
			 * packs then we should modify the mtime of later ones
			 * to preserve this property.
			 */
875
			if (stat(pack_tmp_name, &st) < 0) {
876
				warning_errno("failed to stat %s", pack_tmp_name);
877 878 879 880 881 882
			} else if (!last_mtime) {
				last_mtime = st.st_mtime;
			} else {
				struct utimbuf utb;
				utb.actime = st.st_atime;
				utb.modtime = --last_mtime;
883
				if (utime(pack_tmp_name, &utb) < 0)
884
					warning_errno("failed utime() on %s", pack_tmp_name);
885 886
			}

887
			strbuf_addf(&tmpname, "%s-", base_name);
888 889

			if (write_bitmap_index) {
890
				bitmap_writer_set_checksum(oid.hash);
891 892
				bitmap_writer_build_type_index(
					&to_pack, written_list, nr_written);
893 894
			}

895
			finish_tmp_packfile(&tmpname, pack_tmp_name,
896
					    written_list, nr_written,
897
					    &pack_idx_opts, oid.hash);
898 899

			if (write_bitmap_index) {
900
				strbuf_addf(&tmpname, "%s.bitmap", oid_to_hex(&oid));
901 902 903 904 905 906 907

				stop_progress(&progress_state);

				bitmap_writer_show_progress(progress);
				bitmap_writer_reuse_bitmaps(&to_pack);
				bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
				bitmap_writer_build(&to_pack);
908
				bitmap_writer_finish(written_list, nr_written,
909
						     tmpname.buf, write_bitmap_options);
910 911 912
				write_bitmap_index = 0;
			}

913
			strbuf_release(&tmpname);
914
			free(pack_tmp_name);
915
			puts(oid_to_hex(&oid));
916 917 918 919
		}

		/* mark written objects as written to previous pack */
		for (j = 0; j < nr_written; j++) {
920
			written_list[j]->offset = (off_t)-1;
921 922
		}
		nr_remaining -= nr_written;
923
	} while (nr_remaining && i < to_pack.nr_objects);
924 925

	free(written_list);
926
	free(write_order);
N
Nicolas Pitre 已提交
927
	stop_progress(&progress_state);
928
	if (written != nr_result)
929 930
		die("wrote %"PRIu32" objects while expecting %"PRIu32,
			written, nr_result);
931 932
}

933 934
static int no_try_delta(const char *path)
{
935
	static struct attr_check *check;
936

937 938 939
	if (!check)
		check = attr_check_initl("delta", NULL);
	if (git_check_attr(path, check))
940
		return 0;
941
	if (ATTR_FALSE(check->items[0].value))
942 943 944 945
		return 1;
	return 0;
}

J
Jeff King 已提交
946 947 948 949 950 951 952 953 954 955
/*
 * When adding an object, check whether we have already added it
 * to our packing list. If so, we can skip. However, if we are
 * being asked to excludei t, but the previous mention was to include
 * it, make sure to adjust its flags and tweak our numbers accordingly.
 *
 * As an optimization, we pass out the index position where we would have
 * found the item, since that saves us from having to look it up again a
 * few lines later when we want to add the new entry.
 */
956
static int have_duplicate_entry(const struct object_id *oid,
J
Jeff King 已提交
957 958
				int exclude,
				uint32_t *index_pos)
959 960
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
961

962
	entry = packlist_find(&to_pack, oid->hash, index_pos);
J
Jeff King 已提交
963
	if (!entry)
N
Nicolas Pitre 已提交
964
		return 0;
J
Jeff King 已提交
965 966 967 968 969

	if (exclude) {
		if (!entry->preferred_base)
			nr_result--;
		entry->preferred_base = 1;
N
Nicolas Pitre 已提交
970
	}
971

J
Jeff King 已提交
972 973 974
	return 1;
}

975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
static int want_found_object(int exclude, struct packed_git *p)
{
	if (exclude)
		return 1;
	if (incremental)
		return 0;

	/*
	 * When asked to do --local (do not include an object that appears in a
	 * pack we borrow from elsewhere) or --honor-pack-keep (do not include
	 * an object that appears in a pack marked with .keep), finding a pack
	 * that matches the criteria is sufficient for us to decide to omit it.
	 * However, even if this pack does not satisfy the criteria, we need to
	 * make sure no copy of this object appears in _any_ pack that makes us
	 * to omit the object, so we need to check all the packs.
	 *
	 * We can however first check whether these options can possible matter;
	 * if they do not matter we know we want the object in generated pack.
	 * Otherwise, we signal "-1" at the end to tell the caller that we do
	 * not know either way, and it needs to check more packs.
	 */
	if (!ignore_packed_keep &&
	    (!local || !have_non_local_packs))
		return 1;

	if (local && !p->pack_local)
		return 0;
	if (ignore_packed_keep && p->pack_local && p->pack_keep)
		return 0;

	/* we don't know yet; keep looking for more packs */
	return -1;
}

J
Jeff King 已提交
1009 1010 1011 1012
/*
 * Check whether we want the object in the pack (e.g., we do not want
 * objects found in non-local stores if the "--local" option was used).
 *
1013 1014 1015 1016
 * If the caller already knows an existing pack it wants to take the object
 * from, that is passed in *found_pack and *found_offset; otherwise this
 * function finds if there is any pack that has the object and returns the pack
 * and its offset in these variables.
J
Jeff King 已提交
1017
 */
1018
static int want_object_in_pack(const struct object_id *oid,
J
Jeff King 已提交
1019 1020 1021 1022
			       int exclude,
			       struct packed_git **found_pack,
			       off_t *found_offset)
{
1023
	int want;
1024
	struct list_head *pos;
J
Jeff King 已提交
1025

1026
	if (!exclude && local && has_loose_object_nonlocal(oid->hash))
1027 1028
		return 0;

1029 1030 1031 1032 1033 1034 1035 1036 1037 1038
	/*
	 * If we already know the pack object lives in, start checks from that
	 * pack - in the usual case when neither --local was given nor .keep files
	 * are present we will determine the answer right now.
	 */
	if (*found_pack) {
		want = want_found_object(exclude, *found_pack);
		if (want != -1)
			return want;
	}
1039
	list_for_each(pos, get_packed_git_mru(the_repository)) {
1040
		struct packed_git *p = list_entry(pos, struct packed_git, mru);
1041 1042 1043 1044 1045
		off_t offset;

		if (p == *found_pack)
			offset = *found_offset;
		else
1046
			offset = find_pack_entry_one(oid->hash, p);
1047

1048
		if (offset) {
J
Jeff King 已提交
1049
			if (!*found_pack) {
1050
				if (!is_pack_valid(p))
1051
					continue;
J
Jeff King 已提交
1052 1053
				*found_offset = offset;
				*found_pack = p;
L
Linus Torvalds 已提交
1054
			}
1055
			want = want_found_object(exclude, p);
1056
			if (!exclude && want > 0)
1057 1058
				list_move(&p->mru,
					  get_packed_git_mru(the_repository));
1059 1060
			if (want != -1)
				return want;
L
Linus Torvalds 已提交
1061 1062
		}
	}
1063

J
Jeff King 已提交
1064 1065 1066
	return 1;
}

1067
static void create_object_entry(const struct object_id *oid,
J
Jeff King 已提交
1068 1069 1070 1071 1072 1073 1074 1075 1076
				enum object_type type,
				uint32_t hash,
				int exclude,
				int no_try_delta,
				uint32_t index_pos,
				struct packed_git *found_pack,
				off_t found_offset)
{
	struct object_entry *entry;
N
Nicolas Pitre 已提交
1077

1078
	entry = packlist_alloc(&to_pack, oid->hash, index_pos);
1079
	entry->hash = hash;
1080
	oe_set_type(entry, type);
N
Nicolas Pitre 已提交
1081 1082
	if (exclude)
		entry->preferred_base = 1;
1083 1084
	else
		nr_result++;
N
Nicolas Pitre 已提交
1085
	if (found_pack) {
1086
		oe_set_in_pack(&to_pack, entry, found_pack);
N
Nicolas Pitre 已提交
1087 1088
		entry->in_pack_offset = found_offset;
	}
1089

J
Jeff King 已提交
1090 1091
	entry->no_try_delta = no_try_delta;
}
N
Nicolas Pitre 已提交
1092

1093 1094 1095 1096
static const char no_closure_warning[] = N_(
"disabling bitmap writing, as some objects are not being packed"
);

1097
static int add_object_entry(const struct object_id *oid, enum object_type type,
J
Jeff King 已提交
1098 1099
			    const char *name, int exclude)
{
1100 1101
	struct packed_git *found_pack = NULL;
	off_t found_offset = 0;
J
Jeff King 已提交
1102
	uint32_t index_pos;
1103

1104
	if (have_duplicate_entry(oid, exclude, &index_pos))
J
Jeff King 已提交
1105
		return 0;
1106

1107
	if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
1108 1109 1110 1111 1112
		/* The pack is missing an object, so it will not have closure */
		if (write_bitmap_index) {
			warning(_(no_closure_warning));
			write_bitmap_index = 0;
		}
J
Jeff King 已提交
1113
		return 0;
1114
	}
N
Nicolas Pitre 已提交
1115

1116
	create_object_entry(oid, type, pack_name_hash(name),
J
Jeff King 已提交
1117 1118
			    exclude, name && no_try_delta(name),
			    index_pos, found_pack, found_offset);
1119

1120
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1121
	return 1;
1122 1123
}

1124
static int add_object_entry_from_bitmap(const struct object_id *oid,
1125 1126 1127 1128 1129 1130
					enum object_type type,
					int flags, uint32_t name_hash,
					struct packed_git *pack, off_t offset)
{
	uint32_t index_pos;

1131
	if (have_duplicate_entry(oid, 0, &index_pos))
1132 1133
		return 0;

1134
	if (!want_object_in_pack(oid, 0, &pack, &offset))
1135 1136
		return 0;

1137
	create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
1138

1139
	display_progress(progress_state, nr_result);
N
Nicolas Pitre 已提交
1140
	return 1;
1141 1142
}

1143
struct pbase_tree_cache {
1144
	struct object_id oid;
1145 1146 1147 1148 1149 1150 1151
	int ref;
	int temporary;
	void *tree_data;
	unsigned long tree_size;
};

static struct pbase_tree_cache *(pbase_tree_cache[256]);
1152
static int pbase_tree_cache_ix(const struct object_id *oid)
1153
{
1154
	return oid->hash[0] % ARRAY_SIZE(pbase_tree_cache);
1155 1156 1157 1158 1159 1160 1161 1162 1163
}
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
J
Justin Lebar 已提交
1164
	 * going to evict it or find it through _get()
1165 1166 1167 1168 1169 1170
	 * mechanism -- this is for the toplevel node that
	 * would almost always change with any commit.
	 */
	struct pbase_tree_cache pcache;
} *pbase_tree;

1171
static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
1172 1173 1174 1175
{
	struct pbase_tree_cache *ent, *nent;
	void *data;
	unsigned long size;
1176
	enum object_type type;
1177
	int neigh;
1178
	int my_ix = pbase_tree_cache_ix(oid);
1179 1180 1181 1182 1183 1184 1185 1186
	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];
1187
		if (ent && !oidcmp(&ent->oid, oid)) {
1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202
			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.
	 */
1203
	data = read_object_file(oid, &type, &size);
1204 1205
	if (!data)
		return NULL;
1206
	if (type != OBJ_TREE) {
1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228
		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;
	}
1229
	oidcpy(&nent->oid, oid);
1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257
	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,
1258 1259
			     int cmplen,
			     const char *fullname)
1260
{
1261
	struct name_entry entry;
1262
	int cmp;
1263 1264

	while (tree_entry(tree,&entry)) {
1265 1266
		if (S_ISGITLINK(entry.mode))
			continue;
1267
		cmp = tree_entry_len(&entry) != cmplen ? 1 :
1268 1269
		      memcmp(name, entry.path, cmplen);
		if (cmp > 0)
1270
			continue;
1271 1272
		if (cmp < 0)
			return;
1273
		if (name[cmplen] != '/') {
1274
			add_object_entry(entry.oid,
1275
					 object_type(entry.mode),
1276
					 fullname, 1);
1277 1278
			return;
		}
1279
		if (S_ISDIR(entry.mode)) {
1280
			struct tree_desc sub;
1281 1282 1283 1284
			struct pbase_tree_cache *tree;
			const char *down = name+cmplen+1;
			int downlen = name_cmp_len(down);

1285
			tree = pbase_tree_get(entry.oid);
1286 1287
			if (!tree)
				return;
1288
			init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1289

1290
			add_pbase_object(&sub, down, downlen, fullname);
1291 1292 1293 1294
			pbase_tree_put(tree);
		}
	}
}
1295

1296 1297 1298 1299 1300 1301 1302 1303
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) {
1304
		int mi = lo + (hi - lo) / 2;
1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316
		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)
{
1317
	int pos = done_pbase_path_pos(hash);
1318 1319 1320
	if (0 <= pos)
		return 1;
	pos = -pos - 1;
1321 1322 1323
	ALLOC_GROW(done_pbase_paths,
		   done_pbase_paths_num + 1,
		   done_pbase_paths_alloc);
1324 1325
	done_pbase_paths_num++;
	if (pos < done_pbase_paths_num)
R
René Scharfe 已提交
1326 1327
		MOVE_ARRAY(done_pbase_paths + pos + 1, done_pbase_paths + pos,
			   done_pbase_paths_num - pos - 1);
1328 1329 1330 1331
	done_pbase_paths[pos] = hash;
	return 0;
}

1332
static void add_preferred_base_object(const char *name)
1333 1334
{
	struct pbase_tree *it;
1335
	int cmplen;
V
Vicent Marti 已提交
1336
	unsigned hash = pack_name_hash(name);
1337

1338
	if (!num_preferred_base || check_pbase_path(hash))
1339 1340
		return;

1341
	cmplen = name_cmp_len(name);
1342 1343
	for (it = pbase_tree; it; it = it->next) {
		if (cmplen == 0) {
1344
			add_object_entry(&it->pcache.oid, OBJ_TREE, NULL, 1);
1345 1346 1347
		}
		else {
			struct tree_desc tree;
1348
			init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1349
			add_pbase_object(&tree, name, cmplen, name);
1350
		}
1351 1352 1353
	}
}

1354
static void add_preferred_base(struct object_id *oid)
1355
{
1356 1357 1358
	struct pbase_tree *it;
	void *data;
	unsigned long size;
1359
	struct object_id tree_oid;
1360

1361 1362 1363
	if (window <= num_preferred_base++)
		return;

1364
	data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
1365
	if (!data)
1366
		return;
1367 1368

	for (it = pbase_tree; it; it = it->next) {
1369
		if (!oidcmp(&it->pcache.oid, &tree_oid)) {
1370 1371 1372 1373 1374 1375 1376 1377 1378
			free(data);
			return;
		}
	}

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

1379
	oidcpy(&it->pcache.oid, &tree_oid);
1380 1381
	it->pcache.tree_data = data;
	it->pcache.tree_size = size;
1382 1383
}

1384 1385 1386 1387 1388 1389 1390 1391
static void cleanup_preferred_base(void)
{
	struct pbase_tree *it;
	unsigned i;

	it = pbase_tree;
	pbase_tree = NULL;
	while (it) {
1392 1393 1394 1395
		struct pbase_tree *tmp = it;
		it = tmp->next;
		free(tmp->pcache.tree_data);
		free(tmp);
1396 1397 1398 1399 1400 1401
	}

	for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
		if (!pbase_tree_cache[i])
			continue;
		free(pbase_tree_cache[i]->tree_data);
1402
		FREE_AND_NULL(pbase_tree_cache[i]);
1403 1404
	}

1405
	FREE_AND_NULL(done_pbase_paths);
1406 1407 1408
	done_pbase_paths_num = done_pbase_paths_alloc = 0;
}

1409 1410
static void check_object(struct object_entry *entry)
{
1411 1412
	if (IN_PACK(entry)) {
		struct packed_git *p = IN_PACK(entry);
1413
		struct pack_window *w_curs = NULL;
1414 1415 1416
		const unsigned char *base_ref = NULL;
		struct object_entry *base_entry;
		unsigned long used, used_0;
1417
		unsigned long avail;
1418 1419
		off_t ofs;
		unsigned char *buf, c;
1420
		enum object_type type;
1421

1422
		buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1423

1424
		/*
1425 1426
		 * We want in_pack_type even if we do not reuse delta
		 * since non-delta representations could still be reused.
1427
		 */
1428
		used = unpack_object_header_buffer(buf, avail,
1429
						   &type,
1430
						   &entry->size);
1431 1432
		if (used == 0)
			goto give_up;
1433

1434 1435 1436 1437
		if (type < 0)
			BUG("invalid type %d", type);
		entry->in_pack_type = type;

1438 1439 1440 1441
		/*
		 * 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.
1442
		 */
1443 1444 1445
		switch (entry->in_pack_type) {
		default:
			/* Not a delta hence we've already got all we need. */
1446
			oe_set_type(entry, entry->in_pack_type);
1447
			entry->in_pack_header_size = used;
1448
			if (oe_type(entry) < OBJ_COMMIT || oe_type(entry) > OBJ_BLOB)
1449
				goto give_up;
1450 1451 1452
			unuse_pack(&w_curs);
			return;
		case OBJ_REF_DELTA:
1453
			if (reuse_delta && !entry->preferred_base)
1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465
				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;
1466 1467
				if (!ofs || MSB(ofs, 7)) {
					error("delta base offset overflow in pack for %s",
1468
					      oid_to_hex(&entry->idx.oid));
1469 1470
					goto give_up;
				}
1471 1472
				c = buf[used_0++];
				ofs = (ofs << 7) + (c & 127);
1473
			}
1474
			ofs = entry->in_pack_offset - ofs;
1475 1476
			if (ofs <= 0 || ofs >= entry->in_pack_offset) {
				error("delta base offset out of bound for %s",
1477
				      oid_to_hex(&entry->idx.oid));
1478 1479
				goto give_up;
			}
1480
			if (reuse_delta && !entry->preferred_base) {
1481 1482
				struct revindex_entry *revidx;
				revidx = find_pack_revindex(p, ofs);
1483 1484
				if (!revidx)
					goto give_up;
1485 1486
				base_ref = nth_packed_object_sha1(p, revidx->nr);
			}
1487 1488
			entry->in_pack_header_size = used + used_0;
			break;
1489 1490
		}

1491
		if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1492 1493 1494 1495 1496 1497 1498 1499 1500
			/*
			 * 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.
1501
			 */
1502
			oe_set_type(entry, entry->in_pack_type);
1503
			SET_DELTA(entry, base_entry);
1504
			entry->delta_size = entry->size;
1505 1506
			entry->delta_sibling_idx = base_entry->delta_child_idx;
			SET_DELTA_CHILD(base_entry, entry);
1507 1508 1509
			unuse_pack(&w_curs);
			return;
		}
1510

1511
		if (oe_type(entry)) {
1512 1513 1514 1515 1516 1517 1518
			/*
			 * 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);
1519 1520
			if (entry->size == 0)
				goto give_up;
1521
			unuse_pack(&w_curs);
1522 1523
			return;
		}
1524 1525 1526 1527 1528 1529

		/*
		 * No choice but to fall back to the recursive delta walk
		 * with sha1_object_info() to find about the object type
		 * at this point...
		 */
1530
		give_up:
1531
		unuse_pack(&w_curs);
1532
	}
1533

1534
	oe_set_type(entry, oid_object_info(&entry->idx.oid, &entry->size));
1535 1536 1537 1538 1539 1540
	/*
	 * The error condition is checked in prepare_pack().  This is
	 * to permit a missing preferred base object to be ignored
	 * as a preferred base.  Doing so can result in a larger
	 * pack file, but the transfer will still take place.
	 */
1541 1542
}

1543 1544 1545 1546
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;
1547 1548
	const struct packed_git *a_in_pack = IN_PACK(a);
	const struct packed_git *b_in_pack = IN_PACK(b);
1549 1550

	/* avoid filesystem trashing with loose objects */
1551
	if (!a_in_pack && !b_in_pack)
1552
		return oidcmp(&a->idx.oid, &b->idx.oid);
1553

1554
	if (a_in_pack < b_in_pack)
1555
		return -1;
1556
	if (a_in_pack > b_in_pack)
1557 1558 1559 1560 1561
		return 1;
	return a->in_pack_offset < b->in_pack_offset ? -1 :
			(a->in_pack_offset > b->in_pack_offset);
}

1562 1563 1564 1565 1566 1567 1568 1569 1570 1571
/*
 * Drop an on-disk delta we were planning to reuse. Naively, this would
 * just involve blanking out the "delta" field, but we have to deal
 * with some extra book-keeping:
 *
 *   1. Removing ourselves from the delta_sibling linked list.
 *
 *   2. Updating our size/type to the non-delta representation. These were
 *      either not recorded initially (size) or overwritten with the delta type
 *      (type) when check_object() decided to reuse the delta.
1572 1573
 *
 *   3. Resetting our delta depth, as we are now a base object.
1574 1575 1576
 */
static void drop_reused_delta(struct object_entry *entry)
{
1577
	unsigned *idx = &to_pack.objects[entry->delta_idx - 1].delta_child_idx;
1578
	struct object_info oi = OBJECT_INFO_INIT;
1579
	enum object_type type;
1580

1581 1582 1583 1584 1585
	while (*idx) {
		struct object_entry *oe = &to_pack.objects[*idx - 1];

		if (oe == entry)
			*idx = oe->delta_sibling_idx;
1586
		else
1587
			idx = &oe->delta_sibling_idx;
1588
	}
1589
	SET_DELTA(entry, NULL);
1590
	entry->depth = 0;
1591 1592

	oi.sizep = &entry->size;
1593
	oi.typep = &type;
1594
	if (packed_object_info(IN_PACK(entry), entry->in_pack_offset, &oi) < 0) {
1595 1596 1597
		/*
		 * We failed to get the info from this pack for some reason;
		 * fall back to sha1_object_info, which may find another copy.
1598
		 * And if that fails, the error will be recorded in oe_type(entry)
1599 1600
		 * and dealt with in prepare_pack().
		 */
1601 1602 1603 1604
		oe_set_type(entry, oid_object_info(&entry->idx.oid,
						   &entry->size));
	} else {
		oe_set_type(entry, type);
1605 1606 1607 1608 1609 1610 1611
	}
}

/*
 * Follow the chain of deltas from this entry onward, throwing away any links
 * that cause us to hit a cycle (as determined by the DFS state flags in
 * the entries).
1612 1613 1614
 *
 * We also detect too-long reused chains that would violate our --depth
 * limit.
1615 1616 1617
 */
static void break_delta_chains(struct object_entry *entry)
{
1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628
	/*
	 * The actual depth of each object we will write is stored as an int,
	 * as it cannot exceed our int "depth" limit. But before we break
	 * changes based no that limit, we may potentially go as deep as the
	 * number of objects, which is elsewhere bounded to a uint32_t.
	 */
	uint32_t total_depth;
	struct object_entry *cur, *next;

	for (cur = entry, total_depth = 0;
	     cur;
1629
	     cur = DELTA(cur), total_depth++) {
1630 1631 1632 1633 1634 1635 1636 1637 1638
		if (cur->dfs_state == DFS_DONE) {
			/*
			 * We've already seen this object and know it isn't
			 * part of a cycle. We do need to append its depth
			 * to our count.
			 */
			total_depth += cur->depth;
			break;
		}
1639 1640

		/*
1641 1642 1643
		 * We break cycles before looping, so an ACTIVE state (or any
		 * other cruft which made its way into the state variable)
		 * is a bug.
1644
		 */
1645 1646 1647
		if (cur->dfs_state != DFS_NONE)
			die("BUG: confusing delta dfs state in first pass: %d",
			    cur->dfs_state);
1648 1649

		/*
1650 1651 1652
		 * Now we know this is the first time we've seen the object. If
		 * it's not a delta, we're done traversing, but we'll mark it
		 * done to save time on future traversals.
1653
		 */
1654
		if (!DELTA(cur)) {
1655 1656 1657
			cur->dfs_state = DFS_DONE;
			break;
		}
1658 1659

		/*
1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674
		 * Mark ourselves as active and see if the next step causes
		 * us to cycle to another active object. It's important to do
		 * this _before_ we loop, because it impacts where we make the
		 * cut, and thus how our total_depth counter works.
		 * E.g., We may see a partial loop like:
		 *
		 *   A -> B -> C -> D -> B
		 *
		 * Cutting B->C breaks the cycle. But now the depth of A is
		 * only 1, and our total_depth counter is at 3. The size of the
		 * error is always one less than the size of the cycle we
		 * broke. Commits C and D were "lost" from A's chain.
		 *
		 * If we instead cut D->B, then the depth of A is correct at 3.
		 * We keep all commits in the chain that we examined.
1675
		 */
1676
		cur->dfs_state = DFS_ACTIVE;
1677
		if (DELTA(cur)->dfs_state == DFS_ACTIVE) {
1678 1679 1680
			drop_reused_delta(cur);
			cur->dfs_state = DFS_DONE;
			break;
1681
		}
1682
	}
1683

1684 1685 1686 1687 1688 1689 1690 1691
	/*
	 * And now that we've gone all the way to the bottom of the chain, we
	 * need to clear the active flags and set the depth fields as
	 * appropriate. Unlike the loop above, which can quit when it drops a
	 * delta, we need to keep going to look for more depth cuts. So we need
	 * an extra "next" pointer to keep going after we reset cur->delta.
	 */
	for (cur = entry; cur; cur = next) {
1692
		next = DELTA(cur);
1693

1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704
		/*
		 * We should have a chain of zero or more ACTIVE states down to
		 * a final DONE. We can quit after the DONE, because either it
		 * has no bases, or we've already handled them in a previous
		 * call.
		 */
		if (cur->dfs_state == DFS_DONE)
			break;
		else if (cur->dfs_state != DFS_ACTIVE)
			die("BUG: confusing delta dfs state in second pass: %d",
			    cur->dfs_state);
1705 1706

		/*
1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722
		 * If the total_depth is more than depth, then we need to snip
		 * the chain into two or more smaller chains that don't exceed
		 * the maximum depth. Most of the resulting chains will contain
		 * (depth + 1) entries (i.e., depth deltas plus one base), and
		 * the last chain (i.e., the one containing entry) will contain
		 * whatever entries are left over, namely
		 * (total_depth % (depth + 1)) of them.
		 *
		 * Since we are iterating towards decreasing depth, we need to
		 * decrement total_depth as we go, and we need to write to the
		 * entry what its final depth will be after all of the
		 * snipping. Since we're snipping into chains of length (depth
		 * + 1) entries, the final depth of an entry will be its
		 * original depth modulo (depth + 1). Any time we encounter an
		 * entry whose final depth is supposed to be zero, we snip it
		 * from its delta base, thereby making it so.
1723
		 */
1724 1725 1726 1727 1728
		cur->depth = (total_depth--) % (depth + 1);
		if (!cur->depth)
			drop_reused_delta(cur);

		cur->dfs_state = DFS_DONE;
1729 1730 1731
	}
}

1732 1733
static void get_object_details(void)
{
1734
	uint32_t i;
1735 1736
	struct object_entry **sorted_by_offset;

1737 1738 1739
	sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
	for (i = 0; i < to_pack.nr_objects; i++)
		sorted_by_offset[i] = to_pack.objects + i;
R
René Scharfe 已提交
1740
	QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort);
1741

1742
	for (i = 0; i < to_pack.nr_objects; i++) {
1743 1744
		struct object_entry *entry = sorted_by_offset[i];
		check_object(entry);
1745
		if (entry->type_valid && big_file_threshold < entry->size)
1746 1747
			entry->no_try_delta = 1;
	}
1748

1749 1750 1751 1752 1753 1754 1755
	/*
	 * This must happen in a second pass, since we rely on the delta
	 * information for the whole list being completed.
	 */
	for (i = 0; i < to_pack.nr_objects; i++)
		break_delta_chains(&to_pack.objects[i]);

1756
	free(sorted_by_offset);
1757 1758
}

1759 1760 1761 1762 1763 1764 1765 1766 1767
/*
 * We search for deltas in a list sorted by type, by filename hash, and then
 * 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.  The deepest deltas are therefore the oldest objects which are
 * less susceptible to be accessed often.
 */
1768
static int type_size_sort(const void *_a, const void *_b)
1769
{
1770 1771
	const struct object_entry *a = *(struct object_entry **)_a;
	const struct object_entry *b = *(struct object_entry **)_b;
1772 1773
	enum object_type a_type = oe_type(a);
	enum object_type b_type = oe_type(b);
1774

1775
	if (a_type > b_type)
1776
		return -1;
1777
	if (a_type < b_type)
1778
		return 1;
1779
	if (a->hash > b->hash)
1780
		return -1;
1781
	if (a->hash < b->hash)
1782
		return 1;
1783
	if (a->preferred_base > b->preferred_base)
1784
		return -1;
1785 1786
	if (a->preferred_base < b->preferred_base)
		return 1;
1787
	if (a->size > b->size)
1788 1789
		return -1;
	if (a->size < b->size)
1790
		return 1;
1791
	return a < b ? -1 : (a > b);  /* newest first */
1792 1793 1794 1795 1796
}

struct unpacked {
	struct object_entry *entry;
	void *data;
1797
	struct delta_index *index;
1798
	unsigned depth;
1799 1800
};

1801 1802
static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
			   unsigned long delta_size)
1803 1804 1805 1806
{
	if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
		return 0;

1807 1808 1809
	if (delta_size < cache_max_small_delta_size)
		return 1;

1810 1811 1812 1813 1814 1815 1816
	/* 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;
}

1817
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
1818

1819
static pthread_mutex_t read_mutex;
N
Nicolas Pitre 已提交
1820 1821 1822
#define read_lock()		pthread_mutex_lock(&read_mutex)
#define read_unlock()		pthread_mutex_unlock(&read_mutex)

1823
static pthread_mutex_t cache_mutex;
1824 1825 1826
#define cache_lock()		pthread_mutex_lock(&cache_mutex)
#define cache_unlock()		pthread_mutex_unlock(&cache_mutex)

1827
static pthread_mutex_t progress_mutex;
N
Nicolas Pitre 已提交
1828 1829 1830 1831 1832
#define progress_lock()		pthread_mutex_lock(&progress_mutex)
#define progress_unlock()	pthread_mutex_unlock(&progress_mutex)

#else

1833 1834 1835 1836 1837 1838
#define read_lock()		(void)0
#define read_unlock()		(void)0
#define cache_lock()		(void)0
#define cache_unlock()		(void)0
#define progress_lock()		(void)0
#define progress_unlock()	(void)0
N
Nicolas Pitre 已提交
1839 1840 1841

#endif

1842
static int try_delta(struct unpacked *trg, struct unpacked *src,
1843
		     unsigned max_depth, unsigned long *mem_usage)
1844
{
1845 1846
	struct object_entry *trg_entry = trg->entry;
	struct object_entry *src_entry = src->entry;
1847
	unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1848
	unsigned ref_depth;
1849
	enum object_type type;
1850 1851 1852
	void *delta_buf;

	/* Don't bother doing diffs between different types */
1853
	if (oe_type(trg_entry) != oe_type(src_entry))
1854 1855
		return -1;

1856
	/*
1857 1858 1859 1860 1861 1862
	 * We do not bother to try a delta that we discarded on an
	 * earlier try, but only when reusing delta data.  Note that
	 * src_entry that is marked as the preferred_base should always
	 * be considered, as even if we produce a suboptimal delta against
	 * it, we will still save the transfer cost, as we already know
	 * the other side has it and we won't send src_entry at all.
1863
	 */
1864 1865
	if (reuse_delta && IN_PACK(trg_entry) &&
	    IN_PACK(trg_entry) == IN_PACK(src_entry) &&
1866
	    !src_entry->preferred_base &&
1867 1868
	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
1869 1870
		return 0;

1871
	/* Let's not bust the allowed depth. */
1872
	if (src->depth >= max_depth)
1873
		return 0;
1874

1875
	/* Now some size filtering heuristics. */
1876
	trg_size = trg_entry->size;
1877
	if (!DELTA(trg_entry)) {
1878 1879 1880 1881
		max_size = trg_size/2 - 20;
		ref_depth = 1;
	} else {
		max_size = trg_entry->delta_size;
1882
		ref_depth = trg->depth;
1883
	}
1884
	max_size = (uint64_t)max_size * (max_depth - src->depth) /
1885
						(max_depth - ref_depth + 1);
1886 1887
	if (max_size == 0)
		return 0;
1888
	src_size = src_entry->size;
1889
	sizediff = src_size < trg_size ? trg_size - src_size : 0;
1890
	if (sizediff >= max_size)
1891
		return 0;
1892 1893
	if (trg_size < src_size / 32)
		return 0;
1894

1895 1896
	/* Load data if not already done */
	if (!trg->data) {
N
Nicolas Pitre 已提交
1897
		read_lock();
1898
		trg->data = read_object_file(&trg_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1899
		read_unlock();
1900 1901
		if (!trg->data)
			die("object %s cannot be read",
1902
			    oid_to_hex(&trg_entry->idx.oid));
1903 1904
		if (sz != trg_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1905 1906
			    oid_to_hex(&trg_entry->idx.oid), sz,
			    trg_size);
1907
		*mem_usage += sz;
1908 1909
	}
	if (!src->data) {
N
Nicolas Pitre 已提交
1910
		read_lock();
1911
		src->data = read_object_file(&src_entry->idx.oid, &type, &sz);
N
Nicolas Pitre 已提交
1912
		read_unlock();
1913 1914 1915 1916 1917
		if (!src->data) {
			if (src_entry->preferred_base) {
				static int warned = 0;
				if (!warned++)
					warning("object %s cannot be read",
1918
						oid_to_hex(&src_entry->idx.oid));
1919 1920 1921 1922 1923 1924 1925 1926
				/*
				 * Those objects are not included in the
				 * resulting pack.  Be resilient and ignore
				 * them if they can't be read, in case the
				 * pack could be created nevertheless.
				 */
				return 0;
			}
1927
			die("object %s cannot be read",
1928
			    oid_to_hex(&src_entry->idx.oid));
1929
		}
1930 1931
		if (sz != src_size)
			die("object %s inconsistent object length (%lu vs %lu)",
1932 1933
			    oid_to_hex(&src_entry->idx.oid), sz,
			    src_size);
1934
		*mem_usage += sz;
1935 1936 1937
	}
	if (!src->index) {
		src->index = create_delta_index(src->data, src_size);
1938 1939 1940 1941 1942 1943
		if (!src->index) {
			static int warned = 0;
			if (!warned++)
				warning("suboptimal pack - out of memory");
			return 0;
		}
1944
		*mem_usage += sizeof_delta_index(src->index);
1945 1946 1947
	}

	delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1948
	if (!delta_buf)
1949
		return 0;
1950

1951
	if (DELTA(trg_entry)) {
1952 1953
		/* Prefer only shallower same-sized deltas. */
		if (delta_size == trg_entry->delta_size &&
1954
		    src->depth + 1 >= trg->depth) {
1955 1956 1957
			free(delta_buf);
			return 0;
		}
1958
	}
N
Nicolas Pitre 已提交
1959

1960 1961 1962
	/*
	 * Handle memory allocation outside of the cache
	 * accounting lock.  Compiler will optimize the strangeness
1963
	 * away when NO_PTHREADS is defined.
1964
	 */
1965
	free(trg_entry->delta_data);
1966
	cache_lock();
N
Nicolas Pitre 已提交
1967 1968 1969 1970
	if (trg_entry->delta_data) {
		delta_cache_size -= trg_entry->delta_size;
		trg_entry->delta_data = NULL;
	}
1971
	if (delta_cacheable(src_size, trg_size, delta_size)) {
1972
		delta_cache_size += delta_size;
1973 1974 1975 1976
		cache_unlock();
		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
	} else {
		cache_unlock();
1977
		free(delta_buf);
1978 1979
	}

1980
	SET_DELTA(trg_entry, src_entry);
1981 1982 1983
	trg_entry->delta_size = delta_size;
	trg->depth = src->depth + 1;

1984
	return 1;
1985 1986
}

1987
static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1988
{
1989
	struct object_entry *child = DELTA_CHILD(me);
1990 1991 1992 1993 1994
	unsigned int m = n;
	while (child) {
		unsigned int c = check_delta_limit(child, n + 1);
		if (m < c)
			m = c;
1995
		child = DELTA_SIBLING(child);
1996 1997
	}
	return m;
1998 1999
}

2000
static unsigned long free_unpacked(struct unpacked *n)
2001
{
2002
	unsigned long freed_mem = sizeof_delta_index(n->index);
2003 2004 2005
	free_delta_index(n->index);
	n->index = NULL;
	if (n->data) {
2006
		freed_mem += n->entry->size;
2007
		FREE_AND_NULL(n->data);
2008 2009
	}
	n->entry = NULL;
2010
	n->depth = 0;
2011
	return freed_mem;
2012 2013
}

2014
static void find_deltas(struct object_entry **list, unsigned *list_size,
2015
			int window, int depth, unsigned *processed)
2016
{
2017
	uint32_t i, idx = 0, count = 0;
2018
	struct unpacked *array;
2019
	unsigned long mem_usage = 0;
2020

2021
	array = xcalloc(window, sizeof(struct unpacked));
2022

2023
	for (;;) {
2024
		struct object_entry *entry;
2025
		struct unpacked *n = array + idx;
2026
		int j, max_depth, best_base = -1;
2027

2028 2029 2030 2031 2032
		progress_lock();
		if (!*list_size) {
			progress_unlock();
			break;
		}
2033
		entry = *list++;
2034 2035 2036 2037 2038 2039 2040
		(*list_size)--;
		if (!entry->preferred_base) {
			(*processed)++;
			display_progress(progress_state, *processed);
		}
		progress_unlock();

2041
		mem_usage -= free_unpacked(n);
2042
		n->entry = entry;
2043

2044
		while (window_memory_limit &&
2045
		       mem_usage > window_memory_limit &&
2046 2047
		       count > 1) {
			uint32_t tail = (idx + window - count) % window;
2048
			mem_usage -= free_unpacked(array + tail);
2049 2050 2051
			count--;
		}

2052 2053 2054 2055 2056 2057
		/* We do not compute delta to *create* objects we are not
		 * going to pack.
		 */
		if (entry->preferred_base)
			goto next;

2058 2059 2060 2061 2062 2063
		/*
		 * 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;
2064
		if (DELTA_CHILD(entry)) {
2065 2066 2067 2068 2069
			max_depth -= check_delta_limit(entry, 0);
			if (max_depth <= 0)
				goto next;
		}

L
Linus Torvalds 已提交
2070 2071
		j = window;
		while (--j > 0) {
2072
			int ret;
2073
			uint32_t other_idx = idx + j;
2074
			struct unpacked *m;
L
Linus Torvalds 已提交
2075 2076
			if (other_idx >= window)
				other_idx -= window;
2077 2078 2079
			m = array + other_idx;
			if (!m->entry)
				break;
2080
			ret = try_delta(n, m, max_depth, &mem_usage);
2081
			if (ret < 0)
2082
				break;
2083 2084
			else if (ret > 0)
				best_base = other_idx;
2085
		}
2086

2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101
		/*
		 * If we decided to cache the delta data, then it is best
		 * to compress it right away.  First because we have to do
		 * it anyway, and doing it here while we're threaded will
		 * save a lot of time in the non threaded write phase,
		 * as well as allow for caching more deltas within
		 * the same cache size limit.
		 * ...
		 * But only if not writing to stdout, since in that case
		 * the network is most likely throttling writes anyway,
		 * and therefore it is best to go to the write phase ASAP
		 * instead, as we can afford spending more time compressing
		 * between writes at that moment.
		 */
		if (entry->delta_data && !pack_to_stdout) {
2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114
			unsigned long size;

			size = do_compress(&entry->delta_data, entry->delta_size);
			if (size < (1U << OE_Z_DELTA_BITS)) {
				entry->z_delta_size = size;
				cache_lock();
				delta_cache_size -= entry->delta_size;
				delta_cache_size += entry->z_delta_size;
				cache_unlock();
			} else {
				FREE_AND_NULL(entry->delta_data);
				entry->z_delta_size = 0;
			}
2115 2116
		}

2117 2118 2119 2120
		/* 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.
		 */
2121
		if (DELTA(entry) && max_depth <= n->depth)
2122
			continue;
2123

2124 2125 2126 2127 2128
		/*
		 * Move the best delta base up in the window, after the
		 * currently deltified object, to keep it longer.  It will
		 * be the first base object to be attempted next.
		 */
2129
		if (DELTA(entry)) {
2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140
			struct unpacked swap = array[best_base];
			int dist = (window + idx - best_base) % window;
			int dst = best_base;
			while (dist--) {
				int src = (dst + 1) % window;
				array[dst] = array[src];
				dst = src;
			}
			array[dst] = swap;
		}

2141
		next:
2142
		idx++;
2143 2144
		if (count + 1 < window)
			count++;
2145 2146
		if (idx >= window)
			idx = 0;
2147
	}
2148

2149
	for (i = 0; i < window; ++i) {
2150
		free_delta_index(array[i].index);
2151
		free(array[i].data);
2152
	}
2153
	free(array);
2154 2155
}

2156
#ifndef NO_PTHREADS
N
Nicolas Pitre 已提交
2157

2158 2159 2160
static void try_to_free_from_threads(size_t size)
{
	read_lock();
2161
	release_pack_memory(size);
2162 2163 2164
	read_unlock();
}

2165
static try_to_free_t old_try_to_free_routine;
2166

2167 2168 2169 2170 2171 2172 2173 2174 2175
/*
 * The main thread waits on the condition that (at least) one of the workers
 * has stopped working (which is indicated in the .working member of
 * struct thread_params).
 * When a work thread has completed its work, it sets .working to 0 and
 * signals the main thread and waits on the condition that .data_ready
 * becomes 1.
 */

N
Nicolas Pitre 已提交
2176 2177 2178 2179
struct thread_params {
	pthread_t thread;
	struct object_entry **list;
	unsigned list_size;
2180
	unsigned remaining;
N
Nicolas Pitre 已提交
2181 2182
	int window;
	int depth;
2183 2184 2185 2186
	int working;
	int data_ready;
	pthread_mutex_t mutex;
	pthread_cond_t cond;
N
Nicolas Pitre 已提交
2187 2188 2189
	unsigned *processed;
};

2190 2191 2192 2193 2194 2195 2196
static pthread_cond_t progress_cond;

/*
 * Mutex and conditional variable can't be statically-initialized on Windows.
 */
static void init_threaded_search(void)
{
2197
	init_recursive_mutex(&read_mutex);
2198 2199 2200
	pthread_mutex_init(&cache_mutex, NULL);
	pthread_mutex_init(&progress_mutex, NULL);
	pthread_cond_init(&progress_cond, NULL);
2201
	old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
2202 2203 2204 2205
}

static void cleanup_threaded_search(void)
{
2206
	set_try_to_free_routine(old_try_to_free_routine);
2207 2208 2209 2210 2211
	pthread_cond_destroy(&progress_cond);
	pthread_mutex_destroy(&read_mutex);
	pthread_mutex_destroy(&cache_mutex);
	pthread_mutex_destroy(&progress_mutex);
}
2212

N
Nicolas Pitre 已提交
2213 2214
static void *threaded_find_deltas(void *arg)
{
2215 2216
	struct thread_params *me = arg;

2217
	progress_lock();
2218
	while (me->remaining) {
2219 2220
		progress_unlock();

2221
		find_deltas(me->list, &me->remaining,
2222
			    me->window, me->depth, me->processed);
2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241

		progress_lock();
		me->working = 0;
		pthread_cond_signal(&progress_cond);
		progress_unlock();

		/*
		 * We must not set ->data_ready before we wait on the
		 * condition because the main thread may have set it to 1
		 * before we get here. In order to be sure that new
		 * work is available if we see 1 in ->data_ready, it
		 * was initialized to 0 before this thread was spawned
		 * and we reset it to 0 right away.
		 */
		pthread_mutex_lock(&me->mutex);
		while (!me->data_ready)
			pthread_cond_wait(&me->cond, &me->mutex);
		me->data_ready = 0;
		pthread_mutex_unlock(&me->mutex);
2242 2243

		progress_lock();
2244
	}
2245
	progress_unlock();
2246 2247
	/* leave ->working 1 so that this doesn't get more work assigned */
	return NULL;
N
Nicolas Pitre 已提交
2248 2249 2250 2251 2252
}

static void ll_find_deltas(struct object_entry **list, unsigned list_size,
			   int window, int depth, unsigned *processed)
{
2253
	struct thread_params *p;
2254
	int i, ret, active_threads = 0;
2255

2256 2257
	init_threaded_search();

2258
	if (delta_search_threads <= 1) {
2259
		find_deltas(list, &list_size, window, depth, processed);
2260
		cleanup_threaded_search();
2261 2262
		return;
	}
2263
	if (progress > pack_to_stdout)
2264
		fprintf(stderr, "Delta compression using up to %d threads.\n",
2265
				delta_search_threads);
2266
	p = xcalloc(delta_search_threads, sizeof(*p));
2267

2268
	/* Partition the work amongst work threads. */
2269
	for (i = 0; i < delta_search_threads; i++) {
2270 2271
		unsigned sub_size = list_size / (delta_search_threads - i);

2272 2273 2274 2275
		/* don't use too small segments or no deltas will be found */
		if (sub_size < 2*window && i+1 < delta_search_threads)
			sub_size = 0;

N
Nicolas Pitre 已提交
2276 2277 2278
		p[i].window = window;
		p[i].depth = depth;
		p[i].processed = processed;
2279 2280
		p[i].working = 1;
		p[i].data_ready = 0;
2281

2282
		/* try to split chunks on "path" boundaries */
2283 2284
		while (sub_size && sub_size < list_size &&
		       list[sub_size]->hash &&
2285 2286 2287
		       list[sub_size]->hash == list[sub_size-1]->hash)
			sub_size++;

2288 2289 2290
		p[i].list = list;
		p[i].list_size = sub_size;
		p[i].remaining = sub_size;
2291

2292 2293 2294 2295
		list += sub_size;
		list_size -= sub_size;
	}

2296 2297 2298 2299
	/* Start work threads. */
	for (i = 0; i < delta_search_threads; i++) {
		if (!p[i].list_size)
			continue;
2300 2301
		pthread_mutex_init(&p[i].mutex, NULL);
		pthread_cond_init(&p[i].cond, NULL);
2302 2303 2304 2305 2306 2307 2308
		ret = pthread_create(&p[i].thread, NULL,
				     threaded_find_deltas, &p[i]);
		if (ret)
			die("unable to create thread: %s", strerror(ret));
		active_threads++;
	}

2309 2310 2311 2312 2313 2314 2315 2316
	/*
	 * Now let's wait for work completion.  Each time a thread is done
	 * with its work, we steal half of the remaining work from the
	 * thread with the largest number of unprocessed objects and give
	 * it to that newly idle thread.  This ensure good load balancing
	 * until the remaining object list segments are simply too short
	 * to be worth splitting anymore.
	 */
2317 2318
	while (active_threads) {
		struct thread_params *target = NULL;
2319 2320 2321 2322
		struct thread_params *victim = NULL;
		unsigned sub_size = 0;

		progress_lock();
2323 2324 2325 2326 2327 2328 2329 2330 2331
		for (;;) {
			for (i = 0; !target && i < delta_search_threads; i++)
				if (!p[i].working)
					target = &p[i];
			if (target)
				break;
			pthread_cond_wait(&progress_cond, &progress_mutex);
		}

2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343
		for (i = 0; i < delta_search_threads; i++)
			if (p[i].remaining > 2*window &&
			    (!victim || victim->remaining < p[i].remaining))
				victim = &p[i];
		if (victim) {
			sub_size = victim->remaining / 2;
			list = victim->list + victim->list_size - sub_size;
			while (sub_size && list[0]->hash &&
			       list[0]->hash == list[-1]->hash) {
				list++;
				sub_size--;
			}
2344 2345 2346 2347 2348 2349 2350 2351 2352 2353
			if (!sub_size) {
				/*
				 * It is possible for some "paths" to have
				 * so many objects that no hash boundary
				 * might be found.  Let's just steal the
				 * exact half in that case.
				 */
				sub_size = victim->remaining / 2;
				list -= sub_size;
			}
2354 2355 2356 2357 2358 2359
			target->list = list;
			victim->list_size -= sub_size;
			victim->remaining -= sub_size;
		}
		target->list_size = sub_size;
		target->remaining = sub_size;
2360 2361 2362 2363 2364 2365 2366
		target->working = 1;
		progress_unlock();

		pthread_mutex_lock(&target->mutex);
		target->data_ready = 1;
		pthread_cond_signal(&target->cond);
		pthread_mutex_unlock(&target->mutex);
2367

2368
		if (!sub_size) {
2369
			pthread_join(target->thread, NULL);
2370 2371
			pthread_cond_destroy(&target->cond);
			pthread_mutex_destroy(&target->mutex);
2372
			active_threads--;
2373
		}
2374
	}
2375
	cleanup_threaded_search();
2376
	free(p);
N
Nicolas Pitre 已提交
2377 2378 2379
}

#else
2380
#define ll_find_deltas(l, s, w, d, p)	find_deltas(l, &s, w, d, p)
N
Nicolas Pitre 已提交
2381 2382
#endif

2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396
static void add_tag_chain(const struct object_id *oid)
{
	struct tag *tag;

	/*
	 * We catch duplicates already in add_object_entry(), but we'd
	 * prefer to do this extra check to avoid having to parse the
	 * tag at all if we already know that it's being packed (e.g., if
	 * it was included via bitmaps, we would not have parsed it
	 * previously).
	 */
	if (packlist_find(&to_pack, oid->hash, NULL))
		return;

2397
	tag = lookup_tag(oid);
2398 2399 2400 2401 2402
	while (1) {
		if (!tag || parse_tag(tag) || !tag->tagged)
			die("unable to pack objects reachable from tag %s",
			    oid_to_hex(oid));

2403
		add_object_entry(&tag->object.oid, OBJ_TAG, NULL, 0);
2404 2405 2406 2407 2408 2409 2410 2411

		if (tag->tagged->type != OBJ_TAG)
			return;

		tag = (struct tag *)tag->tagged;
	}
}

2412
static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
2413
{
2414
	struct object_id peeled;
2415

2416
	if (starts_with(path, "refs/tags/") && /* is a tag? */
2417
	    !peel_ref(path, &peeled)    && /* peelable? */
2418
	    packlist_find(&to_pack, peeled.hash, NULL))      /* object packed? */
2419
		add_tag_chain(oid);
2420 2421 2422
	return 0;
}

2423 2424
static void prepare_pack(int window, int depth)
{
2425
	struct object_entry **delta_list;
2426 2427
	uint32_t i, nr_deltas;
	unsigned n;
2428

2429
	get_object_details();
2430

2431 2432 2433 2434 2435 2436 2437 2438 2439 2440
	/*
	 * If we're locally repacking then we need to be doubly careful
	 * from now on in order to make sure no stealth corruption gets
	 * propagated to the new pack.  Clients receiving streamed packs
	 * should validate everything they get anyway so no need to incur
	 * the additional cost here in that case.
	 */
	if (!pack_to_stdout)
		do_check_packed_object_crc = 1;

2441
	if (!to_pack.nr_objects || !window || !depth)
2442 2443
		return;

J
Jeff King 已提交
2444
	ALLOC_ARRAY(delta_list, to_pack.nr_objects);
2445 2446
	nr_deltas = n = 0;

2447 2448
	for (i = 0; i < to_pack.nr_objects; i++) {
		struct object_entry *entry = to_pack.objects + i;
2449

2450
		if (DELTA(entry))
2451
			/* This happens if we decided to reuse existing
2452
			 * delta from a pack.  "reuse_delta &&" is implied.
2453 2454 2455
			 */
			continue;

2456
		if (!entry->type_valid || entry->size < 50)
2457 2458 2459 2460 2461
			continue;

		if (entry->no_try_delta)
			continue;

2462
		if (!entry->preferred_base) {
2463
			nr_deltas++;
2464
			if (oe_type(entry) < 0)
2465
				die("unable to get type of object %s",
2466
				    oid_to_hex(&entry->idx.oid));
2467
		} else {
2468
			if (oe_type(entry) < 0) {
2469 2470 2471 2472 2473 2474
				/*
				 * This object is not found, but we
				 * don't have to include it anyway.
				 */
				continue;
			}
2475
		}
2476 2477 2478 2479

		delta_list[n++] = entry;
	}

2480
	if (nr_deltas && n > 1) {
2481 2482
		unsigned nr_done = 0;
		if (progress)
2483
			progress_state = start_progress(_("Compressing objects"),
2484
							nr_deltas);
R
René Scharfe 已提交
2485
		QSORT(delta_list, n, type_size_sort);
N
Nicolas Pitre 已提交
2486
		ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
N
Nicolas Pitre 已提交
2487
		stop_progress(&progress_state);
2488 2489
		if (nr_done != nr_deltas)
			die("inconsistency with delta count");
2490
	}
2491
	free(delta_list);
2492 2493
}

2494
static int git_pack_config(const char *k, const char *v, void *cb)
2495
{
2496
	if (!strcmp(k, "pack.window")) {
2497 2498 2499
		window = git_config_int(k, v);
		return 0;
	}
2500 2501 2502 2503 2504
	if (!strcmp(k, "pack.windowmemory")) {
		window_memory_limit = git_config_ulong(k, v);
		return 0;
	}
	if (!strcmp(k, "pack.depth")) {
2505 2506 2507
		depth = git_config_int(k, v);
		return 0;
	}
2508 2509 2510 2511
	if (!strcmp(k, "pack.deltacachesize")) {
		max_delta_cache_size = git_config_int(k, v);
		return 0;
	}
2512 2513 2514 2515
	if (!strcmp(k, "pack.deltacachelimit")) {
		cache_max_small_delta_size = git_config_int(k, v);
		return 0;
	}
2516 2517 2518 2519 2520 2521
	if (!strcmp(k, "pack.writebitmaphashcache")) {
		if (git_config_bool(k, v))
			write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
		else
			write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
	}
2522
	if (!strcmp(k, "pack.usebitmaps")) {
2523
		use_bitmap_index_default = git_config_bool(k, v);
2524 2525
		return 0;
	}
2526 2527
	if (!strcmp(k, "pack.threads")) {
		delta_search_threads = git_config_int(k, v);
2528
		if (delta_search_threads < 0)
2529 2530
			die("invalid number of threads specified (%d)",
			    delta_search_threads);
2531
#ifdef NO_PTHREADS
2532
		if (delta_search_threads != 1) {
2533
			warning("no threads support, ignoring %s", k);
2534 2535
			delta_search_threads = 0;
		}
2536 2537 2538
#endif
		return 0;
	}
2539
	if (!strcmp(k, "pack.indexversion")) {
2540 2541
		pack_idx_opts.version = git_config_int(k, v);
		if (pack_idx_opts.version > 2)
2542
			die("bad pack.indexversion=%"PRIu32,
2543
			    pack_idx_opts.version);
2544 2545
		return 0;
	}
2546
	return git_default_config(k, v, cb);
2547 2548
}

2549
static void read_object_list_from_stdin(void)
2550
{
2551 2552 2553
	char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
	struct object_id oid;
	const char *p;
2554

2555 2556 2557 2558 2559 2560
	for (;;) {
		if (!fgets(line, sizeof(line), stdin)) {
			if (feof(stdin))
				break;
			if (!ferror(stdin))
				die("fgets returned NULL, not EOF, not error!");
2561
			if (errno != EINTR)
2562
				die_errno("fgets");
2563 2564
			clearerr(stdin);
			continue;
2565
		}
2566
		if (line[0] == '-') {
2567 2568
			if (get_oid_hex(line+1, &oid))
				die("expected edge object ID, got garbage:\n %s",
2569
				    line);
2570
			add_preferred_base(&oid);
2571
			continue;
2572
		}
2573 2574
		if (parse_oid_hex(line, &oid, &p))
			die("expected object ID, got garbage:\n %s", line);
2575

2576
		add_preferred_base_object(p + 1);
2577
		add_object_entry(&oid, OBJ_NONE, p + 1, 0);
2578
	}
2579 2580
}

2581
/* Remember to update object flag allocation in object.h */
J
Junio C Hamano 已提交
2582 2583
#define OBJECT_ADDED (1u<<20)

2584
static void show_commit(struct commit *commit, void *data)
2585
{
2586
	add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
J
Junio C Hamano 已提交
2587
	commit->object.flags |= OBJECT_ADDED;
2588 2589 2590

	if (write_bitmap_index)
		index_commit_for_bitmap(commit);
2591 2592
}

2593
static void show_object(struct object *obj, const char *name, void *data)
2594
{
2595
	add_preferred_base_object(name);
2596
	add_object_entry(&obj->oid, obj->type, name, 0);
2597
	obj->flags |= OBJECT_ADDED;
2598 2599
}

2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613
static void show_object__ma_allow_any(struct object *obj, const char *name, void *data)
{
	assert(arg_missing_action == MA_ALLOW_ANY);

	/*
	 * Quietly ignore ALL missing objects.  This avoids problems with
	 * staging them now and getting an odd error later.
	 */
	if (!has_object_file(&obj->oid))
		return;

	show_object(obj, name, data);
}

2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627
static void show_object__ma_allow_promisor(struct object *obj, const char *name, void *data)
{
	assert(arg_missing_action == MA_ALLOW_PROMISOR);

	/*
	 * Quietly ignore EXPECTED missing objects.  This avoids problems with
	 * staging them now and getting an odd error later.
	 */
	if (!has_object_file(&obj->oid) && is_promisor_object(&obj->oid))
		return;

	show_object(obj, name, data);
}

2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641
static int option_parse_missing_action(const struct option *opt,
				       const char *arg, int unset)
{
	assert(arg);
	assert(!unset);

	if (!strcmp(arg, "error")) {
		arg_missing_action = MA_ERROR;
		fn_show_object = show_object;
		return 0;
	}

	if (!strcmp(arg, "allow-any")) {
		arg_missing_action = MA_ALLOW_ANY;
2642
		fetch_if_missing = 0;
2643 2644 2645 2646
		fn_show_object = show_object__ma_allow_any;
		return 0;
	}

2647 2648 2649 2650 2651 2652 2653
	if (!strcmp(arg, "allow-promisor")) {
		arg_missing_action = MA_ALLOW_PROMISOR;
		fetch_if_missing = 0;
		fn_show_object = show_object__ma_allow_promisor;
		return 0;
	}

2654 2655 2656 2657
	die(_("invalid value for --missing"));
	return 0;
}

2658 2659
static void show_edge(struct commit *commit)
{
2660
	add_preferred_base(&commit->object.oid);
2661 2662
}

J
Junio C Hamano 已提交
2663 2664 2665 2666 2667 2668
struct in_pack_object {
	off_t offset;
	struct object *object;
};

struct in_pack {
2669 2670
	unsigned int alloc;
	unsigned int nr;
J
Junio C Hamano 已提交
2671 2672 2673 2674 2675
	struct in_pack_object *array;
};

static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
{
B
brian m. carlson 已提交
2676
	in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
J
Junio C Hamano 已提交
2677 2678 2679 2680 2681 2682
	in_pack->array[in_pack->nr].object = object;
	in_pack->nr++;
}

/*
 * Compare the objects in the offset order, in order to emulate the
2683
 * "git rev-list --objects" output that produced the pack originally.
J
Junio C Hamano 已提交
2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694
 */
static int ofscmp(const void *a_, const void *b_)
{
	struct in_pack_object *a = (struct in_pack_object *)a_;
	struct in_pack_object *b = (struct in_pack_object *)b_;

	if (a->offset < b->offset)
		return -1;
	else if (a->offset > b->offset)
		return 1;
	else
2695
		return oidcmp(&a->object->oid, &b->object->oid);
J
Junio C Hamano 已提交
2696 2697 2698 2699 2700 2701 2702 2703 2704 2705
}

static void add_objects_in_unpacked_packs(struct rev_info *revs)
{
	struct packed_git *p;
	struct in_pack in_pack;
	uint32_t i;

	memset(&in_pack, 0, sizeof(in_pack));

2706
	for (p = get_packed_git(the_repository); p; p = p->next) {
2707
		struct object_id oid;
J
Junio C Hamano 已提交
2708 2709
		struct object *o;

2710
		if (!p->pack_local || p->pack_keep)
J
Junio C Hamano 已提交
2711 2712 2713 2714 2715 2716 2717 2718 2719
			continue;
		if (open_pack_index(p))
			die("cannot open pack index");

		ALLOC_GROW(in_pack.array,
			   in_pack.nr + p->num_objects,
			   in_pack.alloc);

		for (i = 0; i < p->num_objects; i++) {
2720 2721
			nth_packed_object_oid(&oid, p, i);
			o = lookup_unknown_object(oid.hash);
J
Junio C Hamano 已提交
2722 2723 2724 2725 2726 2727 2728
			if (!(o->flags & OBJECT_ADDED))
				mark_in_pack_object(o, p, &in_pack);
			o->flags |= OBJECT_ADDED;
		}
	}

	if (in_pack.nr) {
R
René Scharfe 已提交
2729
		QSORT(in_pack.array, in_pack.nr, ofscmp);
J
Junio C Hamano 已提交
2730 2731
		for (i = 0; i < in_pack.nr; i++) {
			struct object *o = in_pack.array[i].object;
2732
			add_object_entry(&o->oid, o->type, "", 0);
J
Junio C Hamano 已提交
2733 2734 2735 2736 2737
		}
	}
	free(in_pack.array);
}

2738
static int add_loose_object(const struct object_id *oid, const char *path,
2739 2740
			    void *data)
{
2741
	enum object_type type = oid_object_info(oid, NULL);
2742 2743 2744 2745 2746 2747

	if (type < 0) {
		warning("loose object at %s could not be examined", path);
		return 0;
	}

2748
	add_object_entry(oid, type, "", 0);
2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763
	return 0;
}

/*
 * We actually don't even have to worry about reachability here.
 * add_object_entry will weed out duplicates, so we just add every
 * loose object we find.
 */
static void add_unreachable_loose_objects(void)
{
	for_each_loose_file_in_objdir(get_object_directory(),
				      add_loose_object,
				      NULL, NULL, NULL);
}

2764
static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
2765 2766 2767 2768
{
	static struct packed_git *last_found = (void *)1;
	struct packed_git *p;

2769 2770
	p = (last_found != (void *)1) ? last_found :
					get_packed_git(the_repository);
2771 2772 2773

	while (p) {
		if ((!p->pack_local || p->pack_keep) &&
2774
			find_pack_entry_one(oid->hash, p)) {
2775 2776 2777 2778
			last_found = p;
			return 1;
		}
		if (p == last_found)
2779
			p = get_packed_git(the_repository);
2780 2781 2782 2783 2784 2785 2786 2787
		else
			p = p->next;
		if (p == last_found)
			p = p->next;
	}
	return 0;
}

2788 2789 2790 2791 2792 2793 2794
/*
 * Store a list of sha1s that are should not be discarded
 * because they are either written too recently, or are
 * reachable from another object that was.
 *
 * This is filled by get_object_list.
 */
2795
static struct oid_array recent_objects;
2796

2797
static int loosened_object_can_be_discarded(const struct object_id *oid,
2798
					    timestamp_t mtime)
2799 2800 2801 2802 2803
{
	if (!unpack_unreachable_expiration)
		return 0;
	if (mtime > unpack_unreachable_expiration)
		return 0;
2804
	if (oid_array_lookup(&recent_objects, oid) >= 0)
2805
		return 0;
2806 2807 2808
	return 1;
}

2809 2810 2811 2812
static void loosen_unused_packed_objects(struct rev_info *revs)
{
	struct packed_git *p;
	uint32_t i;
2813
	struct object_id oid;
2814

2815
	for (p = get_packed_git(the_repository); p; p = p->next) {
2816
		if (!p->pack_local || p->pack_keep)
2817 2818 2819 2820 2821 2822
			continue;

		if (open_pack_index(p))
			die("cannot open pack index");

		for (i = 0; i < p->num_objects; i++) {
2823 2824
			nth_packed_object_oid(&oid, p, i);
			if (!packlist_find(&to_pack, oid.hash, NULL) &&
2825
			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
2826
			    !loosened_object_can_be_discarded(&oid, p->mtime))
2827
				if (force_object_loose(&oid, p->mtime))
2828 2829 2830 2831 2832
					die("unable to force loose object");
		}
	}
}

2833
/*
2834 2835 2836
 * This tracks any options which pack-reuse code expects to be on, or which a
 * reader of the pack might not understand, and which would therefore prevent
 * blind reuse of what we have on disk.
2837 2838 2839
 */
static int pack_options_allow_reuse(void)
{
2840 2841 2842 2843 2844
	return pack_to_stdout &&
	       allow_ofs_delta &&
	       !ignore_packed_keep &&
	       (!local || !have_non_local_packs) &&
	       !incremental;
2845 2846
}

2847 2848 2849 2850 2851
static int get_object_list_from_bitmap(struct rev_info *revs)
{
	if (prepare_bitmap_walk(revs) < 0)
		return -1;

2852 2853
	if (pack_options_allow_reuse() &&
	    !reuse_partial_packfile_from_bitmap(
2854 2855 2856 2857 2858
			&reuse_packfile,
			&reuse_packfile_objects,
			&reuse_packfile_offset)) {
		assert(reuse_packfile_objects);
		nr_result += reuse_packfile_objects;
2859
		display_progress(progress_state, nr_result);
2860 2861 2862 2863 2864 2865
	}

	traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
	return 0;
}

2866
static void record_recent_object(struct object *obj,
2867
				 const char *name,
2868 2869
				 void *data)
{
2870
	oid_array_append(&recent_objects, &obj->oid);
2871 2872 2873 2874
}

static void record_recent_commit(struct commit *commit, void *data)
{
2875
	oid_array_append(&recent_objects, &commit->object.oid);
2876 2877
}

2878
static void get_object_list(int ac, const char **av)
2879 2880 2881 2882 2883 2884 2885 2886 2887
{
	struct rev_info revs;
	char line[1000];
	int flags = 0;

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

2888 2889 2890
	/* make sure shallows are read */
	is_repository_shallow();

2891 2892
	while (fgets(line, sizeof(line), stdin) != NULL) {
		int len = strlen(line);
2893
		if (len && line[len - 1] == '\n')
2894 2895 2896 2897 2898 2899
			line[--len] = 0;
		if (!len)
			break;
		if (*line == '-') {
			if (!strcmp(line, "--not")) {
				flags ^= UNINTERESTING;
2900
				write_bitmap_index = 0;
2901 2902
				continue;
			}
2903
			if (starts_with(line, "--shallow ")) {
2904 2905
				struct object_id oid;
				if (get_oid_hex(line + 10, &oid))
2906
					die("not an SHA-1 '%s'", line + 10);
2907
				register_shallow(&oid);
2908
				use_bitmap_index = 0;
2909 2910
				continue;
			}
2911 2912
			die("not a rev '%s'", line);
		}
2913
		if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2914 2915 2916
			die("bad revision '%s'", line);
	}

2917 2918 2919
	if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
		return;

2920 2921
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2922
	mark_edges_uninteresting(&revs, show_edge);
2923 2924 2925 2926 2927 2928

	if (!fn_show_object)
		fn_show_object = show_object;
	traverse_commit_list_filtered(&filter_options, &revs,
				      show_commit, fn_show_object, NULL,
				      NULL);
J
Junio C Hamano 已提交
2929

2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940
	if (unpack_unreachable_expiration) {
		revs.ignore_missing_links = 1;
		if (add_unseen_recent_objects_to_traversal(&revs,
				unpack_unreachable_expiration))
			die("unable to add recent objects");
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
		traverse_commit_list(&revs, record_recent_commit,
				     record_recent_object, NULL);
	}

J
Junio C Hamano 已提交
2941 2942
	if (keep_unreachable)
		add_objects_in_unpacked_packs(&revs);
2943 2944
	if (pack_loose_unreachable)
		add_unreachable_loose_objects();
2945 2946
	if (unpack_unreachable)
		loosen_unused_packed_objects(&revs);
2947

2948
	oid_array_clear(&recent_objects);
2949 2950
}

2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965
static int option_parse_index_version(const struct option *opt,
				      const char *arg, int unset)
{
	char *c;
	const char *val = arg;
	pack_idx_opts.version = strtoul(val, &c, 10);
	if (pack_idx_opts.version > 2)
		die(_("unsupported index version %s"), val);
	if (*c == ',' && c[1])
		pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
	if (*c || pack_idx_opts.off32_limit & 0x80000000)
		die(_("bad index version '%s'"), val);
	return 0;
}

2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980
static int option_parse_unpack_unreachable(const struct option *opt,
					   const char *arg, int unset)
{
	if (unset) {
		unpack_unreachable = 0;
		unpack_unreachable_expiration = 0;
	}
	else {
		unpack_unreachable = 1;
		if (arg)
			unpack_unreachable_expiration = approxidate(arg);
	}
	return 0;
}

2981 2982 2983
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
	int use_internal_rev_list = 0;
2984
	int thin = 0;
2985
	int shallow = 0;
2986
	int all_progress_implied = 0;
J
Jeff King 已提交
2987
	struct argv_array rp = ARGV_ARRAY_INIT;
2988
	int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2989
	int rev_list_index = 0;
2990 2991
	struct option pack_objects_options[] = {
		OPT_SET_INT('q', "quiet", &progress,
2992
			    N_("do not show progress meter"), 0),
2993
		OPT_SET_INT(0, "progress", &progress,
2994
			    N_("show progress meter"), 1),
2995
		OPT_SET_INT(0, "all-progress", &progress,
2996
			    N_("show progress meter during object writing phase"), 2),
2997 2998
		OPT_BOOL(0, "all-progress-implied",
			 &all_progress_implied,
2999 3000 3001
			 N_("similar to --all-progress when progress meter is shown")),
		{ OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
		  N_("write the pack index file in the specified idx format version"),
3002
		  0, option_parse_index_version },
3003 3004
		OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
			      N_("maximum size of each output pack file")),
3005
		OPT_BOOL(0, "local", &local,
3006
			 N_("ignore borrowed objects from alternate object store")),
3007
		OPT_BOOL(0, "incremental", &incremental,
3008
			 N_("ignore packed objects")),
3009
		OPT_INTEGER(0, "window", &window,
3010
			    N_("limit pack window by objects")),
3011 3012
		OPT_MAGNITUDE(0, "window-memory", &window_memory_limit,
			      N_("limit pack window by memory in addition to object limit")),
3013
		OPT_INTEGER(0, "depth", &depth,
3014
			    N_("maximum length of delta chain allowed in the resulting pack")),
3015
		OPT_BOOL(0, "reuse-delta", &reuse_delta,
3016
			 N_("reuse existing deltas")),
3017
		OPT_BOOL(0, "reuse-object", &reuse_object,
3018
			 N_("reuse existing objects")),
3019
		OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
3020
			 N_("use OFS_DELTA objects")),
3021
		OPT_INTEGER(0, "threads", &delta_search_threads,
3022
			    N_("use threads when searching for best delta matches")),
3023
		OPT_BOOL(0, "non-empty", &non_empty,
3024
			 N_("do not create an empty pack output")),
3025
		OPT_BOOL(0, "revs", &use_internal_rev_list,
3026
			 N_("read revision arguments from standard input")),
3027
		{ OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
3028
		  N_("limit the objects to those that are not yet packed"),
3029 3030
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
3031
		  N_("include objects reachable from any reference"),
3032 3033
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
		{ OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
3034
		  N_("include objects referred by reflog entries"),
3035
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
3036 3037 3038
		{ OPTION_SET_INT, 0, "indexed-objects", &rev_list_index, NULL,
		  N_("include objects referred to by the index"),
		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
3039
		OPT_BOOL(0, "stdout", &pack_to_stdout,
3040
			 N_("output pack to stdout")),
3041
		OPT_BOOL(0, "include-tag", &include_tag,
3042
			 N_("include tag objects that refer to objects to be packed")),
3043
		OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
3044
			 N_("keep unreachable objects")),
3045 3046
		OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
			 N_("pack loose unreachable objects")),
3047 3048
		{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
		  N_("unpack unreachable objects newer than <time>"),
3049
		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
3050
		OPT_BOOL(0, "thin", &thin,
3051
			 N_("create thin packs")),
3052 3053
		OPT_BOOL(0, "shallow", &shallow,
			 N_("create packs suitable for shallow fetches")),
3054
		OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
3055
			 N_("ignore packs that have companion .keep file")),
3056
		OPT_INTEGER(0, "compression", &pack_compression_level,
3057
			    N_("pack compression level")),
3058
		OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
3059
			    N_("do not hide commits by grafts"), 0),
3060 3061
		OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
			 N_("use a bitmap index if available to speed up counting objects")),
3062 3063
		OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
			 N_("write a bitmap index together with the pack index")),
3064 3065 3066 3067
		OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
		{ OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
		  N_("handling for missing objects"), PARSE_OPT_NONEG,
		  option_parse_missing_action },
3068 3069
		OPT_BOOL(0, "exclude-promisor-objects", &exclude_promisor_objects,
			 N_("do not pack objects in promisor packfiles")),
3070 3071
		OPT_END(),
	};
3072

3073 3074 3075
	if (DFS_NUM_STATES > (1 << OE_DFS_STATE_BITS))
		BUG("too many dfs states, increase OE_DFS_STATE_BITS");

3076
	check_replace_refs = 0;
3077

3078
	reset_pack_idx_option(&pack_idx_opts);
3079
	git_config(git_pack_config, NULL);
3080 3081

	progress = isatty(2);
3082 3083
	argc = parse_options(argc, argv, prefix, pack_objects_options,
			     pack_usage, 0);
3084

3085 3086 3087
	if (argc) {
		base_name = argv[0];
		argc--;
3088
	}
3089 3090
	if (pack_to_stdout != !base_name || argc)
		usage_with_options(pack_usage, pack_objects_options);
3091

3092 3093 3094 3095 3096
	if (depth >= (1 << OE_DEPTH_BITS)) {
		warning(_("delta chain depth %d is too deep, forcing %d"),
			depth, (1 << OE_DEPTH_BITS) - 1);
		depth = (1 << OE_DEPTH_BITS) - 1;
	}
3097 3098 3099 3100 3101
	if (cache_max_small_delta_size >= (1U << OE_Z_DELTA_BITS)) {
		warning(_("pack.deltaCacheLimit is too high, forcing %d"),
			(1U << OE_Z_DELTA_BITS) - 1);
		cache_max_small_delta_size = (1U << OE_Z_DELTA_BITS) - 1;
	}
3102

J
Jeff King 已提交
3103
	argv_array_push(&rp, "pack-objects");
3104 3105
	if (thin) {
		use_internal_rev_list = 1;
3106 3107 3108
		argv_array_push(&rp, shallow
				? "--objects-edge-aggressive"
				: "--objects-edge");
3109
	} else
J
Jeff King 已提交
3110
		argv_array_push(&rp, "--objects");
3111

3112 3113
	if (rev_list_all) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3114
		argv_array_push(&rp, "--all");
3115 3116 3117
	}
	if (rev_list_reflog) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3118
		argv_array_push(&rp, "--reflog");
3119
	}
3120 3121 3122
	if (rev_list_index) {
		use_internal_rev_list = 1;
		argv_array_push(&rp, "--indexed-objects");
3123 3124 3125
	}
	if (rev_list_unpacked) {
		use_internal_rev_list = 1;
J
Jeff King 已提交
3126
		argv_array_push(&rp, "--unpacked");
3127
	}
3128

3129 3130 3131 3132 3133 3134
	if (exclude_promisor_objects) {
		use_internal_rev_list = 1;
		fetch_if_missing = 0;
		argv_array_push(&rp, "--exclude-promisor-objects");
	}

3135 3136 3137 3138 3139 3140
	if (!reuse_object)
		reuse_delta = 0;
	if (pack_compression_level == -1)
		pack_compression_level = Z_DEFAULT_COMPRESSION;
	else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
		die("bad pack compression level %d", pack_compression_level);
3141 3142 3143 3144

	if (!delta_search_threads)	/* --threads=0 means autodetect */
		delta_search_threads = online_cpus();

3145 3146
#ifdef NO_PTHREADS
	if (delta_search_threads != 1)
3147
		warning("no threads support, ignoring --threads");
3148
#endif
3149 3150
	if (!pack_to_stdout && !pack_size_limit)
		pack_size_limit = pack_size_limit_cfg;
3151 3152
	if (pack_to_stdout && pack_size_limit)
		die("--max-pack-size cannot be used to build a pack for transfer.");
3153 3154 3155 3156
	if (pack_size_limit && pack_size_limit < 1024*1024) {
		warning("minimum pack size limit is 1 MiB");
		pack_size_limit = 1024*1024;
	}
3157

3158 3159
	if (!pack_to_stdout && thin)
		die("--thin cannot be used to build an indexable pack.");
3160

3161 3162
	if (keep_unreachable && unpack_unreachable)
		die("--keep-unreachable and --unpack-unreachable are incompatible.");
3163 3164
	if (!rev_list_all || !rev_list_reflog || !rev_list_index)
		unpack_unreachable_expiration = 0;
3165

3166 3167 3168 3169 3170 3171
	if (filter_options.choice) {
		if (!pack_to_stdout)
			die("cannot use --filter without --stdout.");
		use_bitmap_index = 0;
	}

3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188
	/*
	 * "soft" reasons not to use bitmaps - for on-disk repack by default we want
	 *
	 * - to produce good pack (with bitmap index not-yet-packed objects are
	 *   packed in suboptimal order).
	 *
	 * - to use more robust pack-generation codepath (avoiding possible
	 *   bugs in bitmap code and possible bitmap index corruption).
	 */
	if (!pack_to_stdout)
		use_bitmap_index_default = 0;

	if (use_bitmap_index < 0)
		use_bitmap_index = use_bitmap_index_default;

	/* "hard" reasons not to use bitmaps; these just won't work at all */
	if (!use_internal_rev_list || (!pack_to_stdout && write_bitmap_index) || is_repository_shallow())
3189 3190
		use_bitmap_index = 0;

3191 3192 3193
	if (pack_to_stdout || !rev_list_all)
		write_bitmap_index = 0;

3194 3195 3196
	if (progress && all_progress_implied)
		progress = 2;

3197 3198
	if (ignore_packed_keep) {
		struct packed_git *p;
3199
		for (p = get_packed_git(the_repository); p; p = p->next)
3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211
			if (p->pack_local && p->pack_keep)
				break;
		if (!p) /* no keep-able packs found */
			ignore_packed_keep = 0;
	}
	if (local) {
		/*
		 * unlike ignore_packed_keep above, we do not want to
		 * unset "local" based on looking at packs, as it
		 * also covers non-local objects
		 */
		struct packed_git *p;
3212
		for (p = get_packed_git(the_repository); p; p = p->next) {
3213 3214 3215 3216 3217 3218
			if (!p->pack_local) {
				have_non_local_packs = 1;
				break;
			}
		}
	}
3219

3220 3221
	prepare_packing_data(&to_pack);

3222
	if (progress)
3223
		progress_state = start_progress(_("Counting objects"), 0);
3224 3225
	if (!use_internal_rev_list)
		read_object_list_from_stdin();
3226
	else {
J
Jeff King 已提交
3227 3228
		get_object_list(rp.argc, rp.argv);
		argv_array_clear(&rp);
3229
	}
3230
	cleanup_preferred_base();
3231 3232
	if (include_tag && nr_result)
		for_each_ref(add_ref_tag, NULL);
N
Nicolas Pitre 已提交
3233
	stop_progress(&progress_state);
N
Nicolas Pitre 已提交
3234

3235
	if (non_empty && !nr_result)
3236
		return 0;
3237 3238
	if (nr_result)
		prepare_pack(window, depth);
3239
	write_pack_file();
3240
	if (progress)
3241 3242
		fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
			" reused %"PRIu32" (delta %"PRIu32")\n",
3243
			written, written_delta, reused, reused_delta);
3244 3245
	return 0;
}