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

comparison mercurial/localrepo.py @ 19202:0455fc94ae00

bundle-ng: move gengroup into bundler, pass repo object to bundler No semantic changes made.

author	Sune Foldager <cryo@cyanite.org>
date	Fri, 10 May 2013 21:35:49 +0200
parents	309c439cdbaa
children	627cd7842e5d

comparison

equal deleted inserted replaced

-:309c439cdbaa
+:0455fc94ae00
 bundlecaps = None
 # create a changegroup from local
 if revs is None and not outgoing.excluded:
 # push everything,
 # use the fast path, no race possible on push
-bundler = changegroup.bundle10(bundlecaps)
+bundler = changegroup.bundle10(self, bundlecaps)
 cg = self._changegroup(outgoing.missing, bundler,
 'push')
 else:
 cg = self.getlocalbundle('push', outgoing, bundlecaps)
 if not bases:
 bases = [nullid]
 csets, bases, heads = cl.nodesbetween(bases, heads)
 # We assume that all ancestors of bases are known
 common = cl.ancestors([cl.rev(n) for n in bases])
-bundler = changegroup.bundle10()
+bundler = changegroup.bundle10(self)
 return self._changegroupsubset(common, csets, heads, bundler, source)
 def getlocalbundle(self, source, outgoing, bundlecaps=None):
 """Like getbundle, but taking a discovery.outgoing as an argument.
 This is only implemented for local repos and reuses potentially
 precomputed sets in outgoing."""
 if not outgoing.missing:
 return None
-bundler = changegroup.bundle10(bundlecaps)
+bundler = changegroup.bundle10(self, bundlecaps)
 return self._changegroupsubset(outgoing.common,
 outgoing.missing,
 outgoing.missingheads,
 bundler,
 source)
 bundlecaps=bundlecaps)
 @unfilteredmethod
 def _changegroupsubset(self, commonrevs, csets, heads, bundler, source):
-cl = self.changelog
+cl = bundler._changelog
-mf = self.manifest
+mf = bundler._manifest
 mfs = {} # needed manifests
 fnodes = {} # needed file nodes
 changedfiles = set()
 fstate = ['', {}]
-count = [0, 0]
 # can we go through the fast path ?
 heads.sort()
 if heads == sorted(self.heads()):
 return self._changegroup(csets, bundler, source)
 _changesets = _('changesets')
 _manifests = _('manifests')
 _files = _('files')
 def lookup(revlog, x):
+count = bundler.count
 if revlog == cl:
 c = cl.read(x)
 changedfiles.update(c[3])
 mfs.setdefault(c[0], x)
 count[0] += 1
 progress(_bundling, count[0], item=fstate[0],
 unit=_files, total=count[1])
 return fstate[1][x]
 bundler.start(lookup)
-reorder = self.ui.config('bundle', 'reorder', 'auto')
-if reorder == 'auto':
+def getmfnodes():
-reorder = None
-else:
-reorder = util.parsebool(reorder)
-def gengroup():
-# Create a changenode group generator that will call our functions
-# back to lookup the owning changenode and collect information.
-count[:] = [0, len(csets)]
-for chunk in bundler.group(csets, cl, reorder=reorder):
-yield chunk
-progress(_bundling, None)
-# Create a generator for the manifestnodes that calls our lookup
-# and data collection functions back.
 for f in changedfiles:
 fnodes[f] = {}
-count[:] = [0, len(mfs)]
+bundler.count[:] = [0, len(mfs)]
-for chunk in bundler.group(prune(mf, mfs), mf, reorder=reorder):
+return prune(mf, mfs)
-yield chunk
+def getfiles():
-progress(_bundling, None)
 mfs.clear()
+return changedfiles
-# Go through all our files in order sorted by name.
+def getfilenodes(fname, filerevlog):
-count[:] = [0, len(changedfiles)]
+fstate[0] = fname
-for fname in sorted(changedfiles):
+fstate[1] = fnodes.pop(fname, {})
-filerevlog = self.file(fname)
+return prune(filerevlog, fstate[1])
-if not len(filerevlog):
-raise util.Abort(_("empty or missing revlog for %s")
+gengroup = bundler.generate(csets, getmfnodes, getfiles, getfilenodes,
-% fname)
+source)
-fstate[0] = fname
+return changegroup.unbundle10(util.chunkbuffer(gengroup), 'UN')
-fstate[1] = fnodes.pop(fname, {})
-nodelist = prune(filerevlog, fstate[1])
-if nodelist:
-count[0] += 1
-yield bundler.fileheader(fname)
-for chunk in bundler.group(nodelist, filerevlog, reorder):
-yield chunk
-# Signal that no more groups are left.
-yield bundler.close()
-progress(_bundling, None)
-if csets:
-self.hook('outgoing', node=hex(csets[0]), source=source)
-return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
 def changegroup(self, basenodes, source):
 # to avoid a race we use changegroupsubset() (issue1320)
 return self.changegroupsubset(basenodes, self.heads(), source)
 This is much easier than the previous function as we can assume that
 the recipient has any changenode we aren't sending them.
 nodes is the set of nodes to send"""
-cl = self.changelog
+cl = bundler._changelog
-mf = self.manifest
+mf = bundler._manifest
 mfs = {}
 changedfiles = set()
 fstate = ['']
-count = [0, 0]
 self.hook('preoutgoing', throw=True, source=source)
 self.changegroupinfo(nodes, source)
 revset = set([cl.rev(n) for n in nodes])
 _changesets = _('changesets')
 _manifests = _('manifests')
 _files = _('files')
 def lookup(revlog, x):
+count = bundler.count
 if revlog == cl:
 c = cl.read(x)
 changedfiles.update(c[3])
 mfs.setdefault(c[0], x)
 count[0] += 1
 progress(_bundling, count[0], item=fstate[0],
 total=count[1], unit=_files)
 return cl.node(revlog.linkrev(revlog.rev(x)))
 bundler.start(lookup)
-reorder = self.ui.config('bundle', 'reorder', 'auto')
-if reorder == 'auto':
+def getmfnodes():
-reorder = None
+bundler.count[:] = [0, len(mfs)]
-else:
+return gennodelst(mf)
-reorder = util.parsebool(reorder)
+def getfiles():
+return changedfiles
-def gengroup():
+def getfilenodes(fname, filerevlog):
-'''yield a sequence of changegroup chunks (strings)'''
+fstate[0] = fname
-# construct a list of all changed files
+return gennodelst(filerevlog)
-count[:] = [0, len(nodes)]
+gengroup = bundler.generate(nodes, getmfnodes, getfiles, getfilenodes,
-for chunk in bundler.group(nodes, cl, reorder=reorder):
+source)
-yield chunk
+return changegroup.unbundle10(util.chunkbuffer(gengroup), 'UN')
-progress(_bundling, None)
-count[:] = [0, len(mfs)]
-for chunk in bundler.group(gennodelst(mf), mf, reorder=reorder):
-yield chunk
-progress(_bundling, None)
-count[:] = [0, len(changedfiles)]
-for fname in sorted(changedfiles):
-filerevlog = self.file(fname)
-if not len(filerevlog):
-raise util.Abort(_("empty or missing revlog for %s")
-% fname)
-fstate[0] = fname
-nodelist = gennodelst(filerevlog)
-if nodelist:
-count[0] += 1
-yield bundler.fileheader(fname)
-for chunk in bundler.group(nodelist, filerevlog, reorder):
-yield chunk
-yield bundler.close()
-progress(_bundling, None)
-if nodes:
-self.hook('outgoing', node=hex(nodes[0]), source=source)
-return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
 @unfilteredmethod
 def addchangegroup(self, source, srctype, url, emptyok=False):
 """Add the changegroup returned by source.read() to this repo.
 srctype is a string like 'push', 'pull', or 'unbundle'.  url is

Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 19202:0455fc94ae00