changeset 29938 | 2c6a05b938d8 |
parent 29937 | 91a95ad985d8 |
child 29939 | e34cd85dc5b1 |
--- a/mercurial/revset.py Sun Aug 07 17:58:50 2016 +0900 +++ b/mercurial/revset.py Sun Jun 26 18:17:12 2016 +0900 @@ -407,7 +407,12 @@ return a + b def orset(repo, subset, x, order): - return _orsetlist(repo, subset, getlist(x)) + xs = getlist(x) + if order == followorder: + # slow path to take the subset order + return subset & _orsetlist(repo, fullreposet(repo), xs) + else: + return _orsetlist(repo, subset, xs) def notset(repo, subset, x, order): return subset - getset(repo, subset, x)