Mercurial > hg-stable

changeset 20538:fe220013e4db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: fixed bug where log -f was taking too long to return
author Lucas Moscovicz <lmoscovicz@fb.com>
date Fri, 21 Feb 2014 13:16:17 -0800
parents c1febc167d87
children aa021ece4506
files mercurial/revset.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Thu Feb 20 16:12:27 2014 -0600
+++ b/mercurial/revset.py	Fri Feb 21 13:16:17 2014 -0800
@@ -2243,9 +2243,13 @@
                 self._hiddenrevs)
 
     def __and__(self, x):
+        if isinstance(x, baseset):
+            x = x.set()
         return lazyset(self, lambda r: r in x)
 
     def __sub__(self, x):
+        if isinstance(x, baseset):
+            x = x.set()
         return lazyset(self, lambda r: r not in x)
 
     def __add__(self, x):