comparison mercurial/bundle2.py @ 21626:985d139c8e8f

bundle2: ignore advisory part with unknown parameters

Advisory parts are advisory. If a handler exists but does not support the
proper parameters, we can safely ignore it.

Test has been updated to include this case.

21625:511f5fa63aa2

        for part in iterparts:
            parttype = part.type
            # part key are matched lower case
            key = parttype.lower()
            try:
                handler = parthandlermapping[key]
                op.ui.debug('found a handler for part %r\n' % parttype)
            except KeyError:
                if key != parttype: # mandatory parts
                    # todo:
                    # - use a more precise exception
                    raise error.BundleValueError(parttype=key)
                op.ui.debug('ignoring unknown advisory part %r\n' % key)
                # consuming the part
                part.read()
                continue

            unknownparams = part.mandatorykeys - handler.params
            if unknownparams:
                unknownparams = list(unknownparams)
                unknownparams.sort()
                raise error.BundleValueError(parttype=key, params=unknownparams)

            # handler is called outside the above try block so that we don't
            # risk catching KeyErrors from anything other than the
            # parthandlermapping lookup (any KeyError raised by handler()
            # itself represents a defect of a different variety).

21626:985d139c8e8f

        for part in iterparts:
            parttype = part.type
            # part key are matched lower case
            key = parttype.lower()
            try:
                handler = parthandlermapping.get(key)
                if handler is None:
                    raise error.BundleValueError(parttype=key)
                op.ui.debug('found a handler for part %r\n' % parttype)
                unknownparams = part.mandatorykeys - handler.params
                if unknownparams:
                    unknownparams = list(unknownparams)
                    unknownparams.sort()
                    raise error.BundleValueError(parttype=key,
                                                   params=unknownparams)
            except error.BundleValueError, exc:
                if key != parttype: # mandatory parts
                    raise
                op.ui.debug('ignoring unsupported advisory part %s\n' % exc)
                # consuming the part
                part.read()
                continue


            # handler is called outside the above try block so that we don't
            # risk catching KeyErrors from anything other than the
            # parthandlermapping lookup (any KeyError raised by handler()
            # itself represents a defect of a different variety).