This is an archive of the discontinued Mercurial Phabricator instance.

revset: remove part of the commonancestors() comment
ClosedPublic

Authored by valentin.gatienbaron on Sep 25 2018, 5:18 PM.

Reviewers

None

Group Reviewers

hg-reviewers

Commits

Summary

The reason is that:

it shows up in "hg help revset", but it doesn't look like documentation targeted at users
it doesn't make sense to me: it doesn't say what happens with < 2 revisions, and is not quite right because my understanding is that this revset was created precisely because "::x and ::y" was not quite the same (when x and y don't evaluate to singletons).

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/revset.py (6 lines)

Commit	Parents	Author	Summary	Date
		Valentin Gatien-Baron		Sep 25 2018, 4:14 PM

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

	h = heads(repo, fullreposet(repo), x, anyorder)			h = heads(repo, fullreposet(repo), x, anyorder)

	ancs = repo.changelog._commonancestorsheads(*list(h))			ancs = repo.changelog._commonancestorsheads(*list(h))
	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):
	"""Returns all common ancestors of the set.			"""Returns all common ancestors of the set.

	This method is for calculating "::x and ::y" (i.e. all the ancestors that
	are common to both x and y) in an easy and optimized way. We can't quite
	use "::head()" because that revset returns "::x + ::y + ..." for each head
	in the repo (whereas we want "::x and ::y").

	"""			"""
	startrevs = getset(repo, fullreposet(repo), x)			startrevs = getset(repo, fullreposet(repo), x)
	if not startrevs:			if not startrevs:
	return baseset()			return baseset()
	for r in startrevs:			for r in startrevs:
	subset &= dagop.revancestors(repo, baseset([r]))			subset &= dagop.revancestors(repo, baseset([r]))
	return subset			return subset