fast-import.c 58.7 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
#include "quote.h"
153

154 155
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
156 157
#define DEPTH_BITS 13
#define MAX_DEPTH ((1<<DEPTH_BITS)-1)
158

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

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

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

186 187
struct last_object
{
P
Pierre Habouzit 已提交
188
	struct strbuf data;
189
	uint32_t offset;
190
	unsigned int depth;
P
Pierre Habouzit 已提交
191
	unsigned no_swap : 1;
192 193
};

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

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

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

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

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

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

255 256 257 258 259
struct hash_list
{
	struct hash_list *next;
	unsigned char sha1[20];
};
260

261 262 263 264 265 266
typedef enum {
	WHENSPEC_RAW = 1,
	WHENSPEC_RFC2822,
	WHENSPEC_NOW,
} whenspec_type;

267 268 269 270 271 272 273
struct recent_command
{
	struct recent_command *prev;
	struct recent_command *next;
	char *buf;
};

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

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

291 292 293 294 295
/* 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;

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

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

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

/* Our last blob */
P
Pierre Habouzit 已提交
315
static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
316 317 318 319 320 321

/* 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;
322 323
static struct strbuf old_tree = STRBUF_INIT;
static struct strbuf new_tree = STRBUF_INIT;
324

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

332 333 334 335
/* Tag data */
static struct tag *first_tag;
static struct tag *last_tag;

336
/* Input stream parsing */
337
static whenspec_type whenspec = WHENSPEC_RAW;
338
static struct strbuf command_buf = STRBUF_INIT;
339
static int unread_command_buf;
340 341 342 343
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;
344
static uintmax_t next_mark;
345
static struct strbuf new_data = STRBUF_INIT;
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
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);
}

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

	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);
395
	fputs(err, rpt);
396 397
	fputc('\n', rpt);

398 399 400 401 402 403 404 405 406 407 408 409
	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);
	}

410 411 412 413 414 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
	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;
440
	char message[2 * PATH_MAX];
441

442
	vsnprintf(message, sizeof(message), err, params);
443
	fputs("fatal: ", stderr);
444
	fputs(message, stderr);
445 446 447 448
	fputc('\n', stderr);

	if (!zombie) {
		zombie = 1;
449
		write_crash_report(message);
450 451 452
	}
	exit(128);
}
453

454
static void alloc_objects(unsigned int cnt)
455
{
456
	struct object_entry_pool *b;
457

458
	b = xmalloc(sizeof(struct object_entry_pool)
459
		+ cnt * sizeof(struct object_entry));
460
	b->next_pool = blocks;
461 462 463 464 465
	b->next_free = b->entries;
	b->end = b->entries + cnt;
	blocks = b;
	alloc_count += cnt;
}
466

467
static struct object_entry *new_object(unsigned char *sha1)
468
{
469
	struct object_entry *e;
470

471
	if (blocks->next_free == blocks->end)
472
		alloc_objects(object_entry_alloc);
473

474
	e = blocks->next_free++;
475
	hashcpy(e->sha1, sha1);
476
	return e;
477 478
}

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

489
static struct object_entry *insert_object(unsigned char *sha1)
490 491
{
	unsigned int h = sha1[0] << 8 | sha1[1];
492
	struct object_entry *e = object_table[h];
493
	struct object_entry *p = NULL;
494 495

	while (e) {
496
		if (!hashcmp(sha1, e->sha1))
497 498 499 500 501 502
			return e;
		p = e;
		e = e->next;
	}

	e = new_object(sha1);
503
	e->next = NULL;
504 505 506 507
	e->offset = 0;
	if (p)
		p->next = e;
	else
508
		object_table[h] = e;
509 510
	return e;
}
511

512 513 514 515 516 517 518 519
static unsigned int hc_str(const char *s, size_t len)
{
	unsigned int r = 0;
	while (len-- > 0)
		r = r * 31 + *s++;
	return r;
}

520
static void *pool_alloc(size_t len)
521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536
{
	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;
537
		p->next_free = (char *) p->space;
538 539 540 541 542
		p->end = p->next_free + mem_pool_alloc;
		mem_pool = p;
	}

	r = p->next_free;
543 544 545
	/* round out to a 'uintmax_t' alignment */
	if (len & (sizeof(uintmax_t) - 1))
		len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
546 547 548 549
	p->next_free += len;
	return r;
}

550
static void *pool_calloc(size_t count, size_t size)
551 552 553 554 555 556 557
{
	size_t len = count * size;
	void *r = pool_alloc(len);
	memset(r, 0, len);
	return r;
}

558
static char *pool_strdup(const char *s)
559 560 561 562 563 564
{
	char *r = pool_alloc(strlen(s) + 1);
	strcpy(r, s);
	return r;
}

565
static void insert_mark(uintmax_t idnum, struct object_entry *oe)
566 567 568 569 570 571 572 573 574
{
	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) {
575
		uintmax_t i = idnum >> s->shift;
576 577 578 579 580 581 582 583 584 585 586 587
		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;
}

588
static struct object_entry *find_mark(uintmax_t idnum)
589
{
590
	uintmax_t orig_idnum = idnum;
591 592 593 594
	struct mark_set *s = marks;
	struct object_entry *oe = NULL;
	if ((idnum >> s->shift) < 1024) {
		while (s && s->shift) {
595
			uintmax_t i = idnum >> s->shift;
596 597 598 599 600 601 602
			idnum -= i << s->shift;
			s = s->data.sets[i];
		}
		if (s)
			oe = s->data.marked[idnum];
	}
	if (!oe)
603
		die("mark :%" PRIuMAX " not declared", orig_idnum);
604 605 606
	return oe;
}

607
static struct atom_str *to_atom(const char *s, unsigned short len)
608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625
{
	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;
}

626
static struct branch *lookup_branch(const char *name)
627 628 629 630 631 632 633 634 635 636
{
	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;
}

637
static struct branch *new_branch(const char *name)
638 639 640 641 642 643
{
	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);
644
	switch (check_ref_format(name)) {
645 646 647
	case 0: break; /* its valid */
	case CHECK_REF_FORMAT_ONELEVEL:
		break; /* valid, but too few '/', allow anyway */
648
	default:
649
		die("Branch name doesn't conform to GIT standards: %s", name);
650
	}
651 652 653 654

	b = pool_calloc(1, sizeof(struct branch));
	b->name = pool_strdup(name);
	b->table_next_branch = branch_table[hc];
655 656
	b->branch_tree.versions[0].mode = S_IFDIR;
	b->branch_tree.versions[1].mode = S_IFDIR;
657
	b->active = 0;
658
	b->pack_id = MAX_PACK_ID;
659 660 661 662 663 664 665 666 667 668 669
	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;
}

670
static struct tree_content *new_tree_content(unsigned int cnt)
671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692
{
	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;
693
	t->delta_depth = 0;
694 695 696 697 698 699 700 701
	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);
702 703 704 705 706 707
	f->next_avail = avail_tree_table[hc];
	avail_tree_table[hc] = f;
}

static void release_tree_content_recursive(struct tree_content *t)
{
708 709 710
	unsigned int i;
	for (i = 0; i < t->entry_count; i++)
		release_tree_entry(t->entries[i]);
711
	release_tree_content(t);
712 713
}

714
static struct tree_content *grow_tree_content(
715 716 717 718 719
	struct tree_content *t,
	int amt)
{
	struct tree_content *r = new_tree_content(t->entry_count + amt);
	r->entry_count = t->entry_count;
720
	r->delta_depth = t->delta_depth;
721 722 723 724 725
	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
	release_tree_content(t);
	return r;
}

726
static struct tree_entry *new_tree_entry(void)
727 728 729 730 731
{
	struct tree_entry *e;

	if (!avail_tree_entry) {
		unsigned int n = tree_entry_alloc;
732
		total_allocd += n * sizeof(struct tree_entry);
733
		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
734
		while (n-- > 1) {
735 736 737
			*((void**)e) = e + 1;
			e++;
		}
738
		*((void**)e) = NULL;
739 740 741 742 743 744 745 746 747 748
	}

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

static void release_tree_entry(struct tree_entry *e)
{
	if (e->tree)
749
		release_tree_content_recursive(e->tree);
750 751 752 753
	*((void**)e) = avail_tree_entry;
	avail_tree_entry = e;
}

754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778
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;
}

779
static void start_packfile(void)
780
{
781
	static char tmpfile[PATH_MAX];
782
	struct packed_git *p;
783
	struct pack_header hdr;
784
	int pack_fd;
785

786
	snprintf(tmpfile, sizeof(tmpfile),
787
		"%s/tmp_pack_XXXXXX", get_object_directory());
788
	pack_fd = xmkstemp(tmpfile);
789 790
	p = xcalloc(1, sizeof(*p) + strlen(tmpfile) + 2);
	strcpy(p->pack_name, tmpfile);
791
	p->pack_fd = pack_fd;
792 793 794 795

	hdr.hdr_signature = htonl(PACK_SIGNATURE);
	hdr.hdr_version = htonl(2);
	hdr.hdr_entries = 0;
796
	write_or_die(p->pack_fd, &hdr, sizeof(hdr));
797 798

	pack_data = p;
799 800
	pack_size = sizeof(hdr);
	object_count = 0;
801 802 803

	all_packs = xrealloc(all_packs, sizeof(*all_packs) * (pack_id + 1));
	all_packs[pack_id] = p;
804 805 806 807 808 809 810 811 812
}

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

813
static char *create_index(void)
814
{
815 816
	static char tmpfile[PATH_MAX];
	SHA_CTX ctx;
817 818 819
	struct sha1file *f;
	struct object_entry **idx, **c, **last, *e;
	struct object_entry_pool *o;
820
	uint32_t array[256];
821
	int i, idx_fd;
822 823 824 825 826

	/* 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)
827 828 829
		for (e = o->next_free; e-- != o->entries;)
			if (pack_id == e->pack_id)
				*c++ = e;
830
	last = idx + object_count;
831 832
	if (c != last)
		die("internal consistency error creating the index");
833 834 835 836 837 838 839 840 841 842 843 844 845 846 847
	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;
	}

848
	snprintf(tmpfile, sizeof(tmpfile),
849
		"%s/tmp_idx_XXXXXX", get_object_directory());
850
	idx_fd = xmkstemp(tmpfile);
851
	f = sha1fd(idx_fd, tmpfile);
852
	sha1write(f, array, 256 * sizeof(int));
853
	SHA1_Init(&ctx);
854
	for (c = idx; c != last; c++) {
855
		uint32_t offset = htonl((*c)->offset);
856 857
		sha1write(f, &offset, 4);
		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
858
		SHA1_Update(&ctx, (*c)->sha1, 20);
859
	}
860
	sha1write(f, pack_data->sha1, sizeof(pack_data->sha1));
861
	sha1close(f, NULL, 1);
862
	free(idx);
863 864 865 866
	SHA1_Final(pack_data->sha1, &ctx);
	return tmpfile;
}

867
static char *keep_pack(char *curr_index_name)
868 869
{
	static char name[PATH_MAX];
870
	static const char *keep_msg = "fast-import";
871 872 873 874 875 876 877 878 879 880
	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");
881 882 883
	write_or_die(keep_fd, keep_msg, strlen(keep_msg));
	if (close(keep_fd))
		die("failed to write keep file");
884 885 886 887 888 889 890 891 892 893 894 895 896

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

897
static void unkeep_all_packs(void)
898 899 900 901 902 903 904 905 906 907
{
	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);
	}
908 909
}

910
static void end_packfile(void)
911
{
912 913
	struct packed_git *old_p = pack_data, *new_p;

914
	if (object_count) {
915
		char *idx_name;
916 917 918
		int i;
		struct branch *b;
		struct tag *t;
919

920 921 922
		fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1,
				    pack_data->pack_name, object_count);
		close(pack_data->pack_fd);
923
		idx_name = keep_pack(create_index());
924 925 926 927 928 929

		/* 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;
930
		all_packs[pack_id] = new_p;
931
		install_packed_git(new_p);
932 933

		/* Print the boundary */
934 935 936 937 938 939 940
		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));
				}
941
			}
942 943 944 945 946 947
			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);
948 949 950
		}

		pack_id++;
951
	}
952
	else
953
		unlink(old_p->pack_name);
954 955 956
	free(old_p);

	/* We can't carry a delta across packfiles. */
P
Pierre Habouzit 已提交
957
	strbuf_release(&last_blob.data);
958 959
	last_blob.offset = 0;
	last_blob.depth = 0;
960 961
}

962
static void cycle_packfile(void)
963 964 965 966 967
{
	end_packfile();
	start_packfile();
}

968
static size_t encode_header(
969
	enum object_type type,
970
	size_t size,
971
	unsigned char *hdr)
972 973 974 975
{
	int n = 1;
	unsigned char c;

976
	if (type < OBJ_COMMIT || type > OBJ_REF_DELTA)
977 978 979 980 981 982 983 984 985 986 987 988 989 990
		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;
}

991 992
static int store_object(
	enum object_type type,
993
	struct strbuf *dat,
994
	struct last_object *last,
995
	unsigned char *sha1out,
996
	uintmax_t mark)
997 998
{
	void *out, *delta;
999 1000 1001
	struct object_entry *e;
	unsigned char hdr[96];
	unsigned char sha1[20];
1002
	unsigned long hdrlen, deltalen;
1003 1004 1005
	SHA_CTX c;
	z_stream s;

1006
	hdrlen = sprintf((char*)hdr,"%s %lu", typename(type),
1007
		(unsigned long)dat->len) + 1;
1008 1009
	SHA1_Init(&c);
	SHA1_Update(&c, hdr, hdrlen);
1010
	SHA1_Update(&c, dat->buf, dat->len);
1011
	SHA1_Final(sha1, &c);
1012
	if (sha1out)
1013
		hashcpy(sha1out, sha1);
1014 1015

	e = insert_object(sha1);
1016 1017
	if (mark)
		insert_mark(mark, e);
1018
	if (e->offset) {
1019
		duplicate_count_by_type[type]++;
1020
		return 1;
1021 1022 1023 1024 1025 1026
	} 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;
1027
	}
1028

P
Pierre Habouzit 已提交
1029 1030
	if (last && last->data.buf && last->depth < max_depth) {
		delta = diff_delta(last->data.buf, last->data.len,
1031
			dat->buf, dat->len,
1032
			&deltalen, 0);
1033
		if (delta && deltalen >= dat->len) {
1034 1035 1036 1037 1038
			free(delta);
			delta = NULL;
		}
	} else
		delta = NULL;
1039 1040 1041

	memset(&s, 0, sizeof(s));
	deflateInit(&s, zlib_compression_level);
1042 1043 1044 1045
	if (delta) {
		s.next_in = delta;
		s.avail_in = deltalen;
	} else {
1046 1047
		s.next_in = (void *)dat->buf;
		s.avail_in = dat->len;
1048 1049 1050 1051 1052 1053 1054 1055
	}
	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. */
1056
	if ((pack_size + 60 + s.total_out) > max_packsize
1057 1058 1059 1060
		|| (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;
1061
		cycle_packfile();
1062 1063 1064 1065 1066

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

			memset(&s, 0, sizeof(s));
			deflateInit(&s, zlib_compression_level);
1070 1071
			s.next_in = (void *)dat->buf;
			s.avail_in = dat->len;
1072 1073 1074 1075 1076
			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);
1077 1078 1079 1080 1081 1082 1083 1084
		}
	}

	e->type = type;
	e->pack_id = pack_id;
	e->offset = pack_size;
	object_count++;
	object_count_by_type[type]++;
1085 1086

	if (delta) {
1087 1088 1089
		unsigned long ofs = e->offset - last->offset;
		unsigned pos = sizeof(hdr) - 1;

1090
		delta_count_by_type[type]++;
1091
		e->depth = last->depth + 1;
1092 1093

		hdrlen = encode_header(OBJ_OFS_DELTA, deltalen, hdr);
1094
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1095 1096 1097 1098 1099
		pack_size += hdrlen;

		hdr[pos] = ofs & 127;
		while (ofs >>= 7)
			hdr[--pos] = 128 | (--ofs & 127);
1100
		write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
1101
		pack_size += sizeof(hdr) - pos;
1102
	} else {
1103
		e->depth = 0;
1104
		hdrlen = encode_header(type, dat->len, hdr);
1105
		write_or_die(pack_data->pack_fd, hdr, hdrlen);
1106
		pack_size += hdrlen;
1107 1108
	}

1109
	write_or_die(pack_data->pack_fd, out, s.total_out);
1110
	pack_size += s.total_out;
1111 1112

	free(out);
1113
	free(delta);
1114
	if (last) {
P
Pierre Habouzit 已提交
1115 1116 1117
		if (last->no_swap) {
			last->data = *dat;
		} else {
1118
			strbuf_swap(&last->data, dat);
P
Pierre Habouzit 已提交
1119
		}
1120
		last->offset = e->offset;
1121
		last->depth = e->depth;
1122 1123 1124 1125
	}
	return 0;
}

1126 1127 1128
static void *gfi_unpack_entry(
	struct object_entry *oe,
	unsigned long *sizep)
1129
{
1130
	enum object_type type;
1131 1132 1133
	struct packed_git *p = all_packs[oe->pack_id];
	if (p == pack_data)
		p->pack_size = pack_size + 20;
1134
	return unpack_entry(p, oe->offset, &type, sizep);
1135 1136
}

1137
static const char *get_mode(const char *str, uint16_t *modep)
1138 1139
{
	unsigned char c;
1140
	uint16_t mode = 0;
1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152

	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)
{
1153
	unsigned char* sha1 = root->versions[1].sha1;
1154 1155 1156 1157 1158 1159 1160
	struct object_entry *myoe;
	struct tree_content *t;
	unsigned long size;
	char *buf;
	const char *c;

	root->tree = t = new_tree_content(8);
1161
	if (is_null_sha1(sha1))
1162 1163
		return;

1164
	myoe = find_object(sha1);
1165
	if (myoe && myoe->pack_id != MAX_PACK_ID) {
1166
		if (myoe->type != OBJ_TREE)
1167
			die("Not a tree: %s", sha1_to_hex(sha1));
1168
		t->delta_depth = myoe->depth;
1169
		buf = gfi_unpack_entry(myoe, &size);
1170
	} else {
1171 1172 1173
		enum object_type type;
		buf = read_sha1_file(sha1, &type, &size);
		if (!buf || type != OBJ_TREE)
1174
			die("Can't load tree %s", sha1_to_hex(sha1));
1175 1176 1177 1178 1179 1180 1181
	}

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

		if (t->entry_count == t->entry_capacity)
1182
			root->tree = t = grow_tree_content(t, t->entry_count);
1183 1184 1185
		t->entries[t->entry_count++] = e;

		e->tree = NULL;
1186
		c = get_mode(c, &e->versions[1].mode);
1187
		if (!c)
1188 1189
			die("Corrupt mode in %s", sha1_to_hex(sha1));
		e->versions[0].mode = e->versions[1].mode;
1190
		e->name = to_atom(c, strlen(c));
1191
		c += e->name->str_len + 1;
1192 1193
		hashcpy(e->versions[0].sha1, (unsigned char*)c);
		hashcpy(e->versions[1].sha1, (unsigned char*)c);
1194 1195 1196 1197 1198
		c += 20;
	}
	free(buf);
}

1199
static int tecmp0 (const void *_a, const void *_b)
1200 1201 1202 1203
{
	struct tree_entry *a = *((struct tree_entry**)_a);
	struct tree_entry *b = *((struct tree_entry**)_b);
	return base_name_compare(
1204 1205
		a->name->str_dat, a->name->str_len, a->versions[0].mode,
		b->name->str_dat, b->name->str_len, b->versions[0].mode);
1206 1207
}

1208
static int tecmp1 (const void *_a, const void *_b)
1209
{
1210 1211 1212 1213 1214 1215 1216
	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);
}

1217
static void mktree(struct tree_content *t, int v, struct strbuf *b)
1218 1219
{
	size_t maxlen = 0;
1220 1221
	unsigned int i;

1222 1223 1224 1225
	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);
1226 1227

	for (i = 0; i < t->entry_count; i++) {
1228 1229
		if (t->entries[i]->versions[v].mode)
			maxlen += t->entries[i]->name->str_len + 34;
1230 1231
	}

1232 1233
	strbuf_reset(b);
	strbuf_grow(b, maxlen);
1234 1235
	for (i = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
1236 1237
		if (!e->versions[v].mode)
			continue;
1238 1239 1240
		strbuf_addf(b, "%o %s%c", (unsigned int)e->versions[v].mode,
					e->name->str_dat, '\0');
		strbuf_add(b, e->versions[v].sha1, 20);
1241
	}
1242 1243 1244 1245 1246 1247
}

static void store_tree(struct tree_entry *root)
{
	struct tree_content *t = root->tree;
	unsigned int i, j, del;
P
Pierre Habouzit 已提交
1248
	struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
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);
P
Pierre Habouzit 已提交
1260
	if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1261
		mktree(t, 0, &old_tree);
P
Pierre Habouzit 已提交
1262
		lo.data = old_tree;
1263
		lo.offset = le->offset;
1264 1265 1266
		lo.depth = t->delta_depth;
	}

1267 1268
	mktree(t, 1, &new_tree);
	store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0);
1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282

	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;
1283 1284 1285 1286 1287 1288
}

static int tree_content_set(
	struct tree_entry *root,
	const char *p,
	const unsigned char *sha1,
1289 1290
	const uint16_t mode,
	struct tree_content *subtree)
1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301
{
	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);
1302 1303
	if (!n)
		die("Empty path component found in input");
1304 1305
	if (!slash1 && !S_ISDIR(mode) && subtree)
		die("Non-directories cannot have subtrees");
1306 1307 1308 1309 1310

	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) {
1311 1312
				if (!S_ISDIR(mode)
						&& e->versions[1].mode == mode
1313
						&& !hashcmp(e->versions[1].sha1, sha1))
1314
					return 0;
1315 1316
				e->versions[1].mode = mode;
				hashcpy(e->versions[1].sha1, sha1);
1317
				if (e->tree)
1318
					release_tree_content_recursive(e->tree);
1319
				e->tree = subtree;
1320
				hashclr(root->versions[1].sha1);
1321 1322
				return 1;
			}
1323
			if (!S_ISDIR(e->versions[1].mode)) {
1324
				e->tree = new_tree_content(8);
1325
				e->versions[1].mode = S_IFDIR;
1326 1327 1328
			}
			if (!e->tree)
				load_tree(e);
1329
			if (tree_content_set(e, slash1 + 1, sha1, mode, subtree)) {
1330
				hashclr(root->versions[1].sha1);
1331 1332 1333 1334 1335 1336 1337
				return 1;
			}
			return 0;
		}
	}

	if (t->entry_count == t->entry_capacity)
1338
		root->tree = t = grow_tree_content(t, t->entry_count);
1339
	e = new_tree_entry();
1340
	e->name = to_atom(p, n);
1341 1342
	e->versions[0].mode = 0;
	hashclr(e->versions[0].sha1);
1343 1344 1345
	t->entries[t->entry_count++] = e;
	if (slash1) {
		e->tree = new_tree_content(8);
1346
		e->versions[1].mode = S_IFDIR;
1347
		tree_content_set(e, slash1 + 1, sha1, mode, subtree);
1348
	} else {
1349
		e->tree = subtree;
1350 1351
		e->versions[1].mode = mode;
		hashcpy(e->versions[1].sha1, sha1);
1352
	}
1353
	hashclr(root->versions[1].sha1);
1354 1355 1356
	return 1;
}

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

del_entry:
1396 1397 1398
	if (backup_leaf)
		memcpy(backup_leaf, e, sizeof(*backup_leaf));
	else if (e->tree)
1399
		release_tree_content_recursive(e->tree);
1400
	e->tree = NULL;
1401 1402 1403
	e->versions[1].mode = 0;
	hashclr(e->versions[1].sha1);
	hashclr(root->versions[1].sha1);
1404
	return 1;
1405 1406
}

1407 1408 1409 1410 1411 1412 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
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;
}

1444
static int update_branch(struct branch *b)
1445 1446
{
	static const char *msg = "fast-import";
1447 1448 1449 1450 1451
	struct ref_lock *lock;
	unsigned char old_sha1[20];

	if (read_ref(b->name, old_sha1))
		hashclr(old_sha1);
1452
	lock = lock_any_ref_for_update(b->name, old_sha1, 0);
1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
	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);
		}

1465
		if (!in_merge_bases(old_cmit, &new_cmit, 1)) {
1466
			unlock_ref(lock);
1467
			warning("Not updating %s"
1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479
				" (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)
{
1480 1481 1482 1483
	unsigned int i;
	struct branch *b;

	for (i = 0; i < branch_table_sz; i++) {
1484 1485
		for (b = branch_table[i]; b; b = b->table_next_branch)
			failure |= update_branch(b);
1486 1487 1488
	}
}

1489
static void dump_tags(void)
1490 1491 1492 1493
{
	static const char *msg = "fast-import";
	struct tag *t;
	struct ref_lock *lock;
1494
	char ref_name[PATH_MAX];
1495 1496

	for (t = first_tag; t; t = t->next_tag) {
1497 1498
		sprintf(ref_name, "tags/%s", t->name);
		lock = lock_ref_sha1(ref_name, NULL);
1499
		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
1500
			failure |= error("Unable to update %s", ref_name);
1501 1502 1503
	}
}

1504
static void dump_marks_helper(FILE *f,
1505
	uintmax_t base,
1506 1507
	struct mark_set *m)
{
1508
	uintmax_t k;
1509 1510 1511 1512 1513 1514 1515 1516 1517
	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])
1518
				fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1519 1520 1521 1522 1523
					sha1_to_hex(m->data.marked[k]->sha1));
		}
	}
}

1524
static void dump_marks(void)
1525
{
1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537
	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;
1538
	}
1539 1540 1541 1542 1543 1544 1545

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

B
Brandon Casey 已提交
1548
	/*
1549 1550
	 * Since the lock file was fdopen()'ed, it should not be close()'ed.
	 * Assign -1 to the lock file descriptor so that commit_lock_file()
B
Brandon Casey 已提交
1551 1552 1553
	 * won't try to close() it.
	 */
	mark_lock.fd = -1;
1554 1555 1556 1557 1558

	dump_marks_helper(f, 0, marks);
	if (ferror(f) || fclose(f)) {
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to write marks file %s: %s",
B
Brandon Casey 已提交
1559
			mark_file, strerror(errno));
1560 1561 1562 1563 1564 1565 1566 1567 1568
		return;
	}

	if (commit_lock_file(&mark_lock)) {
		rollback_lock_file(&mark_lock);
		failure |= error("Unable to commit marks file %s: %s",
			mark_file, strerror(errno));
		return;
	}
1569 1570
}

1571
static int read_next_command(void)
1572
{
1573 1574 1575 1576 1577 1578 1579
	static int stdin_eof = 0;

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

1580
	do {
1581
		if (unread_command_buf) {
1582
			unread_command_buf = 0;
1583 1584 1585
		} else {
			struct recent_command *rc;

1586
			strbuf_detach(&command_buf, NULL);
1587 1588 1589
			stdin_eof = strbuf_getline(&command_buf, stdin, '\n');
			if (stdin_eof)
				return EOF;
1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607

			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] == '#');
1608 1609

	return 0;
1610 1611
}

J
Junio C Hamano 已提交
1612
static void skip_optional_lf(void)
1613 1614 1615 1616 1617 1618
{
	int term_char = fgetc(stdin);
	if (term_char != '\n' && term_char != EOF)
		ungetc(term_char, stdin);
}

1619
static void cmd_mark(void)
1620
{
1621
	if (!prefixcmp(command_buf.buf, "mark :")) {
1622
		next_mark = strtoumax(command_buf.buf + 6, NULL, 10);
1623 1624 1625
		read_next_command();
	}
	else
1626
		next_mark = 0;
1627 1628
}

1629
static void cmd_data(struct strbuf *sb)
1630
{
1631
	strbuf_reset(sb);
1632

1633
	if (prefixcmp(command_buf.buf, "data "))
1634 1635
		die("Expected 'data n' command, found: %s", command_buf.buf);

1636
	if (!prefixcmp(command_buf.buf + 5, "<<")) {
1637
		char *term = xstrdup(command_buf.buf + 5 + 2);
1638 1639
		size_t term_len = command_buf.len - 5 - 2;

1640
		strbuf_detach(&command_buf, NULL);
1641
		for (;;) {
1642
			if (strbuf_getline(&command_buf, stdin, '\n') == EOF)
1643 1644 1645 1646
				die("EOF in data (terminator '%s' not found)", term);
			if (term_len == command_buf.len
				&& !strcmp(term, command_buf.buf))
				break;
1647 1648
			strbuf_addbuf(sb, &command_buf);
			strbuf_addch(sb, '\n');
1649 1650 1651 1652
		}
		free(term);
	}
	else {
1653 1654
		size_t n = 0, length;

1655
		length = strtoul(command_buf.buf + 5, NULL, 10);
1656

1657
		while (n < length) {
1658
			size_t s = strbuf_fread(sb, length - n, stdin);
1659
			if (!s && feof(stdin))
1660 1661
				die("EOF in data (%lu bytes remaining)",
					(unsigned long)(length - n));
1662 1663
			n += s;
		}
1664 1665
	}

1666
	skip_optional_lf();
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 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
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;
}

1727
static void cmd_new_blob(void)
1728
{
P
Pierre Habouzit 已提交
1729
	static struct strbuf buf = STRBUF_INIT;
1730 1731 1732

	read_next_command();
	cmd_mark();
1733
	cmd_data(&buf);
P
Pierre Habouzit 已提交
1734
	store_object(OBJ_BLOB, &buf, &last_blob, NULL, next_mark);
1735 1736
}

1737
static void unload_one_branch(void)
1738
{
1739 1740
	while (cur_active_branches
		&& cur_active_branches >= max_active_branches) {
1741
		uintmax_t min_commit = ULONG_MAX;
1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758
		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;
		}
1759
		e->active = 0;
1760 1761
		e->active_next_branch = NULL;
		if (e->branch_tree.tree) {
1762
			release_tree_content_recursive(e->branch_tree.tree);
1763 1764 1765
			e->branch_tree.tree = NULL;
		}
		cur_active_branches--;
1766 1767 1768
	}
}

1769
static void load_branch(struct branch *b)
1770
{
1771
	load_tree(&b->branch_tree);
1772 1773 1774 1775 1776 1777 1778
	if (!b->active) {
		b->active = 1;
		b->active_next_branch = active_branches;
		active_branches = b;
		cur_active_branches++;
		branch_load_count++;
	}
1779 1780
}

1781
static void file_change_m(struct branch *b)
1782
{
1783
	const char *p = command_buf.buf + 2;
1784
	static struct strbuf uq = STRBUF_INIT;
1785
	const char *endp;
1786
	struct object_entry *oe = oe;
1787
	unsigned char sha1[20];
1788
	uint16_t mode, inline_data = 0;
1789

1790 1791 1792 1793 1794 1795
	p = get_mode(p, &mode);
	if (!p)
		die("Corrupt mode: %s", command_buf.buf);
	switch (mode) {
	case S_IFREG | 0644:
	case S_IFREG | 0755:
1796
	case S_IFLNK:
1797 1798 1799 1800 1801 1802 1803 1804
	case 0644:
	case 0755:
		/* ok */
		break;
	default:
		die("Corrupt mode: %s", command_buf.buf);
	}

1805 1806
	if (*p == ':') {
		char *x;
1807
		oe = find_mark(strtoumax(p + 1, &x, 10));
1808
		hashcpy(sha1, oe->sha1);
1809
		p = x;
1810
	} else if (!prefixcmp(p, "inline")) {
1811 1812
		inline_data = 1;
		p += 6;
1813 1814 1815 1816 1817 1818
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
1819 1820 1821
	if (*p++ != ' ')
		die("Missing space after SHA1: %s", command_buf.buf);

1822 1823
	strbuf_reset(&uq);
	if (!unquote_c_style(&uq, p, &endp)) {
1824 1825
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
1826
		p = uq.buf;
1827
	}
1828

1829
	if (inline_data) {
P
Pierre Habouzit 已提交
1830
		static struct strbuf buf = STRBUF_INIT;
1831

1832 1833 1834 1835
		if (p != uq.buf) {
			strbuf_addstr(&uq, p);
			p = uq.buf;
		}
1836
		read_next_command();
1837
		cmd_data(&buf);
P
Pierre Habouzit 已提交
1838
		store_object(OBJ_BLOB, &buf, &last_blob, sha1, 0);
1839
	} else if (oe) {
1840
		if (oe->type != OBJ_BLOB)
1841
			die("Not a blob (actually a %s): %s",
1842
				typename(oe->type), command_buf.buf);
1843
	} else {
1844 1845
		enum object_type type = sha1_object_info(sha1, NULL);
		if (type < 0)
1846
			die("Blob not found: %s", command_buf.buf);
1847
		if (type != OBJ_BLOB)
1848
			die("Not a blob (actually a %s): %s",
1849
			    typename(type), command_buf.buf);
1850
	}
1851

1852
	tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
1853
}
1854

1855 1856
static void file_change_d(struct branch *b)
{
1857
	const char *p = command_buf.buf + 2;
1858
	static struct strbuf uq = STRBUF_INIT;
1859 1860
	const char *endp;

1861 1862
	strbuf_reset(&uq);
	if (!unquote_c_style(&uq, p, &endp)) {
1863 1864
		if (*endp)
			die("Garbage after path in: %s", command_buf.buf);
1865
		p = uq.buf;
1866
	}
1867
	tree_content_remove(&b->branch_tree, p, NULL);
1868 1869
}

1870
static void file_change_cr(struct branch *b, int rename)
1871 1872
{
	const char *s, *d;
1873 1874
	static struct strbuf s_uq = STRBUF_INIT;
	static struct strbuf d_uq = STRBUF_INIT;
1875 1876 1877 1878
	const char *endp;
	struct tree_entry leaf;

	s = command_buf.buf + 2;
1879 1880
	strbuf_reset(&s_uq);
	if (!unquote_c_style(&s_uq, s, &endp)) {
1881 1882
		if (*endp != ' ')
			die("Missing space after source: %s", command_buf.buf);
1883
	} else {
1884 1885 1886
		endp = strchr(s, ' ');
		if (!endp)
			die("Missing space after source: %s", command_buf.buf);
1887
		strbuf_add(&s_uq, s, endp - s);
1888
	}
1889
	s = s_uq.buf;
1890 1891 1892 1893 1894 1895

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

	d = endp;
1896 1897
	strbuf_reset(&d_uq);
	if (!unquote_c_style(&d_uq, d, &endp)) {
1898 1899
		if (*endp)
			die("Garbage after dest in: %s", command_buf.buf);
1900
		d = d_uq.buf;
1901 1902 1903
	}

	memset(&leaf, 0, sizeof(leaf));
1904 1905 1906 1907
	if (rename)
		tree_content_remove(&b->branch_tree, s, &leaf);
	else
		tree_content_get(&b->branch_tree, s, &leaf);
1908 1909 1910 1911 1912 1913 1914 1915
	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);
}

1916 1917 1918 1919 1920 1921 1922 1923
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);
}

1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950
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);
	}
}

1951
static int cmd_from(struct branch *b)
1952
{
1953
	const char *from;
1954 1955
	struct branch *s;

1956
	if (prefixcmp(command_buf.buf, "from "))
1957
		return 0;
1958

1959 1960 1961 1962
	if (b->branch_tree.tree) {
		release_tree_content_recursive(b->branch_tree.tree);
		b->branch_tree.tree = NULL;
	}
1963 1964 1965 1966 1967 1968

	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) {
1969
		unsigned char *t = s->branch_tree.versions[1].sha1;
1970
		hashcpy(b->sha1, s->sha1);
1971 1972
		hashcpy(b->branch_tree.versions[0].sha1, t);
		hashcpy(b->branch_tree.versions[1].sha1, t);
1973
	} else if (*from == ':') {
1974
		uintmax_t idnum = strtoumax(from + 1, NULL, 10);
1975 1976
		struct object_entry *oe = find_mark(idnum);
		if (oe->type != OBJ_COMMIT)
1977
			die("Mark :%" PRIuMAX " not a commit", idnum);
1978
		hashcpy(b->sha1, oe->sha1);
1979
		if (oe->pack_id != MAX_PACK_ID) {
1980
			unsigned long size;
1981 1982
			char *buf = gfi_unpack_entry(oe, &size);
			cmd_from_commit(b, buf, size);
1983
			free(buf);
1984 1985
		} else
			cmd_from_existing(b);
1986 1987 1988
	} else if (!get_sha1(from, b->sha1))
		cmd_from_existing(b);
	else
1989 1990 1991
		die("Invalid ref name or SHA1 expression: %s", from);

	read_next_command();
1992
	return 1;
1993 1994
}

1995
static struct hash_list *cmd_merge(unsigned int *count)
1996
{
1997
	struct hash_list *list = NULL, *n, *e = e;
1998
	const char *from;
1999 2000 2001
	struct branch *s;

	*count = 0;
2002
	while (!prefixcmp(command_buf.buf, "merge ")) {
2003 2004 2005 2006 2007 2008
		from = strchr(command_buf.buf, ' ') + 1;
		n = xmalloc(sizeof(*n));
		s = lookup_branch(from);
		if (s)
			hashcpy(n->sha1, s->sha1);
		else if (*from == ':') {
2009
			uintmax_t idnum = strtoumax(from + 1, NULL, 10);
2010 2011
			struct object_entry *oe = find_mark(idnum);
			if (oe->type != OBJ_COMMIT)
2012
				die("Mark :%" PRIuMAX " not a commit", idnum);
2013
			hashcpy(n->sha1, oe->sha1);
2014 2015 2016
		} else if (!get_sha1(from, n->sha1)) {
			unsigned long size;
			char *buf = read_object_with_reference(n->sha1,
S
Shawn O. Pearce 已提交
2017
				commit_type, &size, n->sha1);
2018 2019 2020 2021
			if (!buf || size < 46)
				die("Not a valid commit: %s", from);
			free(buf);
		} else
2022 2023 2024 2025 2026 2027 2028 2029
			die("Invalid ref name or SHA1 expression: %s", from);

		n->next = NULL;
		if (list)
			e->next = n;
		else
			list = n;
		e = n;
2030
		(*count)++;
2031 2032 2033 2034 2035
		read_next_command();
	}
	return list;
}

2036
static void cmd_new_commit(void)
2037
{
2038
	static struct strbuf msg = STRBUF_INIT;
2039 2040 2041 2042
	struct branch *b;
	char *sp;
	char *author = NULL;
	char *committer = NULL;
2043 2044
	struct hash_list *merge_list = NULL;
	unsigned int merge_count;
2045 2046 2047 2048

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	b = lookup_branch(sp);
2049
	if (!b)
2050
		b = new_branch(sp);
2051 2052 2053

	read_next_command();
	cmd_mark();
2054
	if (!prefixcmp(command_buf.buf, "author ")) {
2055
		author = parse_ident(command_buf.buf + 7);
2056 2057
		read_next_command();
	}
2058
	if (!prefixcmp(command_buf.buf, "committer ")) {
2059
		committer = parse_ident(command_buf.buf + 10);
2060 2061 2062 2063
		read_next_command();
	}
	if (!committer)
		die("Expected committer but didn't get one");
2064
	cmd_data(&msg);
2065 2066
	read_next_command();
	cmd_from(b);
2067
	merge_list = cmd_merge(&merge_count);
2068 2069

	/* ensure the branch is active/loaded */
2070
	if (!b->branch_tree.tree || !max_active_branches) {
2071 2072 2073
		unload_one_branch();
		load_branch(b);
	}
2074

2075
	/* file_change* */
2076
	while (command_buf.len > 0) {
2077
		if (!prefixcmp(command_buf.buf, "M "))
2078
			file_change_m(b);
2079
		else if (!prefixcmp(command_buf.buf, "D "))
2080
			file_change_d(b);
2081
		else if (!prefixcmp(command_buf.buf, "R "))
2082 2083 2084
			file_change_cr(b, 1);
		else if (!prefixcmp(command_buf.buf, "C "))
			file_change_cr(b, 0);
2085 2086
		else if (!strcmp("deleteall", command_buf.buf))
			file_change_deleteall(b);
2087 2088 2089 2090
		else {
			unread_command_buf = 1;
			break;
		}
2091 2092
		if (read_next_command() == EOF)
			break;
2093 2094
	}

2095
	/* build the tree and the commit */
2096
	store_tree(&b->branch_tree);
2097 2098
	hashcpy(b->branch_tree.versions[0].sha1,
		b->branch_tree.versions[1].sha1);
2099 2100 2101

	strbuf_reset(&new_data);
	strbuf_addf(&new_data, "tree %s\n",
2102
		sha1_to_hex(b->branch_tree.versions[1].sha1));
2103
	if (!is_null_sha1(b->sha1))
2104
		strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(b->sha1));
2105 2106
	while (merge_list) {
		struct hash_list *next = merge_list->next;
2107
		strbuf_addf(&new_data, "parent %s\n", sha1_to_hex(merge_list->sha1));
2108 2109 2110
		free(merge_list);
		merge_list = next;
	}
2111 2112 2113 2114 2115 2116
	strbuf_addf(&new_data,
		"author %s\n"
		"committer %s\n"
		"\n",
		author ? author : committer, committer);
	strbuf_addbuf(&new_data, &msg);
2117
	free(author);
2118 2119
	free(committer);

2120
	if (!store_object(OBJ_COMMIT, &new_data, NULL, b->sha1, next_mark))
2121
		b->pack_id = pack_id;
2122
	b->last_commit = object_count_by_type[OBJ_COMMIT];
2123 2124
}

2125
static void cmd_new_tag(void)
2126
{
2127
	static struct strbuf msg = STRBUF_INIT;
2128 2129 2130 2131 2132
	char *sp;
	const char *from;
	char *tagger;
	struct branch *s;
	struct tag *t;
2133
	uintmax_t from_mark = 0;
2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148
	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 ... */
2149
	if (prefixcmp(command_buf.buf, "from "))
2150 2151 2152 2153
		die("Expected from command, got %s", command_buf.buf);
	from = strchr(command_buf.buf, ' ') + 1;
	s = lookup_branch(from);
	if (s) {
2154
		hashcpy(sha1, s->sha1);
2155
	} else if (*from == ':') {
2156
		struct object_entry *oe;
2157
		from_mark = strtoumax(from + 1, NULL, 10);
2158
		oe = find_mark(from_mark);
2159
		if (oe->type != OBJ_COMMIT)
2160
			die("Mark :%" PRIuMAX " not a commit", from_mark);
2161
		hashcpy(sha1, oe->sha1);
2162 2163 2164 2165 2166
	} else if (!get_sha1(from, sha1)) {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(sha1,
2167
			commit_type, &size, sha1);
2168 2169 2170 2171 2172 2173 2174 2175
		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 ... */
2176
	if (prefixcmp(command_buf.buf, "tagger "))
2177
		die("Expected tagger command, got %s", command_buf.buf);
2178
	tagger = parse_ident(command_buf.buf + 7);
2179 2180 2181

	/* tag payload/message */
	read_next_command();
2182
	cmd_data(&msg);
2183 2184

	/* build the tag object */
2185 2186 2187 2188 2189 2190 2191 2192 2193
	strbuf_reset(&new_data);
	strbuf_addf(&new_data,
		"object %s\n"
		"type %s\n"
		"tag %s\n"
		"tagger %s\n"
		"\n",
		sha1_to_hex(sha1), commit_type, t->name, tagger);
	strbuf_addbuf(&new_data, &msg);
2194 2195
	free(tagger);

2196
	if (store_object(OBJ_TAG, &new_data, NULL, t->sha1, 0))
2197 2198 2199
		t->pack_id = MAX_PACK_ID;
	else
		t->pack_id = pack_id;
2200 2201
}

2202
static void cmd_reset_branch(void)
2203 2204 2205 2206 2207 2208 2209 2210
{
	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) {
2211 2212 2213
		hashclr(b->sha1);
		hashclr(b->branch_tree.versions[0].sha1);
		hashclr(b->branch_tree.versions[1].sha1);
2214 2215 2216 2217 2218
		if (b->branch_tree.tree) {
			release_tree_content_recursive(b->branch_tree.tree);
			b->branch_tree.tree = NULL;
		}
	}
2219 2220 2221
	else
		b = new_branch(sp);
	read_next_command();
2222
	if (!cmd_from(b) && command_buf.len > 0)
2223
		unread_command_buf = 1;
2224 2225
}

2226
static void cmd_checkpoint(void)
2227
{
2228 2229 2230 2231 2232 2233
	if (object_count) {
		cycle_packfile();
		dump_branches();
		dump_tags();
		dump_marks();
	}
2234
	skip_optional_lf();
2235 2236
}

2237 2238
static void cmd_progress(void)
{
2239
	fwrite(command_buf.buf, 1, command_buf.len, stdout);
2240 2241 2242 2243 2244
	fputc('\n', stdout);
	fflush(stdout);
	skip_optional_lf();
}

2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272
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;
2273
			e->offset = 1; /* just not zero! */
2274 2275 2276 2277 2278 2279
		}
		insert_mark(mark, e);
	}
	fclose(f);
}

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

2283 2284
int main(int argc, const char **argv)
{
2285
	unsigned int i, show_stats = 1;
2286

2287
	git_config(git_default_config);
2288
	alloc_objects(object_entry_alloc);
2289
	strbuf_init(&command_buf, 0);
2290 2291 2292 2293
	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));
2294

2295 2296 2297 2298 2299
	for (i = 1; i < argc; i++) {
		const char *a = argv[i];

		if (*a != '-' || !strcmp(a, "--"))
			break;
2300
		else if (!prefixcmp(a, "--date-format=")) {
2301 2302 2303 2304 2305 2306 2307 2308 2309 2310
			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);
		}
2311
		else if (!prefixcmp(a, "--max-pack-size="))
2312
			max_packsize = strtoumax(a + 16, NULL, 0) * 1024 * 1024;
2313
		else if (!prefixcmp(a, "--depth=")) {
2314
			max_depth = strtoul(a + 8, NULL, 0);
2315 2316 2317
			if (max_depth > MAX_DEPTH)
				die("--depth cannot exceed %u", MAX_DEPTH);
		}
2318
		else if (!prefixcmp(a, "--active-branches="))
2319
			max_active_branches = strtoul(a + 18, NULL, 0);
2320 2321
		else if (!prefixcmp(a, "--import-marks="))
			import_marks(a + 15);
2322
		else if (!prefixcmp(a, "--export-marks="))
2323
			mark_file = a + 15;
2324
		else if (!prefixcmp(a, "--export-pack-edges=")) {
2325 2326 2327 2328 2329 2330
			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"))
2331
			force_update = 1;
2332 2333 2334 2335
		else if (!strcmp(a, "--quiet"))
			show_stats = 0;
		else if (!strcmp(a, "--stats"))
			show_stats = 1;
2336 2337 2338
		else
			die("unknown option %s", a);
	}
2339
	if (i != argc)
2340 2341
		usage(fast_import_usage);

2342 2343 2344 2345 2346
	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;

2347
	prepare_packed_git();
2348
	start_packfile();
2349
	set_die_routine(die_nicely);
2350 2351
	while (read_next_command() != EOF) {
		if (!strcmp("blob", command_buf.buf))
2352
			cmd_new_blob();
2353
		else if (!prefixcmp(command_buf.buf, "commit "))
2354
			cmd_new_commit();
2355
		else if (!prefixcmp(command_buf.buf, "tag "))
2356
			cmd_new_tag();
2357
		else if (!prefixcmp(command_buf.buf, "reset "))
2358
			cmd_reset_branch();
2359 2360
		else if (!strcmp("checkpoint", command_buf.buf))
			cmd_checkpoint();
2361 2362
		else if (!prefixcmp(command_buf.buf, "progress "))
			cmd_progress();
2363 2364
		else
			die("Unsupported command: %s", command_buf.buf);
2365
	}
2366
	end_packfile();
2367

2368
	dump_branches();
2369
	dump_tags();
2370
	unkeep_all_packs();
2371
	dump_marks();
2372

2373 2374 2375
	if (pack_edges)
		fclose(pack_edges);

2376 2377 2378 2379 2380 2381 2382 2383 2384
	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");
2385 2386 2387 2388 2389 2390
		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]);
2391
		fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
2392
		fprintf(stderr, "      marks:     %10" PRIuMAX " (%10" PRIuMAX " unique    )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
2393
		fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
2394
		fprintf(stderr, "Memory total:    %10" PRIuMAX " KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
2395
		fprintf(stderr, "       pools:    %10lu KiB\n", (unsigned long)(total_allocd/1024));
2396
		fprintf(stderr, "     objects:    %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
2397 2398 2399 2400 2401
		fprintf(stderr, "---------------------------------------------------------------------\n");
		pack_report();
		fprintf(stderr, "---------------------------------------------------------------------\n");
		fprintf(stderr, "\n");
	}
2402

2403
	return failure ? 1 : 0;
2404
}