[PATCH] revset: fixed bug where log -f was taking too long to return

Lucas Moscovicz lmoscovicz at fb.com
Fri Feb 21 15:17:26 CST 2014


# HG changeset patch
# User Lucas Moscovicz <lmoscovicz at fb.com>
# Date 1393017377 28800
#      Fri Feb 21 13:16:17 2014 -0800
# Node ID ee2cb5dc57bce1196732071070309e03f112b2e1
# Parent  9ad6dae67845b3d106f233b16bdc207389ee9d19
revset: fixed bug where log -f was taking too long to return

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -2197,9 +2197,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):


More information about the Mercurial-devel mailing list