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

  stream ::= cmd*;

  cmd ::= new_blob
7
        | new_commit
8 9 10
        | new_tag
        ;

11 12 13 14
  new_blob ::= 'blob' lf
	mark?
    file_content;
  file_content ::= data;
15

16
  new_commit ::= 'commit' sp ref_str lf
17 18 19 20
    mark?
    ('author' sp name '<' email '>' ts tz lf)?
    'committer' sp name '<' email '>' ts tz lf
    commit_msg
21
    ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
22 23 24
    file_change*
    lf;
  commit_msg ::= data;
25

26 27
  file_change ::= 'M' sp mode sp (hexsha1 | idnum) sp path_str lf
                | 'D' sp path_str lf
28
                ;
29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
  mode ::= '644' | '755';

  new_tag ::= 'tag' sp tag_str lf
    'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
	'tagger' sp name '<' email '>' ts tz lf
    tag_msg;
  tag_msg ::= data;

     # 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
	 # idnum can be updated in the future to a new object by issuing
     # a new mark directive with the old idnum.
	 #
  mark ::= 'mark' sp idnum lf;

     # note: declen indicates the length of binary_data in bytes.
     # declen does not include the lf preceeding or trailing the
     # binary data.
     #
  data ::= 'data' sp declen lf
    binary_data
	lf;

     # note: quoted strings are C-style quoting supporting \c for
     # common escapes of 'c' (e..g \n, \t, \\, \") or \nnn where nnn
	 # is the signed byte value in octal.  Note that the only
     # characters which must actually be escaped to protect the
     # stream formatting is: \, " and LF.  Otherwise these values
	 # are UTF8.
     #
  ref_str     ::= ref     | '"' quoted(ref)     '"' ;
  sha1exp_str ::= sha1exp | '"' quoted(sha1exp) '"' ;
  tag_str     ::= tag     | '"' quoted(tag)     '"' ;
  path_str    ::= path    | '"' quoted(path)    '"' ;

  declen ::= # unsigned 32 bit value, ascii base10 notation;
66
  binary_data ::= # file content, not interpreted;
67

68 69
  sp ::= # ASCII space character;
  lf ::= # ASCII newline (LF) character;
70 71 72 73 74 75 76 77 78

     # note: a colon (':') must precede the numerical value assigned to
	 # an idnum.  This is to distinguish it from a ref or tag name as
     # GIT does not permit ':' in ref or tag strings.
	 #
  idnum   ::= ':' declen;
  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";
79 80
  sha1exp ::= # Any valid GIT SHA1 expression;
  hexsha1 ::= # SHA1 in hexadecimal format;
81 82 83 84 85 86

     # note: name and email are UTF8 strings, however name must not
	 # contain '<' or lf and email must not contain any of the
     # following: '<', '>', lf.
	 #
  name  ::= # valid GIT author/committer name;
87
  email ::= # valid GIT author/committer email;
88 89
  ts    ::= # time since the epoch in seconds, ascii base10 notation;
  tz    ::= # GIT style timezone;
90 91
*/

92 93 94 95
#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "blob.h"
96
#include "tree.h"
97 98
#include "delta.h"
#include "pack.h"
99
#include "refs.h"
100
#include "csum-file.h"
101 102
#include "strbuf.h"
#include "quote.h"
103

104 105 106
struct object_entry
{
	struct object_entry *next;
107
	enum object_type type;
108 109 110 111
	unsigned long offset;
	unsigned char sha1[20];
};

112
struct object_entry_pool
113
{
114
	struct object_entry_pool *next_pool;
115 116
	struct object_entry *next_free;
	struct object_entry *end;
117
	struct object_entry entries[FLEX_ARRAY]; /* more */
118 119
};

120 121 122 123 124 125 126 127 128
struct mark_set
{
	int shift;
	union {
		struct object_entry *marked[1024];
		struct mark_set *sets[1024];
	} data;
};

129 130 131
struct last_object
{
	void *data;
132 133
	unsigned int len;
	unsigned int depth;
134 135 136
	unsigned char sha1[20];
};

137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
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;
	int str_len;
	char str_dat[FLEX_ARRAY]; /* more */
};

struct tree_content;
153 154
struct tree_entry
{
155 156 157
	struct tree_content *tree;
	struct atom_str* name;
	unsigned int mode;
158 159 160
	unsigned char sha1[20];
};

161
struct tree_content
162
{
163 164 165 166 167 168 169 170 171
	unsigned int entry_capacity; /* must match avail_tree_content */
	unsigned int entry_count;
	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;
172 173 174 175
};

struct branch
{
176 177
	struct branch *table_next_branch;
	struct branch *active_next_branch;
178
	const char *name;
179 180 181
	unsigned long last_commit;
	struct tree_entry branch_tree;
	unsigned char sha1[20];
182 183
};

184 185 186 187 188 189 190
struct tag
{
	struct tag *next_tag;
	const char *name;
	unsigned char sha1[20];
};

191 192

/* Stats and misc. counters */
193
static unsigned long max_depth = 10;
194
static unsigned long alloc_count;
195
static unsigned long branch_count;
196
static unsigned long branch_load_count;
197
static unsigned long remap_count;
198
static unsigned long object_count;
199
static unsigned long duplicate_count;
200
static unsigned long marks_set_count;
201 202
static unsigned long object_count_by_type[9];
static unsigned long duplicate_count_by_type[9];
203

204 205 206 207 208
/* 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;

209
/* Atom management */
210 211 212 213 214
static unsigned int atom_table_sz = 4451;
static unsigned int atom_cnt;
static struct atom_str **atom_table;

/* The .pack file being generated */
215
static int pack_fd;
216
static unsigned long pack_size;
217
static unsigned char pack_sha1[20];
218 219
static void* pack_base;
static size_t pack_mlen;
220 221

/* Table of objects we've written. */
222 223 224
static unsigned int object_entry_alloc = 1000;
static struct object_entry_pool *blocks;
static struct object_entry *object_table[1 << 16];
225
static struct mark_set *marks;
226
static const char* mark_file;
227 228

/* Our last blob */
229 230 231 232 233 234 235
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;
236

237
/* Branch data */
238 239 240
static unsigned long max_active_branches = 5;
static unsigned long cur_active_branches;
static unsigned long branch_table_sz = 1039;
241 242 243
static struct branch **branch_table;
static struct branch *active_branches;

244 245 246 247
/* Tag data */
static struct tag *first_tag;
static struct tag *last_tag;

248 249
/* Input stream parsing */
static struct strbuf command_buf;
250
static unsigned long next_mark;
251

252

253
static void alloc_objects(int cnt)
254
{
255
	struct object_entry_pool *b;
256

257
	b = xmalloc(sizeof(struct object_entry_pool)
258
		+ cnt * sizeof(struct object_entry));
259
	b->next_pool = blocks;
260 261 262 263 264
	b->next_free = b->entries;
	b->end = b->entries + cnt;
	blocks = b;
	alloc_count += cnt;
}
265

266
static struct object_entry* new_object(unsigned char *sha1)
267
{
268
	struct object_entry *e;
269

270
	if (blocks->next_free == blocks->end)
271
		alloc_objects(object_entry_alloc);
272

273 274 275
	e = blocks->next_free++;
	memcpy(e->sha1, sha1, sizeof(e->sha1));
	return e;
276 277
}

278 279 280 281 282 283 284 285 286 287
static struct object_entry* find_object(unsigned char *sha1)
{
	unsigned int h = sha1[0] << 8 | sha1[1];
	struct object_entry *e;
	for (e = object_table[h]; e; e = e->next)
		if (!memcmp(sha1, e->sha1, sizeof(e->sha1)))
			return e;
	return NULL;
}

288 289 290
static struct object_entry* insert_object(unsigned char *sha1)
{
	unsigned int h = sha1[0] << 8 | sha1[1];
291
	struct object_entry *e = object_table[h];
292
	struct object_entry *p = NULL;
293 294 295 296 297 298 299 300 301

	while (e) {
		if (!memcmp(sha1, e->sha1, sizeof(e->sha1)))
			return e;
		p = e;
		e = e->next;
	}

	e = new_object(sha1);
302
	e->next = NULL;
303 304 305 306
	e->offset = 0;
	if (p)
		p->next = e;
	else
307
		object_table[h] = e;
308 309
	return e;
}
310

311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341
static unsigned int hc_str(const char *s, size_t len)
{
	unsigned int r = 0;
	while (len-- > 0)
		r = r * 31 + *s++;
	return r;
}

static void* pool_alloc(size_t len)
{
	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;
342 343 344
	/* round out to a pointer alignment */
	if (len & (sizeof(void*) - 1))
		len += sizeof(void*) - (len & (sizeof(void*) - 1));
345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363
	p->next_free += len;
	return r;
}

static void* pool_calloc(size_t count, size_t size)
{
	size_t len = count * size;
	void *r = pool_alloc(len);
	memset(r, 0, len);
	return r;
}

static char* pool_strdup(const char *s)
{
	char *r = pool_alloc(strlen(s) + 1);
	strcpy(r, s);
	return r;
}

364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
static void insert_mark(unsigned long idnum, struct object_entry *oe)
{
	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) {
		unsigned long i = idnum >> s->shift;
		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;
}

static struct object_entry* find_mark(unsigned long idnum)
{
	unsigned long orig_idnum = idnum;
	struct mark_set *s = marks;
	struct object_entry *oe = NULL;
	if ((idnum >> s->shift) < 1024) {
		while (s && s->shift) {
			unsigned long i = idnum >> s->shift;
			idnum -= i << s->shift;
			s = s->data.sets[i];
		}
		if (s)
			oe = s->data.marked[idnum];
	}
	if (!oe)
		die("mark :%lu not declared", orig_idnum);
	return oe;
}

406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442
static struct atom_str* to_atom(const char *s, size_t len)
{
	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;
}

static struct branch* lookup_branch(const char *name)
{
	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;
}

static struct branch* new_branch(const char *name)
{
	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);
443 444
	if (check_ref_format(name))
		die("Branch name doesn't conform to GIT standards: %s", name);
445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490

	b = pool_calloc(1, sizeof(struct branch));
	b->name = pool_strdup(name);
	b->table_next_branch = branch_table[hc];
	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;
}

static struct tree_content* new_tree_content(unsigned int cnt)
{
	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;
	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);
491 492 493 494 495 496
	f->next_avail = avail_tree_table[hc];
	avail_tree_table[hc] = f;
}

static void release_tree_content_recursive(struct tree_content *t)
{
497 498 499
	unsigned int i;
	for (i = 0; i < t->entry_count; i++)
		release_tree_entry(t->entries[i]);
500
	release_tree_content(t);
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519
}

static struct tree_content* grow_tree_content(
	struct tree_content *t,
	int amt)
{
	struct tree_content *r = new_tree_content(t->entry_count + amt);
	r->entry_count = t->entry_count;
	memcpy(r->entries,t->entries,t->entry_count*sizeof(t->entries[0]));
	release_tree_content(t);
	return r;
}

static struct tree_entry* new_tree_entry()
{
	struct tree_entry *e;

	if (!avail_tree_entry) {
		unsigned int n = tree_entry_alloc;
520
		total_allocd += n * sizeof(struct tree_entry);
521 522 523 524 525 526 527 528 529 530 531 532 533 534 535
		avail_tree_entry = e = xmalloc(n * sizeof(struct tree_entry));
		while (n--) {
			*((void**)e) = e + 1;
			e++;
		}
	}

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

static void release_tree_entry(struct tree_entry *e)
{
	if (e->tree)
536
		release_tree_content_recursive(e->tree);
537 538 539 540 541
	*((void**)e) = avail_tree_entry;
	avail_tree_entry = e;
}

static void yread(int fd, void *buffer, size_t length)
542 543 544 545
{
	ssize_t ret = 0;
	while (ret < length) {
		ssize_t size = xread(fd, (char *) buffer + ret, length - ret);
546 547 548 549 550 551 552 553 554
		if (!size)
			die("Read from descriptor %i: end of stream", fd);
		if (size < 0)
			die("Read from descriptor %i: %s", fd, strerror(errno));
		ret += size;
	}
}

static void ywrite(int fd, void *buffer, size_t length)
555 556 557 558
{
	ssize_t ret = 0;
	while (ret < length) {
		ssize_t size = xwrite(fd, (char *) buffer + ret, length - ret);
559 560 561 562
		if (!size)
			die("Write to descriptor %i: end of file", fd);
		if (size < 0)
			die("Write to descriptor %i: %s", fd, strerror(errno));
563 564 565 566
		ret += size;
	}
}

567
static size_t encode_header(
568
	enum object_type type,
569
	size_t size,
570
	unsigned char *hdr)
571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589
{
	int n = 1;
	unsigned char c;

	if (type < OBJ_COMMIT || type > OBJ_DELTA)
		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;
}

590 591 592
static int store_object(
	enum object_type type,
	void *dat,
593
	size_t datlen,
594
	struct last_object *last,
595 596
	unsigned char *sha1out,
	unsigned long mark)
597 598
{
	void *out, *delta;
599 600 601
	struct object_entry *e;
	unsigned char hdr[96];
	unsigned char sha1[20];
602
	unsigned long hdrlen, deltalen;
603 604 605 606 607 608 609 610
	SHA_CTX c;
	z_stream s;

	hdrlen = sprintf((char*)hdr,"%s %lu",type_names[type],datlen) + 1;
	SHA1_Init(&c);
	SHA1_Update(&c, hdr, hdrlen);
	SHA1_Update(&c, dat, datlen);
	SHA1_Final(sha1, &c);
611 612
	if (sha1out)
		memcpy(sha1out, sha1, sizeof(sha1));
613 614

	e = insert_object(sha1);
615 616
	if (mark)
		insert_mark(mark, e);
617 618
	if (e->offset) {
		duplicate_count++;
619
		duplicate_count_by_type[type]++;
620
		return 1;
621
	}
622
	e->type = type;
623
	e->offset = pack_size;
624
	object_count++;
625
	object_count_by_type[type]++;
626

627
	if (last && last->data && last->depth < max_depth)
628
		delta = diff_delta(last->data, last->len,
629 630
			dat, datlen,
			&deltalen, 0);
631
	else
632 633 634 635 636 637
		delta = 0;

	memset(&s, 0, sizeof(s));
	deflateInit(&s, zlib_compression_level);

	if (delta) {
638
		last->depth++;
639 640 641
		s.next_in = delta;
		s.avail_in = deltalen;
		hdrlen = encode_header(OBJ_DELTA, deltalen, hdr);
642 643
		ywrite(pack_fd, hdr, hdrlen);
		ywrite(pack_fd, last->sha1, sizeof(sha1));
644
		pack_size += hdrlen + sizeof(sha1);
645
	} else {
646 647
		if (last)
			last->depth = 0;
648 649
		s.next_in = dat;
		s.avail_in = datlen;
650
		hdrlen = encode_header(type, datlen, hdr);
651
		ywrite(pack_fd, hdr, hdrlen);
652
		pack_size += hdrlen;
653 654 655 656 657 658 659 660
	}

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

661
	ywrite(pack_fd, out, s.total_out);
662
	pack_size += s.total_out;
663 664 665 666

	free(out);
	if (delta)
		free(delta);
667 668 669 670 671 672 673 674 675 676
	if (last) {
		if (last->data)
			free(last->data);
		last->data = dat;
		last->len = datlen;
		memcpy(last->sha1, sha1, sizeof(sha1));
	}
	return 0;
}

677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 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 794 795 796 797
static void* map_pack(unsigned long offset)
{
	if (offset >= pack_size)
		die("object offset outside of pack file");
	if (offset >= pack_mlen) {
		if (pack_base)
			munmap(pack_base, pack_mlen);
		/* round out how much we map to 16 MB units */
		pack_mlen = pack_size;
		if (pack_mlen & ((1 << 24) - 1))
			pack_mlen = ((pack_mlen >> 24) + 1) << 24;
		pack_base = mmap(NULL,pack_mlen,PROT_READ,MAP_SHARED,pack_fd,0);
		if (pack_base == MAP_FAILED)
			die("Failed to map generated pack: %s", strerror(errno));
		remap_count++;
	}
	return (char*)pack_base + offset;
}

static unsigned long unpack_object_header(unsigned long offset,
	enum object_type *type,
	unsigned long *sizep)
{
	unsigned shift;
	unsigned char c;
	unsigned long size;

	c = *(unsigned char*)map_pack(offset++);
	*type = (c >> 4) & 7;
	size = c & 15;
	shift = 4;
	while (c & 0x80) {
		c = *(unsigned char*)map_pack(offset++);
		size += (c & 0x7f) << shift;
		shift += 7;
	}
	*sizep = size;
	return offset;
}

static void *unpack_non_delta_entry(unsigned long o, unsigned long sz)
{
	z_stream stream;
	unsigned char *result;

	result = xmalloc(sz + 1);
	result[sz] = 0;

	memset(&stream, 0, sizeof(stream));
	stream.next_in = map_pack(o);
	stream.avail_in = pack_mlen - o;
	stream.next_out = result;
	stream.avail_out = sz;

	inflateInit(&stream);
	for (;;) {
		int st = inflate(&stream, Z_FINISH);
		if (st == Z_STREAM_END)
			break;
		if (st == Z_OK) {
			o = stream.next_in - (unsigned char*)pack_base;
			stream.next_in = map_pack(o);
			stream.avail_in = pack_mlen - o;
			continue;
		}
		die("Error from zlib during inflate.");
	}
	inflateEnd(&stream);
	if (stream.total_out != sz)
		die("Error after inflate: sizes mismatch");
	return result;
}

static void *unpack_entry(unsigned long offset, unsigned long *sizep);

static void *unpack_delta_entry(unsigned long offset,
	unsigned long delta_size,
	unsigned long *sizep)
{
	struct object_entry *base_oe;
	unsigned char *base_sha1;
	void *delta_data, *base, *result;
	unsigned long base_size, result_size;

	base_sha1 = (unsigned char*)map_pack(offset + 20) - 20;
	base_oe = find_object(base_sha1);
	if (!base_oe)
		die("I'm broken; I can't find a base I know must be here.");
	base = unpack_entry(base_oe->offset, &base_size);
	delta_data = unpack_non_delta_entry(offset + 20, delta_size);
	result = patch_delta(base, base_size,
			     delta_data, delta_size,
			     &result_size);
	if (!result)
		die("failed to apply delta");
	free(delta_data);
	free(base);
	*sizep = result_size;
	return result;
}

static void *unpack_entry(unsigned long offset, unsigned long *sizep)
{
	unsigned long size;
	enum object_type kind;

	offset = unpack_object_header(offset, &kind, &size);
	switch (kind) {
	case OBJ_DELTA:
		return unpack_delta_entry(offset, size, sizep);
	case OBJ_COMMIT:
	case OBJ_TREE:
	case OBJ_BLOB:
	case OBJ_TAG:
		*sizep = size;
		return unpack_non_delta_entry(offset, size);
	default:
		die("I created an object I can't read!");
	}
}

798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825
static const char *get_mode(const char *str, unsigned int *modep)
{
	unsigned char c;
	unsigned int mode = 0;

	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)
{
	struct object_entry *myoe;
	struct tree_content *t;
	unsigned long size;
	char *buf;
	const char *c;

	root->tree = t = new_tree_content(8);
	if (!memcmp(root->sha1, null_sha1, 20))
		return;

	myoe = find_object(root->sha1);
	if (myoe) {
826 827 828
		if (myoe->type != OBJ_TREE)
			die("Not a tree: %s", sha1_to_hex(root->sha1));
		buf = unpack_entry(myoe->offset, &size);
829
	} else {
830
		char type[20];
831
		buf = read_sha1_file(root->sha1, type, &size);
832
		if (!buf || strcmp(type, tree_type))
833
			die("Can't load tree %s", sha1_to_hex(root->sha1));
834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892
	}

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

		if (t->entry_count == t->entry_capacity)
			root->tree = t = grow_tree_content(t, 8);
		t->entries[t->entry_count++] = e;

		e->tree = NULL;
		c = get_mode(c, &e->mode);
		if (!c)
			die("Corrupt mode in %s", sha1_to_hex(root->sha1));
		e->name = to_atom(c, strlen(c));
		c += e->name->str_len + 1;
		memcpy(e->sha1, c, sizeof(e->sha1));
		c += 20;
	}
	free(buf);
}

static int tecmp (const void *_a, const void *_b)
{
	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->mode,
		b->name->str_dat, b->name->str_len, b->mode);
}

static void store_tree(struct tree_entry *root)
{
	struct tree_content *t = root->tree;
	unsigned int i;
	size_t maxlen;
	char *buf, *c;

	if (memcmp(root->sha1, null_sha1, 20))
		return;

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

	qsort(t->entries, t->entry_count, sizeof(t->entries[0]), tecmp);
	buf = c = xmalloc(maxlen);
	for (i = 0; i < t->entry_count; i++) {
		struct tree_entry *e = t->entries[i];
		c += sprintf(c, "%o", e->mode);
		*c++ = ' ';
		strcpy(c, e->name->str_dat);
		c += e->name->str_len + 1;
		memcpy(c, e->sha1, 20);
		c += 20;
	}
893
	store_object(OBJ_TREE, buf, c - buf, NULL, root->sha1, 0);
894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922
	free(buf);
}

static int tree_content_set(
	struct tree_entry *root,
	const char *p,
	const unsigned char *sha1,
	const unsigned int mode)
{
	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) {
				if (e->mode == mode && !memcmp(e->sha1, sha1, 20))
					return 0;
				e->mode = mode;
				memcpy(e->sha1, sha1, 20);
				if (e->tree) {
923
					release_tree_content_recursive(e->tree);
924 925 926 927 928 929 930
					e->tree = NULL;
				}
				memcpy(root->sha1, null_sha1, 20);
				return 1;
			}
			if (!S_ISDIR(e->mode)) {
				e->tree = new_tree_content(8);
931
				e->mode = S_IFDIR;
932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949
			}
			if (!e->tree)
				load_tree(e);
			if (tree_content_set(e, slash1 + 1, sha1, mode)) {
				memcpy(root->sha1, null_sha1, 20);
				return 1;
			}
			return 0;
		}
	}

	if (t->entry_count == t->entry_capacity)
		root->tree = t = grow_tree_content(t, 8);
	e = new_tree_entry();
	e->name = to_atom(p, n);
	t->entries[t->entry_count++] = e;
	if (slash1) {
		e->tree = new_tree_content(8);
950
		e->mode = S_IFDIR;
951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997
		tree_content_set(e, slash1 + 1, sha1, mode);
	} else {
		e->tree = NULL;
		e->mode = mode;
		memcpy(e->sha1, sha1, 20);
	}
	memcpy(root->sha1, null_sha1, 20);
	return 1;
}

static int tree_content_remove(struct tree_entry *root, const char *p)
{
	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 || !S_ISDIR(e->mode))
				goto del_entry;
			if (!e->tree)
				load_tree(e);
			if (tree_content_remove(e, slash1 + 1)) {
				if (!e->tree->entry_count)
					goto del_entry;
				memcpy(root->sha1, null_sha1, 20);
				return 1;
			}
			return 0;
		}
	}
	return 0;

del_entry:
	for (i++; i < t->entry_count; i++)
		t->entries[i-1] = t->entries[i];
	t->entry_count--;
	release_tree_entry(e);
	memcpy(root->sha1, null_sha1, 20);
998
	return 1;
999 1000
}

1001
static void init_pack_header()
1002
{
1003 1004 1005 1006 1007 1008 1009
	struct pack_header hdr;

	hdr.hdr_signature = htonl(PACK_SIGNATURE);
	hdr.hdr_version = htonl(2);
	hdr.hdr_entries = 0;

	ywrite(pack_fd, &hdr, sizeof(hdr));
1010
	pack_size = sizeof(hdr);
1011 1012
}

1013
static void fixup_header_footer()
1014 1015 1016 1017 1018 1019 1020
{
	SHA_CTX c;
	char hdr[8];
	unsigned long cnt;
	char *buf;
	size_t n;

1021
	if (lseek(pack_fd, 0, SEEK_SET) != 0)
1022 1023 1024
		die("Failed seeking to start: %s", strerror(errno));

	SHA1_Init(&c);
1025
	yread(pack_fd, hdr, 8);
1026 1027 1028 1029
	SHA1_Update(&c, hdr, 8);

	cnt = htonl(object_count);
	SHA1_Update(&c, &cnt, 4);
1030
	ywrite(pack_fd, &cnt, 4);
1031 1032 1033

	buf = xmalloc(128 * 1024);
	for (;;) {
1034
		n = xread(pack_fd, buf, 128 * 1024);
1035 1036 1037 1038 1039 1040
		if (n <= 0)
			break;
		SHA1_Update(&c, buf, n);
	}
	free(buf);

1041
	SHA1_Final(pack_sha1, &c);
1042
	ywrite(pack_fd, pack_sha1, sizeof(pack_sha1));
1043 1044
}

1045
static int oecmp (const void *_a, const void *_b)
1046
{
1047 1048 1049 1050 1051 1052 1053 1054 1055 1056
	struct object_entry *a = *((struct object_entry**)_a);
	struct object_entry *b = *((struct object_entry**)_b);
	return memcmp(a->sha1, b->sha1, sizeof(a->sha1));
}

static void write_index(const char *idx_name)
{
	struct sha1file *f;
	struct object_entry **idx, **c, **last;
	struct object_entry *e;
1057
	struct object_entry_pool *o;
1058 1059 1060 1061 1062 1063
	unsigned int array[256];
	int i;

	/* Build the sorted table of object IDs. */
	idx = xmalloc(object_count * sizeof(struct object_entry*));
	c = idx;
1064
	for (o = blocks; o; o = o->next_pool)
1065 1066
		for (e = o->entries; e != o->next_free; e++)
			*c++ = e;
1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089
	last = idx + object_count;
	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;
	}

	f = sha1create("%s", idx_name);
	sha1write(f, array, 256 * sizeof(int));
	for (c = idx; c != last; c++) {
		unsigned int offset = htonl((*c)->offset);
		sha1write(f, &offset, 4);
		sha1write(f, (*c)->sha1, sizeof((*c)->sha1));
	}
1090
	sha1write(f, pack_sha1, sizeof(pack_sha1));
1091 1092 1093 1094
	sha1close(f, NULL, 1);
	free(idx);
}

1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110
static void dump_branches()
{
	static const char *msg = "fast-import";
	unsigned int i;
	struct branch *b;
	struct ref_lock *lock;

	for (i = 0; i < branch_table_sz; i++) {
		for (b = branch_table[i]; b; b = b->table_next_branch) {
			lock = lock_any_ref_for_update(b->name, NULL, 0);
			if (!lock || write_ref_sha1(lock, b->sha1, msg) < 0)
				die("Can't write %s", b->name);
		}
	}
}

1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125
static void dump_tags()
{
	static const char *msg = "fast-import";
	struct tag *t;
	struct ref_lock *lock;
	char path[PATH_MAX];

	for (t = first_tag; t; t = t->next_tag) {
		sprintf(path, "refs/tags/%s", t->name);
		lock = lock_any_ref_for_update(path, NULL, 0);
		if (!lock || write_ref_sha1(lock, t->sha1, msg) < 0)
			die("Can't write %s", path);
	}
}

1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155
static void dump_marks_helper(FILE *f,
	unsigned long base,
	struct mark_set *m)
{
	int k;
	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])
				fprintf(f, "%lu,%s\n", base + k,
					sha1_to_hex(m->data.marked[k]->sha1));
		}
	}
}

static void dump_marks()
{
	if (mark_file)
	{
		FILE *f = fopen(mark_file, "w");
		dump_marks_helper(f, 0, marks);
		fclose(f);
	}
}

1156 1157 1158 1159 1160 1161 1162 1163
static void read_next_command()
{
	read_line(&command_buf, stdin, '\n');
}

static void cmd_mark()
{
	if (!strncmp("mark :", command_buf.buf, 6)) {
1164
		next_mark = strtoul(command_buf.buf + 6, NULL, 10);
1165 1166 1167
		read_next_command();
	}
	else
1168
		next_mark = 0;
1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196
}

static void* cmd_data (size_t *size)
{
	size_t n = 0;
	void *buffer;
	size_t length;

	if (strncmp("data ", command_buf.buf, 5))
		die("Expected 'data n' command, found: %s", command_buf.buf);

	length = strtoul(command_buf.buf + 5, NULL, 10);
	buffer = xmalloc(length);

	while (n < length) {
		size_t s = fread((char*)buffer + n, 1, length - n, stdin);
		if (!s && feof(stdin))
			die("EOF in data (%lu bytes remaining)", length - n);
		n += s;
	}

	if (fgetc(stdin) != '\n')
		die("An lf did not trail the binary data as expected.");

	*size = length;
	return buffer;
}

1197
static void cmd_new_blob()
1198
{
1199 1200
	size_t l;
	void *d;
1201 1202 1203

	read_next_command();
	cmd_mark();
1204
	d = cmd_data(&l);
1205

1206 1207
	if (store_object(OBJ_BLOB, d, l, &last_blob, NULL, next_mark))
		free(d);
1208 1209
}

1210
static void unload_one_branch()
1211
{
1212 1213
	while (cur_active_branches
		&& cur_active_branches >= max_active_branches) {
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233
		unsigned long min_commit = ULONG_MAX;
		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;
		}
		e->active_next_branch = NULL;
		if (e->branch_tree.tree) {
1234
			release_tree_content_recursive(e->branch_tree.tree);
1235 1236 1237
			e->branch_tree.tree = NULL;
		}
		cur_active_branches--;
1238 1239 1240
	}
}

1241
static void load_branch(struct branch *b)
1242
{
1243 1244 1245 1246
	load_tree(&b->branch_tree);
	b->active_next_branch = active_branches;
	active_branches = b;
	cur_active_branches++;
1247
	branch_load_count++;
1248 1249
}

1250
static void file_change_m(struct branch *b)
1251
{
1252 1253 1254
	const char *p = command_buf.buf + 2;
	char *p_uq;
	const char *endp;
1255
	struct object_entry *oe;
1256
	unsigned char sha1[20];
1257
	unsigned int mode;
1258
	char type[20];
1259

1260 1261 1262 1263 1264 1265
	p = get_mode(p, &mode);
	if (!p)
		die("Corrupt mode: %s", command_buf.buf);
	switch (mode) {
	case S_IFREG | 0644:
	case S_IFREG | 0755:
1266
	case S_IFLNK:
1267 1268 1269 1270 1271 1272 1273 1274
	case 0644:
	case 0755:
		/* ok */
		break;
	default:
		die("Corrupt mode: %s", command_buf.buf);
	}

1275 1276 1277 1278 1279 1280 1281 1282 1283 1284
	if (*p == ':') {
		char *x;
		oe = find_mark(strtoul(p + 1, &x, 10));
		p = x;
	} else {
		if (get_sha1_hex(p, sha1))
			die("Invalid SHA1: %s", command_buf.buf);
		oe = find_object(sha1);
		p += 40;
	}
1285 1286 1287 1288 1289 1290 1291 1292 1293
	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;
	}
1294

1295 1296
	if (oe) {
		if (oe->type != OBJ_BLOB)
1297 1298
			die("Not a blob (actually a %s): %s",
				command_buf.buf, type_names[oe->type]);
1299 1300
	} else {
		if (sha1_object_info(sha1, type, NULL))
1301
			die("Blob not found: %s", command_buf.buf);
1302
		if (strcmp(blob_type, type))
1303 1304
			die("Not a blob (actually a %s): %s",
				command_buf.buf, type);
1305
	}
1306

1307 1308 1309 1310
	tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode);

	if (p_uq)
		free(p_uq);
1311
}
1312

1313 1314
static void file_change_d(struct branch *b)
{
1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327
	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;
	}
	tree_content_remove(&b->branch_tree, p);
	if (p_uq)
		free(p_uq);
1328 1329
}

1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392
static void cmd_from(struct branch *b)
{
	const char *from, *endp;
	char *str_uq;
	struct branch *s;

	if (strncmp("from ", command_buf.buf, 5))
		return;

	if (b->last_commit)
		die("Can't reinitailize branch %s", b->name);

	from = strchr(command_buf.buf, ' ') + 1;
	str_uq = unquote_c_style(from, &endp);
	if (str_uq) {
		if (*endp)
			die("Garbage after string in: %s", command_buf.buf);
		from = str_uq;
	}

	s = lookup_branch(from);
	if (b == s)
		die("Can't create a branch from itself: %s", b->name);
	else if (s) {
		memcpy(b->sha1, s->sha1, 20);
		memcpy(b->branch_tree.sha1, s->branch_tree.sha1, 20);
	} else if (*from == ':') {
		unsigned long idnum = strtoul(from + 1, NULL, 10);
		struct object_entry *oe = find_mark(idnum);
		unsigned long size;
		char *buf;
		if (oe->type != OBJ_COMMIT)
			die("Mark :%lu not a commit", idnum);
		memcpy(b->sha1, oe->sha1, 20);
		buf = unpack_entry(oe->offset, &size);
		if (!buf || size < 46)
			die("Not a valid commit: %s", from);
		if (memcmp("tree ", buf, 5)
			|| get_sha1_hex(buf + 5, b->branch_tree.sha1))
			die("The commit %s is corrupt", sha1_to_hex(b->sha1));
		free(buf);
	} else if (!get_sha1(from, b->sha1)) {
		if (!memcmp(b->sha1, null_sha1, 20))
			memcpy(b->branch_tree.sha1, null_sha1, 20);
		else {
			unsigned long size;
			char *buf;

			buf = read_object_with_reference(b->sha1,
				type_names[OBJ_COMMIT], &size, b->sha1);
			if (!buf || size < 46)
				die("Not a valid commit: %s", from);
			if (memcmp("tree ", buf, 5)
				|| get_sha1_hex(buf + 5, b->branch_tree.sha1))
				die("The commit %s is corrupt", sha1_to_hex(b->sha1));
			free(buf);
		}
	} else
		die("Invalid ref name or SHA1 expression: %s", from);

	read_next_command();
}

1393
static void cmd_new_commit()
1394
{
1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413
	struct branch *b;
	void *msg;
	size_t msglen;
	char *str_uq;
	const char *endp;
	char *sp;
	char *author = NULL;
	char *committer = NULL;
	char *body;

	/* Obtain the branch name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	str_uq = unquote_c_style(sp, &endp);
	if (str_uq) {
		if (*endp)
			die("Garbage after ref in: %s", command_buf.buf);
		sp = str_uq;
	}
	b = lookup_branch(sp);
1414
	if (!b)
1415
		b = new_branch(sp);
1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431
	if (str_uq)
		free(str_uq);

	read_next_command();
	cmd_mark();
	if (!strncmp("author ", command_buf.buf, 7)) {
		author = strdup(command_buf.buf);
		read_next_command();
	}
	if (!strncmp("committer ", command_buf.buf, 10)) {
		committer = strdup(command_buf.buf);
		read_next_command();
	}
	if (!committer)
		die("Expected committer but didn't get one");
	msg = cmd_data(&msglen);
1432 1433
	read_next_command();
	cmd_from(b);
1434 1435

	/* ensure the branch is active/loaded */
1436
	if (!b->branch_tree.tree || !max_active_branches) {
1437 1438 1439
		unload_one_branch();
		load_branch(b);
	}
1440

1441 1442
	/* file_change* */
	for (;;) {
1443
		if (1 == command_buf.len)
1444
			break;
1445
		else if (!strncmp("M ", command_buf.buf, 2))
1446
			file_change_m(b);
1447
		else if (!strncmp("D ", command_buf.buf, 2))
1448 1449
			file_change_d(b);
		else
1450
			die("Unsupported file_change: %s", command_buf.buf);
1451
		read_next_command();
1452 1453
	}

1454
	/* build the tree and the commit */
1455
	store_tree(&b->branch_tree);
1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475
	body = xmalloc(97 + msglen
		+ (author
			? strlen(author) + strlen(committer)
			: 2 * strlen(committer)));
	sp = body;
	sp += sprintf(sp, "tree %s\n", sha1_to_hex(b->branch_tree.sha1));
	if (memcmp(b->sha1, null_sha1, 20))
		sp += sprintf(sp, "parent %s\n", sha1_to_hex(b->sha1));
	if (author)
		sp += sprintf(sp, "%s\n", author);
	else
		sp += sprintf(sp, "author %s\n", committer + 10);
	sp += sprintf(sp, "%s\n\n", committer);
	memcpy(sp, msg, msglen);
	sp += msglen;
	if (author)
		free(author);
	free(committer);
	free(msg);

1476
	store_object(OBJ_COMMIT, body, sp - body, NULL, b->sha1, next_mark);
1477 1478
	free(body);
	b->last_commit = object_count_by_type[OBJ_COMMIT];
1479 1480
}

1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576
static void cmd_new_tag()
{
	char *str_uq;
	const char *endp;
	char *sp;
	const char *from;
	char *tagger;
	struct branch *s;
	void *msg;
	size_t msglen;
	char *body;
	struct tag *t;
	unsigned char sha1[20];

	/* Obtain the new tag name from the rest of our command */
	sp = strchr(command_buf.buf, ' ') + 1;
	str_uq = unquote_c_style(sp, &endp);
	if (str_uq) {
		if (*endp)
			die("Garbage after tag name in: %s", command_buf.buf);
		sp = str_uq;
	}
	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;
	if (str_uq)
		free(str_uq);
	read_next_command();

	/* from ... */
	if (strncmp("from ", command_buf.buf, 5))
		die("Expected from command, got %s", command_buf.buf);

	from = strchr(command_buf.buf, ' ') + 1;
	str_uq = unquote_c_style(from, &endp);
	if (str_uq) {
		if (*endp)
			die("Garbage after string in: %s", command_buf.buf);
		from = str_uq;
	}

	s = lookup_branch(from);
	if (s) {
		memcpy(sha1, s->sha1, 20);
	} else if (*from == ':') {
		unsigned long idnum = strtoul(from + 1, NULL, 10);
		struct object_entry *oe = find_mark(idnum);
		if (oe->type != OBJ_COMMIT)
			die("Mark :%lu not a commit", idnum);
		memcpy(sha1, oe->sha1, 20);
	} else if (!get_sha1(from, sha1)) {
		unsigned long size;
		char *buf;

		buf = read_object_with_reference(sha1,
			type_names[OBJ_COMMIT], &size, sha1);
		if (!buf || size < 46)
			die("Not a valid commit: %s", from);
		free(buf);
	} else
		die("Invalid ref name or SHA1 expression: %s", from);

	if (str_uq)
		free(str_uq);
	read_next_command();

	/* tagger ... */
	if (strncmp("tagger ", command_buf.buf, 7))
		die("Expected tagger command, got %s", command_buf.buf);
	tagger = strdup(command_buf.buf);

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

	/* build the tag object */
	body = xmalloc(67 + strlen(t->name) + strlen(tagger) + msglen);
	sp = body;
	sp += sprintf(sp, "object %s\n", sha1_to_hex(sha1));
	sp += sprintf(sp, "type %s\n", type_names[OBJ_COMMIT]);
	sp += sprintf(sp, "tag %s\n", t->name);
	sp += sprintf(sp, "%s\n\n", tagger);
	memcpy(sp, msg, msglen);
	sp += msglen;
	free(tagger);
	free(msg);

	store_object(OBJ_TAG, body, sp - body, NULL, t->sha1, 0);
	free(body);
}

1577
static const char fast_import_usage[] =
1578
"git-fast-import [--objects=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file] temp.pack";
1579

1580 1581
int main(int argc, const char **argv)
{
1582 1583 1584
	const char *base_name;
	int i;
	unsigned long est_obj_cnt = 1000;
1585 1586
	char *pack_name;
	char *idx_name;
1587
	struct stat sb;
1588

1589 1590 1591
	setup_ident();
	git_config(git_default_config);

1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602
	for (i = 1; i < argc; i++) {
		const char *a = argv[i];

		if (*a != '-' || !strcmp(a, "--"))
			break;
		else if (!strncmp(a, "--objects=", 10))
			est_obj_cnt = strtoul(a + 10, NULL, 0);
		else if (!strncmp(a, "--depth=", 8))
			max_depth = strtoul(a + 8, NULL, 0);
		else if (!strncmp(a, "--active-branches=", 18))
			max_active_branches = strtoul(a + 18, NULL, 0);
1603 1604
		else if (!strncmp(a, "--export-marks=", 15))
			mark_file = a + 15;
1605 1606 1607 1608 1609 1610 1611
		else
			die("unknown option %s", a);
	}
	if ((i+1) != argc)
		usage(fast_import_usage);
	base_name = argv[i];

1612 1613 1614 1615 1616
	pack_name = xmalloc(strlen(base_name) + 6);
	sprintf(pack_name, "%s.pack", base_name);
	idx_name = xmalloc(strlen(base_name) + 5);
	sprintf(idx_name, "%s.idx", base_name);

1617 1618
	pack_fd = open(pack_name, O_RDWR|O_CREAT|O_EXCL, 0666);
	if (pack_fd < 0)
1619
		die("Can't create %s: %s", pack_name, strerror(errno));
1620

1621
	init_pack_header();
1622
	alloc_objects(est_obj_cnt);
1623
	strbuf_init(&command_buf);
1624 1625 1626 1627

	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*));
1628
	marks = pool_calloc(1, sizeof(struct mark_set));
1629

1630
	for (;;) {
1631 1632
		read_next_command();
		if (command_buf.eof)
1633
			break;
1634 1635 1636 1637
		else if (!strcmp("blob", command_buf.buf))
			cmd_new_blob();
		else if (!strncmp("commit ", command_buf.buf, 7))
			cmd_new_commit();
1638 1639
		else if (!strncmp("tag ", command_buf.buf, 4))
			cmd_new_tag();
1640 1641
		else
			die("Unsupported command: %s", command_buf.buf);
1642
	}
1643

1644
	fixup_header_footer();
1645
	close(pack_fd);
1646
	write_index(idx_name);
1647
	dump_branches();
1648
	dump_tags();
1649
	dump_marks();
1650

1651 1652 1653 1654 1655 1656 1657 1658
	fprintf(stderr, "%s statistics:\n", argv[0]);
	fprintf(stderr, "---------------------------------------------------\n");
	fprintf(stderr, "Alloc'd objects: %10lu (%10lu overflow  )\n", alloc_count, alloc_count - est_obj_cnt);
	fprintf(stderr, "Total objects:   %10lu (%10lu duplicates)\n", object_count, duplicate_count);
	fprintf(stderr, "      blobs  :   %10lu (%10lu duplicates)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB]);
	fprintf(stderr, "      trees  :   %10lu (%10lu duplicates)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE]);
	fprintf(stderr, "      commits:   %10lu (%10lu duplicates)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT]);
	fprintf(stderr, "      tags   :   %10lu (%10lu duplicates)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG]);
1659
	fprintf(stderr, "Total branches:  %10lu (%10lu loads     )\n", branch_count, branch_load_count);
1660
	fprintf(stderr, "      marks:     %10u (%10lu unique    )\n", (1 << marks->shift) * 1024, marks_set_count);
1661
	fprintf(stderr, "      atoms:     %10u\n", atom_cnt);
1662 1663 1664
	fprintf(stderr, "Memory total:    %10lu KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024);
	fprintf(stderr, "       pools:    %10lu KiB\n", total_allocd/1024);
	fprintf(stderr, "     objects:    %10lu KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
1665
	fprintf(stderr, "Pack remaps:     %10lu\n", remap_count);
1666 1667 1668 1669 1670 1671 1672 1673
	fprintf(stderr, "---------------------------------------------------\n");

	stat(pack_name, &sb);
	fprintf(stderr, "Pack size:       %10lu KiB\n", (unsigned long)(sb.st_size/1024));
	stat(idx_name, &sb);
	fprintf(stderr, "Index size:      %10lu KiB\n", (unsigned long)(sb.st_size/1024));

	fprintf(stderr, "\n");
1674 1675 1676

	return 0;
}