This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4738

revset: make commonancestors(x + x^) be ::(x^), not ::x
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcb5134f2318a: revset: make commonancestors(x + x^) be ::(x^), not ::x
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja added a subscriber: yuja.Sep 26 2018, 7:32 AM

Queued the series for stable, many thanks.

  • # only wants the heads of the set passed in
  • h = heads(repo, fullreposet(repo), x, anyorder)
  • if not h:

+ startrevs = getset(repo, fullreposet(repo), x)

I've resurrected the anyorder flag though that wouldn't matter much in
practice.

Closed by commit rHGcb5134f2318a: revset: make commonancestors(x + x^) be ::(x^), not ::x (authored by valentin.gatienbaron). · Explain WhySep 26 2018, 7:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revset.py (8 lines)
Mtests/test-revset.t (1 line)

Diff 11355

mercurial/revset.py

"""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 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 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 use "::head()" because that revset returns "::x + ::y + ..." for each head
in the repo (whereas we want "::x *and* ::y"). in the repo (whereas we want "::x *and* ::y").
""" """
# only wants the heads of the set passed in startrevs = getset(repo, fullreposet(repo), x)
h = heads(repo, fullreposet(repo), x, anyorder) if not startrevs:
if not h:
return baseset() return baseset()
for r in h: for r in startrevs:
subset &= dagop.revancestors(repo, baseset([r])) subset &= dagop.revancestors(repo, baseset([r]))
return subset return subset
@predicate('contains(pattern)', weight=100) @predicate('contains(pattern)', weight=100)
def contains(repo, subset, x): def contains(repo, subset, x):
"""The revision's manifest contains a file matching pattern (but might not """The revision's manifest contains a file matching pattern (but might not
modify it). See :hg:`help patterns` for information about file patterns. modify it). See :hg:`help patterns` for information about file patterns.
The pattern without explicit kind like ``glob:`` is expected to be The pattern without explicit kind like ``glob:`` is expected to be

tests/test-revset.t

9 9
$ hg log -T '{rev}\n' -r 'commonancestors(8 + 9)' $ hg log -T '{rev}\n' -r 'commonancestors(8 + 9)'
0 0
1 1
2 2
4 4
8 8
9
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())'
test ancestors with depth limit test ancestors with depth limit