| indygreg |
| hg-reviewers |
This moves the bundle2 part handling for bundlerepo out to a separate function
so extensions can participate in bundlerepo setup when using bundle2 bundles.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundlerepo.py (34 lines) |
| else: | else: | ||||
| self._url = 'bundle:' + bundlename | self._url = 'bundle:' + bundlename | ||||
| self.tempfile = None | self.tempfile = None | ||||
| f = util.posixfile(bundlename, "rb") | f = util.posixfile(bundlename, "rb") | ||||
| self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlename) | self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlename) | ||||
| if isinstance(self.bundle, bundle2.unbundle20): | if isinstance(self.bundle, bundle2.unbundle20): | ||||
| cgstream = None | hadchangegroup = False | ||||
| for part in self.bundle.iterparts(): | for part in self.bundle.iterparts(): | ||||
| if part.type == 'changegroup': | if part.type == 'changegroup': | ||||
| if cgstream is not None: | if hadchangegroup: | ||||
| raise NotImplementedError("can't process " | raise NotImplementedError("can't process " | ||||
| "multiple changegroups") | "multiple changegroups") | ||||
| cgstream = part | hadchangegroup = True | ||||
| 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) | |||||
| if cgstream is None: | self._handlebundle2part(part) | ||||
| raise error.Abort(_('No changegroups found')) | |||||
| self.bundle = changegroup.getunbundler(version, cgstream, 'UN') | if not hadchangegroup: | ||||
| raise error.Abort(_("No changegroups found")) | |||||
| elif self.bundle.compressed(): | elif self.bundle.compressed(): | ||||
| f = self._writetempbundle(self.bundle.read, '.hg10un', | f = self._writetempbundle(self.bundle.read, '.hg10un', | ||||
| header='HG10UN') | header='HG10UN') | ||||
| self.bundlefile = self.bundle = exchange.readbundle(ui, f, | self.bundlefile = self.bundle = exchange.readbundle(ui, f, | ||||
| bundlename, | bundlename, | ||||
| self.vfs) | self.vfs) | ||||
| # dict with the mapping 'filename' -> position in the bundle | # dict with the mapping 'filename' -> position in the bundle | ||||
| self.bundlefilespos = {} | self.bundlefilespos = {} | ||||
| self.firstnewrev = self.changelog.repotiprev + 1 | self.firstnewrev = self.changelog.repotiprev + 1 | ||||
| phases.retractboundary(self, None, phases.draft, | phases.retractboundary(self, None, phases.draft, | ||||
| [ctx.node() for ctx in self[self.firstnewrev:]]) | [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=''): | def _writetempbundle(self, readfn, suffix, header=''): | ||||
| """Write a temporary file to disk | """Write a temporary file to disk | ||||
| """ | """ | ||||
| fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | ||||
| suffix=".hg10un") | suffix=".hg10un") | ||||
| self.tempfile = temp | self.tempfile = temp | ||||
| with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp: | with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp: | ||||