mercurial-scm/hg: mercurial/localrepo.py comparison

comparison mercurial/localrepo.py @ 13782:9131724c3f4b

changegroup: combine infocollect and lookup callbacks

author	Matt Mackall <mpm@selenic.com>
date	Mon, 28 Mar 2011 11:18:56 -0500
parents	7abab875e647
children	c196352d935b

comparison

equal deleted inserted replaced

-:66c54d2ebe72
+:9131724c3f4b
 # 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.
 changedfiles = set()
 collect = changegroup.collector(cl, mfs, changedfiles)
+def clookup(x):
+collect(x)
+return x
 # Create a changenode group generator that will call our functions
 # back to lookup the owning changenode and collect information.
-group = cl.group(csets, lambda x: x, collect)
+group = cl.group(csets, clookup)
 for count, chunk in enumerate(group):
 yield chunk
 # revlog.group yields three entries per node, so
 # dividing by 3 gives an approximation of how many
 # nodes have been processed.
 self.ui.progress(_('bundling'), None)
 prune(mf, mfs)
 # Create a generator for the manifestnodes that calls our lookup
 # and data collection functions back.
-group = mf.group(sorted(mfs, key=mf.rev),
+fcollect = filenode_collector(changedfiles)
-lambda mnode: mfs[mnode],
+def mlookup(x):
-filenode_collector(changedfiles))
+fcollect(x)
+return mfs[x]
+group = mf.group(sorted(mfs, key=mf.rev), mlookup)
 for count, chunk in enumerate(group):
 yield chunk
 # see above comment for why we divide by 3
 self.ui.progress(_('bundling'), count / 3,
 unit=_('manifests'), total=changecount)
 yield changegroup.chunkheader(len(fname))
 yield fname
 # Create a group generator and only pass in a changenode
 # lookup function as we need to collect no information
 # from filenodes.
+def flookup(x):
+return missingfnodes[x]
 group = filerevlog.group(
 sorted(missingfnodes, key=filerevlog.rev),
-lambda fnode: missingfnodes[fnode])
+flookup)
 for chunk in group:
 # even though we print the same progress on
 # most loop iterations, put the progress call
 # here so that time estimates (if any) can be updated
 self.ui.progress(
 def gengroup():
 '''yield a sequence of changegroup chunks (strings)'''
 # construct a list of all changed files
 changedfiles = set()
 mmfs = {}
 collect = changegroup.collector(cl, mmfs, changedfiles)
+def clookup(x):
-for count, chunk in enumerate(cl.group(nodes, lambda x: x, collect)):
+collect(x)
+return x
+for count, chunk in enumerate(cl.group(nodes, clookup)):
 # revlog.group yields three entries per node, so
 # dividing by 3 gives an approximation of how many
 # nodes have been processed.
 self.ui.progress(_('bundling'), count / 3, unit=_('changesets'))
 yield chunk
 changecount = count / 3
 self.ui.progress(_('bundling'), None)
 mnfst = self.manifest
 nodeiter = gennodelst(mnfst)
-for count, chunk in enumerate(mnfst.group(nodeiter,
+mfunc = lookuplinkrev_func(mnfst)
-lookuplinkrev_func(mnfst))):
+def mlookup(x):
+return mfunc(x)
+for count, chunk in enumerate(mnfst.group(nodeiter, mlookup)):
 # see above comment for why we divide by 3
 self.ui.progress(_('bundling'), count / 3,
 unit=_('manifests'), total=changecount)
 yield chunk
 self.ui.progress(_('bundling'), None)
 nodeiter = gennodelst(filerevlog)
 nodeiter = list(nodeiter)
 if nodeiter:
 yield changegroup.chunkheader(len(fname))
 yield fname
-lookup = lookuplinkrev_func(filerevlog)
+ffunc = lookuplinkrev_func(filerevlog)
-for chunk in filerevlog.group(nodeiter, lookup):
+def flookup(x):
+return ffunc(x)
+for chunk in filerevlog.group(nodeiter, flookup):
 self.ui.progress(
 _('bundling'), idx, item=fname,
 total=efiles, unit=_('files'))
 yield chunk
 self.ui.progress(_('bundling'), None)

Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 13782:9131724c3f4b