Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revset.py @ 21201:c8b9c6147108 stable
revset: fix revision filtering in spanset.contains (regression)
The argument is `x` but the variable tested for filtering is `rev`. `rev`
happens to be a revset methods, ... never part of the filtered revs. This
method is now using `rev` for everything.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 28 Apr 2014 16:28:52 -0700 |
| parents | e9c2f76be74b |
| children | 1d7a2771aa36 |
comparison
equal
deleted
inserted
replaced
| 21200:a1381eea7c7d | 21201:c8b9c6147108 |
|---|---|
| 2781 yield r | 2781 yield r |
| 2782 else: | 2782 else: |
| 2783 for r in iterrange: | 2783 for r in iterrange: |
| 2784 yield r | 2784 yield r |
| 2785 | 2785 |
| 2786 def __contains__(self, x): | 2786 def __contains__(self, rev): |
| 2787 return self._contained(x) and not (self._hiddenrevs and rev in | 2787 return self._contained(rev) and not (self._hiddenrevs and rev in |
| 2788 self._hiddenrevs) | 2788 self._hiddenrevs) |
| 2789 | 2789 |
| 2790 def __nonzero__(self): | 2790 def __nonzero__(self): |
| 2791 for r in self: | 2791 for r in self: |
| 2792 return True | 2792 return True |