facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

bundlerepo: move bundle2 part handling out to a function

Browse Source 
This moves the bundle2 part handling for bundlerepo out to a separate function
so extensions can participate in bundlerepo setup when using bundle2 bundles.

Differential Revision: https://phab.mercurial-scm.org/D290
This commit is contained in:
Durham Goode 2017-08-23 12:35:03 -07:00
parent 22fc2e18a8
commit 8075a9d667
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mercurial/bundlerepo.py
View File

@ -283,26 +283,18 @@ class bundlerepository(localrepo.localrepository):
self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlename)
if isinstance(self.bundle, bundle2.unbundle20):
cgstream = None
hadchangegroup = False
for part in self.bundle.iterparts():
if part.type == 'changegroup':
if cgstream is not None:
if hadchangegroup:
raise NotImplementedError("can't process "
"multiple changegroups")
cgstream = part
version = part.params.get('version', '01')
legalcgvers = changegroup.supportedincomingversions(self)
if version not in legalcgvers:
msg = _('Unsupported changegroup version: %s')
raise error.Abort(msg % version)
if self.bundle.compressed():
cgstream = self._writetempbundle(part.read,
".cg%sun" % version)
hadchangegroup = True
if cgstream is None:
raise error.Abort(_('No changegroups found'))
self._handlebundle2part(part)
self.bundle = changegroup.getunbundler(version, cgstream, 'UN')
if not hadchangegroup:
raise error.Abort(_("No changegroups found"))
elif self.bundle.compressed():
f = self._writetempbundle(self.bundle.read, '.hg10un',
@ -318,6 +310,20 @@ class bundlerepository(localrepo.localrepository):
phases.retractboundary(self, None, phases.draft,
[ctx.node() for ctx in self[self.firstnewrev:]])
def _handlebundle2part(self, part):
if part.type == 'changegroup':
cgstream = part
version = part.params.get('version', '01')
legalcgvers = changegroup.supportedincomingversions(self)
if version not in legalcgvers:
msg = _('Unsupported changegroup version: %s')
raise error.Abort(msg % version)
if self.bundle.compressed():
cgstream = self._writetempbundle(part.read,
".cg%sun" % version)
self.bundle = changegroup.getunbundler(version, cgstream, 'UN')
def _writetempbundle(self, readfn, suffix, header=''):
"""Write a temporary file to disk
"""