Mercurial > hg
comparison mercurial/bundle2.py @ 26393:cff70549a959
bundle2: rename error exception class for unsupported feature
The original name explicitly mention "Part", however it is also used outside of
parts related feature. We rename from 'UnsupportedPartError' to
'BundleUnknownFeatureError' to fix this.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 23 Sep 2015 11:44:52 -0700 |
parents | 521b4d061d4a |
children | 4e7b0bf9f0b1 |
comparison
equal
deleted
inserted
replaced
26392:127b59787fd5 | 26393:cff70549a959 |
---|---|
374 try: | 374 try: |
375 try: | 375 try: |
376 handler = parthandlermapping.get(part.type) | 376 handler = parthandlermapping.get(part.type) |
377 if handler is None: | 377 if handler is None: |
378 status = 'unsupported-type' | 378 status = 'unsupported-type' |
379 raise error.UnsupportedPartError(parttype=part.type) | 379 raise error.BundleUnknownFeatureError(parttype=part.type) |
380 indebug(op.ui, 'found a handler for part %r' % part.type) | 380 indebug(op.ui, 'found a handler for part %r' % part.type) |
381 unknownparams = part.mandatorykeys - handler.params | 381 unknownparams = part.mandatorykeys - handler.params |
382 if unknownparams: | 382 if unknownparams: |
383 unknownparams = list(unknownparams) | 383 unknownparams = list(unknownparams) |
384 unknownparams.sort() | 384 unknownparams.sort() |
385 status = 'unsupported-params (%s)' % unknownparams | 385 status = 'unsupported-params (%s)' % unknownparams |
386 raise error.UnsupportedPartError(parttype=part.type, | 386 raise error.BundleUnknownFeatureError(parttype=part.type, |
387 params=unknownparams) | 387 params=unknownparams) |
388 status = 'supported' | 388 status = 'supported' |
389 except error.UnsupportedPartError as exc: | 389 except error.BundleUnknownFeatureError as exc: |
390 if part.mandatory: # mandatory parts | 390 if part.mandatory: # mandatory parts |
391 raise | 391 raise |
392 indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) | 392 indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) |
393 return # skip to part processing | 393 return # skip to part processing |
394 finally: | 394 finally: |
664 # Some logic will be later added here to try to process the option for | 664 # Some logic will be later added here to try to process the option for |
665 # a dict of known parameter. | 665 # a dict of known parameter. |
666 if name[0].islower(): | 666 if name[0].islower(): |
667 indebug(self.ui, "ignoring unknown parameter %r" % name) | 667 indebug(self.ui, "ignoring unknown parameter %r" % name) |
668 else: | 668 else: |
669 raise error.UnsupportedPartError(params=(name,)) | 669 raise error.BundleUnknownFeatureError(params=(name,)) |
670 | 670 |
671 | 671 |
672 def iterparts(self): | 672 def iterparts(self): |
673 """yield all parts contained in the stream""" | 673 """yield all parts contained in the stream""" |
674 # make sure param have been loaded | 674 # make sure param have been loaded |
1327 kwargs['parttype'] = parttype | 1327 kwargs['parttype'] = parttype |
1328 params = inpart.params.get('params') | 1328 params = inpart.params.get('params') |
1329 if params is not None: | 1329 if params is not None: |
1330 kwargs['params'] = params.split('\0') | 1330 kwargs['params'] = params.split('\0') |
1331 | 1331 |
1332 raise error.UnsupportedPartError(**kwargs) | 1332 raise error.BundleUnknownFeatureError(**kwargs) |
1333 | 1333 |
1334 @parthandler('error:pushraced', ('message',)) | 1334 @parthandler('error:pushraced', ('message',)) |
1335 def handleerrorpushraced(op, inpart): | 1335 def handleerrorpushraced(op, inpart): |
1336 """Used to transmit push race error over the wire""" | 1336 """Used to transmit push race error over the wire""" |
1337 raise error.ResponseError(_('push failed:'), inpart.params['message']) | 1337 raise error.ResponseError(_('push failed:'), inpart.params['message']) |