fast-import.c 57.6 KB
Newer Older
1 2 3 4 5 6
/*
Format of STDIN stream:

  stream ::= cmd*;

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

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

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

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

  new_tag ::= 'tag' sp tag_str lf
    'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
46
    'tagger' sp name '<' email '>' when lf
47 48 49
    tag_msg;
  tag_msg ::= data;

50 51
  reset_branch ::= 'reset' sp ref_str lf
    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
52
    lf?;
53

54
  checkpoint ::= 'checkpoint' lf
55
    lf?;
56

57 58 59
  progress ::= 'progress' sp not_lf* lf
    lf?;

60 61 62
     # 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
63
     # idnum can be updated in the future to a new object by issuing
64
     # a new mark directive with the old idnum.
65
     #
66
  mark ::= 'mark' sp idnum lf;
67
  data ::= (delimited_data | exact_data)
68
    lf?;
69 70 71 72 73 74

    # 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)*
75
    delim lf;
76 77

     # note: declen indicates the length of binary_data in bytes.
78
     # declen does not include the lf preceeding the binary data.
79
     #
80 81
  exact_data ::= 'data' sp declen lf
    binary_data;
82 83 84

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

  declen ::= # unsigned 32 bit value, ascii base10 notation;
100
  bigint ::= # unsigned integer value, ascii base10 notation;
101
  binary_data ::= # file content, not interpreted;
102

103 104 105 106
  when         ::= raw_when | rfc2822_when;
  raw_when     ::= ts sp tz;
  rfc2822_when ::= # Valid RFC 2822 date and time;

107 108
  sp ::= # ASCII space character;
  lf ::= # ASCII newline (LF) character;
109 110

     # note: a colon (':') must precede the numerical value assigned to
111
     # an idnum.  This is to distinguish it from a ref or tag name as
112
     # GIT does not permit ':' in ref or tag strings.
113
     #
114
  idnum   ::= ':' bigint;
115 116 117
  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";
118 119
  sha1exp ::= # Any valid GIT SHA1 expression;
  hexsha1 ::= # SHA1 in hexadecimal format;
120 121

     # note: name and email are UTF8 strings, however name must not
122
     # contain '<' or lf and email must not contain any of the
123
     # following: '<', '>', lf.
124
     #
125
  name  ::= # valid GIT author/committer name;
126
  email ::= # valid GIT author/committer email;
127 128
  ts    ::= # time since the epoch in seconds, ascii base10 notation;
  tz    ::= # GIT style timezone;
129 130 131 132 133 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
     # must be the first character on that the line (an lf have
     # preceeded it).
     #
  comment ::= '#' not_lf* lf;
  not_lf  ::= # Any byte that is not ASCII newline (LF);
140 141
*/

142 143 144 145
#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "blob.h"
146
#include "tree.h"
147
#include "commit.h"
148 149
#include "delta.h"
#include "pack.h"
150
#include "refs.h"
151
#include "csum-file.h"
152 153
#include "strbuf.h"
#include "quote.h"
154

155 156 157
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)

158 159 160
struct object_entry
{
	struct object_entry *next;
161
	uint32_t offset;
162
	unsigned type : TYPE_BITS;
163
	unsigned pack_id : PACK_ID_BITS;
164 165 166
	unsigned char sha1[20];
};

167
struct object_entry_pool
168
{
169
	struct object_entry_pool *next_pool;
170 171
	struct object_entry *next_free;
	struct object_entry *end;
172
	struct object_entry entries[FLEX_ARRAY]; /* more */
173 174
};

175 176 177 178 179 180
struct mark_set
{
	union {
		struct object_entry *marked[1024];
		struct mark_set *sets[1024];
	} data;
181
	unsigned int shift;
182 183
};

184 185 186
struct last_object
{
	void *data;
187
	unsigned long len;
188
	uint32_t offset;
189
	unsigned int depth;
190
	unsigned no_free:1;
191 192
};

193 194 195 196 197 198 199 200 201 202 203
struct mem_pool
{
	struct mem_pool *next_pool;
	char *next_free;
	char *end;
	char space[FLEX_ARRAY]; /* more */
};

struct atom_str
{
	struct atom_str *next_atom;
204
	unsigned short str_len;
205 206 207 208
	char str_dat[FLEX_ARRAY]; /* more */
};

struct tree_content;
209 210
struct tree_entry
{
211 212
	struct tree_content *tree;
	struct atom_str* name;
213 214
	struct tree_entry_ms
	{
215
		uint16_t mode;
216 217
		unsigned char sha1[20];
	} versions[2];
218 219
};

220
struct tree_content
221
{
222 223
	unsigned int entry_capacity; /* must match avail_tree_content */
	unsigned int entry_count;
224
	unsigned int delta_depth;
225 226 227 228 229 230 231
	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;
232 233 234 235
};

struct branch
{
236 237
	struct branch *table_next_branch;
	struct branch *active_next_branch;
238
	const char *name;
239
	struct tree_entry branch_tree;
240
	uintmax_t last_commit;
241 242
	unsigned active : 1;
	unsigned pack_id : PACK_ID_BITS;
243
	unsigned char sha1[20];
244 245
};

246 247 248 249
struct tag
{
	struct tag *next_tag;
	const char *name;
250
	unsigned int pack_id;
251 252 253
	unsigned char sha1[20];
};

254 255 256 257 258 259
struct dbuf
{
	void *buffer;
	size_t capacity;
};

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

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

272
/* Configured limits on output */
273
static unsigned long max_depth = 10;
274
static off_t max_packsize = (1LL << 32) - 1;
275
static int force_update;
276 277 278 279 280 281 282

/* 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];
283
static unsigned long object_count;
284
static unsigned long branch_count;
285
static unsigned long branch_load_count;
286
static int failure;
287
static FILE *pack_edges;
288

289 290 291 292 293
/* 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;

294
/* Atom management */
295 296 297 298 299
static unsigned int atom_table_sz = 4451;
static unsigned int atom_cnt;
static struct atom_str **atom_table;

/* The .pack file being generated */
300
static unsigned int pack_id;
301
static struct packed_git *pack_data;
302
static struct packed_git **all_packs;
303
static unsigned long pack_size;
304 305

/* Table of objects we've written. */
306
static unsigned int object_entry_alloc = 5000;
307 308
static struct object_entry_pool *blocks;
static struct object_entry *object_table[1 << 16];
309
static struct mark_set *marks;
310
static const char* mark_file;
311 312

/* Our last blob */
313 314 315 316 317 318 319
static struct last_object last_blob;

/* 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;
320 321
static struct dbuf old_tree;
static struct dbuf new_tree;
322

323
/* Branch data */
324 325 326
static unsigned long max_active_branches = 5;
static unsigned long cur_active_branches;
static unsigned long branch_table_sz = 1039;
327 328 329
static struct branch **branch_table;
static struct branch *active_branches;

330 331 332 333
/* Tag data */
static struct tag *first_tag;
static struct tag *last_tag;

334
/* Input stream parsing */
335
static whenspec_type whenspec = WHENSPEC_RAW;
336
static struct strbuf command_buf;
337
static int unread_command_buf;
338
static uintmax_t next_mark;
339
static struct dbuf new_data;
340

341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 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 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432
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);
}

static void write_crash_report(const char *err, va_list params)
{
	char *loc = git_path("fast_import_crash_%d", getpid());
	FILE *rpt = fopen(loc, "w");
	struct branch *b;
	unsigned long lu;

	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");
	fprintf(rpt, "    fast-import process: %d\n", getpid());
	fprintf(rpt, "    parent process     : %d\n", getppid());
	fprintf(rpt, "    at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
	fputc('\n', rpt);

	fputs("fatal: ", rpt);
	vfprintf(rpt, err, params);
	fputc('\n', rpt);

	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);
	}

	fputc('\n', rpt);
	fputs("-------------------\n", rpt);
	fputs("END OF CRASH REPORT\n", rpt);
	fclose(rpt);
}

static NORETURN void die_nicely(const char *err, va_list params)
{
	static int zombie;

	fputs("fatal: ", stderr);
	vfprintf(stderr, err, params);
	fputc('\n', stderr);

	if (!zombie) {
		zombie = 1;
		write_crash_report(err, params);
	}

	exit(128);
}
433

434
static void alloc_objects(unsigned int cnt)
435
{
436
	struct object_entry_pool *b;
437

438
	b = xmalloc(sizeof(struct object_entry_pool)
439
		+ cnt * sizeof(struct object_entry));
440
	b->next_pool = blocks;
441 442 443 444 445
	b->next_free = b->entries;
	b->end = b->entries + cnt;
	blocks = b;
	alloc_count += cnt;
}
446

447
static struct object_entry *new_object(unsigned char *sha1)
448
{
449
	struct object_entry *e;
450

451
	if (blocks->next_free == blocks->end)
452
		alloc_objects(object_entry_alloc);
453

454
	e = blocks->next_free++;
455
	hashcpy(e->sha1, sha1);
456
	return e;
457 458
}

459
static struct object_entry *find_object(unsigned char *sha1)
460 461 462 463
{
	unsigned int h = sha1[0] << 8 | sha1[1];
	struct object_entry *e;
	for (e = object_table[h]; e; e = e->next)
464
		if (!hashcmp(sha1, e->sha1))
465 466 467 468
			return e;
	return NULL;
}

469
static struct object_entry *insert_object(unsigned char *sha1)
470 471
{
	unsigned int h = sha1[0] << 8 | sha1[1];
472
	struct object_entry *e = object_table[h];
473
	struct object_entry *p = NULL;
474 475

	while (e) {
476
		if (!hashcmp(sha1, e->sha1))
477 478 479 480 481 482
			return e;
		p = e;
		e = e->next;
	}

	e = new_object(sha1);
483
	e->next = NULL;
484 485 486 487
	e->offset = 0;
	if (p)
		p->next = e;
	else
488
		object_table[h] = e;
489 490
	return e;
}
491

492 493 494 495 496 497 498 499
static unsigned int hc_str(const char *s, size_t len)
{
	unsigned int r = 0;
	while (len-- > 0)
		r = r * 31 + *s++;
	return r;
}

500
static void *pool_alloc(size_t len)
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522
{
	struct mem_pool *p;
	void *r;

	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;
		p->next_free = p->space;
		p->end = p->next_free + mem_pool_alloc;
		mem_pool = p;
	}

	r = p->next_free;
523 524 525
	/* round out to a pointer alignment */
	if (len & (sizeof(void*) - 1))
		len += sizeof(void*) - (len & (sizeof(void*) - 1));
526 527 528 529
	p->next_free += len;
	return r;
}

530
static void *pool_calloc(size_t count, size_t size)
531 532 533 534 535 536 537
{
	size_t len = count * size;
	void *r = pool_alloc(len);
	memset(r, 0, len);
	return r;
}

538
static char *pool_strdup(const char *s)
539 540 541 542 543 544
{
	char *r = pool_alloc(strlen(s) + 1);
	strcpy(r, s);
	return r;
}

545 546 547 548 549 550 551 552 553 554 555
static void size_dbuf(struct dbuf *b, size_t maxlen)
{
	if (b->buffer) {
		if (b->capacity >= maxlen)
			return;
		free(b->buffer);
	}
	b->capacity = ((maxlen / 1024) + 1) * 1024;
	b->buffer = xmalloc(b->capacity);
}

556
static void insert_mark(uintmax_t idnum, struct object_entry *oe)
557 558 559 560 561 562 563 564 565
{
	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) {
566
		uintmax_t i = idnum >> s->shift;
567 568 569 570 571 572 573 574 575 576 577 578
		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;
}

579
static struct object_entry *find_mark(uintmax_t idnum)
580
{
581
	uintmax_t orig_idnum = idnum;
582 583 584 585
	struct mark_set *s = marks;
	struct object_entry *oe = NULL;
	if ((idnum >> s->shift) < 1024) {
		while (s && s->shift) {
586
			uintmax_t i = idnum >> s->shift;
587 588 589 590 591 592 593
			idnum -= i << s->shift;
			s = s->data.sets[i];
		}
		if (s)
			oe = s->data.marked[idnum];
	}
	if (!oe)
594
		die("mark :%" PRIuMAX " not declared", orig_idnum);
595 596 597
	return oe;
}

598
static struct atom_str *to_atom(const char *s, unsigned short len)
599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616
{
	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;
}

617
static struct branch *lookup_branch(const char *name)
618 619 620 621 622 623 624 625 626 627
{
	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;
}

628
static struct branch *new_branch(const char *name)
629 630 631 632 633 634
{
	unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
	struct branch* b = lookup_branch(name);

	if (b)
		die("Invalid attempt to create duplicate branch: %s", name);
635 636 637 638
	switch (check_ref_format(name)) {
	case  0: break; /* its valid */
	case -2: break; /* valid, but too few '/', allow anyway */
	default:
639
		die("Branch name doesn't conform to GIT standards: %s", name);
640
	}
641 642 643 644

	b = pool_calloc(1, sizeof(struct branch));
	b->name = pool_strdup(name);
	b->table_next_branch = branch_table[hc];
645 646
	b->branch_tree.versions[0].mode = S_IFDIR;
	b->branch_tree.versions[1].mode = S_IFDIR;
647
	b->active = 0;
648
	b->pack_id = MAX_PACK_ID;
649 650 651 652 653 654 655 656 657 658 659
	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;
}

660
static struct tree_content *new_tree_content(unsigned int cnt)
661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682
{
	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;
683
	t->delta_depth = 0;
684 685 686 687 688 689 690 691
	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);
692 693 694 695 696 697
	f->next_avail = avail_tree_table[hc];
	avail_tree_table[hc] = f;
}

static void release_tree_content_recursive(struct tree_content *t)
{
698 699 700
	unsigned int i;
	for (i = 0; i < t->entry_count; i++)
		release_tree_entry(t->entries[i]);
701
	release_tree_content(t);
702 703
}

704
static struct tree_content *grow_tree_content(
705 706 707 708 709
	struct tree_content *t,
	int amt)
{
	struct tree_content *r = new_tree_content(t->entry_count + amt);
	r->entry_count = t->entry_count;
710
	r->delta_depth = t->delta_depth;
711 712 713 714 715
	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
	release_tree_content(t);
	return r;
}

716
static struct tree_entry *new_tree_entry(void)
717 718 719 720 721
{
	struct tree_entry *e;

	if (!avail_tree_entry) {
		unsigned int n = tree_entry_alloc;
722
		total_allocd += n * sizeof(struct tree_entry);
723
		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
724
		while (n-- > 1) {
725 726 727
			*((void**)e) = e + 1;
			e++;
		}
728
		*((void**)e) = NULL;
729 730 731 732 733 734 735 736 737 738
	}

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

static void release_tree_entry(struct tree_entry *e)
{
	if (e->tree)
739
		release_tree_content_recursive(e->tree);
740 741 742 743
	*((void**)e) = avail_tree_entry;
	avail_tree_entry = e;
}

744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768
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;
}

769
static void start_packfile(void)
770
{
771
	static char tmpfile[PATH_MAX];
772
	struct packed_git *p;
773
	struct pack_header hdr;
774
	int pack_fd;
775

776
	snprintf(tmpfile, sizeof(tmpfile),
777
		"%s/tmp_pack_XXXXXX", get_object_directory());
778
	pack_fd = xmkstemp(tmpfile);
779 780
	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
	strcpy(p->pack_name, tmpfile);
781
	p->pack_fd = pack_fd;
782 783 784 785

	hdr.hdr_signature = htonl(PACK_SIGNATURE);
	hdr.hdr_version = htonl(2);
	hdr.hdr_entries = 0;
786
	write_or_die(p->pack_fd, &hdr, sizeof(hdr));
787 788

	pack_data = p;
789 790
	pack_size = sizeof(hdr);
	object_count = 0;
791 792 793

	all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
	all_packs[pack_id] = p;
794 795 796 797 798 799 800 801 802
}

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);
}

803
static char *create_index(void)
804
{
805 806
	static char tmpfile[PATH_MAX];
	SHA_CTX ctx;
807 808 809
	struct sha1file *f;
	struct object_entry **idx, **c, **last, *e;
	struct object_entry_pool *o;
810
	uint32_t array[256];
811
	int i, idx_fd;
812 813 814 815 816

	/* 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)
817 818 819
		for (e = o->next_free; e-- != o->entries;)
			if (pack_id == e->pack_id)
				*c++ = e;
820
	last = idx + object_count;
821 822
	if (c != last)
		die("internal consistency error creating the index");
823 824 825 826 827 828 829 830 831 832 833 834 835 836 837
	qsort(idx, object_count, sizeof(struct object_entry*), oecmp);

	/* Generate the fan-out array. */
	c = idx;
	for (i = 0; i < 256; i++) {
		struct object_entry **next = c;;
		while (next < last) {
			if ((*next)->sha1[0] != i)
				break;
			next++;
		}
		array[i] = htonl(next - idx);
		c = next;
	}

838
	snprintf(tmpfile, sizeof(tmpfile),
839
		"%s/tmp_idx_XXXXXX", get_object_directory());
840
	idx_fd = xmkstemp(tmpfile);
841
	f = sha1fd(idx_fd, tmpfile);
842
	sha1write(f, array, 256 * sizeof(int));
843
	SHA1_Init(&ctx);
844
	for (c = idx; c != last; c++) {
845
		uint32_t offset = htonl((*c)->offset);
846 847
		sha1write(f, &offset, 4);
		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
848
		SHA1_Update(&ctx, (*c)->sha1, 20);
849
	}
850
	sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
851
	sha1close(f, NULL, 1);
852
	free(idx);
853 854 855 856
	SHA1_Final(pack_data->sha1, &ctx);
	return tmpfile;
}

857
static char *keep_pack(char *curr_index_name)
858 859
{
	static char name[PATH_MAX];
860
	static const char *keep_msg = "fast-import";
861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885
	int keep_fd;

	chmod(pack_data->pack_name, 0444);
	chmod(curr_index_name, 0444);

	snprintf(name, sizeof(name), "%s/pack/pack-%s.keep",
		 get_object_directory(), sha1_to_hex(pack_data->sha1));
	keep_fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
	if (keep_fd < 0)
		die("cannot create keep file");
	write(keep_fd, keep_msg, strlen(keep_msg));
	close(keep_fd);

	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;
}

886
static void unkeep_all_packs(void)
887 888 889 890 891 892 893 894 895 896
{
	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));
		unlink(name);
	}
897 898
}

899
static void end_packfile(void)
900
{
901 902
	struct packed_git *old_p = pack_data, *new_p;

903
	if (object_count) {
904
		char *idx_name;
905 906 907
		int i;
		struct branch *b;
		struct tag *t;
908

909 910 911
		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
				    pack_data->pack_name, object_count);
		close(pack_data->pack_fd);
912
		idx_name = keep_pack(create_index());
913 914 915 916 917 918

		/* Register the packfile with core git's machinary. */
		new_p = add_packed_git(idx_name, strlen(idx_name), 1);
		if (!new_p)
			die("core git rejected index %s", idx_name);
		new_p->windows = old_p->windows;
919
		all_packs[pack_id] = new_p;
920
		install_packed_git(new_p);
921 922

		/* Print the boundary */
923 924 925 926 927 928 929
		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));
				}
930
			}
931 932 933 934 935 936
			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);
937 938 939
		}

		pack_id++;
940
	}
941
	else
942
		unlink(old_p->pack_name);
943 944 945 946 947 948 949 950
	free(old_p);

	/* We can't carry a delta across packfiles. */
	free(last_blob.data);
	last_blob.data = NULL;
	last_blob.len = 0;
	last_blob.offset = 0;
	last_blob.depth = 0;
951 952
}

953
static void cycle_packfile(void)
954 955 956 957 958
{
	end_packfile();
	start_packfile();
}

959
static size_t encode_header(
960
	enum object_type type,
961
	size_t size,
962
	unsigned char *hdr)
963 964 965 966
{
	int n = 1;
	unsigned char c;

967
	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
968 969 970 971 972 973 974 975 976 977 978 979 980 981
		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;
}

982 983 984
static int store_object(
	enum object_type type,
	void *dat,
985
	size_t datlen,
986
	struct last_object *last,
987
	unsigned char *sha1out,
988
	uintmax_t mark)
989 990
{
	void *out, *delta;
991 992 993
	struct object_entry *e;
	unsigned char hdr[96];
	unsigned char sha1[20];
994
	unsigned long hdrlen, deltalen;
995 996 997
	SHA_CTX c;
	z_stream s;

998
	hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
999
		(unsigned long)datlen) + 1;
1000 1001 1002 1003
	SHA1_Init(&c);
	SHA1_Update(&c, hdr, hdrlen);
	SHA1_Update(&c, dat, datlen);
	SHA1_Final(sha1, &c);
1004
	if (sha1out)
1005
		hashcpy(sha1out, sha1);
1006 1007

	e = insert_object(sha1);
1008 1009
	if (mark)
		insert_mark(mark, e);
1010
	if (e->offset) {
1011
		duplicate_count_by_type[type]++;
1012
		return 1;
1013 1014 1015 1016 1017 1018
	} 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;
1019
	}
1020

1021
	if (last && last->data && last->depth < max_depth) {
1022
		delta = diff_delta(last->data, last->len,
1023 1024
			dat, datlen,
			&deltalen, 0);
1025 1026 1027 1028 1029 1030
		if (delta && deltalen >= datlen) {
			free(delta);
			delta = NULL;
		}
	} else
		delta = NULL;
1031 1032 1033

	memset(&s, 0, sizeof(s));
	deflateInit(&s, zlib_compression_level);
1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047
	if (delta) {
		s.next_in = delta;
		s.avail_in = deltalen;
	} else {
		s.next_in = dat;
		s.avail_in = datlen;
	}
	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. */
1048
	if ((pack_size + 60 + s.total_out) > max_packsize
1049 1050 1051 1052
		|| (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;
1053
		cycle_packfile();
1054 1055 1056 1057 1058

		/* We cannot carry a delta into the new pack. */
		if (delta) {
			free(delta);
			delta = NULL;
1059 1060 1061 1062 1063 1064 1065 1066 1067 1068

			memset(&s, 0, sizeof(s));
			deflateInit(&s, zlib_compression_level);
			s.next_in = dat;
			s.avail_in = datlen;
			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);
1069 1070 1071 1072 1073 1074 1075 1076
		}
	}

	e->type = type;
	e->pack_id = pack_id;
	e->offset = pack_size;
	object_count++;
	object_count_by_type[type]++;
1077 1078

	if (delta) {
1079 1080 1081
		unsigned long ofs = e->offset - last->offset;
		unsigned pos = sizeof(hdr) - 1;

1082
		delta_count_by_type[type]++;
1083
		last->depth++;
1084 1085

		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1086
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1087 1088 1089 1090 1091
		pack_size += hdrlen;

		hdr[pos] = ofs & 127;
		while (ofs >>= 7)
			hdr[--pos] = 128 | (--ofs & 127);
1092
		write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1093
		pack_size += sizeof(hdr) - pos;
1094
	} else {
1095 1096
		if (last)
			last->depth = 0;
1097
		hdrlen = encode_header(type, datlen, hdr);
1098
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1099
		pack_size += hdrlen;
1100 1101
	}

1102
	write_or_die(pack_data->pack_fd, out, s.total_out);
1103
	pack_size += s.total_out;
1104 1105

	free(out);
1106
	free(delta);
1107
	if (last) {
1108
		if (!last->no_free)
1109 1110
			free(last->data);
		last->data = dat;
1111
		last->offset = e->offset;
1112 1113 1114 1115 1116
		last->len = datlen;
	}
	return 0;
}

1117 1118 1119
static void *gfi_unpack_entry(
	struct object_entry *oe,
	unsigned long *sizep)
1120
{
1121
	enum object_type type;
1122 1123 1124
	struct packed_git *p = all_packs[oe->pack_id];
	if (p == pack_data)
		p->pack_size = pack_size + 20;
1125
	return unpack_entry(p, oe->offset, &type, sizep);
1126 1127
}

1128
static const char *get_mode(const char *str, uint16_t *modep)
1129 1130
{
	unsigned char c;
1131
	uint16_t mode = 0;
1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143

	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)
{
1144
	unsigned char* sha1 = root->versions[1].sha1;
1145 1146 1147 1148 1149 1150 1151
	struct object_entry *myoe;
	struct tree_content *t;
	unsigned long size;
	char *buf;
	const char *c;

	root->tree = t = new_tree_content(8);
1152
	if (is_null_sha1(sha1))
1153 1154
		return;

1155
	myoe = find_object(sha1);
1156
	if (myoe && myoe->pack_id != MAX_PACK_ID) {
1157
		if (myoe->type != OBJ_TREE)
1158
			die("Not a tree: %s", sha1_to_hex(sha1));
1159
		t->delta_depth = 0;
1160
		buf = gfi_unpack_entry(myoe, &size);
1161
	} else {
1162 1163 1164
		enum object_type type;
		buf = read_sha1_file(sha1, &type, &size);
		if (!buf || type != OBJ_TREE)
1165
			die("Can't load tree %s", sha1_to_hex(sha1));
1166 1167 1168 1169 1170 1171 1172
	}

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

		if (t->entry_count == t->entry_capacity)
1173
			root->tree = t = grow_tree_content(t, t->entry_count);
1174 1175 1176
		t->entries[t->entry_count++] = e;

		e->tree = NULL;
1177
		c = get_mode(c, &e->versions[1].mode);
1178
		if (!c)
1179 1180
			die("Corrupt mode in %s", sha1_to_hex(sha1));
		e->versions[0].mode = e->versions[1].mode;
1181
		e->name = to_atom(c, strlen(c));
1182
		c += e->name->str_len + 1;
1183 1184
		hashcpy(e->versions[0].sha1, (unsigned char*)c);
		hashcpy(e->versions[1].sha1, (unsigned char*)c);
1185 1186 1187 1188 1189
		c += 20;
	}
	free(buf);
}

1190
static int tecmp0 (const void *_a, const void *_b)
1191 1192 1193 1194
{
	struct tree_entry *a = *((struct tree_entry**)_a);
	struct tree_entry *b = *((struct tree_entry**)_b);
	return base_name_compare(
1195 1196
		a->name->str_dat, a->name->str_len, a->versions[0].mode,
		b->name->str_dat, b->name->str_len, b->versions[0].mode);
1197 1198
}

1199
static int tecmp1 (const void *_a, const void *_b)
1200
{
1201 1202 1203 1204 1205 1206 1207
	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);
}

1208 1209 1210 1211
static void mktree(struct tree_content *t,
	int v,
	unsigned long *szp,
	struct dbuf *b)
1212 1213
{
	size_t maxlen = 0;
1214
	unsigned int i;
1215
	char *c;
1216

1217 1218 1219 1220
	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);
1221 1222

	for (i = 0; i < t->entry_count; i++) {
1223 1224
		if (t->entries[i]->versions[v].mode)
			maxlen += t->entries[i]->name->str_len + 34;
1225 1226
	}

1227
	size_dbuf(b, maxlen);
1228
	c = b->buffer;
1229 1230
	for (i = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
1231 1232
		if (!e->versions[v].mode)
			continue;
1233
		c += sprintf(c, "%o", (unsigned int)e->versions[v].mode);
1234 1235 1236
		*c++ = ' ';
		strcpy(c, e->name->str_dat);
		c += e->name->str_len + 1;
1237
		hashcpy((unsigned char*)c, e->versions[v].sha1);
1238 1239
		c += 20;
	}
1240
	*szp = c - (char*)b->buffer;
1241 1242 1243 1244 1245 1246
}

static void store_tree(struct tree_entry *root)
{
	struct tree_content *t = root->tree;
	unsigned int i, j, del;
1247
	unsigned long new_len;
1248
	struct last_object lo;
1249
	struct object_entry *le;
1250 1251 1252 1253 1254 1255 1256 1257 1258

	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]);
	}

1259
	le = find_object(root->versions[0].sha1);
1260 1261 1262
	if (!S_ISDIR(root->versions[0].mode)
		|| !le
		|| le->pack_id != pack_id) {
1263 1264
		lo.data = NULL;
		lo.depth = 0;
1265
		lo.no_free = 0;
1266
	} else {
1267 1268
		mktree(t, 0, &lo.len, &old_tree);
		lo.data = old_tree.buffer;
1269
		lo.offset = le->offset;
1270
		lo.depth = t->delta_depth;
1271
		lo.no_free = 1;
1272 1273
	}

1274
	mktree(t, 1, &new_len, &new_tree);
1275
	store_object(OBJ_TREE, new_tree.buffer, new_len,
1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
		&lo, root->versions[1].sha1, 0);

	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;
1291 1292 1293 1294 1295 1296
}

static int tree_content_set(
	struct tree_entry *root,
	const char *p,
	const unsigned char *sha1,
1297 1298
	const uint16_t mode,
	struct tree_content *subtree)
1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309
{
	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);
1310 1311
	if (!n)
		die("Empty path component found in input");
1312 1313
	if (!slash1 && !S_ISDIR(mode) && subtree)
		die("Non-directories cannot have subtrees");
1314 1315 1316 1317 1318

	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) {
1319 1320
				if (!S_ISDIR(mode)
						&& e->versions[1].mode == mode
1321
						&& !hashcmp(e->versions[1].sha1, sha1))
1322
					return 0;
1323 1324
				e->versions[1].mode = mode;
				hashcpy(e->versions[1].sha1, sha1);
1325
				if (e->tree)
1326
					release_tree_content_recursive(e->tree);
1327
				e->tree = subtree;
1328
				hashclr(root->versions[1].sha1);
1329 1330
				return 1;
			}
1331
			if (!S_ISDIR(e->versions[1].mode)) {
1332
				e->tree = new_tree_content(8);
1333
				e->versions[1].mode = S_IFDIR;
1334 1335 1336
			}
			if (!e->tree)
				load_tree(e);
1337
			if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1338
				hashclr(root->versions[1].sha1);
1339 1340 1341 1342 1343 1344 1345
				return 1;
			}
			return 0;
		}
	}

	if (t->entry_count == t->entry_capacity)
1346
		root->tree = t = grow_tree_content(t, t->entry_count);
1347
	e = new_tree_entry();
1348
	e->name = to_atom(p, n);
1349 1350
	e->versions[0].mode = 0;
	hashclr(e->versions[0].sha1);
1351 1352 1353
	t->entries[t->entry_count++] = e;
	if (slash1) {
		e->tree = new_tree_content(8);
1354
		e->versions[1].mode = S_IFDIR;
1355
		tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1356
	} else {
1357
		e->tree = subtree;
1358 1359
		e->versions[1].mode = mode;
		hashcpy(e->versions[1].sha1, sha1);
1360
	}
1361
	hashclr(root->versions[1].sha1);
1362 1363 1364
	return 1;
}

1365 1366 1367 1368
static int tree_content_remove(
	struct tree_entry *root,
	const char *p,
	struct tree_entry *backup_leaf)
1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383
{
	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)) {
1384
			if (!slash1 || !S_ISDIR(e->versions[1].mode))
1385 1386 1387
				goto del_entry;
			if (!e->tree)
				load_tree(e);
1388
			if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1389 1390 1391 1392 1393 1394
				for (n = 0; n < e->tree->entry_count; n++) {
					if (e->tree->entries[n]->versions[1].mode) {
						hashclr(root->versions[1].sha1);
						return 1;
					}
				}
1395
				backup_leaf = NULL;
1396
				goto del_entry;
1397 1398 1399 1400 1401 1402 1403
			}
			return 0;
		}
	}
	return 0;

del_entry:
1404 1405 1406
	if (backup_leaf)
		memcpy(backup_leaf, e, sizeof(*backup_leaf));
	else if (e->tree)
1407
		release_tree_content_recursive(e->tree);
1408
	e->tree = NULL;
1409 1410 1411
	e->versions[1].mode = 0;
	hashclr(e->versions[1].sha1);
	hashclr(root->versions[1].sha1);
1412
	return 1;
1413 1414
}

1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451
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;
}

1452
static int update_branch(struct branch *b)
1453 1454
{
	static const char *msg = "fast-import";
1455 1456 1457 1458 1459
	struct ref_lock *lock;
	unsigned char old_sha1[20];

	if (read_ref(b->name, old_sha1))
		hashclr(old_sha1);
1460
	lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472
	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);
		}

1473
		if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1474
			unlock_ref(lock);
1475
			warning("Not updating %s"
1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487
				" (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)
{
1488 1489 1490 1491
	unsigned int i;
	struct branch *b;

	for (i = 0; i < branch_table_sz; i++) {
1492 1493
		for (b = branch_table[i]; b; b = b->table_next_branch)
			failure |= update_branch(b);
1494 1495 1496
	}
}

1497
static void dump_tags(void)
1498 1499 1500 1501
{
	static const char *msg = "fast-import";
	struct tag *t;
	struct ref_lock *lock;
1502
	char ref_name[PATH_MAX];
1503 1504

	for (t = first_tag; t; t = t->next_tag) {
1505 1506
		sprintf(ref_name, "tags/%s", t->name);
		lock = lock_ref_sha1(ref_name, NULL);
1507
		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1508
			failure |= error("Unable to update %s", ref_name);
1509 1510 1511
	}
}

1512
static void dump_marks_helper(FILE *f,
1513
	uintmax_t base,
1514 1515
	struct mark_set *m)
{
1516
	uintmax_t k;
1517 1518 1519 1520 1521 1522 1523 1524 1525
	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])
1526
				fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1527 1528 1529 1530 1531
					sha1_to_hex(m->data.marked[k]->sha1));
		}
	}
}

1532
static void dump_marks(void)
1533
{
1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545
	static struct lock_file mark_lock;
	int mark_fd;
	FILE *f;

	if (!mark_file)
		return;

	mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
	if (mark_fd < 0) {
		failure |= error("Unable to write marks file %s: %s",
			mark_file, strerror(errno));
		return;
1546
	}
1547 1548 1549 1550 1551 1552 1553

	f = fdopen(mark_fd, "w");
	if (!f) {
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to write marks file %s: %s",
			mark_file, strerror(errno));
		return;
1554
	}
1555 1556 1557 1558 1559 1560

	dump_marks_helper(f, 0, marks);
	fclose(f);
	if (commit_lock_file(&mark_lock))
		failure |= error("Unable to write marks file %s: %s",
			mark_file, strerror(errno));
1561 1562
}

1563
static void read_next_command(void)
1564
{
1565
	do {
1566 1567 1568 1569
		if (unread_command_buf)
			unread_command_buf = 0;
		else
			read_line(&command_buf, stdin, '\n');
1570
	} while (!command_buf.eof && command_buf.buf[0] == '#');
1571 1572
}

1573 1574 1575 1576 1577 1578 1579
static void skip_optional_lf()
{
	int term_char = fgetc(stdin);
	if (term_char != '\n' && term_char != EOF)
		ungetc(term_char, stdin);
}

1580
static void cmd_mark(void)
1581
{
1582
	if (!prefixcmp(command_buf.buf, "mark :")) {
1583
		next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1584 1585 1586
		read_next_command();
	}
	else
1587
		next_mark = 0;
1588 1589
}

1590
static void *cmd_data (size_t *size)
1591 1592
{
	size_t length;
1593
	char *buffer;
1594

1595
	if (prefixcmp(command_buf.buf, "data "))
1596 1597
		die("Expected 'data n' command, found: %s", command_buf.buf);

1598
	if (!prefixcmp(command_buf.buf + 5, "<<")) {
1599 1600 1601 1602 1603
		char *term = xstrdup(command_buf.buf + 5 + 2);
		size_t sz = 8192, term_len = command_buf.len - 5 - 2;
		length = 0;
		buffer = xmalloc(sz);
		for (;;) {
1604
			read_line(&command_buf, stdin, '\n');
1605 1606 1607 1608 1609
			if (command_buf.eof)
				die("EOF in data (terminator '%s' not found)", term);
			if (term_len == command_buf.len
				&& !strcmp(term, command_buf.buf))
				break;
1610
			ALLOC_GROW(buffer, length + command_buf.len, sz);
1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625
			memcpy(buffer + length,
				command_buf.buf,
				command_buf.len - 1);
			length += command_buf.len - 1;
			buffer[length++] = '\n';
		}
		free(term);
	}
	else {
		size_t n = 0;
		length = strtoul(command_buf.buf + 5, NULL, 10);
		buffer = xmalloc(length);
		while (n < length) {
			size_t s = fread(buffer + n, 1, length - n, stdin);
			if (!s && feof(stdin))
1626 1627
				die("EOF in data (%lu bytes remaining)",
					(unsigned long)(length - n));
1628 1629
			n += s;
		}
1630 1631
	}

1632
	skip_optional_lf();
1633 1634 1635 1636
	*size = length;
	return buffer;
}

1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 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 1687 1688 1689 1690 1691 1692 1693 1694
static int validate_raw_date(const char *src, char *result, int maxlen)
{
	const char *orig_src = src;
	char *endp, sign;

	strtoul(src, &endp, 10);
	if (endp == src || *endp != ' ')
		return -1;

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

	strtoul(src + 1, &endp, 10);
	if (endp == src || *endp || (endp - orig_src) >= maxlen)
		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;
}

1695
static void cmd_new_blob(void)
1696
{
1697 1698
	size_t l;
	void *d;
1699 1700 1701

	read_next_command();
	cmd_mark();
1702
	d = cmd_data(&l);
1703

1704 1705
	if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
		free(d);
1706 1707
}

1708
static void unload_one_branch(void)
1709
{
1710 1711
	while (cur_active_branches
		&& cur_active_branches >= max_active_branches) {
1712
		uintmax_t min_commit = ULONG_MAX;
1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729
		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;
		}
1730
		e->active = 0;
1731 1732
		e->active_next_branch = NULL;
		if (e->branch_tree.tree) {
1733
			release_tree_content_recursive(e->branch_tree.tree);
1734 1735 1736
			e->branch_tree.tree = NULL;
		}
		cur_active_branches--;
1737 1738 1739
	}
}

1740
static void load_branch(struct branch *b)
1741
{
1742
	load_tree(&b->branch_tree);
1743 1744 1745 1746 1747 1748 1749
	if (!b->active) {
		b->active = 1;
		b->active_next_branch = active_branches;
		active_branches = b;
		cur_active_branches++;
		branch_load_count++;
	}
1750 1751
}

1752
static void file_change_m(struct branch *b)
1753
{
1754 1755 1756
	const char *p = command_buf.buf + 2;
	char *p_uq;
	const char *endp;
1757
	struct object_entry *oe = oe;
1758
	unsigned char sha1[20];
1759
	uint16_t mode, inline_data = 0;
1760

1761 1762 1763 1764 1765 1766
	p = get_mode(p, &mode);
	if (!p)
		die("Corrupt mode: %s", command_buf.buf);
	switch (mode) {
	case S_IFREG | 0644:
	case S_IFREG | 0755:
1767
	case S_IFLNK:
1768 1769 1770 1771 1772 1773 1774 1775
	case 0644:
	case 0755:
		/* ok */
		break;
	default:
		die("Corrupt mode: %s", command_buf.buf);
	}

1776 1777
	if (*p == ':') {
		char *x;
1778
		oe = find_mark(strtoumax(p + 1, &x, 10));
1779
		hashcpy(sha1, oe->sha1);
1780
		p = x;
1781
	} else if (!prefixcmp(p, "inline")) {
1782 1783
		inline_data = 1;
		p += 6;
1784 1785 1786 1787 1788 1789
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
1790 1791 1792 1793 1794 1795 1796 1797 1798
	if (*p++ != ' ')
		die("Missing space after SHA1: %s", command_buf.buf);

	p_uq = unquote_c_style(p, &endp);
	if (p_uq) {
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
		p = p_uq;
	}
1799

1800 1801 1802 1803 1804 1805 1806 1807 1808 1809
	if (inline_data) {
		size_t l;
		void *d;
		if (!p_uq)
			p = p_uq = xstrdup(p);
		read_next_command();
		d = cmd_data(&l);
		if (store_object(OBJ_BLOB, d, l, &last_blob, sha1, 0))
			free(d);
	} else if (oe) {
1810
		if (oe->type != OBJ_BLOB)
1811
			die("Not a blob (actually a %s): %s",
1812
				command_buf.buf, typename(oe->type));
1813
	} else {
1814 1815
		enum object_type type = sha1_object_info(sha1, NULL);
		if (type < 0)
1816
			die("Blob not found: %s", command_buf.buf);
1817
		if (type != OBJ_BLOB)
1818
			die("Not a blob (actually a %s): %s",
1819
			    typename(type), command_buf.buf);
1820
	}
1821

1822
	tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1823
	free(p_uq);
1824
}
1825

1826 1827
static void file_change_d(struct branch *b)
{
1828 1829 1830 1831 1832 1833 1834 1835 1836 1837
	const char *p = command_buf.buf + 2;
	char *p_uq;
	const char *endp;

	p_uq = unquote_c_style(p, &endp);
	if (p_uq) {
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
		p = p_uq;
	}
1838
	tree_content_remove(&b->branch_tree, p, NULL);
1839
	free(p_uq);
1840 1841
}

1842
static void file_change_cr(struct branch *b, int rename)
1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877
{
	const char *s, *d;
	char *s_uq, *d_uq;
	const char *endp;
	struct tree_entry leaf;

	s = command_buf.buf + 2;
	s_uq = unquote_c_style(s, &endp);
	if (s_uq) {
		if (*endp != ' ')
			die("Missing space after source: %s", command_buf.buf);
	}
	else {
		endp = strchr(s, ' ');
		if (!endp)
			die("Missing space after source: %s", command_buf.buf);
		s_uq = xmalloc(endp - s + 1);
		memcpy(s_uq, s, endp - s);
		s_uq[endp - s] = 0;
	}
	s = s_uq;

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

	d = endp;
	d_uq = unquote_c_style(d, &endp);
	if (d_uq) {
		if (*endp)
			die("Garbage after dest in: %s", command_buf.buf);
		d = d_uq;
	}

	memset(&leaf, 0, sizeof(leaf));
1878 1879 1880 1881
	if (rename)
		tree_content_remove(&b->branch_tree, s, &leaf);
	else
		tree_content_get(&b->branch_tree, s, &leaf);
1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892
	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);

	free(s_uq);
	free(d_uq);
}

1893 1894 1895 1896 1897 1898 1899 1900
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);
}

1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927
static void cmd_from_commit(struct branch *b, char *buf, unsigned long size)
{
	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);
}

static void cmd_from_existing(struct branch *b)
{
	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);
		cmd_from_commit(b, buf, size);
		free(buf);
	}
}

1928
static int cmd_from(struct branch *b)
1929
{
1930
	const char *from;
1931 1932
	struct branch *s;

1933
	if (prefixcmp(command_buf.buf, "from "))
1934
		return 0;
1935

1936 1937 1938 1939
	if (b->branch_tree.tree) {
		release_tree_content_recursive(b->branch_tree.tree);
		b->branch_tree.tree = NULL;
	}
1940 1941 1942 1943 1944 1945

	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) {
1946
		unsigned char *t = s->branch_tree.versions[1].sha1;
1947
		hashcpy(b->sha1, s->sha1);
1948 1949
		hashcpy(b->branch_tree.versions[0].sha1, t);
		hashcpy(b->branch_tree.versions[1].sha1, t);
1950
	} else if (*from == ':') {
1951
		uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1952 1953
		struct object_entry *oe = find_mark(idnum);
		if (oe->type != OBJ_COMMIT)
1954
			die("Mark :%" PRIuMAX " not a commit", idnum);
1955
		hashcpy(b->sha1, oe->sha1);
1956
		if (oe->pack_id != MAX_PACK_ID) {
1957
			unsigned long size;
1958 1959
			char *buf = gfi_unpack_entry(oe, &size);
			cmd_from_commit(b, buf, size);
1960
			free(buf);
1961 1962
		} else
			cmd_from_existing(b);
1963 1964 1965
	} else if (!get_sha1(from, b->sha1))
		cmd_from_existing(b);
	else
1966 1967 1968
		die("Invalid ref name or SHA1 expression: %s", from);

	read_next_command();
1969
	return 1;
1970 1971
}

1972
static struct hash_list *cmd_merge(unsigned int *count)
1973
{
1974
	struct hash_list *list = NULL, *n, *e = e;
1975
	const char *from;
1976 1977 1978
	struct branch *s;

	*count = 0;
1979
	while (!prefixcmp(command_buf.buf, "merge ")) {
1980 1981 1982 1983 1984 1985
		from = strchr(command_buf.buf, ' ') + 1;
		n = xmalloc(sizeof(*n));
		s = lookup_branch(from);
		if (s)
			hashcpy(n->sha1, s->sha1);
		else if (*from == ':') {
1986
			uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1987 1988
			struct object_entry *oe = find_mark(idnum);
			if (oe->type != OBJ_COMMIT)
1989
				die("Mark :%" PRIuMAX " not a commit", idnum);
1990
			hashcpy(n->sha1, oe->sha1);
1991 1992 1993
		} else if (!get_sha1(from, n->sha1)) {
			unsigned long size;
			char *buf = read_object_with_reference(n->sha1,
S
Shawn O. Pearce 已提交
1994
				commit_type, &size, n->sha1);
1995 1996 1997 1998
			if (!buf || size < 46)
				die("Not a valid commit: %s", from);
			free(buf);
		} else
1999 2000 2001 2002 2003 2004 2005 2006
			die("Invalid ref name or SHA1 expression: %s", from);

		n->next = NULL;
		if (list)
			e->next = n;
		else
			list = n;
		e = n;
2007
		(*count)++;
2008 2009 2010 2011 2012
		read_next_command();
	}
	return list;
}

2013
static void cmd_new_commit(void)
2014
{
2015 2016 2017 2018 2019 2020
	struct branch *b;
	void *msg;
	size_t msglen;
	char *sp;
	char *author = NULL;
	char *committer = NULL;
2021 2022
	struct hash_list *merge_list = NULL;
	unsigned int merge_count;
2023 2024 2025 2026

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	b = lookup_branch(sp);
2027
	if (!b)
2028
		b = new_branch(sp);
2029 2030 2031

	read_next_command();
	cmd_mark();
2032
	if (!prefixcmp(command_buf.buf, "author ")) {
2033
		author = parse_ident(command_buf.buf + 7);
2034 2035
		read_next_command();
	}
2036
	if (!prefixcmp(command_buf.buf, "committer ")) {
2037
		committer = parse_ident(command_buf.buf + 10);
2038 2039 2040 2041 2042
		read_next_command();
	}
	if (!committer)
		die("Expected committer but didn't get one");
	msg = cmd_data(&msglen);
2043 2044
	read_next_command();
	cmd_from(b);
2045
	merge_list = cmd_merge(&merge_count);
2046 2047

	/* ensure the branch is active/loaded */
2048
	if (!b->branch_tree.tree || !max_active_branches) {
2049 2050 2051
		unload_one_branch();
		load_branch(b);
	}
2052

2053
	/* file_change* */
2054 2055
	while (!command_buf.eof && command_buf.len > 1) {
		if (!prefixcmp(command_buf.buf, "M "))
2056
			file_change_m(b);
2057
		else if (!prefixcmp(command_buf.buf, "D "))
2058
			file_change_d(b);
2059
		else if (!prefixcmp(command_buf.buf, "R "))
2060 2061 2062
			file_change_cr(b, 1);
		else if (!prefixcmp(command_buf.buf, "C "))
			file_change_cr(b, 0);
2063 2064
		else if (!strcmp("deleteall", command_buf.buf))
			file_change_deleteall(b);
2065 2066 2067 2068
		else {
			unread_command_buf = 1;
			break;
		}
2069
		read_next_command();
2070 2071
	}

2072
	/* build the tree and the commit */
2073
	store_tree(&b->branch_tree);
2074 2075
	hashcpy(b->branch_tree.versions[0].sha1,
		b->branch_tree.versions[1].sha1);
2076
	size_dbuf(&new_data, 114 + msglen
2077
		+ merge_count * 49
2078 2079 2080
		+ (author
			? strlen(author) + strlen(committer)
			: 2 * strlen(committer)));
2081
	sp = new_data.buffer;
2082 2083
	sp += sprintf(sp, "tree %s\n",
		sha1_to_hex(b->branch_tree.versions[1].sha1));
2084
	if (!is_null_sha1(b->sha1))
2085
		sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
2086 2087 2088 2089 2090 2091
	while (merge_list) {
		struct hash_list *next = merge_list->next;
		sp += sprintf(sp, "parent %s\n", sha1_to_hex(merge_list->sha1));
		free(merge_list);
		merge_list = next;
	}
2092 2093 2094
	sp += sprintf(sp, "author %s\n", author ? author : committer);
	sp += sprintf(sp, "committer %s\n", committer);
	*sp++ = '\n';
2095 2096
	memcpy(sp, msg, msglen);
	sp += msglen;
2097
	free(author);
2098 2099 2100
	free(committer);
	free(msg);

2101
	if (!store_object(OBJ_COMMIT,
2102
		new_data.buffer, sp - (char*)new_data.buffer,
2103 2104
		NULL, b->sha1, next_mark))
		b->pack_id = pack_id;
2105
	b->last_commit = object_count_by_type[OBJ_COMMIT];
2106 2107
}

2108
static void cmd_new_tag(void)
2109 2110 2111 2112 2113 2114 2115 2116
{
	char *sp;
	const char *from;
	char *tagger;
	struct branch *s;
	void *msg;
	size_t msglen;
	struct tag *t;
2117
	uintmax_t from_mark = 0;
2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132
	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 ... */
2133
	if (prefixcmp(command_buf.buf, "from "))
2134 2135 2136 2137
		die("Expected from command, got %s", command_buf.buf);
	from = strchr(command_buf.buf, ' ') + 1;
	s = lookup_branch(from);
	if (s) {
2138
		hashcpy(sha1, s->sha1);
2139
	} else if (*from == ':') {
2140
		struct object_entry *oe;
2141
		from_mark = strtoumax(from + 1, NULL, 10);
2142
		oe = find_mark(from_mark);
2143
		if (oe->type != OBJ_COMMIT)
2144
			die("Mark :%" PRIuMAX " not a commit", from_mark);
2145
		hashcpy(sha1, oe->sha1);
2146 2147 2148 2149 2150
	} else if (!get_sha1(from, sha1)) {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(sha1,
2151
			commit_type, &size, sha1);
2152 2153 2154 2155 2156 2157 2158 2159
		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 ... */
2160
	if (prefixcmp(command_buf.buf, "tagger "))
2161
		die("Expected tagger command, got %s", command_buf.buf);
2162
	tagger = parse_ident(command_buf.buf + 7);
2163 2164 2165 2166 2167 2168

	/* tag payload/message */
	read_next_command();
	msg = cmd_data(&msglen);

	/* build the tag object */
2169 2170
	size_dbuf(&new_data, 67+strlen(t->name)+strlen(tagger)+msglen);
	sp = new_data.buffer;
2171
	sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
2172
	sp += sprintf(sp, "type %s\n", commit_type);
2173
	sp += sprintf(sp, "tag %s\n", t->name);
2174 2175
	sp += sprintf(sp, "tagger %s\n", tagger);
	*sp++ = '\n';
2176 2177 2178 2179 2180
	memcpy(sp, msg, msglen);
	sp += msglen;
	free(tagger);
	free(msg);

2181 2182 2183 2184 2185 2186
	if (store_object(OBJ_TAG, new_data.buffer,
		sp - (char*)new_data.buffer,
		NULL, t->sha1, 0))
		t->pack_id = MAX_PACK_ID;
	else
		t->pack_id = pack_id;
2187 2188
}

2189
static void cmd_reset_branch(void)
2190 2191 2192 2193 2194 2195 2196 2197
{
	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) {
2198 2199 2200
		hashclr(b->sha1);
		hashclr(b->branch_tree.versions[0].sha1);
		hashclr(b->branch_tree.versions[1].sha1);
2201 2202 2203 2204 2205
		if (b->branch_tree.tree) {
			release_tree_content_recursive(b->branch_tree.tree);
			b->branch_tree.tree = NULL;
		}
	}
2206 2207 2208
	else
		b = new_branch(sp);
	read_next_command();
2209 2210
	if (!cmd_from(b) && command_buf.len > 1)
		unread_command_buf = 1;
2211 2212
}

2213
static void cmd_checkpoint(void)
2214
{
2215 2216 2217 2218 2219 2220
	if (object_count) {
		cycle_packfile();
		dump_branches();
		dump_tags();
		dump_marks();
	}
2221
	skip_optional_lf();
2222 2223
}

2224 2225 2226 2227 2228 2229 2230 2231
static void cmd_progress(void)
{
	fwrite(command_buf.buf, 1, command_buf.len - 1, stdout);
	fputc('\n', stdout);
	fflush(stdout);
	skip_optional_lf();
}

2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259
static void import_marks(const char *input_file)
{
	char line[512];
	FILE *f = fopen(input_file, "r");
	if (!f)
		die("cannot read %s: %s", input_file, strerror(errno));
	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;
2260
			e->offset = 1; /* just not zero! */
2261 2262 2263 2264 2265 2266
		}
		insert_mark(mark, e);
	}
	fclose(f);
}

2267
static const char fast_import_usage[] =
2268
"git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
2269

2270 2271
int main(int argc, const char **argv)
{
2272
	int i, show_stats = 1;
2273

2274
	git_config(git_default_config);
2275 2276 2277 2278 2279 2280
	alloc_objects(object_entry_alloc);
	strbuf_init(&command_buf);
	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));
2281

2282 2283 2284 2285 2286
	for (i = 1; i < argc; i++) {
		const char *a = argv[i];

		if (*a != '-' || !strcmp(a, "--"))
			break;
2287
		else if (!prefixcmp(a, "--date-format=")) {
2288 2289 2290 2291 2292 2293 2294 2295 2296 2297
			const char *fmt = a + 14;
			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);
		}
2298
		else if (!prefixcmp(a, "--max-pack-size="))
2299
			max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2300
		else if (!prefixcmp(a, "--depth="))
2301
			max_depth = strtoul(a + 8, NULL, 0);
2302
		else if (!prefixcmp(a, "--active-branches="))
2303
			max_active_branches = strtoul(a + 18, NULL, 0);
2304 2305
		else if (!prefixcmp(a, "--import-marks="))
			import_marks(a + 15);
2306
		else if (!prefixcmp(a, "--export-marks="))
2307
			mark_file = a + 15;
2308
		else if (!prefixcmp(a, "--export-pack-edges=")) {
2309 2310 2311 2312 2313 2314
			if (pack_edges)
				fclose(pack_edges);
			pack_edges = fopen(a + 20, "a");
			if (!pack_edges)
				die("Cannot open %s: %s", a + 20, strerror(errno));
		} else if (!strcmp(a, "--force"))
2315
			force_update = 1;
2316 2317 2318 2319
		else if (!strcmp(a, "--quiet"))
			show_stats = 0;
		else if (!strcmp(a, "--stats"))
			show_stats = 1;
2320 2321 2322
		else
			die("unknown option %s", a);
	}
2323
	if (i != argc)
2324 2325
		usage(fast_import_usage);

2326
	prepare_packed_git();
2327
	start_packfile();
2328
	set_die_routine(die_nicely);
2329
	for (;;) {
2330 2331
		read_next_command();
		if (command_buf.eof)
2332
			break;
2333 2334
		else if (!strcmp("blob", command_buf.buf))
			cmd_new_blob();
2335
		else if (!prefixcmp(command_buf.buf, "commit "))
2336
			cmd_new_commit();
2337
		else if (!prefixcmp(command_buf.buf, "tag "))
2338
			cmd_new_tag();
2339
		else if (!prefixcmp(command_buf.buf, "reset "))
2340
			cmd_reset_branch();
2341 2342
		else if (!strcmp("checkpoint", command_buf.buf))
			cmd_checkpoint();
2343 2344
		else if (!prefixcmp(command_buf.buf, "progress "))
			cmd_progress();
2345 2346
		else
			die("Unsupported command: %s", command_buf.buf);
2347
	}
2348
	end_packfile();
2349

2350
	dump_branches();
2351
	dump_tags();
2352
	unkeep_all_packs();
2353
	dump_marks();
2354

2355 2356 2357
	if (pack_edges)
		fclose(pack_edges);

2358 2359 2360 2361 2362 2363 2364 2365 2366
	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");
2367 2368 2369 2370 2371 2372
		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]);
2373
		fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
2374
		fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2375
		fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
2376
		fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2377
		fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
2378
		fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2379 2380 2381 2382 2383
		fprintf(stderr, "---------------------------------------------------------------------\n");
		pack_report();
		fprintf(stderr, "---------------------------------------------------------------------\n");
		fprintf(stderr, "\n");
	}
2384

2385
	return failure ? 1 : 0;
2386
}