From 7bc546e4e05b13174db33f3535279f6bc2ab36f9 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <madski@unity3d.com>
Date: Wed, 16 Jan 2013 20:41:34 +0100
Subject: [PATCH] bundlerepo: improve performance for bundle() revset
 expression

Create the set of revision numbers directly instead of creating a list of nodes
first.
---
 mercurial/bundlerepo.py | 8 ++++----
 mercurial/revset.py     | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
index cd5f780bd3..8d862d42ee 100644
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -25,8 +25,7 @@ class bundlerevlog(revlog.revlog):
         # (start).
         #
         # basemap is indexed with revisions coming from the bundle, and it
-        # maps to the corresponding node that is the base of the corresponding
-        # delta.
+        # maps to the node that is the base of the corresponding delta.
         #
         # To differentiate a rev in the bundle from a rev in the revlog, we
         # check revision against basemap.
@@ -37,7 +36,7 @@ class bundlerevlog(revlog.revlog):
         n = len(self)
         self.disktiprev = n - 1
         chain = None
-        self.bundlenodes = []
+        self.bundlerevs = set() # used by 'bundle()' revset expression
         while True:
             chunkdata = bundle.deltachunk(chain)
             if not chunkdata:
@@ -53,10 +52,10 @@ class bundlerevlog(revlog.revlog):
             start = bundle.tell() - size
 
             link = linkmapper(cs)
-            self.bundlenodes.append(node)
             if node in self.nodemap:
                 # this can happen if two branches make the same change
                 chain = node
+                self.bundlerevs.add(self.nodemap[node])
                 continue
 
             for p in (p1, p2):
@@ -69,6 +68,7 @@ class bundlerevlog(revlog.revlog):
             self.basemap[n] = deltabase
             self.index.insert(-1, e)
             self.nodemap[node] = n
+            self.bundlerevs.add(n)
             chain = node
             n += 1
 
diff --git a/mercurial/revset.py b/mercurial/revset.py
index f2915c4656..9631522a27 100644
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -450,11 +450,10 @@ def bundle(repo, subset, x):
     Bundle must be specified by the -R option."""
 
     try:
-        bundlenodes = repo.changelog.bundlenodes
+        bundlerevs = repo.changelog.bundlerevs
     except AttributeError:
         raise util.Abort(_("no bundle provided - specify with -R"))
-    revs = set(repo[n].rev() for n in bundlenodes)
-    return [r for r in subset if r in revs]
+    return [r for r in subset if r in bundlerevs]
 
 def checkstatus(repo, subset, pat, field):
     m = None