This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1376

bundlerepo: don't assume there are only two bundle classes
ClosedPublic

Authored by indygreg on Nov 11 2017, 9:51 PM.

Details

Reviewers
dlax
durin42
Group Reviewers
hg-reviewers
Commits
rHG4f04c9207a76: bundlerepo: don't assume there are only two bundle classes
Summary

exchange.readbundle() can return a type that represents a stream
clone bundle. Explicitly handle the bundle1 type and raise a
reasonable error message for unhandled bundle types.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Nov 11 2017, 9:51 PM
dlax accepted this revision.Nov 13 2017, 2:57 AM
durin42 accepted this revision.Nov 13 2017, 5:20 PM
This revision is now accepted and ready to land.Nov 13 2017, 5:20 PM
Closed by commit rHG4f04c9207a76: bundlerepo: don't assume there are only two bundle classes (authored by indygreg). · Explain WhyNov 13 2017, 6:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundlerepo.py (17 lines)

Diff 3431

mercurial/bundlerepo.py

raise NotImplementedError("can't process " raise NotImplementedError("can't process "
"multiple changegroups") "multiple changegroups")
hadchangegroup = True hadchangegroup = True
self._handlebundle2part(part) self._handlebundle2part(part)
if not hadchangegroup: if not hadchangegroup:
raise error.Abort(_("No changegroups found")) raise error.Abort(_("No changegroups found"))
elif isinstance(self.bundle, changegroup.cg1unpacker):
elif self.bundle.compressed(): if 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,
bundlepath, bundlepath,
self.vfs) self.vfs)
else:
raise error.Abort(_('bundle type %s cannot be read') %
type(self.bundle))
# 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:]])