changeset 20367:2ac278aab2b4

revset: added intersection to baseset class

Added the method __and__ to the baseset class to be able to intersect with
other objects in a more efficient way.

--- a/mercurial/revset.py	Thu Jan 23 14:20:58 2014 -0800
+++ b/mercurial/revset.py	Fri Jan 24 16:57:44 2014 -0800
@@ -407,8 +407,7 @@
             bmrevs = set()
             for bmrev in matchrevs:
                 bmrevs.add(repo[bmrev].rev())
-            s = subset.set()
-            return baseset([r for r in s if r in bmrevs])
+            return subset & bmrevs
 
     bms = set([repo[r].rev()
                for r in repo._bookmarks.values()])
@@ -455,7 +454,7 @@
     # i18n: "bumped" is a keyword
     getargs(x, 0, 0, _("bumped takes no arguments"))
     bumped = obsmod.getrevs(repo, 'bumped')
-    return baseset([r for r in subset if r in bumped])
+    return subset & bumped
 
 def bundle(repo, subset, x):
     """``bundle()``
@@ -467,7 +466,7 @@
         bundlerevs = repo.changelog.bundlerevs
     except AttributeError:
         raise util.Abort(_("no bundle provided - specify with -R"))
-    return baseset([r for r in subset if r in bundlerevs])
+    return subset & bundlerevs
 
 def checkstatus(repo, subset, pat, field):
     m = None
@@ -520,7 +519,7 @@
     """
     s = getset(repo, baseset(repo), x).set()
     cs = _children(repo, subset, s)
-    return baseset([r for r in subset if r in cs])
+    return subset & cs
 
 def closed(repo, subset, x):
     """``closed()``
@@ -690,7 +689,7 @@
     # i18n: "extinct" is a keyword
     getargs(x, 0, 0, _("extinct takes no arguments"))
     extincts = obsmod.getrevs(repo, 'extinct')
-    return baseset([r for r in subset if r in extincts])
+    return subset & extincts
 
 def extra(repo, subset, x):
     """``extra(label, [value])``
@@ -921,7 +920,7 @@
     # i18n: "hidden" is a keyword
     getargs(x, 0, 0, _("hidden takes no arguments"))
     hiddenrevs = repoview.filterrevs(repo, 'visible')
-    return baseset([r for r in subset if r in hiddenrevs])
+    return subset & hiddenrevs
 
 def keyword(repo, subset, x):
     """``keyword(string)``
@@ -1058,7 +1057,7 @@
     # i18n: "obsolete" is a keyword
     getargs(x, 0, 0, _("obsolete takes no arguments"))
     obsoletes = obsmod.getrevs(repo, 'obsolete')
-    return baseset([r for r in subset if r in obsoletes])
+    return subset & obsoletes
 
 def origin(repo, subset, x):
     """``origin([set])``
@@ -1125,8 +1124,7 @@
     cl = repo.changelog
     for r in getset(repo, baseset(repo), x):
         ps.add(cl.parentrevs(r)[0])
-    s = subset.set()
-    return baseset([r for r in s if r in ps])
+    return subset & ps
 
 def p2(repo, subset, x):
     """``p2([set])``
@@ -1144,8 +1142,7 @@
     cl = repo.changelog
     for r in getset(repo, baseset(repo), x):
         ps.add(cl.parentrevs(r)[1])
-    s = subset.set()
-    return baseset([r for r in s if r in ps])
+    return subset & ps
 
 def parents(repo, subset, x):
     """``parents([set])``
@@ -1153,14 +1150,13 @@
     """
     if x is None:
         ps = tuple(p.rev() for p in repo[x].parents())
-        return baseset([r for r in subset if r in ps])
+        return subset & ps
 
     ps = set()
     cl = repo.changelog
     for r in getset(repo, baseset(repo), x):
         ps.update(cl.parentrevs(r))
-    s = subset.set()
-    return baseset([r for r in s if r in ps])
+    return subset & ps
 
 def parentspec(repo, subset, x, n):
     """``set^0``
@@ -1185,8 +1181,7 @@
             parents = cl.parentrevs(r)
             if len(parents) > 1:
                 ps.add(parents[1])
-    s = subset.set()
-    return baseset([r for r in s if r in ps])
+    return subset & ps
 
 def present(repo, subset, x):
     """``present(set)``
@@ -1531,7 +1526,7 @@
             s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])
     else:
         s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
-    return baseset([r for r in subset if r in s])
+    return subset & s
 
 def tagged(repo, subset, x):
     return tag(repo, subset, x)
@@ -1543,7 +1538,7 @@
     # i18n: "unstable" is a keyword
     getargs(x, 0, 0, _("unstable takes no arguments"))
     unstables = obsmod.getrevs(repo, 'unstable')
-    return baseset([r for r in subset if r in unstables])
+    return subset & unstables
 
 
 def user(repo, subset, x):
@@ -2074,5 +2069,11 @@
             s = set(x)
         return baseset(self.set() - s)
 
+    def __and__(self, x):
+        s = self.set()
+        if isinstance(x, baseset):
+            x = x.set()
+        return baseset([y for y in s if y in x])
+
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = symbols.values()