This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	valentin.gatienbaron	D4742 revset: make heads(commonancestors(x + x^)) be x^, not x
Closed	valentin.gatienbaron	D4741 revset: add tests of heads(commonancestors(..))
Closed	valentin.gatienbaron	D4740 revset: reword commonancestor()'s help
Closed	valentin.gatienbaron	D4739 revset: remove part of the commonancestors() comment
Closed	valentin.gatienbaron	D4738 revset: make commonancestors(x + x^) be ::(x^), not ::x
Closed	valentin.gatienbaron	D4737 revset: add test demonstrating a bug with commonancestor()
Closed	valentin.gatienbaron	D4736 revset: fix commonancestor test so it demonstrates correct behavior

Diff 11359

	condrepr='<branch closed>')			condrepr='<branch closed>')

	# for internal use			# for internal use
	@predicate('_commonancestorheads(set)', safe=True)			@predicate('_commonancestorheads(set)', safe=True)
	def _commonancestorheads(repo, subset, x):			def _commonancestorheads(repo, subset, x):
	# This is an internal method is for quickly calculating "heads(::x and			# This is an internal method is for quickly calculating "heads(::x and
	# ::y)"			# ::y)"

	# These greatest common ancestors are the same ones that the consesus bid			# These greatest common ancestors are the same ones that the consensus bid
	# merge will find.			# merge will find.
	h = heads(repo, fullreposet(repo), x, anyorder)			startrevs = getset(repo, fullreposet(repo), x)

	ancs = repo.changelog._commonancestorsheads(*list(h))			ancs = repo.changelog._commonancestorsheads(*list(startrevs))
	return subset & baseset(ancs)			return subset & baseset(ancs)

	@predicate('commonancestors(set)', safe=True)			@predicate('commonancestors(set)', safe=True)
	def commonancestors(repo, subset, x):			def commonancestors(repo, subset, x):
	"""Changesets that are ancestors of every changeset in set.			"""Changesets that are ancestors of every changeset in set.
	"""			"""
	startrevs = getset(repo, fullreposet(repo), x)			startrevs = getset(repo, fullreposet(repo), x)
	if not startrevs:			if not startrevs:


	$ hg log -T '{rev}\n' -r 'heads(commonancestors(7 + 9))'			$ hg log -T '{rev}\n' -r 'heads(commonancestors(7 + 9))'
	4			4
	$ hg log -T '{rev}\n' -r 'heads(commonancestors(heads(all())))'			$ hg log -T '{rev}\n' -r 'heads(commonancestors(heads(all())))'
	4			4
	$ hg log -T '{rev}\n' -r 'heads(commonancestors(9))'			$ hg log -T '{rev}\n' -r 'heads(commonancestors(9))'
	9			9
	$ hg log -T '{rev}\n' -r 'heads(commonancestors(8 + 9))'			$ hg log -T '{rev}\n' -r 'heads(commonancestors(8 + 9))'
	9			8

	test ancestor variants of empty revision			test ancestor variants of empty revision

	$ log 'ancestor(none())'			$ log 'ancestor(none())'
	$ log 'ancestors(none())'			$ log 'ancestors(none())'
	$ log 'commonancestors(none())'			$ log 'commonancestors(none())'
	$ log 'heads(commonancestors(none()))'			$ log 'heads(commonancestors(none()))'