changegroup: unnest some lookup functions

mercurial/localrepo.py

@@ -1479,6 +1479,7 b' class localrepository(repo.repository):'
         mfs = {} # needed manifests
         fnodes = {} # needed file nodes
         changedfiles = set()
+        count = [0]
 
         # can we go through the fast path ?
         heads.sort()
@@ -1495,12 +1496,6 b' class localrepository(repo.repository):'
                 if revlog.linkrev(revlog.rev(n)) not in commonrevs:
                     yield n
 
-        # Now that we have all theses utility functions to help out and
-        # logically divide up the task, generate the group.
-        def gengroup():
-            # The set of changed files starts empty.
-
-            count = [0]
             def clookup(revlog, x):
                 c = cl.read(x)
                 changedfiles.update(c[3])
@@ -1509,17 +1504,6 b' class localrepository(repo.repository):'
                 self.ui.progress(_('bundling'), count[0], unit=_('changesets'))
                 return x
 
-            # Create a changenode group generator that will call our functions
-            # back to lookup the owning changenode and collect information.
-            for chunk in cl.group(csets, clookup):
-                yield chunk
-            changecount = count[0]
-            efiles = len(changedfiles)
-            self.ui.progress(_('bundling'), None)
-
-            # Create a generator for the manifestnodes that calls our lookup
-            # and data collection functions back.
-            count = [0]
             def mlookup(revlog, x):
                 clnode = mfs[x]
                 mdata = mf.readfast(x)
@@ -1528,9 +1512,22 b' class localrepository(repo.repository):'
                         fnodes.setdefault(f, {}).setdefault(mdata[f], clnode)
                 count[0] += 1
                 self.ui.progress(_('bundling'), count[0],
-                                 unit=_('manifests'), total=changecount)
+                             unit=_('manifests'), total=len(mfs))
                 return mfs[x]
 
+        # Now that we have all theses utility functions to help out and
+        # logically divide up the task, generate the group.
+        def gengroup():
+            # Create a changenode group generator that will call our functions
+            # back to lookup the owning changenode and collect information.
+            for chunk in cl.group(csets, clookup):
+                yield chunk
+            efiles = len(changedfiles)
+            self.ui.progress(_('bundling'), None)
+
+            # Create a generator for the manifestnodes that calls our lookup
+            # and data collection functions back.
+            count[0] = 0
             for chunk in mf.group(prune(mf, mfs), mlookup):
                 yield chunk
             self.ui.progress(_('bundling'), None)