This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D7806 graft: use revset for intersecting with ancestor set
Closed	martinvonz	D7805 graft: don't remove from a list in a loop
Closed	martinvonz	D7804 tests: avoid grafting the same change over and over
Closed	martinvonz	D7803 tests: split out another ~1/2 of test-graft.t
Closed	martinvonz	D7802 tests: split out ~1/3 of test-graft.t
Closed	martinvonz	D7801 overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies
Closed	martinvonz	D7800 movedirstate: get copies from dirstate before setting parents
Abandoned	martinvonz	D7799 merge: remove unused keepparent argument for graft()

Diff 19129

	# way to the graftstate. With --force, any revisions we would have otherwise			# way to the graftstate. With --force, any revisions we would have otherwise
	# skipped would not have been filtered out, and if they hadn't been applied			# skipped would not have been filtered out, and if they hadn't been applied
	# already, they'd have been in the graftstate.			# already, they'd have been in the graftstate.
	if not (cont or opts.get(b'force')) and basectx is None:			if not (cont or opts.get(b'force')) and basectx is None:
	# check for ancestors of dest branch			# check for ancestors of dest branch
	crev = repo[b'.'].rev()			crev = repo[b'.'].rev()
	ancestors = repo.changelog.ancestors([crev], inclusive=True)			ancestors = repo.changelog.ancestors([crev], inclusive=True)
	# XXX make this lazy in the future			# XXX make this lazy in the future
	# don't mutate while iterating, create a copy			for rev in revs:
	for rev in list(revs):
	if rev in ancestors:			if rev in ancestors:
	ui.warn(			ui.warn(
	_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])			_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])
	)			)
	# XXX remove on list is slow			revs = [r for r in revs if r not in ancestors]
	revs.remove(rev)
	if not revs:			if not revs:
	return -1			return -1

	# analyze revs for earlier grafts			# analyze revs for earlier grafts
	ids = {}			ids = {}
	for ctx in repo.set(b"%ld", revs):			for ctx in repo.set(b"%ld", revs):
	ids[ctx.hex()] = ctx.rev()			ids[ctx.hex()] = ctx.rev()
	n = ctx.extra().get(b'source')			n = ctx.extra().get(b'source')