This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4739

revset: remove part of the commonancestors() comment
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3bc4fce0167f: revset: remove part of the commonancestors() comment
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).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (6 lines)

Diff 11365

mercurial/revset.py

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, order=anyorder) startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
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