Mercurial > hg > mercurial-source

diff mercurial/revset.py @ 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 532b114a6e02
children fa16c710a3d8
line wrap: on
line diff
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -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):