Mercurial > hg

changeset 13713:ee4f7109457e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changegroup: drop expensive redundant usage of readdelta for progress
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Mar 2011 20:16:51 -0500
parents c4706accf310
children 7f53ce232d63
files mercurial/localrepo.py
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Mar 20 19:43:28 2011 -0500
+++ b/mercurial/localrepo.py	Sun Mar 20 20:16:51 2011 -0500
@@ -1511,6 +1511,7 @@
                 self.ui.progress(_('bundling'), count / 3,
                                  unit=_('changesets'))
             changecount = count / 3
+            efiles = len(changedfiles)
             self.ui.progress(_('bundling'), None)
 
             prune(mf, mfs)
@@ -1519,17 +1520,12 @@
             group = mf.group(sorted(mfs, key=mf.rev),
                              lambda mnode: mfs[mnode],
                              filenode_collector(changedfiles))
-            efiles = {}
             for count, chunk in enumerate(group):
-                if count % 3 == 1:
-                    mnode = chunk[:20]
-                    efiles.update(mf.readdelta(mnode))
                 yield chunk
                 # see above comment for why we divide by 3
                 self.ui.progress(_('bundling'), count / 3,
                                  unit=_('manifests'), total=changecount)
             self.ui.progress(_('bundling'), None)
-            efiles = len(efiles)
 
             mfs.clear()
 
@@ -1616,22 +1612,20 @@
                 # nodes have been processed.
                 self.ui.progress(_('bundling'), cnt / 3, unit=_('changesets'))
                 yield chnk
+            efiles = len(changedfiles)
             changecount = cnt / 3
             self.ui.progress(_('bundling'), None)
 
             mnfst = self.manifest
             nodeiter = gennodelst(mnfst)
-            efiles = {}
             for cnt, chnk in enumerate(mnfst.group(nodeiter,
                                                    lookuplinkrev_func(mnfst))):
                 if cnt % 3 == 1:
                     mnode = chnk[:20]
-                    efiles.update(mnfst.readdelta(mnode))
                 # see above comment for why we divide by 3
                 self.ui.progress(_('bundling'), cnt / 3,
                                  unit=_('manifests'), total=changecount)
                 yield chnk
-            efiles = len(efiles)
             self.ui.progress(_('bundling'), None)
 
             for idx, fname in enumerate(sorted(changedfiles)):