Mercurial > hg
changeset 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 | a1381eea7c7d |
| children | c04e5e937139 |
| files | mercurial/revset.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revset.py Mon Apr 28 17:25:36 2014 -0700 +++ b/mercurial/revset.py Mon Apr 28 16:28:52 2014 -0700 @@ -2783,8 +2783,8 @@ for r in iterrange: yield r - def __contains__(self, x): - return self._contained(x) and not (self._hiddenrevs and rev in + def __contains__(self, rev): + return self._contained(rev) and not (self._hiddenrevs and rev in self._hiddenrevs) def __nonzero__(self):