# HG changeset patch # User Pierre-Yves David # Date 2015-09-23 18:44:52 # Node ID cff70549a9599625a5569b20770c36a4b5418105 # Parent 127b59787fd5de875478aea2e55820f2521b77d5 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. diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -376,17 +376,17 @@ def _processpart(op, part): handler = parthandlermapping.get(part.type) if handler is None: status = 'unsupported-type' - raise error.UnsupportedPartError(parttype=part.type) + raise error.BundleUnknownFeatureError(parttype=part.type) indebug(op.ui, 'found a handler for part %r' % part.type) unknownparams = part.mandatorykeys - handler.params if unknownparams: unknownparams = list(unknownparams) unknownparams.sort() status = 'unsupported-params (%s)' % unknownparams - raise error.UnsupportedPartError(parttype=part.type, - params=unknownparams) + raise error.BundleUnknownFeatureError(parttype=part.type, + params=unknownparams) status = 'supported' - except error.UnsupportedPartError as exc: + except error.BundleUnknownFeatureError as exc: if part.mandatory: # mandatory parts raise indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) @@ -666,7 +666,7 @@ class unbundle20(unpackermixin): if name[0].islower(): indebug(self.ui, "ignoring unknown parameter %r" % name) else: - raise error.UnsupportedPartError(params=(name,)) + raise error.BundleUnknownFeatureError(params=(name,)) def iterparts(self): @@ -1329,7 +1329,7 @@ def handleerrorunsupportedcontent(op, in if params is not None: kwargs['params'] = params.split('\0') - raise error.UnsupportedPartError(**kwargs) + raise error.BundleUnknownFeatureError(**kwargs) @parthandler('error:pushraced', ('message',)) def handleerrorpushraced(op, inpart): diff --git a/mercurial/error.py b/mercurial/error.py --- a/mercurial/error.py +++ b/mercurial/error.py @@ -141,7 +141,7 @@ class PushRaced(RuntimeError): class BundleValueError(ValueError): """error raised when bundle2 cannot be processed""" -class UnsupportedPartError(BundleValueError): +class BundleUnknownFeatureError(BundleValueError): def __init__(self, parttype=None, params=()): self.parttype = parttype self.params = params