revset: fix revision filtering in spanset.contains (regression) stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Mon, 28 Apr 2014 16:28:52 -0700
branchstable
changeset 21201 c8b9c6147108
parent 21200 a1381eea7c7d
child 21202 c04e5e937139
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.
mercurial/revset.py
--- 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):