fast-import.c 65.7 KB
Newer Older
1
/*
2
(See Documentation/git-fast-import.txt for maintained documentation.)
3 4 5 6 7
Format of STDIN stream:

  stream ::= cmd*;

  cmd ::= new_blob
8
        | new_commit
9
        | new_tag
10
        | reset_branch
11
        | checkpoint
12
        | progress
13 14
        ;

15
  new_blob ::= 'blob' lf
16
    mark?
17 18
    file_content;
  file_content ::= data;
19

20
  new_commit ::= 'commit' sp ref_str lf
21
    mark?
22 23
    ('author' sp name sp '<' email '>' sp when lf)?
    'committer' sp name sp '<' email '>' sp when lf
24
    commit_msg
25 26
    ('from' sp committish lf)?
    ('merge' sp committish lf)*
27
    file_change*
28
    lf?;
29
  commit_msg ::= data;
30

31 32 33 34 35 36
  file_change ::= file_clr
    | file_del
    | file_rnm
    | file_cpy
    | file_obm
    | file_inm;
37
  file_clr ::= 'deleteall' lf;
38
  file_del ::= 'D' sp path_str lf;
39
  file_rnm ::= 'R' sp path_str sp path_str lf;
40
  file_cpy ::= 'C' sp path_str sp path_str lf;
41 42 43
  file_obm ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf;
  file_inm ::= 'M' sp mode sp 'inline' sp path_str lf
    data;
44 45 46
  note_obm ::= 'N' sp (hexsha1 | idnum) sp committish lf;
  note_inm ::= 'N' sp 'inline' sp committish lf
    data;
47 48

  new_tag ::= 'tag' sp tag_str lf
49
    'from' sp committish lf
50
    ('tagger' sp name sp '<' email '>' sp when lf)?
51 52 53
    tag_msg;
  tag_msg ::= data;

54
  reset_branch ::= 'reset' sp ref_str lf
55
    ('from' sp committish lf)?
56
    lf?;
57

58
  checkpoint ::= 'checkpoint' lf
59
    lf?;
60

61 62 63
  progress ::= 'progress' sp not_lf* lf
    lf?;

64 65 66
     # note: the first idnum in a stream should be 1 and subsequent
     # idnums should not have gaps between values as this will cause
     # the stream parser to reserve space for the gapped values.  An
67
     # idnum can be updated in the future to a new object by issuing
68
     # a new mark directive with the old idnum.
69
     #
70
  mark ::= 'mark' sp idnum lf;
71
  data ::= (delimited_data | exact_data)
72
    lf?;
73 74 75 76 77 78

    # note: delim may be any string but must not contain lf.
    # data_line may contain any data but must not be exactly
    # delim.
  delimited_data ::= 'data' sp '<<' delim lf
    (data_line lf)*
79
    delim lf;
80 81

     # note: declen indicates the length of binary_data in bytes.
M
Mike Ralphson 已提交
82
     # declen does not include the lf preceding the binary data.
83
     #
84 85
  exact_data ::= 'data' sp declen lf
    binary_data;
86 87 88

     # note: quoted strings are C-style quoting supporting \c for
     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
89
     # is the signed byte value in octal.  Note that the only
90 91
     # characters which must actually be escaped to protect the
     # stream formatting is: \, " and LF.  Otherwise these values
92
     # are UTF8.
93
     #
94
  committish  ::= (ref_str | hexsha1 | sha1exp_str | idnum);
95 96 97
  ref_str     ::= ref;
  sha1exp_str ::= sha1exp;
  tag_str     ::= tag;
98
  path_str    ::= path    | '"' quoted(path)    '"' ;
99 100
  mode        ::= '100644' | '644'
                | '100755' | '755'
J
Junio C Hamano 已提交
101
                | '120000'
102
                ;
103 104

  declen ::= # unsigned 32 bit value, ascii base10 notation;
105
  bigint ::= # unsigned integer value, ascii base10 notation;
106
  binary_data ::= # file content, not interpreted;
107

108 109 110 111
  when         ::= raw_when | rfc2822_when;
  raw_when     ::= ts sp tz;
  rfc2822_when ::= # Valid RFC 2822 date and time;

112 113
  sp ::= # ASCII space character;
  lf ::= # ASCII newline (LF) character;
114 115

     # note: a colon (':') must precede the numerical value assigned to
116
     # an idnum.  This is to distinguish it from a ref or tag name as
117
     # GIT does not permit ':' in ref or tag strings.
118
     #
119
  idnum   ::= ':' bigint;
120 121 122
  path    ::= # GIT style file path, e.g. "a/b/c";
  ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
  tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
123 124
  sha1exp ::= # Any valid GIT SHA1 expression;
  hexsha1 ::= # SHA1 in hexadecimal format;
125 126

     # note: name and email are UTF8 strings, however name must not
127
     # contain '<' or lf and email must not contain any of the
128
     # following: '<', '>', lf.
129
     #
130
  name  ::= # valid GIT author/committer name;
131
  email ::= # valid GIT author/committer email;
132 133
  ts    ::= # time since the epoch in seconds, ascii base10 notation;
  tz    ::= # GIT style timezone;
134 135 136 137 138 139

     # note: comments may appear anywhere in the input, except
     # within a data command.  Any form of the data command
     # always escapes the related input from comment processing.
     #
     # In case it is not clear, the '#' that starts the comment
140
     # must be the first character on that line (an lf
M
Mike Ralphson 已提交
141
     # preceded it).
142 143 144
     #
  comment ::= '#' not_lf* lf;
  not_lf  ::= # Any byte that is not ASCII newline (LF);
145 146
*/

147 148 149 150
#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "blob.h"
151
#include "tree.h"
152
#include "commit.h"
153 154
#include "delta.h"
#include "pack.h"
155
#include "refs.h"
156
#include "csum-file.h"
157
#include "quote.h"
158
#include "exec_cmd.h"
159

160 161
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
162 163
#define DEPTH_BITS 13
#define MAX_DEPTH ((1<<DEPTH_BITS)-1)
164

165 166 167
struct object_entry
{
	struct object_entry *next;
168
	uint32_t offset;
169 170 171
	uint32_t type : TYPE_BITS,
		pack_id : PACK_ID_BITS,
		depth : DEPTH_BITS;
172 173 174
	unsigned char sha1[20];
};

175
struct object_entry_pool
176
{
177
	struct object_entry_pool *next_pool;
178 179
	struct object_entry *next_free;
	struct object_entry *end;
180
	struct object_entry entries[FLEX_ARRAY]; /* more */
181 182
};

183 184 185 186 187 188
struct mark_set
{
	union {
		struct object_entry *marked[1024];
		struct mark_set *sets[1024];
	} data;
189
	unsigned int shift;
190 191
};

192 193
struct last_object
{
P
Pierre Habouzit 已提交
194
	struct strbuf data;
195
	uint32_t offset;
196
	unsigned int depth;
P
Pierre Habouzit 已提交
197
	unsigned no_swap : 1;
198 199
};

200 201 202 203 204
struct mem_pool
{
	struct mem_pool *next_pool;
	char *next_free;
	char *end;
205
	uintmax_t space[FLEX_ARRAY]; /* more */
206 207 208 209 210
};

struct atom_str
{
	struct atom_str *next_atom;
211
	unsigned short str_len;
212 213 214 215
	char str_dat[FLEX_ARRAY]; /* more */
};

struct tree_content;
216 217
struct tree_entry
{
218
	struct tree_content *tree;
219
	struct atom_str *name;
220 221
	struct tree_entry_ms
	{
222
		uint16_t mode;
223 224
		unsigned char sha1[20];
	} versions[2];
225 226
};

227
struct tree_content
228
{
229 230
	unsigned int entry_capacity; /* must match avail_tree_content */
	unsigned int entry_count;
231
	unsigned int delta_depth;
232 233 234 235 236 237 238
	struct tree_entry *entries[FLEX_ARRAY]; /* more */
};

struct avail_tree_content
{
	unsigned int entry_capacity; /* must match tree_content */
	struct avail_tree_content *next_avail;
239 240 241 242
};

struct branch
{
243 244
	struct branch *table_next_branch;
	struct branch *active_next_branch;
245
	const char *name;
246
	struct tree_entry branch_tree;
247
	uintmax_t last_commit;
248 249
	unsigned active : 1;
	unsigned pack_id : PACK_ID_BITS;
250
	unsigned char sha1[20];
251 252
};

253 254 255 256
struct tag
{
	struct tag *next_tag;
	const char *name;
257
	unsigned int pack_id;
258 259 260
	unsigned char sha1[20];
};

261 262 263 264 265
struct hash_list
{
	struct hash_list *next;
	unsigned char sha1[20];
};
266

267 268 269 270 271 272
typedef enum {
	WHENSPEC_RAW = 1,
	WHENSPEC_RFC2822,
	WHENSPEC_NOW,
} whenspec_type;

273 274 275 276 277 278 279
struct recent_command
{
	struct recent_command *prev;
	struct recent_command *next;
	char *buf;
};

280
/* Configured limits on output */
281
static unsigned long max_depth = 10;
282
static off_t max_packsize = (1LL << 32) - 1;
283
static int force_update;
284 285
static int pack_compression_level = Z_DEFAULT_COMPRESSION;
static int pack_compression_seen;
286 287 288 289 290 291 292

/* Stats and misc. counters */
static uintmax_t alloc_count;
static uintmax_t marks_set_count;
static uintmax_t object_count_by_type[1 << TYPE_BITS];
static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
static uintmax_t delta_count_by_type[1 << TYPE_BITS];
293
static unsigned long object_count;
294
static unsigned long branch_count;
295
static unsigned long branch_load_count;
296
static int failure;
297
static FILE *pack_edges;
298
static unsigned int show_stats = 1;
299

300 301 302 303 304
/* Memory pools */
static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
static size_t total_allocd;
static struct mem_pool *mem_pool;

305
/* Atom management */
306 307 308 309 310
static unsigned int atom_table_sz = 4451;
static unsigned int atom_cnt;
static struct atom_str **atom_table;

/* The .pack file being generated */
311
static unsigned int pack_id;
312
static struct packed_git *pack_data;
313
static struct packed_git **all_packs;
314
static unsigned long pack_size;
315 316

/* Table of objects we've written. */
317
static unsigned int object_entry_alloc = 5000;
318 319
static struct object_entry_pool *blocks;
static struct object_entry *object_table[1 << 16];
320
static struct mark_set *marks;
321 322
static const char *export_marks_file;
static const char *import_marks_file;
323 324

/* Our last blob */
P
Pierre Habouzit 已提交
325
static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
326 327 328 329 330 331

/* Tree management */
static unsigned int tree_entry_alloc = 1000;
static void *avail_tree_entry;
static unsigned int avail_tree_table_sz = 100;
static struct avail_tree_content **avail_tree_table;
332 333
static struct strbuf old_tree = STRBUF_INIT;
static struct strbuf new_tree = STRBUF_INIT;
334

335
/* Branch data */
336 337 338
static unsigned long max_active_branches = 5;
static unsigned long cur_active_branches;
static unsigned long branch_table_sz = 1039;
339 340 341
static struct branch **branch_table;
static struct branch *active_branches;

342 343 344 345
/* Tag data */
static struct tag *first_tag;
static struct tag *last_tag;

346
/* Input stream parsing */
347
static whenspec_type whenspec = WHENSPEC_RAW;
348
static struct strbuf command_buf = STRBUF_INIT;
349
static int unread_command_buf;
350 351 352 353
static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
static struct recent_command *cmd_tail = &cmd_hist;
static struct recent_command *rc_free;
static unsigned int cmd_save = 100;
354
static uintmax_t next_mark;
355
static struct strbuf new_data = STRBUF_INIT;
356

357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382
static void write_branch_report(FILE *rpt, struct branch *b)
{
	fprintf(rpt, "%s:\n", b->name);

	fprintf(rpt, "  status      :");
	if (b->active)
		fputs(" active", rpt);
	if (b->branch_tree.tree)
		fputs(" loaded", rpt);
	if (is_null_sha1(b->branch_tree.versions[1].sha1))
		fputs(" dirty", rpt);
	fputc('\n', rpt);

	fprintf(rpt, "  tip commit  : %s\n", sha1_to_hex(b->sha1));
	fprintf(rpt, "  old tree    : %s\n", sha1_to_hex(b->branch_tree.versions[0].sha1));
	fprintf(rpt, "  cur tree    : %s\n", sha1_to_hex(b->branch_tree.versions[1].sha1));
	fprintf(rpt, "  commit clock: %" PRIuMAX "\n", b->last_commit);

	fputs("  last pack   : ", rpt);
	if (b->pack_id < MAX_PACK_ID)
		fprintf(rpt, "%u", b->pack_id);
	fputc('\n', rpt);

	fputc('\n', rpt);
}

383 384
static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);

385
static void write_crash_report(const char *err)
386
{
387
	char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
388 389 390
	FILE *rpt = fopen(loc, "w");
	struct branch *b;
	unsigned long lu;
391
	struct recent_command *rc;
392 393 394 395 396 397 398 399 400

	if (!rpt) {
		error("can't write crash report %s: %s", loc, strerror(errno));
		return;
	}

	fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);

	fprintf(rpt, "fast-import crash report:\n");
401 402
	fprintf(rpt, "    fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
	fprintf(rpt, "    parent process     : %"PRIuMAX"\n", (uintmax_t) getppid());
403 404 405 406
	fprintf(rpt, "    at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
	fputc('\n', rpt);

	fputs("fatal: ", rpt);
407
	fputs(err, rpt);
408 409
	fputc('\n', rpt);

410 411 412 413 414 415 416 417 418 419 420 421
	fputc('\n', rpt);
	fputs("Most Recent Commands Before Crash\n", rpt);
	fputs("---------------------------------\n", rpt);
	for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
		if (rc->next == &cmd_hist)
			fputs("* ", rpt);
		else
			fputs("  ", rpt);
		fputs(rc->buf, rpt);
		fputc('\n', rpt);
	}

422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442
	fputc('\n', rpt);
	fputs("Active Branch LRU\n", rpt);
	fputs("-----------------\n", rpt);
	fprintf(rpt, "    active_branches = %lu cur, %lu max\n",
		cur_active_branches,
		max_active_branches);
	fputc('\n', rpt);
	fputs("  pos  clock name\n", rpt);
	fputs("  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
	for (b = active_branches, lu = 0; b; b = b->active_next_branch)
		fprintf(rpt, "  %2lu) %6" PRIuMAX" %s\n",
			++lu, b->last_commit, b->name);

	fputc('\n', rpt);
	fputs("Inactive Branches\n", rpt);
	fputs("-----------------\n", rpt);
	for (lu = 0; lu < branch_table_sz; lu++) {
		for (b = branch_table[lu]; b; b = b->table_next_branch)
			write_branch_report(rpt, b);
	}

443 444 445 446 447 448 449 450 451 452 453 454 455
	if (first_tag) {
		struct tag *tg;
		fputc('\n', rpt);
		fputs("Annotated Tags\n", rpt);
		fputs("--------------\n", rpt);
		for (tg = first_tag; tg; tg = tg->next_tag) {
			fputs(sha1_to_hex(tg->sha1), rpt);
			fputc(' ', rpt);
			fputs(tg->name, rpt);
			fputc('\n', rpt);
		}
	}

456 457 458
	fputc('\n', rpt);
	fputs("Marks\n", rpt);
	fputs("-----\n", rpt);
459 460
	if (export_marks_file)
		fprintf(rpt, "  exported to %s\n", export_marks_file);
461 462 463
	else
		dump_marks_helper(rpt, 0, marks);

464 465 466 467 468 469
	fputc('\n', rpt);
	fputs("-------------------\n", rpt);
	fputs("END OF CRASH REPORT\n", rpt);
	fclose(rpt);
}

470 471 472 473
static void end_packfile(void);
static void unkeep_all_packs(void);
static void dump_marks(void);

474 475 476
static NORETURN void die_nicely(const char *err, va_list params)
{
	static int zombie;
477
	char message[2 * PATH_MAX];
478

479
	vsnprintf(message, sizeof(message), err, params);
480
	fputs("fatal: ", stderr);
481
	fputs(message, stderr);
482 483 484 485
	fputc('\n', stderr);

	if (!zombie) {
		zombie = 1;
486
		write_crash_report(message);
487 488 489
		end_packfile();
		unkeep_all_packs();
		dump_marks();
490 491 492
	}
	exit(128);
}
493

494
static void alloc_objects(unsigned int cnt)
495
{
496
	struct object_entry_pool *b;
497

498
	b = xmalloc(sizeof(struct object_entry_pool)
499
		+ cnt * sizeof(struct object_entry));
500
	b->next_pool = blocks;
501 502 503 504 505
	b->next_free = b->entries;
	b->end = b->entries + cnt;
	blocks = b;
	alloc_count += cnt;
}
506

507
static struct object_entry *new_object(unsigned char *sha1)
508
{
509
	struct object_entry *e;
510

511
	if (blocks->next_free == blocks->end)
512
		alloc_objects(object_entry_alloc);
513

514
	e = blocks->next_free++;
515
	hashcpy(e->sha1, sha1);
516
	return e;
517 518
}

519
static struct object_entry *find_object(unsigned char *sha1)
520 521 522 523
{
	unsigned int h = sha1[0] << 8 | sha1[1];
	struct object_entry *e;
	for (e = object_table[h]; e; e = e->next)
524
		if (!hashcmp(sha1, e->sha1))
525 526 527 528
			return e;
	return NULL;
}

529
static struct object_entry *insert_object(unsigned char *sha1)
530 531
{
	unsigned int h = sha1[0] << 8 | sha1[1];
532
	struct object_entry *e = object_table[h];
533
	struct object_entry *p = NULL;
534 535

	while (e) {
536
		if (!hashcmp(sha1, e->sha1))
537 538 539 540 541 542
			return e;
		p = e;
		e = e->next;
	}

	e = new_object(sha1);
543
	e->next = NULL;
544 545 546 547
	e->offset = 0;
	if (p)
		p->next = e;
	else
548
		object_table[h] = e;
549 550
	return e;
}
551

552 553 554 555 556 557 558 559
static unsigned int hc_str(const char *s, size_t len)
{
	unsigned int r = 0;
	while (len-- > 0)
		r = r * 31 + *s++;
	return r;
}

560
static void *pool_alloc(size_t len)
561 562 563 564
{
	struct mem_pool *p;
	void *r;

565 566 567 568
	/* round up to a 'uintmax_t' alignment */
	if (len & (sizeof(uintmax_t) - 1))
		len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));

569 570 571 572 573 574 575 576 577 578 579 580
	for (p = mem_pool; p; p = p->next_pool)
		if ((p->end - p->next_free >= len))
			break;

	if (!p) {
		if (len >= (mem_pool_alloc/2)) {
			total_allocd += len;
			return xmalloc(len);
		}
		total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
		p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
		p->next_pool = mem_pool;
581
		p->next_free = (char *) p->space;
582 583 584 585 586 587 588 589 590
		p->end = p->next_free + mem_pool_alloc;
		mem_pool = p;
	}

	r = p->next_free;
	p->next_free += len;
	return r;
}

591
static void *pool_calloc(size_t count, size_t size)
592 593 594 595 596 597 598
{
	size_t len = count * size;
	void *r = pool_alloc(len);
	memset(r, 0, len);
	return r;
}

599
static char *pool_strdup(const char *s)
600 601 602 603 604 605
{
	char *r = pool_alloc(strlen(s) + 1);
	strcpy(r, s);
	return r;
}

606
static void insert_mark(uintmax_t idnum, struct object_entry *oe)
607 608 609 610 611 612 613 614 615
{
	struct mark_set *s = marks;
	while ((idnum >> s->shift) >= 1024) {
		s = pool_calloc(1, sizeof(struct mark_set));
		s->shift = marks->shift + 10;
		s->data.sets[0] = marks;
		marks = s;
	}
	while (s->shift) {
616
		uintmax_t i = idnum >> s->shift;
617 618 619 620 621 622 623 624 625 626 627 628
		idnum -= i << s->shift;
		if (!s->data.sets[i]) {
			s->data.sets[i] = pool_calloc(1, sizeof(struct mark_set));
			s->data.sets[i]->shift = s->shift - 10;
		}
		s = s->data.sets[i];
	}
	if (!s->data.marked[idnum])
		marks_set_count++;
	s->data.marked[idnum] = oe;
}

629
static struct object_entry *find_mark(uintmax_t idnum)
630
{
631
	uintmax_t orig_idnum = idnum;
632 633 634 635
	struct mark_set *s = marks;
	struct object_entry *oe = NULL;
	if ((idnum >> s->shift) < 1024) {
		while (s && s->shift) {
636
			uintmax_t i = idnum >> s->shift;
637 638 639 640 641 642 643
			idnum -= i << s->shift;
			s = s->data.sets[i];
		}
		if (s)
			oe = s->data.marked[idnum];
	}
	if (!oe)
644
		die("mark :%" PRIuMAX " not declared", orig_idnum);
645 646 647
	return oe;
}

648
static struct atom_str *to_atom(const char *s, unsigned short len)
649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666
{
	unsigned int hc = hc_str(s, len) % atom_table_sz;
	struct atom_str *c;

	for (c = atom_table[hc]; c; c = c->next_atom)
		if (c->str_len == len && !strncmp(s, c->str_dat, len))
			return c;

	c = pool_alloc(sizeof(struct atom_str) + len + 1);
	c->str_len = len;
	strncpy(c->str_dat, s, len);
	c->str_dat[len] = 0;
	c->next_atom = atom_table[hc];
	atom_table[hc] = c;
	atom_cnt++;
	return c;
}

667
static struct branch *lookup_branch(const char *name)
668 669 670 671 672 673 674 675 676 677
{
	unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
	struct branch *b;

	for (b = branch_table[hc]; b; b = b->table_next_branch)
		if (!strcmp(name, b->name))
			return b;
	return NULL;
}

678
static struct branch *new_branch(const char *name)
679 680
{
	unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
681
	struct branch *b = lookup_branch(name);
682 683 684

	if (b)
		die("Invalid attempt to create duplicate branch: %s", name);
685
	switch (check_ref_format(name)) {
686 687 688
	case 0: break; /* its valid */
	case CHECK_REF_FORMAT_ONELEVEL:
		break; /* valid, but too few '/', allow anyway */
689
	default:
690
		die("Branch name doesn't conform to GIT standards: %s", name);
691
	}
692 693 694 695

	b = pool_calloc(1, sizeof(struct branch));
	b->name = pool_strdup(name);
	b->table_next_branch = branch_table[hc];
696 697
	b->branch_tree.versions[0].mode = S_IFDIR;
	b->branch_tree.versions[1].mode = S_IFDIR;
698
	b->active = 0;
699
	b->pack_id = MAX_PACK_ID;
700 701 702 703 704 705 706 707 708 709 710
	branch_table[hc] = b;
	branch_count++;
	return b;
}

static unsigned int hc_entries(unsigned int cnt)
{
	cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
	return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
}

711
static struct tree_content *new_tree_content(unsigned int cnt)
712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733
{
	struct avail_tree_content *f, *l = NULL;
	struct tree_content *t;
	unsigned int hc = hc_entries(cnt);

	for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
		if (f->entry_capacity >= cnt)
			break;

	if (f) {
		if (l)
			l->next_avail = f->next_avail;
		else
			avail_tree_table[hc] = f->next_avail;
	} else {
		cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
		f = pool_alloc(sizeof(*t) + sizeof(t->entries[0]) * cnt);
		f->entry_capacity = cnt;
	}

	t = (struct tree_content*)f;
	t->entry_count = 0;
734
	t->delta_depth = 0;
735 736 737 738 739 740 741 742
	return t;
}

static void release_tree_entry(struct tree_entry *e);
static void release_tree_content(struct tree_content *t)
{
	struct avail_tree_content *f = (struct avail_tree_content*)t;
	unsigned int hc = hc_entries(f->entry_capacity);
743 744 745 746 747 748
	f->next_avail = avail_tree_table[hc];
	avail_tree_table[hc] = f;
}

static void release_tree_content_recursive(struct tree_content *t)
{
749 750 751
	unsigned int i;
	for (i = 0; i < t->entry_count; i++)
		release_tree_entry(t->entries[i]);
752
	release_tree_content(t);
753 754
}

755
static struct tree_content *grow_tree_content(
756 757 758 759 760
	struct tree_content *t,
	int amt)
{
	struct tree_content *r = new_tree_content(t->entry_count + amt);
	r->entry_count = t->entry_count;
761
	r->delta_depth = t->delta_depth;
762 763 764 765 766
	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
	release_tree_content(t);
	return r;
}

767
static struct tree_entry *new_tree_entry(void)
768 769 770 771 772
{
	struct tree_entry *e;

	if (!avail_tree_entry) {
		unsigned int n = tree_entry_alloc;
773
		total_allocd += n * sizeof(struct tree_entry);
774
		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
775
		while (n-- > 1) {
776 777 778
			*((void**)e) = e + 1;
			e++;
		}
779
		*((void**)e) = NULL;
780 781 782 783 784 785 786 787 788 789
	}

	e = avail_tree_entry;
	avail_tree_entry = *((void**)e);
	return e;
}

static void release_tree_entry(struct tree_entry *e)
{
	if (e->tree)
790
		release_tree_content_recursive(e->tree);
791 792 793 794
	*((void**)e) = avail_tree_entry;
	avail_tree_entry = e;
}

795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819
static struct tree_content *dup_tree_content(struct tree_content *s)
{
	struct tree_content *d;
	struct tree_entry *a, *b;
	unsigned int i;

	if (!s)
		return NULL;
	d = new_tree_content(s->entry_count);
	for (i = 0; i < s->entry_count; i++) {
		a = s->entries[i];
		b = new_tree_entry();
		memcpy(b, a, sizeof(*a));
		if (a->tree && is_null_sha1(b->versions[1].sha1))
			b->tree = dup_tree_content(a->tree);
		else
			b->tree = NULL;
		d->entries[i] = b;
	}
	d->entry_count = s->entry_count;
	d->delta_depth = s->delta_depth;

	return d;
}

820
static void start_packfile(void)
821
{
822
	static char tmpfile[PATH_MAX];
823
	struct packed_git *p;
824
	struct pack_header hdr;
825
	int pack_fd;
826

827 828
	pack_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
			      "pack/tmp_pack_XXXXXX");
829 830
	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
	strcpy(p->pack_name, tmpfile);
831
	p->pack_fd = pack_fd;
832 833 834 835

	hdr.hdr_signature = htonl(PACK_SIGNATURE);
	hdr.hdr_version = htonl(2);
	hdr.hdr_entries = 0;
836
	write_or_die(p->pack_fd, &hdr, sizeof(hdr));
837 838

	pack_data = p;
839 840
	pack_size = sizeof(hdr);
	object_count = 0;
841 842 843

	all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
	all_packs[pack_id] = p;
844 845 846 847 848 849 850 851 852
}

static int oecmp (const void *a_, const void *b_)
{
	struct object_entry *a = *((struct object_entry**)a_);
	struct object_entry *b = *((struct object_entry**)b_);
	return hashcmp(a->sha1, b->sha1);
}

853
static char *create_index(void)
854
{
855
	static char tmpfile[PATH_MAX];
856
	git_SHA_CTX ctx;
857 858 859
	struct sha1file *f;
	struct object_entry **idx, **c, **last, *e;
	struct object_entry_pool *o;
860
	uint32_t array[256];
861
	int i, idx_fd;
862 863 864 865 866

	/* Build the sorted table of object IDs. */
	idx = xmalloc(object_count * sizeof(struct object_entry*));
	c = idx;
	for (o = blocks; o; o = o->next_pool)
867 868 869
		for (e = o->next_free; e-- != o->entries;)
			if (pack_id == e->pack_id)
				*c++ = e;
870
	last = idx + object_count;
871 872
	if (c != last)
		die("internal consistency error creating the index");
873 874 875 876 877
	qsort(idx, object_count, sizeof(struct object_entry*), oecmp);

	/* Generate the fan-out array. */
	c = idx;
	for (i = 0; i < 256; i++) {
J
Junio C Hamano 已提交
878
		struct object_entry **next = c;
879 880 881 882 883 884 885 886 887
		while (next < last) {
			if ((*next)->sha1[0] != i)
				break;
			next++;
		}
		array[i] = htonl(next - idx);
		c = next;
	}

888 889
	idx_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
			     "pack/tmp_idx_XXXXXX");
890
	f = sha1fd(idx_fd, tmpfile);
891
	sha1write(f, array, 256 * sizeof(int));
892
	git_SHA1_Init(&ctx);
893
	for (c = idx; c != last; c++) {
894
		uint32_t offset = htonl((*c)->offset);
895 896
		sha1write(f, &offset, 4);
		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
897
		git_SHA1_Update(&ctx, (*c)->sha1, 20);
898
	}
899
	sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
900
	sha1close(f, NULL, CSUM_FSYNC);
901
	free(idx);
902
	git_SHA1_Final(pack_data->sha1, &ctx);
903 904 905
	return tmpfile;
}

906
static char *keep_pack(char *curr_index_name)
907 908
{
	static char name[PATH_MAX];
909
	static const char *keep_msg = "fast-import";
910 911
	int keep_fd;

912
	keep_fd = odb_pack_keep(name, sizeof(name), pack_data->sha1);
913
	if (keep_fd < 0)
914
		die_errno("cannot create keep file");
915 916
	write_or_die(keep_fd, keep_msg, strlen(keep_msg));
	if (close(keep_fd))
917
		die_errno("failed to write keep file");
918 919 920 921 922 923 924 925 926 927 928 929 930

	snprintf(name, sizeof(name), "%s/pack/pack-%s.pack",
		 get_object_directory(), sha1_to_hex(pack_data->sha1));
	if (move_temp_to_file(pack_data->pack_name, name))
		die("cannot store pack file");

	snprintf(name, sizeof(name), "%s/pack/pack-%s.idx",
		 get_object_directory(), sha1_to_hex(pack_data->sha1));
	if (move_temp_to_file(curr_index_name, name))
		die("cannot store index file");
	return name;
}

931
static void unkeep_all_packs(void)
932 933 934 935 936 937 938 939
{
	static char name[PATH_MAX];
	int k;

	for (k = 0; k < pack_id; k++) {
		struct packed_git *p = all_packs[k];
		snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
			 get_object_directory(), sha1_to_hex(p->sha1));
940
		unlink_or_warn(name);
941
	}
942 943
}

944
static void end_packfile(void)
945
{
946 947
	struct packed_git *old_p = pack_data, *new_p;

948
	clear_delta_base_cache();
949
	if (object_count) {
950
		char *idx_name;
951 952 953
		int i;
		struct branch *b;
		struct tag *t;
954

955
		close_pack_windows(pack_data);
956
		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
957 958
				    pack_data->pack_name, object_count,
				    NULL, 0);
959
		close(pack_data->pack_fd);
960
		idx_name = keep_pack(create_index());
961

M
Mike Ralphson 已提交
962
		/* Register the packfile with core git's machinery. */
963 964 965
		new_p = add_packed_git(idx_name, strlen(idx_name), 1);
		if (!new_p)
			die("core git rejected index %s", idx_name);
966
		all_packs[pack_id] = new_p;
967
		install_packed_git(new_p);
968 969

		/* Print the boundary */
970 971 972 973 974 975 976
		if (pack_edges) {
			fprintf(pack_edges, "%s:", new_p->pack_name);
			for (i = 0; i < branch_table_sz; i++) {
				for (b = branch_table[i]; b; b = b->table_next_branch) {
					if (b->pack_id == pack_id)
						fprintf(pack_edges, " %s", sha1_to_hex(b->sha1));
				}
977
			}
978 979 980 981 982 983
			for (t = first_tag; t; t = t->next_tag) {
				if (t->pack_id == pack_id)
					fprintf(pack_edges, " %s", sha1_to_hex(t->sha1));
			}
			fputc('\n', pack_edges);
			fflush(pack_edges);
984 985 986
		}

		pack_id++;
987
	}
988 989
	else {
		close(old_p->pack_fd);
990
		unlink_or_warn(old_p->pack_name);
991
	}
992 993 994
	free(old_p);

	/* We can't carry a delta across packfiles. */
P
Pierre Habouzit 已提交
995
	strbuf_release(&last_blob.data);
996 997
	last_blob.offset = 0;
	last_blob.depth = 0;
998 999
}

1000
static void cycle_packfile(void)
1001 1002 1003 1004 1005
{
	end_packfile();
	start_packfile();
}

1006
static size_t encode_header(
1007
	enum object_type type,
1008
	size_t size,
1009
	unsigned char *hdr)
1010 1011 1012 1013
{
	int n = 1;
	unsigned char c;

1014
	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028
		die("bad type %d", type);

	c = (type << 4) | (size & 15);
	size >>= 4;
	while (size) {
		*hdr++ = c | 0x80;
		c = size & 0x7f;
		size >>= 7;
		n++;
	}
	*hdr = c;
	return n;
}

1029 1030
static int store_object(
	enum object_type type,
1031
	struct strbuf *dat,
1032
	struct last_object *last,
1033
	unsigned char *sha1out,
1034
	uintmax_t mark)
1035 1036
{
	void *out, *delta;
1037 1038 1039
	struct object_entry *e;
	unsigned char hdr[96];
	unsigned char sha1[20];
1040
	unsigned long hdrlen, deltalen;
1041
	git_SHA_CTX c;
1042 1043
	z_stream s;

1044
	hdrlen = sprintf((char *)hdr,"%s %lu", typename(type),
1045
		(unsigned long)dat->len) + 1;
1046 1047 1048 1049
	git_SHA1_Init(&c);
	git_SHA1_Update(&c, hdr, hdrlen);
	git_SHA1_Update(&c, dat->buf, dat->len);
	git_SHA1_Final(sha1, &c);
1050
	if (sha1out)
1051
		hashcpy(sha1out, sha1);
1052 1053

	e = insert_object(sha1);
1054 1055
	if (mark)
		insert_mark(mark, e);
1056
	if (e->offset) {
1057
		duplicate_count_by_type[type]++;
1058
		return 1;
1059 1060 1061 1062 1063 1064
	} else if (find_sha1_pack(sha1, packed_git)) {
		e->type = type;
		e->pack_id = MAX_PACK_ID;
		e->offset = 1; /* just not zero! */
		duplicate_count_by_type[type]++;
		return 1;
1065
	}
1066

P
Pierre Habouzit 已提交
1067 1068
	if (last && last->data.buf && last->depth < max_depth) {
		delta = diff_delta(last->data.buf, last->data.len,
1069
			dat->buf, dat->len,
1070
			&deltalen, 0);
1071
		if (delta && deltalen >= dat->len) {
1072 1073 1074 1075 1076
			free(delta);
			delta = NULL;
		}
	} else
		delta = NULL;
1077 1078

	memset(&s, 0, sizeof(s));
1079
	deflateInit(&s, pack_compression_level);
1080 1081 1082 1083
	if (delta) {
		s.next_in = delta;
		s.avail_in = deltalen;
	} else {
1084 1085
		s.next_in = (void *)dat->buf;
		s.avail_in = dat->len;
1086 1087 1088 1089 1090 1091 1092 1093
	}
	s.avail_out = deflateBound(&s, s.avail_in);
	s.next_out = out = xmalloc(s.avail_out);
	while (deflate(&s, Z_FINISH) == Z_OK)
		/* nothing */;
	deflateEnd(&s);

	/* Determine if we should auto-checkpoint. */
1094
	if ((pack_size + 60 + s.total_out) > max_packsize
1095 1096 1097 1098
		|| (pack_size + 60 + s.total_out) < pack_size) {

		/* This new object needs to *not* have the current pack_id. */
		e->pack_id = pack_id + 1;
1099
		cycle_packfile();
1100 1101 1102 1103 1104

		/* We cannot carry a delta into the new pack. */
		if (delta) {
			free(delta);
			delta = NULL;
1105 1106

			memset(&s, 0, sizeof(s));
1107
			deflateInit(&s, pack_compression_level);
1108 1109
			s.next_in = (void *)dat->buf;
			s.avail_in = dat->len;
1110 1111 1112 1113 1114
			s.avail_out = deflateBound(&s, s.avail_in);
			s.next_out = out = xrealloc(out, s.avail_out);
			while (deflate(&s, Z_FINISH) == Z_OK)
				/* nothing */;
			deflateEnd(&s);
1115 1116 1117 1118 1119 1120 1121 1122
		}
	}

	e->type = type;
	e->pack_id = pack_id;
	e->offset = pack_size;
	object_count++;
	object_count_by_type[type]++;
1123 1124

	if (delta) {
1125 1126 1127
		unsigned long ofs = e->offset - last->offset;
		unsigned pos = sizeof(hdr) - 1;

1128
		delta_count_by_type[type]++;
1129
		e->depth = last->depth + 1;
1130 1131

		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1132
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1133 1134 1135 1136 1137
		pack_size += hdrlen;

		hdr[pos] = ofs & 127;
		while (ofs >>= 7)
			hdr[--pos] = 128 | (--ofs & 127);
1138
		write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1139
		pack_size += sizeof(hdr) - pos;
1140
	} else {
1141
		e->depth = 0;
1142
		hdrlen = encode_header(type, dat->len, hdr);
1143
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1144
		pack_size += hdrlen;
1145 1146
	}

1147
	write_or_die(pack_data->pack_fd, out, s.total_out);
1148
	pack_size += s.total_out;
1149 1150

	free(out);
1151
	free(delta);
1152
	if (last) {
P
Pierre Habouzit 已提交
1153 1154 1155
		if (last->no_swap) {
			last->data = *dat;
		} else {
1156
			strbuf_swap(&last->data, dat);
P
Pierre Habouzit 已提交
1157
		}
1158
		last->offset = e->offset;
1159
		last->depth = e->depth;
1160 1161 1162 1163
	}
	return 0;
}

1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181
/* All calls must be guarded by find_object() or find_mark() to
 * ensure the 'struct object_entry' passed was written by this
 * process instance.  We unpack the entry by the offset, avoiding
 * the need for the corresponding .idx file.  This unpacking rule
 * works because we only use OBJ_REF_DELTA within the packfiles
 * created by fast-import.
 *
 * oe must not be NULL.  Such an oe usually comes from giving
 * an unknown SHA-1 to find_object() or an undefined mark to
 * find_mark().  Callers must test for this condition and use
 * the standard read_sha1_file() when it happens.
 *
 * oe->pack_id must not be MAX_PACK_ID.  Such an oe is usually from
 * find_mark(), where the mark was reloaded from an existing marks
 * file and is referencing an object that this fast-import process
 * instance did not write out to a packfile.  Callers must test for
 * this condition and use read_sha1_file() instead.
 */
1182 1183 1184
static void *gfi_unpack_entry(
	struct object_entry *oe,
	unsigned long *sizep)
1185
{
1186
	enum object_type type;
1187
	struct packed_git *p = all_packs[oe->pack_id];
1188
	if (p == pack_data && p->pack_size < (pack_size + 20)) {
1189 1190 1191 1192 1193 1194 1195 1196
		/* The object is stored in the packfile we are writing to
		 * and we have modified it since the last time we scanned
		 * back to read a previously written object.  If an old
		 * window covered [p->pack_size, p->pack_size + 20) its
		 * data is stale and is not valid.  Closing all windows
		 * and updating the packfile length ensures we can read
		 * the newly written data.
		 */
1197
		close_pack_windows(p);
1198 1199 1200 1201 1202 1203 1204

		/* We have to offer 20 bytes additional on the end of
		 * the packfile as the core unpacker code assumes the
		 * footer is present at the file end and must promise
		 * at least 20 bytes within any window it maps.  But
		 * we don't actually create the footer here.
		 */
1205
		p->pack_size = pack_size + 20;
1206
	}
1207
	return unpack_entry(p, oe->offset, &type, sizep);
1208 1209
}

1210
static const char *get_mode(const char *str, uint16_t *modep)
1211 1212
{
	unsigned char c;
1213
	uint16_t mode = 0;
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225

	while ((c = *str++) != ' ') {
		if (c < '0' || c > '7')
			return NULL;
		mode = (mode << 3) + (c - '0');
	}
	*modep = mode;
	return str;
}

static void load_tree(struct tree_entry *root)
{
1226
	unsigned char *sha1 = root->versions[1].sha1;
1227 1228 1229 1230 1231 1232 1233
	struct object_entry *myoe;
	struct tree_content *t;
	unsigned long size;
	char *buf;
	const char *c;

	root->tree = t = new_tree_content(8);
1234
	if (is_null_sha1(sha1))
1235 1236
		return;

1237
	myoe = find_object(sha1);
1238
	if (myoe && myoe->pack_id != MAX_PACK_ID) {
1239
		if (myoe->type != OBJ_TREE)
1240
			die("Not a tree: %s", sha1_to_hex(sha1));
1241
		t->delta_depth = myoe->depth;
1242
		buf = gfi_unpack_entry(myoe, &size);
1243 1244
		if (!buf)
			die("Can't load tree %s", sha1_to_hex(sha1));
1245
	} else {
1246 1247 1248
		enum object_type type;
		buf = read_sha1_file(sha1, &type, &size);
		if (!buf || type != OBJ_TREE)
1249
			die("Can't load tree %s", sha1_to_hex(sha1));
1250 1251 1252 1253 1254 1255 1256
	}

	c = buf;
	while (c != (buf + size)) {
		struct tree_entry *e = new_tree_entry();

		if (t->entry_count == t->entry_capacity)
1257
			root->tree = t = grow_tree_content(t, t->entry_count);
1258 1259 1260
		t->entries[t->entry_count++] = e;

		e->tree = NULL;
1261
		c = get_mode(c, &e->versions[1].mode);
1262
		if (!c)
1263 1264
			die("Corrupt mode in %s", sha1_to_hex(sha1));
		e->versions[0].mode = e->versions[1].mode;
1265
		e->name = to_atom(c, strlen(c));
1266
		c += e->name->str_len + 1;
1267 1268
		hashcpy(e->versions[0].sha1, (unsigned char *)c);
		hashcpy(e->versions[1].sha1, (unsigned char *)c);
1269 1270 1271 1272 1273
		c += 20;
	}
	free(buf);
}

1274
static int tecmp0 (const void *_a, const void *_b)
1275 1276 1277 1278
{
	struct tree_entry *a = *((struct tree_entry**)_a);
	struct tree_entry *b = *((struct tree_entry**)_b);
	return base_name_compare(
1279 1280
		a->name->str_dat, a->name->str_len, a->versions[0].mode,
		b->name->str_dat, b->name->str_len, b->versions[0].mode);
1281 1282
}

1283
static int tecmp1 (const void *_a, const void *_b)
1284
{
1285 1286 1287 1288 1289 1290 1291
	struct tree_entry *a = *((struct tree_entry**)_a);
	struct tree_entry *b = *((struct tree_entry**)_b);
	return base_name_compare(
		a->name->str_dat, a->name->str_len, a->versions[1].mode,
		b->name->str_dat, b->name->str_len, b->versions[1].mode);
}

1292
static void mktree(struct tree_content *t, int v, struct strbuf *b)
1293 1294
{
	size_t maxlen = 0;
1295 1296
	unsigned int i;

1297 1298 1299 1300
	if (!v)
		qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp0);
	else
		qsort(t->entries,t->entry_count,sizeof(t->entries[0]),tecmp1);
1301 1302

	for (i = 0; i < t->entry_count; i++) {
1303 1304
		if (t->entries[i]->versions[v].mode)
			maxlen += t->entries[i]->name->str_len + 34;
1305 1306
	}

1307 1308
	strbuf_reset(b);
	strbuf_grow(b, maxlen);
1309 1310
	for (i = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
1311 1312
		if (!e->versions[v].mode)
			continue;
1313 1314 1315
		strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
					e->name->str_dat, '\0');
		strbuf_add(b, e->versions[v].sha1, 20);
1316
	}
1317 1318 1319 1320 1321 1322
}

static void store_tree(struct tree_entry *root)
{
	struct tree_content *t = root->tree;
	unsigned int i, j, del;
P
Pierre Habouzit 已提交
1323
	struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1324
	struct object_entry *le;
1325 1326 1327 1328 1329 1330 1331 1332 1333

	if (!is_null_sha1(root->versions[1].sha1))
		return;

	for (i = 0; i < t->entry_count; i++) {
		if (t->entries[i]->tree)
			store_tree(t->entries[i]);
	}

1334
	le = find_object(root->versions[0].sha1);
P
Pierre Habouzit 已提交
1335
	if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1336
		mktree(t, 0, &old_tree);
P
Pierre Habouzit 已提交
1337
		lo.data = old_tree;
1338
		lo.offset = le->offset;
1339 1340 1341
		lo.depth = t->delta_depth;
	}

1342 1343
	mktree(t, 1, &new_tree);
	store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357

	t->delta_depth = lo.depth;
	for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
		if (e->versions[1].mode) {
			e->versions[0].mode = e->versions[1].mode;
			hashcpy(e->versions[0].sha1, e->versions[1].sha1);
			t->entries[j++] = e;
		} else {
			release_tree_entry(e);
			del++;
		}
	}
	t->entry_count -= del;
1358 1359 1360 1361 1362 1363
}

static int tree_content_set(
	struct tree_entry *root,
	const char *p,
	const unsigned char *sha1,
1364 1365
	const uint16_t mode,
	struct tree_content *subtree)
1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376
{
	struct tree_content *t = root->tree;
	const char *slash1;
	unsigned int i, n;
	struct tree_entry *e;

	slash1 = strchr(p, '/');
	if (slash1)
		n = slash1 - p;
	else
		n = strlen(p);
1377 1378
	if (!n)
		die("Empty path component found in input");
1379 1380
	if (!slash1 && !S_ISDIR(mode) && subtree)
		die("Non-directories cannot have subtrees");
1381 1382 1383 1384 1385

	for (i = 0; i < t->entry_count; i++) {
		e = t->entries[i];
		if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
			if (!slash1) {
1386 1387
				if (!S_ISDIR(mode)
						&& e->versions[1].mode == mode
1388
						&& !hashcmp(e->versions[1].sha1, sha1))
1389
					return 0;
1390 1391
				e->versions[1].mode = mode;
				hashcpy(e->versions[1].sha1, sha1);
1392
				if (e->tree)
1393
					release_tree_content_recursive(e->tree);
1394
				e->tree = subtree;
1395
				hashclr(root->versions[1].sha1);
1396 1397
				return 1;
			}
1398
			if (!S_ISDIR(e->versions[1].mode)) {
1399
				e->tree = new_tree_content(8);
1400
				e->versions[1].mode = S_IFDIR;
1401 1402 1403
			}
			if (!e->tree)
				load_tree(e);
1404
			if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1405
				hashclr(root->versions[1].sha1);
1406 1407 1408 1409 1410 1411 1412
				return 1;
			}
			return 0;
		}
	}

	if (t->entry_count == t->entry_capacity)
1413
		root->tree = t = grow_tree_content(t, t->entry_count);
1414
	e = new_tree_entry();
1415
	e->name = to_atom(p, n);
1416 1417
	e->versions[0].mode = 0;
	hashclr(e->versions[0].sha1);
1418 1419 1420
	t->entries[t->entry_count++] = e;
	if (slash1) {
		e->tree = new_tree_content(8);
1421
		e->versions[1].mode = S_IFDIR;
1422
		tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1423
	} else {
1424
		e->tree = subtree;
1425 1426
		e->versions[1].mode = mode;
		hashcpy(e->versions[1].sha1, sha1);
1427
	}
1428
	hashclr(root->versions[1].sha1);
1429 1430 1431
	return 1;
}

1432 1433 1434 1435
static int tree_content_remove(
	struct tree_entry *root,
	const char *p,
	struct tree_entry *backup_leaf)
1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450
{
	struct tree_content *t = root->tree;
	const char *slash1;
	unsigned int i, n;
	struct tree_entry *e;

	slash1 = strchr(p, '/');
	if (slash1)
		n = slash1 - p;
	else
		n = strlen(p);

	for (i = 0; i < t->entry_count; i++) {
		e = t->entries[i];
		if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
1451
			if (!slash1 || !S_ISDIR(e->versions[1].mode))
1452 1453 1454
				goto del_entry;
			if (!e->tree)
				load_tree(e);
1455
			if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1456 1457 1458 1459 1460 1461
				for (n = 0; n < e->tree->entry_count; n++) {
					if (e->tree->entries[n]->versions[1].mode) {
						hashclr(root->versions[1].sha1);
						return 1;
					}
				}
1462
				backup_leaf = NULL;
1463
				goto del_entry;
1464 1465 1466 1467 1468 1469 1470
			}
			return 0;
		}
	}
	return 0;

del_entry:
1471 1472 1473
	if (backup_leaf)
		memcpy(backup_leaf, e, sizeof(*backup_leaf));
	else if (e->tree)
1474
		release_tree_content_recursive(e->tree);
1475
	e->tree = NULL;
1476 1477 1478
	e->versions[1].mode = 0;
	hashclr(e->versions[1].sha1);
	hashclr(root->versions[1].sha1);
1479
	return 1;
1480 1481
}

1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518
static int tree_content_get(
	struct tree_entry *root,
	const char *p,
	struct tree_entry *leaf)
{
	struct tree_content *t = root->tree;
	const char *slash1;
	unsigned int i, n;
	struct tree_entry *e;

	slash1 = strchr(p, '/');
	if (slash1)
		n = slash1 - p;
	else
		n = strlen(p);

	for (i = 0; i < t->entry_count; i++) {
		e = t->entries[i];
		if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
			if (!slash1) {
				memcpy(leaf, e, sizeof(*leaf));
				if (e->tree && is_null_sha1(e->versions[1].sha1))
					leaf->tree = dup_tree_content(e->tree);
				else
					leaf->tree = NULL;
				return 1;
			}
			if (!S_ISDIR(e->versions[1].mode))
				return 0;
			if (!e->tree)
				load_tree(e);
			return tree_content_get(e, slash1 + 1, leaf);
		}
	}
	return 0;
}

1519
static int update_branch(struct branch *b)
1520 1521
{
	static const char *msg = "fast-import";
1522 1523 1524
	struct ref_lock *lock;
	unsigned char old_sha1[20];

1525 1526
	if (is_null_sha1(b->sha1))
		return 0;
1527 1528
	if (read_ref(b->name, old_sha1))
		hashclr(old_sha1);
1529
	lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541
	if (!lock)
		return error("Unable to lock %s", b->name);
	if (!force_update && !is_null_sha1(old_sha1)) {
		struct commit *old_cmit, *new_cmit;

		old_cmit = lookup_commit_reference_gently(old_sha1, 0);
		new_cmit = lookup_commit_reference_gently(b->sha1, 0);
		if (!old_cmit || !new_cmit) {
			unlock_ref(lock);
			return error("Branch %s is missing commits.", b->name);
		}

1542
		if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1543
			unlock_ref(lock);
1544
			warning("Not updating %s"
1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556
				" (new tip %s does not contain %s)",
				b->name, sha1_to_hex(b->sha1), sha1_to_hex(old_sha1));
			return -1;
		}
	}
	if (write_ref_sha1(lock, b->sha1, msg) < 0)
		return error("Unable to update %s", b->name);
	return 0;
}

static void dump_branches(void)
{
1557 1558 1559 1560
	unsigned int i;
	struct branch *b;

	for (i = 0; i < branch_table_sz; i++) {
1561 1562
		for (b = branch_table[i]; b; b = b->table_next_branch)
			failure |= update_branch(b);
1563 1564 1565
	}
}

1566
static void dump_tags(void)
1567 1568 1569 1570
{
	static const char *msg = "fast-import";
	struct tag *t;
	struct ref_lock *lock;
1571
	char ref_name[PATH_MAX];
1572 1573

	for (t = first_tag; t; t = t->next_tag) {
1574 1575
		sprintf(ref_name, "tags/%s", t->name);
		lock = lock_ref_sha1(ref_name, NULL);
1576
		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1577
			failure |= error("Unable to update %s", ref_name);
1578 1579 1580
	}
}

1581
static void dump_marks_helper(FILE *f,
1582
	uintmax_t base,
1583 1584
	struct mark_set *m)
{
1585
	uintmax_t k;
1586 1587 1588 1589 1590 1591 1592 1593 1594
	if (m->shift) {
		for (k = 0; k < 1024; k++) {
			if (m->data.sets[k])
				dump_marks_helper(f, (base + k) << m->shift,
					m->data.sets[k]);
		}
	} else {
		for (k = 0; k < 1024; k++) {
			if (m->data.marked[k])
1595
				fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1596 1597 1598 1599 1600
					sha1_to_hex(m->data.marked[k]->sha1));
		}
	}
}

1601
static void dump_marks(void)
1602
{
1603 1604 1605 1606
	static struct lock_file mark_lock;
	int mark_fd;
	FILE *f;

1607
	if (!export_marks_file)
1608 1609
		return;

1610
	mark_fd = hold_lock_file_for_update(&mark_lock, export_marks_file, 0);
1611 1612
	if (mark_fd < 0) {
		failure |= error("Unable to write marks file %s: %s",
1613
			export_marks_file, strerror(errno));
1614
		return;
1615
	}
1616 1617 1618

	f = fdopen(mark_fd, "w");
	if (!f) {
1619
		int saved_errno = errno;
1620 1621
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to write marks file %s: %s",
1622
			export_marks_file, strerror(saved_errno));
1623
		return;
1624
	}
1625

B
Brandon Casey 已提交
1626
	/*
1627 1628
	 * Since the lock file was fdopen()'ed, it should not be close()'ed.
	 * Assign -1 to the lock file descriptor so that commit_lock_file()
B
Brandon Casey 已提交
1629 1630 1631
	 * won't try to close() it.
	 */
	mark_lock.fd = -1;
1632 1633 1634

	dump_marks_helper(f, 0, marks);
	if (ferror(f) || fclose(f)) {
1635
		int saved_errno = errno;
1636 1637
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to write marks file %s: %s",
1638
			export_marks_file, strerror(saved_errno));
1639 1640 1641 1642
		return;
	}

	if (commit_lock_file(&mark_lock)) {
1643
		int saved_errno = errno;
1644 1645
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to commit marks file %s: %s",
1646
			export_marks_file, strerror(saved_errno));
1647 1648
		return;
	}
1649 1650
}

1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686
static void read_marks(void)
{
	char line[512];
	FILE *f = fopen(import_marks_file, "r");
	if (!f)
		die_errno("cannot read '%s'", import_marks_file);
	while (fgets(line, sizeof(line), f)) {
		uintmax_t mark;
		char *end;
		unsigned char sha1[20];
		struct object_entry *e;

		end = strchr(line, '\n');
		if (line[0] != ':' || !end)
			die("corrupt mark line: %s", line);
		*end = 0;
		mark = strtoumax(line + 1, &end, 10);
		if (!mark || end == line + 1
			|| *end != ' ' || get_sha1(end + 1, sha1))
			die("corrupt mark line: %s", line);
		e = find_object(sha1);
		if (!e) {
			enum object_type type = sha1_object_info(sha1, NULL);
			if (type < 0)
				die("object not found: %s", sha1_to_hex(sha1));
			e = insert_object(sha1);
			e->type = type;
			e->pack_id = MAX_PACK_ID;
			e->offset = 1; /* just not zero! */
		}
		insert_mark(mark, e);
	}
	fclose(f);
}


1687
static int read_next_command(void)
1688
{
1689 1690 1691 1692 1693 1694 1695
	static int stdin_eof = 0;

	if (stdin_eof) {
		unread_command_buf = 0;
		return EOF;
	}

1696
	do {
1697
		if (unread_command_buf) {
1698
			unread_command_buf = 0;
1699 1700 1701
		} else {
			struct recent_command *rc;

1702
			strbuf_detach(&command_buf, NULL);
1703 1704 1705
			stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
			if (stdin_eof)
				return EOF;
1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723

			rc = rc_free;
			if (rc)
				rc_free = rc->next;
			else {
				rc = cmd_hist.next;
				cmd_hist.next = rc->next;
				cmd_hist.next->prev = &cmd_hist;
				free(rc->buf);
			}

			rc->buf = command_buf.buf;
			rc->prev = cmd_tail;
			rc->next = cmd_hist.prev;
			rc->prev->next = rc;
			cmd_tail = rc;
		}
	} while (command_buf.buf[0] == '#');
1724 1725

	return 0;
1726 1727
}

J
Junio C Hamano 已提交
1728
static void skip_optional_lf(void)
1729 1730 1731 1732 1733 1734
{
	int term_char = fgetc(stdin);
	if (term_char != '\n' && term_char != EOF)
		ungetc(term_char, stdin);
}

1735
static void parse_mark(void)
1736
{
1737
	if (!prefixcmp(command_buf.buf, "mark :")) {
1738
		next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1739 1740 1741
		read_next_command();
	}
	else
1742
		next_mark = 0;
1743 1744
}

1745
static void parse_data(struct strbuf *sb)
1746
{
1747
	strbuf_reset(sb);
1748

1749
	if (prefixcmp(command_buf.buf, "data "))
1750 1751
		die("Expected 'data n' command, found: %s", command_buf.buf);

1752
	if (!prefixcmp(command_buf.buf + 5, "<<")) {
1753
		char *term = xstrdup(command_buf.buf + 5 + 2);
1754 1755
		size_t term_len = command_buf.len - 5 - 2;

1756
		strbuf_detach(&command_buf, NULL);
1757
		for (;;) {
1758
			if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1759 1760 1761 1762
				die("EOF in data (terminator '%s' not found)", term);
			if (term_len == command_buf.len
				&& !strcmp(term, command_buf.buf))
				break;
1763 1764
			strbuf_addbuf(sb, &command_buf);
			strbuf_addch(sb, '\n');
1765 1766 1767 1768
		}
		free(term);
	}
	else {
1769 1770
		size_t n = 0, length;

1771
		length = strtoul(command_buf.buf + 5, NULL, 10);
1772

1773
		while (n < length) {
1774
			size_t s = strbuf_fread(sb, length - n, stdin);
1775
			if (!s && feof(stdin))
1776 1777
				die("EOF in data (%lu bytes remaining)",
					(unsigned long)(length - n));
1778 1779
			n += s;
		}
1780 1781
	}

1782
	skip_optional_lf();
1783 1784
}

1785 1786 1787
static int validate_raw_date(const char *src, char *result, int maxlen)
{
	const char *orig_src = src;
1788
	char *endp;
1789
	unsigned long num;
1790

1791 1792
	errno = 0;

1793 1794
	num = strtoul(src, &endp, 10);
	/* NEEDSWORK: perhaps check for reasonable values? */
1795
	if (errno || endp == src || *endp != ' ')
1796 1797 1798 1799 1800 1801
		return -1;

	src = endp + 1;
	if (*src != '-' && *src != '+')
		return -1;

1802 1803 1804
	num = strtoul(src + 1, &endp, 10);
	if (errno || endp == src + 1 || *endp || (endp - orig_src) >= maxlen ||
	    1400 < num)
1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846
		return -1;

	strcpy(result, orig_src);
	return 0;
}

static char *parse_ident(const char *buf)
{
	const char *gt;
	size_t name_len;
	char *ident;

	gt = strrchr(buf, '>');
	if (!gt)
		die("Missing > in ident string: %s", buf);
	gt++;
	if (*gt != ' ')
		die("Missing space after > in ident string: %s", buf);
	gt++;
	name_len = gt - buf;
	ident = xmalloc(name_len + 24);
	strncpy(ident, buf, name_len);

	switch (whenspec) {
	case WHENSPEC_RAW:
		if (validate_raw_date(gt, ident + name_len, 24) < 0)
			die("Invalid raw date \"%s\" in ident: %s", gt, buf);
		break;
	case WHENSPEC_RFC2822:
		if (parse_date(gt, ident + name_len, 24) < 0)
			die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf);
		break;
	case WHENSPEC_NOW:
		if (strcmp("now", gt))
			die("Date in ident must be 'now': %s", buf);
		datestamp(ident + name_len, 24);
		break;
	}

	return ident;
}

1847
static void parse_new_blob(void)
1848
{
P
Pierre Habouzit 已提交
1849
	static struct strbuf buf = STRBUF_INIT;
1850 1851

	read_next_command();
1852 1853
	parse_mark();
	parse_data(&buf);
P
Pierre Habouzit 已提交
1854
	store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1855 1856
}

1857
static void unload_one_branch(void)
1858
{
1859 1860
	while (cur_active_branches
		&& cur_active_branches >= max_active_branches) {
1861
		uintmax_t min_commit = ULONG_MAX;
1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878
		struct branch *e, *l = NULL, *p = NULL;

		for (e = active_branches; e; e = e->active_next_branch) {
			if (e->last_commit < min_commit) {
				p = l;
				min_commit = e->last_commit;
			}
			l = e;
		}

		if (p) {
			e = p->active_next_branch;
			p->active_next_branch = e->active_next_branch;
		} else {
			e = active_branches;
			active_branches = e->active_next_branch;
		}
1879
		e->active = 0;
1880 1881
		e->active_next_branch = NULL;
		if (e->branch_tree.tree) {
1882
			release_tree_content_recursive(e->branch_tree.tree);
1883 1884 1885
			e->branch_tree.tree = NULL;
		}
		cur_active_branches--;
1886 1887 1888
	}
}

1889
static void load_branch(struct branch *b)
1890
{
1891
	load_tree(&b->branch_tree);
1892 1893 1894 1895 1896 1897 1898
	if (!b->active) {
		b->active = 1;
		b->active_next_branch = active_branches;
		active_branches = b;
		cur_active_branches++;
		branch_load_count++;
	}
1899 1900
}

1901
static void file_change_m(struct branch *b)
1902
{
1903
	const char *p = command_buf.buf + 2;
1904
	static struct strbuf uq = STRBUF_INIT;
1905
	const char *endp;
1906
	struct object_entry *oe = oe;
1907
	unsigned char sha1[20];
1908
	uint16_t mode, inline_data = 0;
1909

1910 1911 1912 1913
	p = get_mode(p, &mode);
	if (!p)
		die("Corrupt mode: %s", command_buf.buf);
	switch (mode) {
1914 1915 1916
	case 0644:
	case 0755:
		mode |= S_IFREG;
1917 1918
	case S_IFREG | 0644:
	case S_IFREG | 0755:
1919
	case S_IFLNK:
1920
	case S_IFGITLINK:
1921 1922 1923 1924 1925 1926
		/* ok */
		break;
	default:
		die("Corrupt mode: %s", command_buf.buf);
	}

1927 1928
	if (*p == ':') {
		char *x;
1929
		oe = find_mark(strtoumax(p + 1, &x, 10));
1930
		hashcpy(sha1, oe->sha1);
1931
		p = x;
1932
	} else if (!prefixcmp(p, "inline")) {
1933 1934
		inline_data = 1;
		p += 6;
1935 1936 1937 1938 1939 1940
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
1941 1942 1943
	if (*p++ != ' ')
		die("Missing space after SHA1: %s", command_buf.buf);

1944 1945
	strbuf_reset(&uq);
	if (!unquote_c_style(&uq, p, &endp)) {
1946 1947
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
1948
		p = uq.buf;
1949
	}
1950

1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964
	if (S_ISGITLINK(mode)) {
		if (inline_data)
			die("Git links cannot be specified 'inline': %s",
				command_buf.buf);
		else if (oe) {
			if (oe->type != OBJ_COMMIT)
				die("Not a commit (actually a %s): %s",
					typename(oe->type), command_buf.buf);
		}
		/*
		 * Accept the sha1 without checking; it expected to be in
		 * another repository.
		 */
	} else if (inline_data) {
P
Pierre Habouzit 已提交
1965
		static struct strbuf buf = STRBUF_INIT;
1966

1967 1968 1969 1970
		if (p != uq.buf) {
			strbuf_addstr(&uq, p);
			p = uq.buf;
		}
1971
		read_next_command();
1972
		parse_data(&buf);
P
Pierre Habouzit 已提交
1973
		store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1974
	} else if (oe) {
1975
		if (oe->type != OBJ_BLOB)
1976
			die("Not a blob (actually a %s): %s",
1977
				typename(oe->type), command_buf.buf);
1978
	} else {
1979 1980
		enum object_type type = sha1_object_info(sha1, NULL);
		if (type < 0)
1981
			die("Blob not found: %s", command_buf.buf);
1982
		if (type != OBJ_BLOB)
1983
			die("Not a blob (actually a %s): %s",
1984
			    typename(type), command_buf.buf);
1985
	}
1986

1987
	tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
1988
}
1989

1990 1991
static void file_change_d(struct branch *b)
{
1992
	const char *p = command_buf.buf + 2;
1993
	static struct strbuf uq = STRBUF_INIT;
1994 1995
	const char *endp;

1996 1997
	strbuf_reset(&uq);
	if (!unquote_c_style(&uq, p, &endp)) {
1998 1999
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
2000
		p = uq.buf;
2001
	}
2002
	tree_content_remove(&b->branch_tree, p, NULL);
2003 2004
}

2005
static void file_change_cr(struct branch *b, int rename)
2006 2007
{
	const char *s, *d;
2008 2009
	static struct strbuf s_uq = STRBUF_INIT;
	static struct strbuf d_uq = STRBUF_INIT;
2010 2011 2012 2013
	const char *endp;
	struct tree_entry leaf;

	s = command_buf.buf + 2;
2014 2015
	strbuf_reset(&s_uq);
	if (!unquote_c_style(&s_uq, s, &endp)) {
2016 2017
		if (*endp != ' ')
			die("Missing space after source: %s", command_buf.buf);
2018
	} else {
2019 2020 2021
		endp = strchr(s, ' ');
		if (!endp)
			die("Missing space after source: %s", command_buf.buf);
2022
		strbuf_add(&s_uq, s, endp - s);
2023
	}
2024
	s = s_uq.buf;
2025 2026 2027 2028 2029 2030

	endp++;
	if (!*endp)
		die("Missing dest: %s", command_buf.buf);

	d = endp;
2031 2032
	strbuf_reset(&d_uq);
	if (!unquote_c_style(&d_uq, d, &endp)) {
2033 2034
		if (*endp)
			die("Garbage after dest in: %s", command_buf.buf);
2035
		d = d_uq.buf;
2036 2037 2038
	}

	memset(&leaf, 0, sizeof(leaf));
2039 2040 2041 2042
	if (rename)
		tree_content_remove(&b->branch_tree, s, &leaf);
	else
		tree_content_get(&b->branch_tree, s, &leaf);
2043 2044 2045 2046 2047 2048 2049 2050
	if (!leaf.versions[1].mode)
		die("Path %s not in branch", s);
	tree_content_set(&b->branch_tree, d,
		leaf.versions[1].sha1,
		leaf.versions[1].mode,
		leaf.tree);
}

2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124
static void note_change_n(struct branch *b)
{
	const char *p = command_buf.buf + 2;
	static struct strbuf uq = STRBUF_INIT;
	struct object_entry *oe = oe;
	struct branch *s;
	unsigned char sha1[20], commit_sha1[20];
	uint16_t inline_data = 0;

	/* <dataref> or 'inline' */
	if (*p == ':') {
		char *x;
		oe = find_mark(strtoumax(p + 1, &x, 10));
		hashcpy(sha1, oe->sha1);
		p = x;
	} else if (!prefixcmp(p, "inline")) {
		inline_data = 1;
		p += 6;
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
	if (*p++ != ' ')
		die("Missing space after SHA1: %s", command_buf.buf);

	/* <committish> */
	s = lookup_branch(p);
	if (s) {
		hashcpy(commit_sha1, s->sha1);
	} else if (*p == ':') {
		uintmax_t commit_mark = strtoumax(p + 1, NULL, 10);
		struct object_entry *commit_oe = find_mark(commit_mark);
		if (commit_oe->type != OBJ_COMMIT)
			die("Mark :%" PRIuMAX " not a commit", commit_mark);
		hashcpy(commit_sha1, commit_oe->sha1);
	} else if (!get_sha1(p, commit_sha1)) {
		unsigned long size;
		char *buf = read_object_with_reference(commit_sha1,
			commit_type, &size, commit_sha1);
		if (!buf || size < 46)
			die("Not a valid commit: %s", p);
		free(buf);
	} else
		die("Invalid ref name or SHA1 expression: %s", p);

	if (inline_data) {
		static struct strbuf buf = STRBUF_INIT;

		if (p != uq.buf) {
			strbuf_addstr(&uq, p);
			p = uq.buf;
		}
		read_next_command();
		parse_data(&buf);
		store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
	} else if (oe) {
		if (oe->type != OBJ_BLOB)
			die("Not a blob (actually a %s): %s",
				typename(oe->type), command_buf.buf);
	} else {
		enum object_type type = sha1_object_info(sha1, NULL);
		if (type < 0)
			die("Blob not found: %s", command_buf.buf);
		if (type != OBJ_BLOB)
			die("Not a blob (actually a %s): %s",
			    typename(type), command_buf.buf);
	}

	tree_content_set(&b->branch_tree, sha1_to_hex(commit_sha1), sha1,
		S_IFREG | 0644, NULL);
}

2125 2126 2127 2128 2129 2130 2131 2132
static void file_change_deleteall(struct branch *b)
{
	release_tree_content_recursive(b->branch_tree.tree);
	hashclr(b->branch_tree.versions[0].sha1);
	hashclr(b->branch_tree.versions[1].sha1);
	load_tree(&b->branch_tree);
}

2133
static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2134 2135 2136 2137 2138 2139 2140 2141 2142 2143
{
	if (!buf || size < 46)
		die("Not a valid commit: %s", sha1_to_hex(b->sha1));
	if (memcmp("tree ", buf, 5)
		|| get_sha1_hex(buf + 5, b->branch_tree.versions[1].sha1))
		die("The commit %s is corrupt", sha1_to_hex(b->sha1));
	hashcpy(b->branch_tree.versions[0].sha1,
		b->branch_tree.versions[1].sha1);
}

2144
static void parse_from_existing(struct branch *b)
2145 2146 2147 2148 2149 2150 2151 2152 2153 2154
{
	if (is_null_sha1(b->sha1)) {
		hashclr(b->branch_tree.versions[0].sha1);
		hashclr(b->branch_tree.versions[1].sha1);
	} else {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(b->sha1,
			commit_type, &size, b->sha1);
2155
		parse_from_commit(b, buf, size);
2156 2157 2158 2159
		free(buf);
	}
}

2160
static int parse_from(struct branch *b)
2161
{
2162
	const char *from;
2163 2164
	struct branch *s;

2165
	if (prefixcmp(command_buf.buf, "from "))
2166
		return 0;
2167

2168 2169 2170 2171
	if (b->branch_tree.tree) {
		release_tree_content_recursive(b->branch_tree.tree);
		b->branch_tree.tree = NULL;
	}
2172 2173 2174 2175 2176 2177

	from = strchr(command_buf.buf, ' ') + 1;
	s = lookup_branch(from);
	if (b == s)
		die("Can't create a branch from itself: %s", b->name);
	else if (s) {
2178
		unsigned char *t = s->branch_tree.versions[1].sha1;
2179
		hashcpy(b->sha1, s->sha1);
2180 2181
		hashcpy(b->branch_tree.versions[0].sha1, t);
		hashcpy(b->branch_tree.versions[1].sha1, t);
2182
	} else if (*from == ':') {
2183
		uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2184 2185
		struct object_entry *oe = find_mark(idnum);
		if (oe->type != OBJ_COMMIT)
2186
			die("Mark :%" PRIuMAX " not a commit", idnum);
2187
		hashcpy(b->sha1, oe->sha1);
2188
		if (oe->pack_id != MAX_PACK_ID) {
2189
			unsigned long size;
2190
			char *buf = gfi_unpack_entry(oe, &size);
2191
			parse_from_commit(b, buf, size);
2192
			free(buf);
2193
		} else
2194
			parse_from_existing(b);
2195
	} else if (!get_sha1(from, b->sha1))
2196
		parse_from_existing(b);
2197
	else
2198 2199 2200
		die("Invalid ref name or SHA1 expression: %s", from);

	read_next_command();
2201
	return 1;
2202 2203
}

2204
static struct hash_list *parse_merge(unsigned int *count)
2205
{
2206
	struct hash_list *list = NULL, *n, *e = e;
2207
	const char *from;
2208 2209 2210
	struct branch *s;

	*count = 0;
2211
	while (!prefixcmp(command_buf.buf, "merge ")) {
2212 2213 2214 2215 2216 2217
		from = strchr(command_buf.buf, ' ') + 1;
		n = xmalloc(sizeof(*n));
		s = lookup_branch(from);
		if (s)
			hashcpy(n->sha1, s->sha1);
		else if (*from == ':') {
2218
			uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2219 2220
			struct object_entry *oe = find_mark(idnum);
			if (oe->type != OBJ_COMMIT)
2221
				die("Mark :%" PRIuMAX " not a commit", idnum);
2222
			hashcpy(n->sha1, oe->sha1);
2223 2224 2225
		} else if (!get_sha1(from, n->sha1)) {
			unsigned long size;
			char *buf = read_object_with_reference(n->sha1,
S
Shawn O. Pearce 已提交
2226
				commit_type, &size, n->sha1);
2227 2228 2229 2230
			if (!buf || size < 46)
				die("Not a valid commit: %s", from);
			free(buf);
		} else
2231 2232 2233 2234 2235 2236 2237 2238
			die("Invalid ref name or SHA1 expression: %s", from);

		n->next = NULL;
		if (list)
			e->next = n;
		else
			list = n;
		e = n;
2239
		(*count)++;
2240 2241 2242 2243 2244
		read_next_command();
	}
	return list;
}

2245
static void parse_new_commit(void)
2246
{
2247
	static struct strbuf msg = STRBUF_INIT;
2248 2249 2250 2251
	struct branch *b;
	char *sp;
	char *author = NULL;
	char *committer = NULL;
2252 2253
	struct hash_list *merge_list = NULL;
	unsigned int merge_count;
2254 2255 2256 2257

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	b = lookup_branch(sp);
2258
	if (!b)
2259
		b = new_branch(sp);
2260 2261

	read_next_command();
2262
	parse_mark();
2263
	if (!prefixcmp(command_buf.buf, "author ")) {
2264
		author = parse_ident(command_buf.buf + 7);
2265 2266
		read_next_command();
	}
2267
	if (!prefixcmp(command_buf.buf, "committer ")) {
2268
		committer = parse_ident(command_buf.buf + 10);
2269 2270 2271 2272
		read_next_command();
	}
	if (!committer)
		die("Expected committer but didn't get one");
2273
	parse_data(&msg);
2274
	read_next_command();
2275 2276
	parse_from(b);
	merge_list = parse_merge(&merge_count);
2277 2278

	/* ensure the branch is active/loaded */
2279
	if (!b->branch_tree.tree || !max_active_branches) {
2280 2281 2282
		unload_one_branch();
		load_branch(b);
	}
2283

2284
	/* file_change* */
2285
	while (command_buf.len > 0) {
2286
		if (!prefixcmp(command_buf.buf, "M "))
2287
			file_change_m(b);
2288
		else if (!prefixcmp(command_buf.buf, "D "))
2289
			file_change_d(b);
2290
		else if (!prefixcmp(command_buf.buf, "R "))
2291 2292 2293
			file_change_cr(b, 1);
		else if (!prefixcmp(command_buf.buf, "C "))
			file_change_cr(b, 0);
2294 2295
		else if (!prefixcmp(command_buf.buf, "N "))
			note_change_n(b);
2296 2297
		else if (!strcmp("deleteall", command_buf.buf))
			file_change_deleteall(b);
2298 2299 2300 2301
		else {
			unread_command_buf = 1;
			break;
		}
2302 2303
		if (read_next_command() == EOF)
			break;
2304 2305
	}

2306
	/* build the tree and the commit */
2307
	store_tree(&b->branch_tree);
2308 2309
	hashcpy(b->branch_tree.versions[0].sha1,
		b->branch_tree.versions[1].sha1);
2310 2311 2312

	strbuf_reset(&new_data);
	strbuf_addf(&new_data, "tree %s\n",
2313
		sha1_to_hex(b->branch_tree.versions[1].sha1));
2314
	if (!is_null_sha1(b->sha1))
2315
		strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2316 2317
	while (merge_list) {
		struct hash_list *next = merge_list->next;
2318
		strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2319 2320 2321
		free(merge_list);
		merge_list = next;
	}
2322 2323 2324 2325 2326 2327
	strbuf_addf(&new_data,
		"author %s\n"
		"committer %s\n"
		"\n",
		author ? author : committer, committer);
	strbuf_addbuf(&new_data, &msg);
2328
	free(author);
2329 2330
	free(committer);

2331
	if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2332
		b->pack_id = pack_id;
2333
	b->last_commit = object_count_by_type[OBJ_COMMIT];
2334 2335
}

2336
static void parse_new_tag(void)
2337
{
2338
	static struct strbuf msg = STRBUF_INIT;
2339 2340 2341 2342 2343
	char *sp;
	const char *from;
	char *tagger;
	struct branch *s;
	struct tag *t;
2344
	uintmax_t from_mark = 0;
2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359
	unsigned char sha1[20];

	/* Obtain the new tag name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	t = pool_alloc(sizeof(struct tag));
	t->next_tag = NULL;
	t->name = pool_strdup(sp);
	if (last_tag)
		last_tag->next_tag = t;
	else
		first_tag = t;
	last_tag = t;
	read_next_command();

	/* from ... */
2360
	if (prefixcmp(command_buf.buf, "from "))
2361 2362 2363 2364
		die("Expected from command, got %s", command_buf.buf);
	from = strchr(command_buf.buf, ' ') + 1;
	s = lookup_branch(from);
	if (s) {
2365
		hashcpy(sha1, s->sha1);
2366
	} else if (*from == ':') {
2367
		struct object_entry *oe;
2368
		from_mark = strtoumax(from + 1, NULL, 10);
2369
		oe = find_mark(from_mark);
2370
		if (oe->type != OBJ_COMMIT)
2371
			die("Mark :%" PRIuMAX " not a commit", from_mark);
2372
		hashcpy(sha1, oe->sha1);
2373 2374 2375 2376 2377
	} else if (!get_sha1(from, sha1)) {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(sha1,
2378
			commit_type, &size, sha1);
2379 2380 2381 2382 2383 2384 2385 2386
		if (!buf || size < 46)
			die("Not a valid commit: %s", from);
		free(buf);
	} else
		die("Invalid ref name or SHA1 expression: %s", from);
	read_next_command();

	/* tagger ... */
2387 2388 2389 2390 2391
	if (!prefixcmp(command_buf.buf, "tagger ")) {
		tagger = parse_ident(command_buf.buf + 7);
		read_next_command();
	} else
		tagger = NULL;
2392 2393

	/* tag payload/message */
2394
	parse_data(&msg);
2395 2396

	/* build the tag object */
2397
	strbuf_reset(&new_data);
2398

2399
	strbuf_addf(&new_data,
2400 2401 2402 2403 2404 2405 2406 2407
		    "object %s\n"
		    "type %s\n"
		    "tag %s\n",
		    sha1_to_hex(sha1), commit_type, t->name);
	if (tagger)
		strbuf_addf(&new_data,
			    "tagger %s\n", tagger);
	strbuf_addch(&new_data, '\n');
2408
	strbuf_addbuf(&new_data, &msg);
2409 2410
	free(tagger);

2411
	if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2412 2413 2414
		t->pack_id = MAX_PACK_ID;
	else
		t->pack_id = pack_id;
2415 2416
}

2417
static void parse_reset_branch(void)
2418 2419 2420 2421 2422 2423 2424 2425
{
	struct branch *b;
	char *sp;

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	b = lookup_branch(sp);
	if (b) {
2426 2427 2428
		hashclr(b->sha1);
		hashclr(b->branch_tree.versions[0].sha1);
		hashclr(b->branch_tree.versions[1].sha1);
2429 2430 2431 2432 2433
		if (b->branch_tree.tree) {
			release_tree_content_recursive(b->branch_tree.tree);
			b->branch_tree.tree = NULL;
		}
	}
2434 2435 2436
	else
		b = new_branch(sp);
	read_next_command();
2437
	parse_from(b);
2438
	if (command_buf.len > 0)
2439
		unread_command_buf = 1;
2440 2441
}

2442
static void parse_checkpoint(void)
2443
{
2444 2445 2446 2447 2448 2449
	if (object_count) {
		cycle_packfile();
		dump_branches();
		dump_tags();
		dump_marks();
	}
2450
	skip_optional_lf();
2451 2452
}

2453
static void parse_progress(void)
2454
{
2455
	fwrite(command_buf.buf, 1, command_buf.len, stdout);
2456 2457 2458 2459 2460
	fputc('\n', stdout);
	fflush(stdout);
	skip_optional_lf();
}

2461
static void option_import_marks(const char *marks)
2462
{
2463
	import_marks_file = xstrdup(marks);
2464 2465
}

2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496
static void option_date_format(const char *fmt)
{
	if (!strcmp(fmt, "raw"))
		whenspec = WHENSPEC_RAW;
	else if (!strcmp(fmt, "rfc2822"))
		whenspec = WHENSPEC_RFC2822;
	else if (!strcmp(fmt, "now"))
		whenspec = WHENSPEC_NOW;
	else
		die("unknown --date-format argument %s", fmt);
}

static void option_max_pack_size(const char *packsize)
{
	max_packsize = strtoumax(packsize, NULL, 0) * 1024 * 1024;
}

static void option_depth(const char *depth)
{
	max_depth = strtoul(depth, NULL, 0);
	if (max_depth > MAX_DEPTH)
		die("--depth cannot exceed %u", MAX_DEPTH);
}

static void option_active_branches(const char *branches)
{
	max_active_branches = strtoul(branches, NULL, 0);
}

static void option_export_marks(const char *marks)
{
2497
	export_marks_file = xstrdup(marks);
2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535
}

static void option_export_pack_edges(const char *edges)
{
	if (pack_edges)
		fclose(pack_edges);
	pack_edges = fopen(edges, "a");
	if (!pack_edges)
		die_errno("Cannot open '%s'", edges);
}

static void parse_one_option(const char *option)
{
	if (!prefixcmp(option, "date-format=")) {
		option_date_format(option + 12);
	} else if (!prefixcmp(option, "max-pack-size=")) {
		option_max_pack_size(option + 14);
	} else if (!prefixcmp(option, "depth=")) {
		option_depth(option + 6);
	} else if (!prefixcmp(option, "active-branches=")) {
		option_active_branches(option + 16);
	} else if (!prefixcmp(option, "import-marks=")) {
		option_import_marks(option + 13);
	} else if (!prefixcmp(option, "export-marks=")) {
		option_export_marks(option + 13);
	} else if (!prefixcmp(option, "export-pack-edges=")) {
		option_export_pack_edges(option + 18);
	} else if (!prefixcmp(option, "force")) {
		force_update = 1;
	} else if (!prefixcmp(option, "quiet")) {
		show_stats = 0;
	} else if (!prefixcmp(option, "stats")) {
		show_stats = 1;
	} else {
		die("Unsupported option: %s", option);
	}
}

2536
static int git_pack_config(const char *k, const char *v, void *cb)
2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553
{
	if (!strcmp(k, "pack.depth")) {
		max_depth = git_config_int(k, v);
		if (max_depth > MAX_DEPTH)
			max_depth = MAX_DEPTH;
		return 0;
	}
	if (!strcmp(k, "pack.compression")) {
		int level = git_config_int(k, v);
		if (level == -1)
			level = Z_DEFAULT_COMPRESSION;
		else if (level < 0 || level > Z_BEST_COMPRESSION)
			die("bad pack compression level %d", level);
		pack_compression_level = level;
		pack_compression_seen = 1;
		return 0;
	}
2554
	return git_default_config(k, v, cb);
2555 2556
}

2557
static const char fast_import_usage[] =
S
Stephan Beyer 已提交
2558
"git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2559

2560 2561
int main(int argc, const char **argv)
{
2562
	unsigned int i;
2563

2564 2565
	git_extract_argv0_path(argv[0]);

2566 2567 2568
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage(fast_import_usage);

2569
	setup_git_directory();
2570
	git_config(git_pack_config, NULL);
2571 2572 2573
	if (!pack_compression_seen && core_compression_seen)
		pack_compression_level = core_compression_level;

2574
	alloc_objects(object_entry_alloc);
2575
	strbuf_init(&command_buf, 0);
2576 2577 2578 2579
	atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
	branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
	avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
	marks = pool_calloc(1, sizeof(struct mark_set));
2580

2581 2582 2583 2584 2585
	for (i = 1; i < argc; i++) {
		const char *a = argv[i];

		if (*a != '-' || !strcmp(a, "--"))
			break;
2586 2587

		parse_one_option(a + 2);
2588
	}
2589
	if (i != argc)
2590
		usage(fast_import_usage);
2591 2592
	if (import_marks_file)
		read_marks();
2593

2594 2595 2596 2597 2598
	rc_free = pool_alloc(cmd_save * sizeof(*rc_free));
	for (i = 0; i < (cmd_save - 1); i++)
		rc_free[i].next = &rc_free[i + 1];
	rc_free[cmd_save - 1].next = NULL;

2599
	prepare_packed_git();
2600
	start_packfile();
2601
	set_die_routine(die_nicely);
2602 2603
	while (read_next_command() != EOF) {
		if (!strcmp("blob", command_buf.buf))
2604
			parse_new_blob();
2605
		else if (!prefixcmp(command_buf.buf, "commit "))
2606
			parse_new_commit();
2607
		else if (!prefixcmp(command_buf.buf, "tag "))
2608
			parse_new_tag();
2609
		else if (!prefixcmp(command_buf.buf, "reset "))
2610
			parse_reset_branch();
2611
		else if (!strcmp("checkpoint", command_buf.buf))
2612
			parse_checkpoint();
2613
		else if (!prefixcmp(command_buf.buf, "progress "))
2614
			parse_progress();
2615 2616
		else
			die("Unsupported command: %s", command_buf.buf);
2617
	}
2618
	end_packfile();
2619

2620
	dump_branches();
2621
	dump_tags();
2622
	unkeep_all_packs();
2623
	dump_marks();
2624

2625 2626 2627
	if (pack_edges)
		fclose(pack_edges);

2628 2629 2630 2631 2632 2633 2634 2635 2636
	if (show_stats) {
		uintmax_t total_count = 0, duplicate_count = 0;
		for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
			total_count += object_count_by_type[i];
		for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
			duplicate_count += duplicate_count_by_type[i];

		fprintf(stderr, "%s statistics:\n", argv[0]);
		fprintf(stderr, "---------------------------------------------------------------------\n");
2637 2638 2639 2640 2641 2642
		fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
		fprintf(stderr, "Total objects:   %10" PRIuMAX " (%10" PRIuMAX " duplicates                  )\n", total_count, duplicate_count);
		fprintf(stderr, "      blobs  :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB]);
		fprintf(stderr, "      trees  :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE]);
		fprintf(stderr, "      commits:   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT]);
		fprintf(stderr, "      tags   :   %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG]);
2643
		fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
2644
		fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2645
		fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
2646
		fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2647
		fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
2648
		fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2649 2650 2651 2652 2653
		fprintf(stderr, "---------------------------------------------------------------------\n");
		pack_report();
		fprintf(stderr, "---------------------------------------------------------------------\n");
		fprintf(stderr, "\n");
	}
2654

2655
	return failure ? 1 : 0;
2656
}