Mercurial > public > mercurial-scm > hg
comparison mercurial/scmutil.py @ 29771:98976e3cae57
revpair: do not optimize tree to check for odd-range spec
At cc3a30ff9490, we had to optimize a parsed tree to resolve x^:y ambiguity.
Since we've moved the resolution of x^:y to parse(), we no longer have to call
optimize(). Therefore, (x:y) can be taken as a single expression, not an odd
range expression x:y.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 06 Aug 2016 20:46:53 +0900 |
| parents | 2372182e505b |
| children | 35560189677c |
comparison
equal
deleted
inserted
replaced
| 29770:9c51a5de76db | 29771:98976e3cae57 |
|---|---|
| 779 raise error.Abort(_('empty revision set')) | 779 raise error.Abort(_('empty revision set')) |
| 780 return repo[l.last()] | 780 return repo[l.last()] |
| 781 | 781 |
| 782 def _pairspec(revspec): | 782 def _pairspec(revspec): |
| 783 tree = revset.parse(revspec) | 783 tree = revset.parse(revspec) |
| 784 tree = revset.optimize(tree) # fix up "x^:y" -> "(x^):y" | |
| 785 return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall') | 784 return tree and tree[0] in ('range', 'rangepre', 'rangepost', 'rangeall') |
| 786 | 785 |
| 787 def revpair(repo, revs): | 786 def revpair(repo, revs): |
| 788 if not revs: | 787 if not revs: |
| 789 return repo.dirstate.p1(), None | 788 return repo.dirstate.p1(), None |