fast-import.c 58.9 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 273 274 275 276 277 278
struct recent_command
{
	struct recent_command *prev;
	struct recent_command *next;
	char *buf;
};

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

/* 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];
290
static unsigned long object_count;
291
static unsigned long branch_count;
292
static unsigned long branch_load_count;
293
static int failure;
294
static FILE *pack_edges;
295

296 297 298 299 300
/* 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;

301
/* Atom management */
302 303 304 305 306
static unsigned int atom_table_sz = 4451;
static unsigned int atom_cnt;
static struct atom_str **atom_table;

/* The .pack file being generated */
307
static unsigned int pack_id;
308
static struct packed_git *pack_data;
309
static struct packed_git **all_packs;
310
static unsigned long pack_size;
311 312

/* Table of objects we've written. */
313
static unsigned int object_entry_alloc = 5000;
314 315
static struct object_entry_pool *blocks;
static struct object_entry *object_table[1 << 16];
316
static struct mark_set *marks;
317
static const char* mark_file;
318 319

/* Our last blob */
320 321 322 323 324 325 326
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;
327 328
static struct dbuf old_tree;
static struct dbuf new_tree;
329

330
/* Branch data */
331 332 333
static unsigned long max_active_branches = 5;
static unsigned long cur_active_branches;
static unsigned long branch_table_sz = 1039;
334 335 336
static struct branch **branch_table;
static struct branch *active_branches;

337 338 339 340
/* Tag data */
static struct tag *first_tag;
static struct tag *last_tag;

341
/* Input stream parsing */
342
static whenspec_type whenspec = WHENSPEC_RAW;
343
static struct strbuf command_buf;
344
static int unread_command_buf;
345 346 347 348
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;
349
static uintmax_t next_mark;
350
static struct dbuf new_data;
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
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);
}

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

	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);
400
	fputs(err, rpt);
401 402
	fputc('\n', rpt);

403 404 405 406 407 408 409 410 411 412 413 414
	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);
	}

415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444
	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;
445
	char message[2 * PATH_MAX];
446

447
	vsnprintf(message, sizeof(message), err, params);
448
	fputs("fatal: ", stderr);
449
	fputs(message, stderr);
450 451 452 453
	fputc('\n', stderr);

	if (!zombie) {
		zombie = 1;
454
		write_crash_report(message);
455 456 457
	}
	exit(128);
}
458

459
static void alloc_objects(unsigned int cnt)
460
{
461
	struct object_entry_pool *b;
462

463
	b = xmalloc(sizeof(struct object_entry_pool)
464
		+ cnt * sizeof(struct object_entry));
465
	b->next_pool = blocks;
466 467 468 469 470
	b->next_free = b->entries;
	b->end = b->entries + cnt;
	blocks = b;
	alloc_count += cnt;
}
471

472
static struct object_entry *new_object(unsigned char *sha1)
473
{
474
	struct object_entry *e;
475

476
	if (blocks->next_free == blocks->end)
477
		alloc_objects(object_entry_alloc);
478

479
	e = blocks->next_free++;
480
	hashcpy(e->sha1, sha1);
481
	return e;
482 483
}

484
static struct object_entry *find_object(unsigned char *sha1)
485 486 487 488
{
	unsigned int h = sha1[0] << 8 | sha1[1];
	struct object_entry *e;
	for (e = object_table[h]; e; e = e->next)
489
		if (!hashcmp(sha1, e->sha1))
490 491 492 493
			return e;
	return NULL;
}

494
static struct object_entry *insert_object(unsigned char *sha1)
495 496
{
	unsigned int h = sha1[0] << 8 | sha1[1];
497
	struct object_entry *e = object_table[h];
498
	struct object_entry *p = NULL;
499 500

	while (e) {
501
		if (!hashcmp(sha1, e->sha1))
502 503 504 505 506 507
			return e;
		p = e;
		e = e->next;
	}

	e = new_object(sha1);
508
	e->next = NULL;
509 510 511 512
	e->offset = 0;
	if (p)
		p->next = e;
	else
513
		object_table[h] = e;
514 515
	return e;
}
516

517 518 519 520 521 522 523 524
static unsigned int hc_str(const char *s, size_t len)
{
	unsigned int r = 0;
	while (len-- > 0)
		r = r * 31 + *s++;
	return r;
}

525
static void *pool_alloc(size_t len)
526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547
{
	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;
548 549 550
	/* round out to a pointer alignment */
	if (len & (sizeof(void*) - 1))
		len += sizeof(void*) - (len & (sizeof(void*) - 1));
551 552 553 554
	p->next_free += len;
	return r;
}

555
static void *pool_calloc(size_t count, size_t size)
556 557 558 559 560 561 562
{
	size_t len = count * size;
	void *r = pool_alloc(len);
	memset(r, 0, len);
	return r;
}

563
static char *pool_strdup(const char *s)
564 565 566 567 568 569
{
	char *r = pool_alloc(strlen(s) + 1);
	strcpy(r, s);
	return r;
}

570 571 572 573 574 575 576 577 578 579 580
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);
}

581
static void insert_mark(uintmax_t idnum, struct object_entry *oe)
582 583 584 585 586 587 588 589 590
{
	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) {
591
		uintmax_t i = idnum >> s->shift;
592 593 594 595 596 597 598 599 600 601 602 603
		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;
}

604
static struct object_entry *find_mark(uintmax_t idnum)
605
{
606
	uintmax_t orig_idnum = idnum;
607 608 609 610
	struct mark_set *s = marks;
	struct object_entry *oe = NULL;
	if ((idnum >> s->shift) < 1024) {
		while (s && s->shift) {
611
			uintmax_t i = idnum >> s->shift;
612 613 614 615 616 617 618
			idnum -= i << s->shift;
			s = s->data.sets[i];
		}
		if (s)
			oe = s->data.marked[idnum];
	}
	if (!oe)
619
		die("mark :%" PRIuMAX " not declared", orig_idnum);
620 621 622
	return oe;
}

623
static struct atom_str *to_atom(const char *s, unsigned short len)
624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641
{
	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;
}

642
static struct branch *lookup_branch(const char *name)
643 644 645 646 647 648 649 650 651 652
{
	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;
}

653
static struct branch *new_branch(const char *name)
654 655 656 657 658 659
{
	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);
660 661 662 663
	switch (check_ref_format(name)) {
	case  0: break; /* its valid */
	case -2: break; /* valid, but too few '/', allow anyway */
	default:
664
		die("Branch name doesn't conform to GIT standards: %s", name);
665
	}
666 667 668 669

	b = pool_calloc(1, sizeof(struct branch));
	b->name = pool_strdup(name);
	b->table_next_branch = branch_table[hc];
670 671
	b->branch_tree.versions[0].mode = S_IFDIR;
	b->branch_tree.versions[1].mode = S_IFDIR;
672
	b->active = 0;
673
	b->pack_id = MAX_PACK_ID;
674 675 676 677 678 679 680 681 682 683 684
	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;
}

685
static struct tree_content *new_tree_content(unsigned int cnt)
686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707
{
	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;
708
	t->delta_depth = 0;
709 710 711 712 713 714 715 716
	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);
717 718 719 720 721 722
	f->next_avail = avail_tree_table[hc];
	avail_tree_table[hc] = f;
}

static void release_tree_content_recursive(struct tree_content *t)
{
723 724 725
	unsigned int i;
	for (i = 0; i < t->entry_count; i++)
		release_tree_entry(t->entries[i]);
726
	release_tree_content(t);
727 728
}

729
static struct tree_content *grow_tree_content(
730 731 732 733 734
	struct tree_content *t,
	int amt)
{
	struct tree_content *r = new_tree_content(t->entry_count + amt);
	r->entry_count = t->entry_count;
735
	r->delta_depth = t->delta_depth;
736 737 738 739 740
	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
	release_tree_content(t);
	return r;
}

741
static struct tree_entry *new_tree_entry(void)
742 743 744 745 746
{
	struct tree_entry *e;

	if (!avail_tree_entry) {
		unsigned int n = tree_entry_alloc;
747
		total_allocd += n * sizeof(struct tree_entry);
748
		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
749
		while (n-- > 1) {
750 751 752
			*((void**)e) = e + 1;
			e++;
		}
753
		*((void**)e) = NULL;
754 755 756 757 758 759 760 761 762 763
	}

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

static void release_tree_entry(struct tree_entry *e)
{
	if (e->tree)
764
		release_tree_content_recursive(e->tree);
765 766 767 768
	*((void**)e) = avail_tree_entry;
	avail_tree_entry = e;
}

769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793
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;
}

794
static void start_packfile(void)
795
{
796
	static char tmpfile[PATH_MAX];
797
	struct packed_git *p;
798
	struct pack_header hdr;
799
	int pack_fd;
800

801
	snprintf(tmpfile, sizeof(tmpfile),
802
		"%s/tmp_pack_XXXXXX", get_object_directory());
803
	pack_fd = xmkstemp(tmpfile);
804 805
	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
	strcpy(p->pack_name, tmpfile);
806
	p->pack_fd = pack_fd;
807 808 809 810

	hdr.hdr_signature = htonl(PACK_SIGNATURE);
	hdr.hdr_version = htonl(2);
	hdr.hdr_entries = 0;
811
	write_or_die(p->pack_fd, &hdr, sizeof(hdr));
812 813

	pack_data = p;
814 815
	pack_size = sizeof(hdr);
	object_count = 0;
816 817 818

	all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
	all_packs[pack_id] = p;
819 820 821 822 823 824 825 826 827
}

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

828
static char *create_index(void)
829
{
830 831
	static char tmpfile[PATH_MAX];
	SHA_CTX ctx;
832 833 834
	struct sha1file *f;
	struct object_entry **idx, **c, **last, *e;
	struct object_entry_pool *o;
835
	uint32_t array[256];
836
	int i, idx_fd;
837 838 839 840 841

	/* 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)
842 843 844
		for (e = o->next_free; e-- != o->entries;)
			if (pack_id == e->pack_id)
				*c++ = e;
845
	last = idx + object_count;
846 847
	if (c != last)
		die("internal consistency error creating the index");
848 849 850 851 852 853 854 855 856 857 858 859 860 861 862
	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;
	}

863
	snprintf(tmpfile, sizeof(tmpfile),
864
		"%s/tmp_idx_XXXXXX", get_object_directory());
865
	idx_fd = xmkstemp(tmpfile);
866
	f = sha1fd(idx_fd, tmpfile);
867
	sha1write(f, array, 256 * sizeof(int));
868
	SHA1_Init(&ctx);
869
	for (c = idx; c != last; c++) {
870
		uint32_t offset = htonl((*c)->offset);
871 872
		sha1write(f, &offset, 4);
		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
873
		SHA1_Update(&ctx, (*c)->sha1, 20);
874
	}
875
	sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
876
	sha1close(f, NULL, 1);
877
	free(idx);
878 879 880 881
	SHA1_Final(pack_data->sha1, &ctx);
	return tmpfile;
}

882
static char *keep_pack(char *curr_index_name)
883 884
{
	static char name[PATH_MAX];
885
	static const char *keep_msg = "fast-import";
886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910
	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;
}

911
static void unkeep_all_packs(void)
912 913 914 915 916 917 918 919 920 921
{
	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);
	}
922 923
}

924
static void end_packfile(void)
925
{
926 927
	struct packed_git *old_p = pack_data, *new_p;

928
	if (object_count) {
929
		char *idx_name;
930 931 932
		int i;
		struct branch *b;
		struct tag *t;
933

934 935 936
		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
				    pack_data->pack_name, object_count);
		close(pack_data->pack_fd);
937
		idx_name = keep_pack(create_index());
938 939 940 941 942 943

		/* 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;
944
		all_packs[pack_id] = new_p;
945
		install_packed_git(new_p);
946 947

		/* Print the boundary */
948 949 950 951 952 953 954
		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));
				}
955
			}
956 957 958 959 960 961
			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);
962 963 964
		}

		pack_id++;
965
	}
966
	else
967
		unlink(old_p->pack_name);
968 969 970 971 972 973 974 975
	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;
976 977
}

978
static void cycle_packfile(void)
979 980 981 982 983
{
	end_packfile();
	start_packfile();
}

984
static size_t encode_header(
985
	enum object_type type,
986
	size_t size,
987
	unsigned char *hdr)
988 989 990 991
{
	int n = 1;
	unsigned char c;

992
	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006
		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;
}

1007 1008 1009
static int store_object(
	enum object_type type,
	void *dat,
1010
	size_t datlen,
1011
	struct last_object *last,
1012
	unsigned char *sha1out,
1013
	uintmax_t mark)
1014 1015
{
	void *out, *delta;
1016 1017 1018
	struct object_entry *e;
	unsigned char hdr[96];
	unsigned char sha1[20];
1019
	unsigned long hdrlen, deltalen;
1020 1021 1022
	SHA_CTX c;
	z_stream s;

1023
	hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1024
		(unsigned long)datlen) + 1;
1025 1026 1027 1028
	SHA1_Init(&c);
	SHA1_Update(&c, hdr, hdrlen);
	SHA1_Update(&c, dat, datlen);
	SHA1_Final(sha1, &c);
1029
	if (sha1out)
1030
		hashcpy(sha1out, sha1);
1031 1032

	e = insert_object(sha1);
1033 1034
	if (mark)
		insert_mark(mark, e);
1035
	if (e->offset) {
1036
		duplicate_count_by_type[type]++;
1037
		return 1;
1038 1039 1040 1041 1042 1043
	} 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;
1044
	}
1045

1046
	if (last && last->data && last->depth < max_depth) {
1047
		delta = diff_delta(last->data, last->len,
1048 1049
			dat, datlen,
			&deltalen, 0);
1050 1051 1052 1053 1054 1055
		if (delta && deltalen >= datlen) {
			free(delta);
			delta = NULL;
		}
	} else
		delta = NULL;
1056 1057 1058

	memset(&s, 0, sizeof(s));
	deflateInit(&s, zlib_compression_level);
1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072
	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. */
1073
	if ((pack_size + 60 + s.total_out) > max_packsize
1074 1075 1076 1077
		|| (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;
1078
		cycle_packfile();
1079 1080 1081 1082 1083

		/* We cannot carry a delta into the new pack. */
		if (delta) {
			free(delta);
			delta = NULL;
1084 1085 1086 1087 1088 1089 1090 1091 1092 1093

			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);
1094 1095 1096 1097 1098 1099 1100 1101
		}
	}

	e->type = type;
	e->pack_id = pack_id;
	e->offset = pack_size;
	object_count++;
	object_count_by_type[type]++;
1102 1103

	if (delta) {
1104 1105 1106
		unsigned long ofs = e->offset - last->offset;
		unsigned pos = sizeof(hdr) - 1;

1107
		delta_count_by_type[type]++;
1108
		last->depth++;
1109 1110

		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1111
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1112 1113 1114 1115 1116
		pack_size += hdrlen;

		hdr[pos] = ofs & 127;
		while (ofs >>= 7)
			hdr[--pos] = 128 | (--ofs & 127);
1117
		write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1118
		pack_size += sizeof(hdr) - pos;
1119
	} else {
1120 1121
		if (last)
			last->depth = 0;
1122
		hdrlen = encode_header(type, datlen, hdr);
1123
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1124
		pack_size += hdrlen;
1125 1126
	}

1127
	write_or_die(pack_data->pack_fd, out, s.total_out);
1128
	pack_size += s.total_out;
1129 1130

	free(out);
1131
	free(delta);
1132
	if (last) {
1133
		if (!last->no_free)
1134 1135
			free(last->data);
		last->data = dat;
1136
		last->offset = e->offset;
1137 1138 1139 1140 1141
		last->len = datlen;
	}
	return 0;
}

1142 1143 1144
static void *gfi_unpack_entry(
	struct object_entry *oe,
	unsigned long *sizep)
1145
{
1146
	enum object_type type;
1147 1148 1149
	struct packed_git *p = all_packs[oe->pack_id];
	if (p == pack_data)
		p->pack_size = pack_size + 20;
1150
	return unpack_entry(p, oe->offset, &type, sizep);
1151 1152
}

1153
static const char *get_mode(const char *str, uint16_t *modep)
1154 1155
{
	unsigned char c;
1156
	uint16_t mode = 0;
1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168

	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)
{
1169
	unsigned char* sha1 = root->versions[1].sha1;
1170 1171 1172 1173 1174 1175 1176
	struct object_entry *myoe;
	struct tree_content *t;
	unsigned long size;
	char *buf;
	const char *c;

	root->tree = t = new_tree_content(8);
1177
	if (is_null_sha1(sha1))
1178 1179
		return;

1180
	myoe = find_object(sha1);
1181
	if (myoe && myoe->pack_id != MAX_PACK_ID) {
1182
		if (myoe->type != OBJ_TREE)
1183
			die("Not a tree: %s", sha1_to_hex(sha1));
1184
		t->delta_depth = 0;
1185
		buf = gfi_unpack_entry(myoe, &size);
1186
	} else {
1187 1188 1189
		enum object_type type;
		buf = read_sha1_file(sha1, &type, &size);
		if (!buf || type != OBJ_TREE)
1190
			die("Can't load tree %s", sha1_to_hex(sha1));
1191 1192 1193 1194 1195 1196 1197
	}

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

		if (t->entry_count == t->entry_capacity)
1198
			root->tree = t = grow_tree_content(t, t->entry_count);
1199 1200 1201
		t->entries[t->entry_count++] = e;

		e->tree = NULL;
1202
		c = get_mode(c, &e->versions[1].mode);
1203
		if (!c)
1204 1205
			die("Corrupt mode in %s", sha1_to_hex(sha1));
		e->versions[0].mode = e->versions[1].mode;
1206
		e->name = to_atom(c, strlen(c));
1207
		c += e->name->str_len + 1;
1208 1209
		hashcpy(e->versions[0].sha1, (unsigned char*)c);
		hashcpy(e->versions[1].sha1, (unsigned char*)c);
1210 1211 1212 1213 1214
		c += 20;
	}
	free(buf);
}

1215
static int tecmp0 (const void *_a, const void *_b)
1216 1217 1218 1219
{
	struct tree_entry *a = *((struct tree_entry**)_a);
	struct tree_entry *b = *((struct tree_entry**)_b);
	return base_name_compare(
1220 1221
		a->name->str_dat, a->name->str_len, a->versions[0].mode,
		b->name->str_dat, b->name->str_len, b->versions[0].mode);
1222 1223
}

1224
static int tecmp1 (const void *_a, const void *_b)
1225
{
1226 1227 1228 1229 1230 1231 1232
	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);
}

1233 1234 1235 1236
static void mktree(struct tree_content *t,
	int v,
	unsigned long *szp,
	struct dbuf *b)
1237 1238
{
	size_t maxlen = 0;
1239
	unsigned int i;
1240
	char *c;
1241

1242 1243 1244 1245
	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);
1246 1247

	for (i = 0; i < t->entry_count; i++) {
1248 1249
		if (t->entries[i]->versions[v].mode)
			maxlen += t->entries[i]->name->str_len + 34;
1250 1251
	}

1252
	size_dbuf(b, maxlen);
1253
	c = b->buffer;
1254 1255
	for (i = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
1256 1257
		if (!e->versions[v].mode)
			continue;
1258
		c += sprintf(c, "%o", (unsigned int)e->versions[v].mode);
1259 1260 1261
		*c++ = ' ';
		strcpy(c, e->name->str_dat);
		c += e->name->str_len + 1;
1262
		hashcpy((unsigned char*)c, e->versions[v].sha1);
1263 1264
		c += 20;
	}
1265
	*szp = c - (char*)b->buffer;
1266 1267 1268 1269 1270 1271
}

static void store_tree(struct tree_entry *root)
{
	struct tree_content *t = root->tree;
	unsigned int i, j, del;
1272
	unsigned long new_len;
1273
	struct last_object lo;
1274
	struct object_entry *le;
1275 1276 1277 1278 1279 1280 1281 1282 1283

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

1284
	le = find_object(root->versions[0].sha1);
1285 1286 1287
	if (!S_ISDIR(root->versions[0].mode)
		|| !le
		|| le->pack_id != pack_id) {
1288 1289
		lo.data = NULL;
		lo.depth = 0;
1290
		lo.no_free = 0;
1291
	} else {
1292 1293
		mktree(t, 0, &lo.len, &old_tree);
		lo.data = old_tree.buffer;
1294
		lo.offset = le->offset;
1295
		lo.depth = t->delta_depth;
1296
		lo.no_free = 1;
1297 1298
	}

1299
	mktree(t, 1, &new_len, &new_tree);
1300
	store_object(OBJ_TREE, new_tree.buffer, new_len,
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315
		&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;
1316 1317 1318 1319 1320 1321
}

static int tree_content_set(
	struct tree_entry *root,
	const char *p,
	const unsigned char *sha1,
1322 1323
	const uint16_t mode,
	struct tree_content *subtree)
1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334
{
	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);
1335 1336
	if (!n)
		die("Empty path component found in input");
1337 1338
	if (!slash1 && !S_ISDIR(mode) && subtree)
		die("Non-directories cannot have subtrees");
1339 1340 1341 1342 1343

	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) {
1344 1345
				if (!S_ISDIR(mode)
						&& e->versions[1].mode == mode
1346
						&& !hashcmp(e->versions[1].sha1, sha1))
1347
					return 0;
1348 1349
				e->versions[1].mode = mode;
				hashcpy(e->versions[1].sha1, sha1);
1350
				if (e->tree)
1351
					release_tree_content_recursive(e->tree);
1352
				e->tree = subtree;
1353
				hashclr(root->versions[1].sha1);
1354 1355
				return 1;
			}
1356
			if (!S_ISDIR(e->versions[1].mode)) {
1357
				e->tree = new_tree_content(8);
1358
				e->versions[1].mode = S_IFDIR;
1359 1360 1361
			}
			if (!e->tree)
				load_tree(e);
1362
			if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1363
				hashclr(root->versions[1].sha1);
1364 1365 1366 1367 1368 1369 1370
				return 1;
			}
			return 0;
		}
	}

	if (t->entry_count == t->entry_capacity)
1371
		root->tree = t = grow_tree_content(t, t->entry_count);
1372
	e = new_tree_entry();
1373
	e->name = to_atom(p, n);
1374 1375
	e->versions[0].mode = 0;
	hashclr(e->versions[0].sha1);
1376 1377 1378
	t->entries[t->entry_count++] = e;
	if (slash1) {
		e->tree = new_tree_content(8);
1379
		e->versions[1].mode = S_IFDIR;
1380
		tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1381
	} else {
1382
		e->tree = subtree;
1383 1384
		e->versions[1].mode = mode;
		hashcpy(e->versions[1].sha1, sha1);
1385
	}
1386
	hashclr(root->versions[1].sha1);
1387 1388 1389
	return 1;
}

1390 1391 1392 1393
static int tree_content_remove(
	struct tree_entry *root,
	const char *p,
	struct tree_entry *backup_leaf)
1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408
{
	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)) {
1409
			if (!slash1 || !S_ISDIR(e->versions[1].mode))
1410 1411 1412
				goto del_entry;
			if (!e->tree)
				load_tree(e);
1413
			if (tree_content_remove(e, slash1 + 1, backup_leaf)) {
1414 1415 1416 1417 1418 1419
				for (n = 0; n < e->tree->entry_count; n++) {
					if (e->tree->entries[n]->versions[1].mode) {
						hashclr(root->versions[1].sha1);
						return 1;
					}
				}
1420
				backup_leaf = NULL;
1421
				goto del_entry;
1422 1423 1424 1425 1426 1427 1428
			}
			return 0;
		}
	}
	return 0;

del_entry:
1429 1430 1431
	if (backup_leaf)
		memcpy(backup_leaf, e, sizeof(*backup_leaf));
	else if (e->tree)
1432
		release_tree_content_recursive(e->tree);
1433
	e->tree = NULL;
1434 1435 1436
	e->versions[1].mode = 0;
	hashclr(e->versions[1].sha1);
	hashclr(root->versions[1].sha1);
1437
	return 1;
1438 1439
}

1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476
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;
}

1477
static int update_branch(struct branch *b)
1478 1479
{
	static const char *msg = "fast-import";
1480 1481 1482 1483 1484
	struct ref_lock *lock;
	unsigned char old_sha1[20];

	if (read_ref(b->name, old_sha1))
		hashclr(old_sha1);
1485
	lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497
	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);
		}

1498
		if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1499
			unlock_ref(lock);
1500
			warning("Not updating %s"
1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512
				" (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)
{
1513 1514 1515 1516
	unsigned int i;
	struct branch *b;

	for (i = 0; i < branch_table_sz; i++) {
1517 1518
		for (b = branch_table[i]; b; b = b->table_next_branch)
			failure |= update_branch(b);
1519 1520 1521
	}
}

1522
static void dump_tags(void)
1523 1524 1525 1526
{
	static const char *msg = "fast-import";
	struct tag *t;
	struct ref_lock *lock;
1527
	char ref_name[PATH_MAX];
1528 1529

	for (t = first_tag; t; t = t->next_tag) {
1530 1531
		sprintf(ref_name, "tags/%s", t->name);
		lock = lock_ref_sha1(ref_name, NULL);
1532
		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1533
			failure |= error("Unable to update %s", ref_name);
1534 1535 1536
	}
}

1537
static void dump_marks_helper(FILE *f,
1538
	uintmax_t base,
1539 1540
	struct mark_set *m)
{
1541
	uintmax_t k;
1542 1543 1544 1545 1546 1547 1548 1549 1550
	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])
1551
				fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1552 1553 1554 1555 1556
					sha1_to_hex(m->data.marked[k]->sha1));
		}
	}
}

1557
static void dump_marks(void)
1558
{
1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570
	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;
1571
	}
1572 1573 1574 1575 1576 1577 1578

	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;
1579
	}
1580 1581 1582 1583 1584 1585

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

1588
static void read_next_command(void)
1589
{
1590
	do {
1591
		if (unread_command_buf) {
1592
			unread_command_buf = 0;
1593 1594 1595 1596 1597 1598
			if (command_buf.eof)
				return;
		} else {
			struct recent_command *rc;

			command_buf.buf = NULL;
1599
			read_line(&command_buf, stdin, '\n');
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619
			if (command_buf.eof)
				return;

			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] == '#');
1620 1621
}

J
Junio C Hamano 已提交
1622
static void skip_optional_lf(void)
1623 1624 1625 1626 1627 1628
{
	int term_char = fgetc(stdin);
	if (term_char != '\n' && term_char != EOF)
		ungetc(term_char, stdin);
}

1629
static void cmd_mark(void)
1630
{
1631
	if (!prefixcmp(command_buf.buf, "mark :")) {
1632
		next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1633 1634 1635
		read_next_command();
	}
	else
1636
		next_mark = 0;
1637 1638
}

1639
static void *cmd_data (size_t *size)
1640 1641
{
	size_t length;
1642
	char *buffer;
1643

1644
	if (prefixcmp(command_buf.buf, "data "))
1645 1646
		die("Expected 'data n' command, found: %s", command_buf.buf);

1647
	if (!prefixcmp(command_buf.buf + 5, "<<")) {
1648 1649 1650 1651
		char *term = xstrdup(command_buf.buf + 5 + 2);
		size_t sz = 8192, term_len = command_buf.len - 5 - 2;
		length = 0;
		buffer = xmalloc(sz);
1652
		command_buf.buf = NULL;
1653
		for (;;) {
1654
			read_line(&command_buf, stdin, '\n');
1655 1656 1657 1658 1659
			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;
1660
			ALLOC_GROW(buffer, length + command_buf.len, sz);
1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675
			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))
1676 1677
				die("EOF in data (%lu bytes remaining)",
					(unsigned long)(length - n));
1678 1679
			n += s;
		}
1680 1681
	}

1682
	skip_optional_lf();
1683 1684 1685 1686
	*size = length;
	return buffer;
}

1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744
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;
}

1745
static void cmd_new_blob(void)
1746
{
1747 1748
	size_t l;
	void *d;
1749 1750 1751

	read_next_command();
	cmd_mark();
1752
	d = cmd_data(&l);
1753

1754 1755
	if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
		free(d);
1756 1757
}

1758
static void unload_one_branch(void)
1759
{
1760 1761
	while (cur_active_branches
		&& cur_active_branches >= max_active_branches) {
1762
		uintmax_t min_commit = ULONG_MAX;
1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779
		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;
		}
1780
		e->active = 0;
1781 1782
		e->active_next_branch = NULL;
		if (e->branch_tree.tree) {
1783
			release_tree_content_recursive(e->branch_tree.tree);
1784 1785 1786
			e->branch_tree.tree = NULL;
		}
		cur_active_branches--;
1787 1788 1789
	}
}

1790
static void load_branch(struct branch *b)
1791
{
1792
	load_tree(&b->branch_tree);
1793 1794 1795 1796 1797 1798 1799
	if (!b->active) {
		b->active = 1;
		b->active_next_branch = active_branches;
		active_branches = b;
		cur_active_branches++;
		branch_load_count++;
	}
1800 1801
}

1802
static void file_change_m(struct branch *b)
1803
{
1804 1805 1806
	const char *p = command_buf.buf + 2;
	char *p_uq;
	const char *endp;
1807
	struct object_entry *oe = oe;
1808
	unsigned char sha1[20];
1809
	uint16_t mode, inline_data = 0;
1810

1811 1812 1813 1814 1815 1816
	p = get_mode(p, &mode);
	if (!p)
		die("Corrupt mode: %s", command_buf.buf);
	switch (mode) {
	case S_IFREG | 0644:
	case S_IFREG | 0755:
1817
	case S_IFLNK:
1818 1819 1820 1821 1822 1823 1824 1825
	case 0644:
	case 0755:
		/* ok */
		break;
	default:
		die("Corrupt mode: %s", command_buf.buf);
	}

1826 1827
	if (*p == ':') {
		char *x;
1828
		oe = find_mark(strtoumax(p + 1, &x, 10));
1829
		hashcpy(sha1, oe->sha1);
1830
		p = x;
1831
	} else if (!prefixcmp(p, "inline")) {
1832 1833
		inline_data = 1;
		p += 6;
1834 1835 1836 1837 1838 1839
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
1840 1841 1842 1843 1844 1845 1846 1847 1848
	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;
	}
1849

1850 1851 1852 1853 1854 1855 1856 1857 1858 1859
	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) {
1860
		if (oe->type != OBJ_BLOB)
1861
			die("Not a blob (actually a %s): %s",
1862
				command_buf.buf, typename(oe->type));
1863
	} else {
1864 1865
		enum object_type type = sha1_object_info(sha1, NULL);
		if (type < 0)
1866
			die("Blob not found: %s", command_buf.buf);
1867
		if (type != OBJ_BLOB)
1868
			die("Not a blob (actually a %s): %s",
1869
			    typename(type), command_buf.buf);
1870
	}
1871

1872
	tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1873
	free(p_uq);
1874
}
1875

1876 1877
static void file_change_d(struct branch *b)
{
1878 1879 1880 1881 1882 1883 1884 1885 1886 1887
	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;
	}
1888
	tree_content_remove(&b->branch_tree, p, NULL);
1889
	free(p_uq);
1890 1891
}

1892
static void file_change_cr(struct branch *b, int rename)
1893 1894 1895 1896 1897 1898 1899 1900 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
{
	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));
1928 1929 1930 1931
	if (rename)
		tree_content_remove(&b->branch_tree, s, &leaf);
	else
		tree_content_get(&b->branch_tree, s, &leaf);
1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
	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);
}

1943 1944 1945 1946 1947 1948 1949 1950
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);
}

1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977
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);
	}
}

1978
static int cmd_from(struct branch *b)
1979
{
1980
	const char *from;
1981 1982
	struct branch *s;

1983
	if (prefixcmp(command_buf.buf, "from "))
1984
		return 0;
1985

1986 1987 1988 1989
	if (b->branch_tree.tree) {
		release_tree_content_recursive(b->branch_tree.tree);
		b->branch_tree.tree = NULL;
	}
1990 1991 1992 1993 1994 1995

	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) {
1996
		unsigned char *t = s->branch_tree.versions[1].sha1;
1997
		hashcpy(b->sha1, s->sha1);
1998 1999
		hashcpy(b->branch_tree.versions[0].sha1, t);
		hashcpy(b->branch_tree.versions[1].sha1, t);
2000
	} else if (*from == ':') {
2001
		uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2002 2003
		struct object_entry *oe = find_mark(idnum);
		if (oe->type != OBJ_COMMIT)
2004
			die("Mark :%" PRIuMAX " not a commit", idnum);
2005
		hashcpy(b->sha1, oe->sha1);
2006
		if (oe->pack_id != MAX_PACK_ID) {
2007
			unsigned long size;
2008 2009
			char *buf = gfi_unpack_entry(oe, &size);
			cmd_from_commit(b, buf, size);
2010
			free(buf);
2011 2012
		} else
			cmd_from_existing(b);
2013 2014 2015
	} else if (!get_sha1(from, b->sha1))
		cmd_from_existing(b);
	else
2016 2017 2018
		die("Invalid ref name or SHA1 expression: %s", from);

	read_next_command();
2019
	return 1;
2020 2021
}

2022
static struct hash_list *cmd_merge(unsigned int *count)
2023
{
2024
	struct hash_list *list = NULL, *n, *e = e;
2025
	const char *from;
2026 2027 2028
	struct branch *s;

	*count = 0;
2029
	while (!prefixcmp(command_buf.buf, "merge ")) {
2030 2031 2032 2033 2034 2035
		from = strchr(command_buf.buf, ' ') + 1;
		n = xmalloc(sizeof(*n));
		s = lookup_branch(from);
		if (s)
			hashcpy(n->sha1, s->sha1);
		else if (*from == ':') {
2036
			uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2037 2038
			struct object_entry *oe = find_mark(idnum);
			if (oe->type != OBJ_COMMIT)
2039
				die("Mark :%" PRIuMAX " not a commit", idnum);
2040
			hashcpy(n->sha1, oe->sha1);
2041 2042 2043
		} else if (!get_sha1(from, n->sha1)) {
			unsigned long size;
			char *buf = read_object_with_reference(n->sha1,
S
Shawn O. Pearce 已提交
2044
				commit_type, &size, n->sha1);
2045 2046 2047 2048
			if (!buf || size < 46)
				die("Not a valid commit: %s", from);
			free(buf);
		} else
2049 2050 2051 2052 2053 2054 2055 2056
			die("Invalid ref name or SHA1 expression: %s", from);

		n->next = NULL;
		if (list)
			e->next = n;
		else
			list = n;
		e = n;
2057
		(*count)++;
2058 2059 2060 2061 2062
		read_next_command();
	}
	return list;
}

2063
static void cmd_new_commit(void)
2064
{
2065 2066 2067 2068 2069 2070
	struct branch *b;
	void *msg;
	size_t msglen;
	char *sp;
	char *author = NULL;
	char *committer = NULL;
2071 2072
	struct hash_list *merge_list = NULL;
	unsigned int merge_count;
2073 2074 2075 2076

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	b = lookup_branch(sp);
2077
	if (!b)
2078
		b = new_branch(sp);
2079 2080 2081

	read_next_command();
	cmd_mark();
2082
	if (!prefixcmp(command_buf.buf, "author ")) {
2083
		author = parse_ident(command_buf.buf + 7);
2084 2085
		read_next_command();
	}
2086
	if (!prefixcmp(command_buf.buf, "committer ")) {
2087
		committer = parse_ident(command_buf.buf + 10);
2088 2089 2090 2091 2092
		read_next_command();
	}
	if (!committer)
		die("Expected committer but didn't get one");
	msg = cmd_data(&msglen);
2093 2094
	read_next_command();
	cmd_from(b);
2095
	merge_list = cmd_merge(&merge_count);
2096 2097

	/* ensure the branch is active/loaded */
2098
	if (!b->branch_tree.tree || !max_active_branches) {
2099 2100 2101
		unload_one_branch();
		load_branch(b);
	}
2102

2103
	/* file_change* */
2104 2105
	while (!command_buf.eof && command_buf.len > 1) {
		if (!prefixcmp(command_buf.buf, "M "))
2106
			file_change_m(b);
2107
		else if (!prefixcmp(command_buf.buf, "D "))
2108
			file_change_d(b);
2109
		else if (!prefixcmp(command_buf.buf, "R "))
2110 2111 2112
			file_change_cr(b, 1);
		else if (!prefixcmp(command_buf.buf, "C "))
			file_change_cr(b, 0);
2113 2114
		else if (!strcmp("deleteall", command_buf.buf))
			file_change_deleteall(b);
2115 2116 2117 2118
		else {
			unread_command_buf = 1;
			break;
		}
2119
		read_next_command();
2120 2121
	}

2122
	/* build the tree and the commit */
2123
	store_tree(&b->branch_tree);
2124 2125
	hashcpy(b->branch_tree.versions[0].sha1,
		b->branch_tree.versions[1].sha1);
2126
	size_dbuf(&new_data, 114 + msglen
2127
		+ merge_count * 49
2128 2129 2130
		+ (author
			? strlen(author) + strlen(committer)
			: 2 * strlen(committer)));
2131
	sp = new_data.buffer;
2132 2133
	sp += sprintf(sp, "tree %s\n",
		sha1_to_hex(b->branch_tree.versions[1].sha1));
2134
	if (!is_null_sha1(b->sha1))
2135
		sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
2136 2137 2138 2139 2140 2141
	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;
	}
2142 2143 2144
	sp += sprintf(sp, "author %s\n", author ? author : committer);
	sp += sprintf(sp, "committer %s\n", committer);
	*sp++ = '\n';
2145 2146
	memcpy(sp, msg, msglen);
	sp += msglen;
2147
	free(author);
2148 2149 2150
	free(committer);
	free(msg);

2151
	if (!store_object(OBJ_COMMIT,
2152
		new_data.buffer, sp - (char*)new_data.buffer,
2153 2154
		NULL, b->sha1, next_mark))
		b->pack_id = pack_id;
2155
	b->last_commit = object_count_by_type[OBJ_COMMIT];
2156 2157
}

2158
static void cmd_new_tag(void)
2159 2160 2161 2162 2163 2164 2165 2166
{
	char *sp;
	const char *from;
	char *tagger;
	struct branch *s;
	void *msg;
	size_t msglen;
	struct tag *t;
2167
	uintmax_t from_mark = 0;
2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182
	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 ... */
2183
	if (prefixcmp(command_buf.buf, "from "))
2184 2185 2186 2187
		die("Expected from command, got %s", command_buf.buf);
	from = strchr(command_buf.buf, ' ') + 1;
	s = lookup_branch(from);
	if (s) {
2188
		hashcpy(sha1, s->sha1);
2189
	} else if (*from == ':') {
2190
		struct object_entry *oe;
2191
		from_mark = strtoumax(from + 1, NULL, 10);
2192
		oe = find_mark(from_mark);
2193
		if (oe->type != OBJ_COMMIT)
2194
			die("Mark :%" PRIuMAX " not a commit", from_mark);
2195
		hashcpy(sha1, oe->sha1);
2196 2197 2198 2199 2200
	} else if (!get_sha1(from, sha1)) {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(sha1,
2201
			commit_type, &size, sha1);
2202 2203 2204 2205 2206 2207 2208 2209
		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 ... */
2210
	if (prefixcmp(command_buf.buf, "tagger "))
2211
		die("Expected tagger command, got %s", command_buf.buf);
2212
	tagger = parse_ident(command_buf.buf + 7);
2213 2214 2215 2216 2217 2218

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

	/* build the tag object */
2219 2220
	size_dbuf(&new_data, 67+strlen(t->name)+strlen(tagger)+msglen);
	sp = new_data.buffer;
2221
	sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
2222
	sp += sprintf(sp, "type %s\n", commit_type);
2223
	sp += sprintf(sp, "tag %s\n", t->name);
2224 2225
	sp += sprintf(sp, "tagger %s\n", tagger);
	*sp++ = '\n';
2226 2227 2228 2229 2230
	memcpy(sp, msg, msglen);
	sp += msglen;
	free(tagger);
	free(msg);

2231 2232 2233 2234 2235 2236
	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;
2237 2238
}

2239
static void cmd_reset_branch(void)
2240 2241 2242 2243 2244 2245 2246 2247
{
	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) {
2248 2249 2250
		hashclr(b->sha1);
		hashclr(b->branch_tree.versions[0].sha1);
		hashclr(b->branch_tree.versions[1].sha1);
2251 2252 2253 2254 2255
		if (b->branch_tree.tree) {
			release_tree_content_recursive(b->branch_tree.tree);
			b->branch_tree.tree = NULL;
		}
	}
2256 2257 2258
	else
		b = new_branch(sp);
	read_next_command();
2259 2260
	if (!cmd_from(b) && command_buf.len > 1)
		unread_command_buf = 1;
2261 2262
}

2263
static void cmd_checkpoint(void)
2264
{
2265 2266 2267 2268 2269 2270
	if (object_count) {
		cycle_packfile();
		dump_branches();
		dump_tags();
		dump_marks();
	}
2271
	skip_optional_lf();
2272 2273
}

2274 2275 2276 2277 2278 2279 2280 2281
static void cmd_progress(void)
{
	fwrite(command_buf.buf, 1, command_buf.len - 1, stdout);
	fputc('\n', stdout);
	fflush(stdout);
	skip_optional_lf();
}

2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309
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;
2310
			e->offset = 1; /* just not zero! */
2311 2312 2313 2314 2315 2316
		}
		insert_mark(mark, e);
	}
	fclose(f);
}

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

2320 2321
int main(int argc, const char **argv)
{
2322
	unsigned int i, show_stats = 1;
2323

2324
	git_config(git_default_config);
2325 2326 2327 2328 2329 2330
	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));
2331

2332 2333 2334 2335 2336
	for (i = 1; i < argc; i++) {
		const char *a = argv[i];

		if (*a != '-' || !strcmp(a, "--"))
			break;
2337
		else if (!prefixcmp(a, "--date-format=")) {
2338 2339 2340 2341 2342 2343 2344 2345 2346 2347
			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);
		}
2348
		else if (!prefixcmp(a, "--max-pack-size="))
2349
			max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2350
		else if (!prefixcmp(a, "--depth="))
2351
			max_depth = strtoul(a + 8, NULL, 0);
2352
		else if (!prefixcmp(a, "--active-branches="))
2353
			max_active_branches = strtoul(a + 18, NULL, 0);
2354 2355
		else if (!prefixcmp(a, "--import-marks="))
			import_marks(a + 15);
2356
		else if (!prefixcmp(a, "--export-marks="))
2357
			mark_file = a + 15;
2358
		else if (!prefixcmp(a, "--export-pack-edges=")) {
2359 2360 2361 2362 2363 2364
			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"))
2365
			force_update = 1;
2366 2367 2368 2369
		else if (!strcmp(a, "--quiet"))
			show_stats = 0;
		else if (!strcmp(a, "--stats"))
			show_stats = 1;
2370 2371 2372
		else
			die("unknown option %s", a);
	}
2373
	if (i != argc)
2374 2375
		usage(fast_import_usage);

2376 2377 2378 2379 2380
	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;

2381
	prepare_packed_git();
2382
	start_packfile();
2383
	set_die_routine(die_nicely);
2384
	for (;;) {
2385 2386
		read_next_command();
		if (command_buf.eof)
2387
			break;
2388 2389
		else if (!strcmp("blob", command_buf.buf))
			cmd_new_blob();
2390
		else if (!prefixcmp(command_buf.buf, "commit "))
2391
			cmd_new_commit();
2392
		else if (!prefixcmp(command_buf.buf, "tag "))
2393
			cmd_new_tag();
2394
		else if (!prefixcmp(command_buf.buf, "reset "))
2395
			cmd_reset_branch();
2396 2397
		else if (!strcmp("checkpoint", command_buf.buf))
			cmd_checkpoint();
2398 2399
		else if (!prefixcmp(command_buf.buf, "progress "))
			cmd_progress();
2400 2401
		else
			die("Unsupported command: %s", command_buf.buf);
2402
	}
2403
	end_packfile();
2404

2405
	dump_branches();
2406
	dump_tags();
2407
	unkeep_all_packs();
2408
	dump_marks();
2409

2410 2411 2412
	if (pack_edges)
		fclose(pack_edges);

2413 2414 2415 2416 2417 2418 2419 2420 2421
	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");
2422 2423 2424 2425 2426 2427
		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]);
2428
		fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
2429
		fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2430
		fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
2431
		fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2432
		fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
2433
		fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2434 2435 2436 2437 2438
		fprintf(stderr, "---------------------------------------------------------------------\n");
		pack_report();
		fprintf(stderr, "---------------------------------------------------------------------\n");
		fprintf(stderr, "\n");
	}
2439

2440
	return failure ? 1 : 0;
2441
}