| indygreg |
| hg-reviewers |
As part of refactoring bundle part processing let's move handler validation to
its own function.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| def _processchangegroup(op, cg, tr, source, url, **kwargs): | def _processchangegroup(op, cg, tr, source, url, **kwargs): | ||||
| ret = cg.apply(op.repo, tr, source, url, **kwargs) | ret = cg.apply(op.repo, tr, source, url, **kwargs) | ||||
| op.records.add('changegroup', { | op.records.add('changegroup', { | ||||
| 'return': ret, | 'return': ret, | ||||
| }) | }) | ||||
| return ret | return ret | ||||
| def _processpart(op, part): | def _gethandler(op, part): | ||||
| """process a single part from a bundle | |||||
| The part is guaranteed to have been fully consumed when the function exits | |||||
| (even if an exception is raised).""" | |||||
| status = 'unknown' # used by debug output | status = 'unknown' # used by debug output | ||||
| try: | try: | ||||
| try: | |||||
| handler = parthandlermapping.get(part.type) | handler = parthandlermapping.get(part.type) | ||||
| if handler is None: | if handler is None: | ||||
| status = 'unsupported-type' | status = 'unsupported-type' | ||||
| raise error.BundleUnknownFeatureError(parttype=part.type) | raise error.BundleUnknownFeatureError(parttype=part.type) | ||||
| indebug(op.ui, 'found a handler for part %r' % part.type) | indebug(op.ui, 'found a handler for part %r' % part.type) | ||||
| unknownparams = part.mandatorykeys - handler.params | unknownparams = part.mandatorykeys - handler.params | ||||
| if unknownparams: | if unknownparams: | ||||
| unknownparams = list(unknownparams) | unknownparams = list(unknownparams) | ||||
| unknownparams.sort() | unknownparams.sort() | ||||
| status = 'unsupported-params (%s)' % unknownparams | status = 'unsupported-params (%s)' % unknownparams | ||||
| raise error.BundleUnknownFeatureError(parttype=part.type, | raise error.BundleUnknownFeatureError(parttype=part.type, | ||||
| params=unknownparams) | params=unknownparams) | ||||
| status = 'supported' | status = 'supported' | ||||
| except error.BundleUnknownFeatureError as exc: | except error.BundleUnknownFeatureError as exc: | ||||
| if part.mandatory: # mandatory parts | if part.mandatory: # mandatory parts | ||||
| raise | raise | ||||
| indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) | indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) | ||||
| return # skip to part processing | return # skip to part processing | ||||
| finally: | finally: | ||||
| if op.ui.debugflag: | if op.ui.debugflag: | ||||
| msg = ['bundle2-input-part: "%s"' % part.type] | msg = ['bundle2-input-part: "%s"' % part.type] | ||||
| if not part.mandatory: | if not part.mandatory: | ||||
| msg.append(' (advisory)') | msg.append(' (advisory)') | ||||
| nbmp = len(part.mandatorykeys) | nbmp = len(part.mandatorykeys) | ||||
| nbap = len(part.params) - nbmp | nbap = len(part.params) - nbmp | ||||
| if nbmp or nbap: | if nbmp or nbap: | ||||
| msg.append(' (params:') | msg.append(' (params:') | ||||
| if nbmp: | if nbmp: | ||||
| msg.append(' %i mandatory' % nbmp) | msg.append(' %i mandatory' % nbmp) | ||||
| if nbap: | if nbap: | ||||
| msg.append(' %i advisory' % nbmp) | msg.append(' %i advisory' % nbmp) | ||||
| msg.append(')') | msg.append(')') | ||||
| msg.append(' %s\n' % status) | msg.append(' %s\n' % status) | ||||
| op.ui.debug(''.join(msg)) | op.ui.debug(''.join(msg)) | ||||
| return handler | |||||
| def _processpart(op, part): | |||||
| """process a single part from a bundle | |||||
| The part is guaranteed to have been fully consumed when the function exits | |||||
| (even if an exception is raised).""" | |||||
| try: | |||||
| handler = _gethandler(op, part) | |||||
| if handler is None: | |||||
| return | |||||
| # handler is called outside the above try block so that we don't | # handler is called outside the above try block so that we don't | ||||
| # risk catching KeyErrors from anything other than the | # risk catching KeyErrors from anything other than the | ||||
| # parthandlermapping lookup (any KeyError raised by handler() | # parthandlermapping lookup (any KeyError raised by handler() | ||||
| # itself represents a defect of a different variety). | # itself represents a defect of a different variety). | ||||
| output = None | output = None | ||||
| if op.captureoutput and op.reply is not None: | if op.captureoutput and op.reply is not None: | ||||
| op.ui.pushbuffer(error=True, subproc=True) | op.ui.pushbuffer(error=True, subproc=True) | ||||
| output = '' | output = '' | ||||