Mercurial > public > mercurial-scm > hg
comparison mercurial/bundlerepo.py @ 35075:3eeb0a3eeaed
bundlerepo: use early return
I like avoiding patterns that lead to the pyramid of doom.
Differential Revision: https://phab.mercurial-scm.org/D1382
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 11 Nov 2017 18:55:04 -0800 |
parents | 3f393e4593f2 |
children | 90609be10891 |
comparison
equal
deleted
inserted
replaced
35074:62e10bf001a9 | 35075:3eeb0a3eeaed |
---|---|
317 self.firstnewrev = self.changelog.repotiprev + 1 | 317 self.firstnewrev = self.changelog.repotiprev + 1 |
318 phases.retractboundary(self, None, phases.draft, | 318 phases.retractboundary(self, None, phases.draft, |
319 [ctx.node() for ctx in self[self.firstnewrev:]]) | 319 [ctx.node() for ctx in self[self.firstnewrev:]]) |
320 | 320 |
321 def _handlebundle2part(self, bundle, part): | 321 def _handlebundle2part(self, bundle, part): |
322 if part.type == 'changegroup': | 322 if part.type != 'changegroup': |
323 cgstream = part | 323 return |
324 version = part.params.get('version', '01') | 324 |
325 legalcgvers = changegroup.supportedincomingversions(self) | 325 cgstream = part |
326 if version not in legalcgvers: | 326 version = part.params.get('version', '01') |
327 msg = _('Unsupported changegroup version: %s') | 327 legalcgvers = changegroup.supportedincomingversions(self) |
328 raise error.Abort(msg % version) | 328 if version not in legalcgvers: |
329 if bundle.compressed(): | 329 msg = _('Unsupported changegroup version: %s') |
330 cgstream = self._writetempbundle(part.read, | 330 raise error.Abort(msg % version) |
331 ".cg%sun" % version) | 331 if bundle.compressed(): |
332 | 332 cgstream = self._writetempbundle(part.read, '.cg%sun' % version) |
333 self._cgunpacker = changegroup.getunbundler(version, cgstream, | 333 |
334 'UN') | 334 self._cgunpacker = changegroup.getunbundler(version, cgstream, 'UN') |
335 | 335 |
336 def _writetempbundle(self, readfn, suffix, header=''): | 336 def _writetempbundle(self, readfn, suffix, header=''): |
337 """Write a temporary file to disk | 337 """Write a temporary file to disk |
338 """ | 338 """ |
339 fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", | 339 fdtemp, temp = self.vfs.mkstemp(prefix="hg-bundle-", |