revision.c 21.5 KB
Newer Older
1 2 3 4 5
#include "cache.h"
#include "tag.h"
#include "blob.h"
#include "tree.h"
#include "commit.h"
6
#include "diff.h"
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 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 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
#include "refs.h"
#include "revision.h"

static char *path_name(struct name_path *path, const char *name)
{
	struct name_path *p;
	char *n, *m;
	int nlen = strlen(name);
	int len = nlen + 1;

	for (p = path; p; p = p->up) {
		if (p->elem_len)
			len += p->elem_len + 1;
	}
	n = xmalloc(len);
	m = n + len - (nlen + 1);
	strcpy(m, name);
	for (p = path; p; p = p->up) {
		if (p->elem_len) {
			m -= p->elem_len + 1;
			memcpy(m, p->elem, p->elem_len);
			m[p->elem_len] = '/';
		}
	}
	return n;
}

struct object_list **add_object(struct object *obj,
				       struct object_list **p,
				       struct name_path *path,
				       const char *name)
{
	struct object_list *entry = xmalloc(sizeof(*entry));
	entry->item = obj;
	entry->next = *p;
	entry->name = path_name(path, name);
	*p = entry;
	return &entry->next;
}

static void mark_blob_uninteresting(struct blob *blob)
{
	if (blob->object.flags & UNINTERESTING)
		return;
	blob->object.flags |= UNINTERESTING;
}

void mark_tree_uninteresting(struct tree *tree)
{
	struct object *obj = &tree->object;
	struct tree_entry_list *entry;

	if (obj->flags & UNINTERESTING)
		return;
	obj->flags |= UNINTERESTING;
	if (!has_sha1_file(obj->sha1))
		return;
	if (parse_tree(tree) < 0)
		die("bad tree %s", sha1_to_hex(obj->sha1));
	entry = tree->entries;
	tree->entries = NULL;
	while (entry) {
		struct tree_entry_list *next = entry->next;
		if (entry->directory)
			mark_tree_uninteresting(entry->item.tree);
		else
			mark_blob_uninteresting(entry->item.blob);
		free(entry);
		entry = next;
	}
}

void mark_parents_uninteresting(struct commit *commit)
{
	struct commit_list *parents = commit->parents;

	while (parents) {
		struct commit *commit = parents->item;
85 86
		if (!(commit->object.flags & UNINTERESTING)) {
			commit->object.flags |= UNINTERESTING;
87

88 89 90 91 92 93 94 95 96 97 98
			/*
			 * Normally we haven't parsed the parent
			 * yet, so we won't have a parent of a parent
			 * here. However, it may turn out that we've
			 * reached this commit some other way (where it
			 * wasn't uninteresting), in which case we need
			 * to mark its parents recursively too..
			 */
			if (commit->parents)
				mark_parents_uninteresting(commit);
		}
99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118

		/*
		 * A missing commit is ok iff its parent is marked
		 * uninteresting.
		 *
		 * We just mark such a thing parsed, so that when
		 * it is popped next time around, we won't be trying
		 * to parse it and get an error.
		 */
		if (!has_sha1_file(commit->object.sha1))
			commit->object.parsed = 1;
		parents = parents->next;
	}
}

static void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
{
	add_object(obj, &revs->pending_objects, NULL, name);
}

119
static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
120 121 122 123 124 125
{
	struct object *object;

	object = parse_object(sha1);
	if (!object)
		die("bad object %s", name);
126 127 128 129 130 131 132
	object->flags |= flags;
	return object;
}

static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
{
	unsigned long flags = object->flags;
133 134 135 136 137 138

	/*
	 * Tag object? Look what it points to..
	 */
	while (object->type == tag_type) {
		struct tag *tag = (struct tag *) object;
139
		if (revs->tag_objects && !(flags & UNINTERESTING))
140 141 142 143 144 145 146 147 148 149 150 151 152 153
			add_pending_object(revs, object, tag->tag);
		object = parse_object(tag->tagged->sha1);
		if (!object)
			die("bad object %s", sha1_to_hex(tag->tagged->sha1));
	}

	/*
	 * Commit object? Just return it, we'll do all the complex
	 * reachability crud.
	 */
	if (object->type == commit_type) {
		struct commit *commit = (struct commit *)object;
		if (parse_commit(commit) < 0)
			die("unable to parse commit %s", name);
154
		if (flags & UNINTERESTING) {
155
			mark_parents_uninteresting(commit);
156 157
			revs->limited = 1;
		}
158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193
		return commit;
	}

	/*
	 * Tree object? Either mark it uniniteresting, or add it
	 * to the list of objects to look at later..
	 */
	if (object->type == tree_type) {
		struct tree *tree = (struct tree *)object;
		if (!revs->tree_objects)
			return NULL;
		if (flags & UNINTERESTING) {
			mark_tree_uninteresting(tree);
			return NULL;
		}
		add_pending_object(revs, object, "");
		return NULL;
	}

	/*
	 * Blob object? You know the drill by now..
	 */
	if (object->type == blob_type) {
		struct blob *blob = (struct blob *)object;
		if (!revs->blob_objects)
			return NULL;
		if (flags & UNINTERESTING) {
			mark_blob_uninteresting(blob);
			return NULL;
		}
		add_pending_object(revs, object, "");
		return NULL;
	}
	die("%s is unknown object", name);
}

194 195 196 197 198 199 200 201 202 203 204 205 206
static int everybody_uninteresting(struct commit_list *orig)
{
	struct commit_list *list = orig;
	while (list) {
		struct commit *commit = list->item;
		list = list->next;
		if (commit->object.flags & UNINTERESTING)
			continue;
		return 0;
	}
	return 1;
}

207
static int tree_difference = REV_TREE_SAME;
208 209 210 211 212 213

static void file_add_remove(struct diff_options *options,
		    int addremove, unsigned mode,
		    const unsigned char *sha1,
		    const char *base, const char *path)
{
214
	int diff = REV_TREE_DIFFERENT;
215 216

	/*
217 218 219 220 221
	 * Is it an add of a new file? It means that the old tree
	 * didn't have it at all, so we will turn "REV_TREE_SAME" ->
	 * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
	 * (and if it already was "REV_TREE_NEW", we'll keep it
	 * "REV_TREE_NEW" of course).
222 223 224
	 */
	if (addremove == '+') {
		diff = tree_difference;
225
		if (diff != REV_TREE_SAME)
226
			return;
227
		diff = REV_TREE_NEW;
228 229 230 231 232 233 234 235 236 237
	}
	tree_difference = diff;
}

static void file_change(struct diff_options *options,
		 unsigned old_mode, unsigned new_mode,
		 const unsigned char *old_sha1,
		 const unsigned char *new_sha1,
		 const char *base, const char *path)
{
238
	tree_difference = REV_TREE_DIFFERENT;
239 240
}

241
int rev_compare_tree(struct rev_info *revs, struct tree *t1, struct tree *t2)
242 243
{
	if (!t1)
244
		return REV_TREE_NEW;
245
	if (!t2)
246 247
		return REV_TREE_DIFFERENT;
	tree_difference = REV_TREE_SAME;
248
	if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
249
			   &revs->pruning) < 0)
250
		return REV_TREE_DIFFERENT;
251 252 253
	return tree_difference;
}

254
int rev_same_tree_as_empty(struct rev_info *revs, struct tree *t1)
255 256 257 258 259 260 261 262
{
	int retval;
	void *tree;
	struct tree_desc empty, real;

	if (!t1)
		return 0;

263
	tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
264 265 266 267 268 269 270 271
	if (!tree)
		return 0;
	real.buf = tree;

	empty.buf = "";
	empty.size = 0;

	tree_difference = 0;
272
	retval = diff_tree(&empty, &real, "", &revs->pruning);
273 274 275 276 277 278 279 280
	free(tree);

	return retval >= 0 && !tree_difference;
}

static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
{
	struct commit_list **pp, *parent;
281
	int tree_changed = 0;
282 283 284 285 286

	if (!commit->tree)
		return;

	if (!commit->parents) {
287
		if (!rev_same_tree_as_empty(revs, commit->tree))
288 289 290 291 292 293 294 295 296
			commit->object.flags |= TREECHANGE;
		return;
	}

	pp = &commit->parents;
	while ((parent = *pp) != NULL) {
		struct commit *p = parent->item;

		parse_commit(p);
297
		switch (rev_compare_tree(revs, p->tree, commit->tree)) {
298
		case REV_TREE_SAME:
299 300 301 302 303 304 305 306 307 308
			if (p->object.flags & UNINTERESTING) {
				/* Even if a merge with an uninteresting
				 * side branch brought the entire change
				 * we are interested in, we do not want
				 * to lose the other branches of this
				 * merge, so we just keep going.
				 */
				pp = &parent->next;
				continue;
			}
309 310 311 312
			parent->next = NULL;
			commit->parents = parent;
			return;

313 314
		case REV_TREE_NEW:
			if (revs->remove_empty_trees &&
315
			    rev_same_tree_as_empty(revs, p->tree)) {
316 317 318 319 320 321 322
				/* We are adding all the specified
				 * paths from this parent, so the
				 * history beyond this parent is not
				 * interesting.  Remove its parents
				 * (they are grandparents for us).
				 * IOW, we pretend this parent is a
				 * "root" commit.
323
				 */
324 325
				parse_commit(p);
				p->parents = NULL;
326 327
			}
		/* fallthrough */
328
		case REV_TREE_DIFFERENT:
329
			tree_changed = 1;
330 331 332 333 334
			pp = &parent->next;
			continue;
		}
		die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
	}
335 336
	if (tree_changed)
		commit->object.flags |= TREECHANGE;
337 338 339 340 341 342
}

static void add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
{
	struct commit_list *parent = commit->parents;

343 344 345 346
	if (commit->object.flags & ADDED)
		return;
	commit->object.flags |= ADDED;

347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379
	/*
	 * If the commit is uninteresting, don't try to
	 * prune parents - we want the maximal uninteresting
	 * set.
	 *
	 * Normally we haven't parsed the parent
	 * yet, so we won't have a parent of a parent
	 * here. However, it may turn out that we've
	 * reached this commit some other way (where it
	 * wasn't uninteresting), in which case we need
	 * to mark its parents recursively too..
	 */
	if (commit->object.flags & UNINTERESTING) {
		while (parent) {
			struct commit *p = parent->item;
			parent = parent->next;
			parse_commit(p);
			p->object.flags |= UNINTERESTING;
			if (p->parents)
				mark_parents_uninteresting(p);
			if (p->object.flags & SEEN)
				continue;
			p->object.flags |= SEEN;
			insert_by_date(p, list);
		}
		return;
	}

	/*
	 * Ok, the commit wasn't uninteresting. Try to
	 * simplify the commit history and find the parent
	 * that has no differences in the path set if one exists.
	 */
380 381
	if (revs->prune_fn)
		revs->prune_fn(revs, commit);
382

L
Linus Torvalds 已提交
383 384 385
	if (revs->no_walk)
		return;

386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428
	parent = commit->parents;
	while (parent) {
		struct commit *p = parent->item;

		parent = parent->next;

		parse_commit(p);
		if (p->object.flags & SEEN)
			continue;
		p->object.flags |= SEEN;
		insert_by_date(p, list);
	}
}

static void limit_list(struct rev_info *revs)
{
	struct commit_list *list = revs->commits;
	struct commit_list *newlist = NULL;
	struct commit_list **p = &newlist;

	while (list) {
		struct commit_list *entry = list;
		struct commit *commit = list->item;
		struct object *obj = &commit->object;

		list = list->next;
		free(entry);

		if (revs->max_age != -1 && (commit->date < revs->max_age))
			obj->flags |= UNINTERESTING;
		if (revs->unpacked && has_sha1_pack(obj->sha1))
			obj->flags |= UNINTERESTING;
		add_parents_to_list(revs, commit, &list);
		if (obj->flags & UNINTERESTING) {
			mark_parents_uninteresting(commit);
			if (everybody_uninteresting(list))
				break;
			continue;
		}
		if (revs->min_age != -1 && (commit->date > revs->min_age))
			continue;
		p = &commit_list_insert(commit, p)->next;
	}
J
Junio C Hamano 已提交
429
	if (revs->boundary) {
430 431 432 433 434 435
		/* mark the ones that are on the result list first */
		for (list = newlist; list; list = list->next) {
			struct commit *commit = list->item;
			commit->object.flags |= TMP_MARK;
		}
		for (list = newlist; list; list = list->next) {
J
Junio C Hamano 已提交
436 437
			struct commit *commit = list->item;
			struct object *obj = &commit->object;
438 439
			struct commit_list *parent;
			if (obj->flags & UNINTERESTING)
J
Junio C Hamano 已提交
440
				continue;
441 442 443
			for (parent = commit->parents;
			     parent;
			     parent = parent->next) {
J
Junio C Hamano 已提交
444 445 446 447
				struct commit *pcommit = parent->item;
				if (!(pcommit->object.flags & UNINTERESTING))
					continue;
				pcommit->object.flags |= BOUNDARY;
448 449 450
				if (pcommit->object.flags & TMP_MARK)
					continue;
				pcommit->object.flags |= TMP_MARK;
J
Junio C Hamano 已提交
451 452
				p = &commit_list_insert(pcommit, p)->next;
			}
453 454 455 456
		}
		for (list = newlist; list; list = list->next) {
			struct commit *commit = list->item;
			commit->object.flags &= ~TMP_MARK;
J
Junio C Hamano 已提交
457 458
		}
	}
459 460 461
	revs->commits = newlist;
}

462 463 464 465 466
static int all_flags;
static struct rev_info *all_revs;

static int handle_one_ref(const char *path, const unsigned char *sha1)
{
467 468
	struct object *object = get_reference(all_revs, path, sha1, all_flags);
	add_pending_object(all_revs, object, "");
469 470 471 472 473 474 475 476 477 478
	return 0;
}

static void handle_all(struct rev_info *revs, unsigned flags)
{
	all_revs = revs;
	all_flags = flags;
	for_each_ref(handle_one_ref);
}

479 480 481
void init_revisions(struct rev_info *revs)
{
	memset(revs, 0, sizeof(*revs));
482

483
	revs->abbrev = DEFAULT_ABBREV;
484
	revs->ignore_merges = 1;
485 486 487
	revs->pruning.recursive = 1;
	revs->pruning.add_remove = file_add_remove;
	revs->pruning.change = file_change;
488 489 490 491 492 493 494 495 496 497 498 499
	revs->lifo = 1;
	revs->dense = 1;
	revs->prefix = setup_git_directory();
	revs->max_age = -1;
	revs->min_age = -1;
	revs->max_count = -1;

	revs->prune_fn = NULL;
	revs->prune_data = NULL;

	revs->topo_setter = topo_sort_default_setter;
	revs->topo_getter = topo_sort_default_getter;
500 501 502 503

	revs->commit_format = CMIT_FMT_DEFAULT;

	diff_setup(&revs->diffopt);
504 505
}

506 507 508 509
/*
 * Parse revision information, filling in the "rev_info" structure,
 * and removing the used arguments from the argument list.
 *
510 511
 * Returns the number of arguments left that weren't recognized
 * (which are also moved to the head of the argument list)
512
 */
513
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
514 515
{
	int i, flags, seen_dashdash;
516
	const char **unrecognized = argv + 1;
517 518 519 520 521 522 523 524 525 526
	int left = 1;

	/* First, search for "--" */
	seen_dashdash = 0;
	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];
		if (strcmp(arg, "--"))
			continue;
		argv[i] = NULL;
		argc = i;
527
		revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
528 529 530 531 532 533
		seen_dashdash = 1;
		break;
	}

	flags = 0;
	for (i = 1; i < argc; i++) {
534
		struct object *object;
535 536 537 538 539 540
		const char *arg = argv[i];
		unsigned char sha1[20];
		char *dotdot;
		int local_flags;

		if (*arg == '-') {
541
			int opts;
542 543 544 545
			if (!strncmp(arg, "--max-count=", 12)) {
				revs->max_count = atoi(arg + 12);
				continue;
			}
546 547 548 549 550 551 552 553 554 555 556 557 558 559 560
			/* accept -<digit>, like traditilnal "head" */
			if ((*arg == '-') && isdigit(arg[1])) {
				revs->max_count = atoi(arg + 1);
				continue;
			}
			if (!strcmp(arg, "-n")) {
				if (argc <= i + 1)
					die("-n requires an argument");
				revs->max_count = atoi(argv[++i]);
				continue;
			}
			if (!strncmp(arg,"-n",2)) {
				revs->max_count = atoi(arg + 2);
				continue;
			}
561 562 563 564
			if (!strncmp(arg, "--max-age=", 10)) {
				revs->max_age = atoi(arg + 10);
				continue;
			}
565 566 567 568 569 570
			if (!strncmp(arg, "--since=", 8)) {
				revs->max_age = approxidate(arg + 8);
				continue;
			}
			if (!strncmp(arg, "--after=", 8)) {
				revs->max_age = approxidate(arg + 8);
571 572 573 574
				continue;
			}
			if (!strncmp(arg, "--min-age=", 10)) {
				revs->min_age = atoi(arg + 10);
575 576 577 578 579 580 581 582 583 584
				continue;
			}
			if (!strncmp(arg, "--before=", 9)) {
				revs->min_age = approxidate(arg + 9);
				continue;
			}
			if (!strncmp(arg, "--until=", 8)) {
				revs->min_age = approxidate(arg + 8);
				continue;
			}
585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607
			if (!strcmp(arg, "--all")) {
				handle_all(revs, flags);
				continue;
			}
			if (!strcmp(arg, "--not")) {
				flags ^= UNINTERESTING;
				continue;
			}
			if (!strcmp(arg, "--default")) {
				if (++i >= argc)
					die("bad --default argument");
				def = argv[i];
				continue;
			}
			if (!strcmp(arg, "--topo-order")) {
				revs->topo_order = 1;
				continue;
			}
			if (!strcmp(arg, "--date-order")) {
				revs->lifo = 0;
				revs->topo_order = 1;
				continue;
			}
608 609 610 611
			if (!strcmp(arg, "--parents")) {
				revs->parents = 1;
				continue;
			}
612 613 614 615 616 617 618 619 620 621 622 623
			if (!strcmp(arg, "--dense")) {
				revs->dense = 1;
				continue;
			}
			if (!strcmp(arg, "--sparse")) {
				revs->dense = 0;
				continue;
			}
			if (!strcmp(arg, "--remove-empty")) {
				revs->remove_empty_trees = 1;
				continue;
			}
624
			if (!strcmp(arg, "--no-merges")) {
625 626 627
				revs->no_merges = 1;
				continue;
			}
J
Junio C Hamano 已提交
628 629 630 631
			if (!strcmp(arg, "--boundary")) {
				revs->boundary = 1;
				continue;
			}
632 633 634 635 636 637 638 639 640 641 642 643 644
			if (!strcmp(arg, "--objects")) {
				revs->tag_objects = 1;
				revs->tree_objects = 1;
				revs->blob_objects = 1;
				continue;
			}
			if (!strcmp(arg, "--objects-edge")) {
				revs->tag_objects = 1;
				revs->tree_objects = 1;
				revs->blob_objects = 1;
				revs->edge_hint = 1;
				continue;
			}
645 646 647 648
			if (!strcmp(arg, "--unpacked")) {
				revs->unpacked = 1;
				continue;
			}
649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 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
			if (!strcmp(arg, "-r")) {
				revs->diff = 1;
				revs->diffopt.recursive = 1;
				continue;
			}
			if (!strcmp(arg, "-t")) {
				revs->diff = 1;
				revs->diffopt.recursive = 1;
				revs->diffopt.tree_in_recursive = 1;
				continue;
			}
			if (!strcmp(arg, "-m")) {
				revs->ignore_merges = 0;
				continue;
			}
			if (!strcmp(arg, "-c")) {
				revs->diff = 1;
				revs->combine_merges = 1;
				continue;
			}
			if (!strcmp(arg, "--cc")) {
				revs->diff = 1;
				revs->dense_combined_merges = 1;
				revs->combine_merges = 1;
				continue;
			}
			if (!strcmp(arg, "-v")) {
				revs->verbose_header = 1;
				continue;
			}
			if (!strncmp(arg, "--pretty", 8)) {
				revs->verbose_header = 1;
				revs->commit_format = get_commit_format(arg+8);
				continue;
			}
			if (!strcmp(arg, "--root")) {
				revs->show_root_diff = 1;
				continue;
			}
			if (!strcmp(arg, "--no-commit-id")) {
				revs->no_commit_id = 1;
				continue;
			}
			if (!strcmp(arg, "--always")) {
				revs->always_show_header = 1;
				continue;
			}
			if (!strcmp(arg, "--no-abbrev")) {
				revs->abbrev = 0;
				continue;
			}
			if (!strcmp(arg, "--abbrev")) {
				revs->abbrev = DEFAULT_ABBREV;
				continue;
			}
			if (!strcmp(arg, "--abbrev-commit")) {
				revs->abbrev_commit = 1;
				continue;
			}
			if (!strcmp(arg, "--full-diff")) {
				revs->diff = 1;
				revs->full_diff = 1;
				continue;
			}
			opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
			if (opts > 0) {
				revs->diff = 1;
				i += opts - 1;
				continue;
			}
719 720 721 722 723 724 725
			*unrecognized++ = arg;
			left++;
			continue;
		}
		dotdot = strstr(arg, "..");
		if (dotdot) {
			unsigned char from_sha1[20];
726 727
			const char *next = dotdot + 2;
			const char *this = arg;
728 729
			*dotdot = 0;
			if (!*next)
730
				next = "HEAD";
731
			if (dotdot == arg)
732
				this = "HEAD";
733 734
			if (!get_sha1(this, from_sha1) &&
			    !get_sha1(next, sha1)) {
735 736
				struct object *exclude;
				struct object *include;
737

738 739
				exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
				include = get_reference(revs, next, sha1, flags);
740 741
				if (!exclude || !include)
					die("Invalid revision range %s..%s", arg, next);
742 743
				add_pending_object(revs, exclude, this);
				add_pending_object(revs, include, next);
744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762
				continue;
			}
			*dotdot = '.';
		}
		local_flags = 0;
		if (*arg == '^') {
			local_flags = UNINTERESTING;
			arg++;
		}
		if (get_sha1(arg, sha1) < 0) {
			struct stat st;
			int j;

			if (seen_dashdash || local_flags)
				die("bad revision '%s'", arg);

			/* If we didn't have a "--", all filenames must exist */
			for (j = i; j < argc; j++) {
				if (lstat(argv[j], &st) < 0)
763
					die("'%s': %s", argv[j], strerror(errno));
764
			}
765
			revs->prune_data = get_pathspec(revs->prefix, argv + i);
766 767
			break;
		}
768 769
		object = get_reference(revs, arg, sha1, flags ^ local_flags);
		add_pending_object(revs, object, arg);
770
	}
771
	if (def && !revs->pending_objects) {
772
		unsigned char sha1[20];
773
		struct object *object;
774 775
		if (get_sha1(def, sha1) < 0)
			die("bad default revision '%s'", def);
776 777
		object = get_reference(revs, def, sha1, 0);
		add_pending_object(revs, object, def);
778
	}
779

780
	if (revs->topo_order || revs->unpacked)
781 782
		revs->limited = 1;

783
	if (revs->prune_data) {
784
		diff_tree_setup_paths(revs->prune_data, &revs->pruning);
785
		revs->prune_fn = try_to_simplify_commit;
786 787
		if (!revs->full_diff)
			diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
788
	}
789 790 791 792 793 794 795 796 797
	if (revs->combine_merges) {
		revs->ignore_merges = 0;
		if (revs->dense_combined_merges)
			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
	}
	if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
		revs->diffopt.recursive = 1;
	revs->diffopt.abbrev = revs->abbrev;
	diff_setup_done(&revs->diffopt);
798

799 800
	return left;
}
801 802 803

void prepare_revision_walk(struct rev_info *revs)
{
804 805 806 807 808 809 810 811 812 813 814 815 816 817 818
	struct object_list *list;

	list = revs->pending_objects;
	revs->pending_objects = NULL;
	while (list) {
		struct commit *commit = handle_commit(revs, list->item, list->name);
		if (commit) {
			if (!(commit->object.flags & SEEN)) {
				commit->object.flags |= SEEN;
				insert_by_date(commit, &revs->commits);
			}
		}
		list = list->next;
	}

L
Linus Torvalds 已提交
819 820
	if (revs->no_walk)
		return;
821 822 823
	if (revs->limited)
		limit_list(revs);
	if (revs->topo_order)
824 825 826
		sort_in_topological_order_fn(&revs->commits, revs->lifo,
					     revs->topo_setter,
					     revs->topo_getter);
827 828
}

829
static int rewrite_one(struct rev_info *revs, struct commit **pp)
830 831 832
{
	for (;;) {
		struct commit *p = *pp;
833 834
		if (!revs->limited)
			add_parents_to_list(revs, p, &revs->commits);
835 836 837 838 839 840 841 842
		if (p->object.flags & (TREECHANGE | UNINTERESTING))
			return 0;
		if (!p->parents)
			return -1;
		*pp = p->parents->item;
	}
}

843
static void rewrite_parents(struct rev_info *revs, struct commit *commit)
844 845 846 847
{
	struct commit_list **pp = &commit->parents;
	while (*pp) {
		struct commit_list *parent = *pp;
848
		if (rewrite_one(revs, &parent->item) < 0) {
849 850 851 852 853 854 855
			*pp = parent->next;
			continue;
		}
		pp = &parent->next;
	}
}

856 857
struct commit *get_revision(struct rev_info *revs)
{
858 859 860
	struct commit_list *list = revs->commits;

	if (!list)
861 862
		return NULL;

863 864 865 866 867 868 869 870 871
	/* Check the max_count ... */
	switch (revs->max_count) {
	case -1:
		break;
	case 0:
		return NULL;
	default:
		revs->max_count--;
	}
872

873
	do {
874 875
		struct commit *commit = revs->commits->item;

876 877 878 879
		revs->commits = revs->commits->next;

		/*
		 * If we haven't done the list limiting, we need to look at
880 881
		 * the parents here. We also need to do the date-based limiting
		 * that we'd otherwise have done in limit_list().
882
		 */
883
		if (!revs->limited) {
884 885 886 887
			if ((revs->unpacked &&
			     has_sha1_pack(commit->object.sha1)) ||
			    (revs->max_age != -1 &&
			     (commit->date < revs->max_age)))
888
				continue;
889
			add_parents_to_list(revs, commit, &revs->commits);
890
		}
J
Junio C Hamano 已提交
891
		if (commit->object.flags & SHOWN)
892
			continue;
J
Junio C Hamano 已提交
893 894
		if (!(commit->object.flags & BOUNDARY) &&
		    (commit->object.flags & UNINTERESTING))
895
			continue;
896
		if (revs->min_age != -1 && (commit->date > revs->min_age))
897
			continue;
J
Junio C Hamano 已提交
898 899
		if (revs->no_merges &&
		    commit->parents && commit->parents->next)
900
			continue;
901
		if (revs->prune_fn && revs->dense) {
902
			if (!(commit->object.flags & TREECHANGE))
903 904
				continue;
			if (revs->parents)
905
				rewrite_parents(revs, commit);
J
Junio C Hamano 已提交
906
		}
907 908 909 910 911
		commit->object.flags |= SHOWN;
		return commit;
	} while (revs->commits);
	return NULL;
}