| hg-reviewers |
A future patch will refactor certain parts of bundlerepo initiatlization such
that we need to create temp bundles from another function. Let's move this to
another function to support that.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundlerepo.py (42 lines) |
| fname = chunkdata['filename'] | fname = chunkdata['filename'] | ||||
| bundlefilespos[fname] = bundle.tell() | bundlefilespos[fname] = bundle.tell() | ||||
| for chunk in iter(lambda: bundle.deltachunk(None), {}): | for chunk in iter(lambda: bundle.deltachunk(None), {}): | ||||
| pass | pass | ||||
| return bundlefilespos | return bundlefilespos | ||||
| class bundlerepository(localrepo.localrepository): | class bundlerepository(localrepo.localrepository): | ||||
| def __init__(self, ui, path, bundlename): | def __init__(self, ui, path, bundlename): | ||||
| def _writetempbundle(read, suffix, header=''): | |||||
| """Write a temporary file to disk | |||||
| This is closure because we need to make sure this tracked by | |||||
| self.tempfile for cleanup purposes.""" | |||||
| fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | |||||
| suffix=".hg10un") | |||||
| self.tempfile = temp | |||||
| with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp: | |||||
| fptemp.write(header) | |||||
| while True: | |||||
| chunk = read(2**18) | |||||
| if not chunk: | |||||
| break | |||||
| fptemp.write(chunk) | |||||
| return self.vfs.open(self.tempfile, mode="rb") | |||||
| self._tempparent = None | self._tempparent = None | ||||
| try: | try: | ||||
| localrepo.localrepository.__init__(self, ui, path) | localrepo.localrepository.__init__(self, ui, path) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| self._tempparent = tempfile.mkdtemp() | self._tempparent = tempfile.mkdtemp() | ||||
| localrepo.instance(ui, self._tempparent, 1) | localrepo.instance(ui, self._tempparent, 1) | ||||
| localrepo.localrepository.__init__(self, ui, self._tempparent) | localrepo.localrepository.__init__(self, ui, self._tempparent) | ||||
| self.ui.setconfig('phases', 'publish', False, 'bundlerepo') | self.ui.setconfig('phases', 'publish', False, 'bundlerepo') | ||||
| "multiple changegroups") | "multiple changegroups") | ||||
| cgstream = part | cgstream = part | ||||
| version = part.params.get('version', '01') | version = part.params.get('version', '01') | ||||
| legalcgvers = changegroup.supportedincomingversions(self) | legalcgvers = changegroup.supportedincomingversions(self) | ||||
| if version not in legalcgvers: | if version not in legalcgvers: | ||||
| msg = _('Unsupported changegroup version: %s') | msg = _('Unsupported changegroup version: %s') | ||||
| raise error.Abort(msg % version) | raise error.Abort(msg % version) | ||||
| if self.bundle.compressed(): | if self.bundle.compressed(): | ||||
| cgstream = _writetempbundle(part.read, | cgstream = self._writetempbundle(part.read, | ||||
| ".cg%sun" % version) | ".cg%sun" % version) | ||||
| if cgstream is None: | if cgstream is None: | ||||
| raise error.Abort(_('No changegroups found')) | raise error.Abort(_('No changegroups found')) | ||||
| cgstream.seek(0) | cgstream.seek(0) | ||||
| self.bundle = changegroup.getunbundler(version, cgstream, 'UN') | self.bundle = changegroup.getunbundler(version, cgstream, 'UN') | ||||
| elif self.bundle.compressed(): | elif self.bundle.compressed(): | ||||
| f = _writetempbundle(self.bundle.read, '.hg10un', header='HG10UN') | f = self._writetempbundle(self.bundle.read, '.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 _writetempbundle(self, readfn, suffix, header=''): | |||||
| """Write a temporary file to disk | |||||
| """ | |||||
| fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | |||||
| suffix=".hg10un") | |||||
| self.tempfile = temp | |||||
| with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp: | |||||
| fptemp.write(header) | |||||
| while True: | |||||
| chunk = readfn(2**18) | |||||
| if not chunk: | |||||
| break | |||||
| fptemp.write(chunk) | |||||
| return self.vfs.open(self.tempfile, mode="rb") | |||||
| @localrepo.unfilteredpropertycache | @localrepo.unfilteredpropertycache | ||||
| def _phasecache(self): | def _phasecache(self): | ||||
| return bundlephasecache(self, self._phasedefaults) | return bundlephasecache(self, self._phasedefaults) | ||||
| @localrepo.unfilteredpropertycache | @localrepo.unfilteredpropertycache | ||||
| def changelog(self): | def changelog(self): | ||||
| # consume the header if it exists | # consume the header if it exists | ||||
| self.bundle.changelogheader() | self.bundle.changelogheader() | ||||