| indygreg |
| hg-reviewers |
Currently, the part iterator logic is tightly coupled with the part handling
logic, which means it's hard to replace the part handling logic without
duplicating the part iterator bits.
In a future diff we'll want to be able to replace all part handling, so let's
begin refactoring the part iterator logic to it's own class.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| tr.hookargs['url'] = url | tr.hookargs['url'] = url | ||||
| return processbundle(repo, unbundler, lambda: tr) | return processbundle(repo, unbundler, lambda: tr) | ||||
| else: | else: | ||||
| # the transactiongetter won't be used, but we might as well set it | # the transactiongetter won't be used, but we might as well set it | ||||
| op = bundleoperation(repo, lambda: tr) | op = bundleoperation(repo, lambda: tr) | ||||
| _processchangegroup(op, unbundler, tr, source, url, **kwargs) | _processchangegroup(op, unbundler, tr, source, url, **kwargs) | ||||
| return op | return op | ||||
| class partiterator(object): | |||||
| def __init__(self, unbundler): | |||||
| self.unbundler = unbundler | |||||
| def __enter__(self): | |||||
| return enumerate(self.unbundler.iterparts()) | |||||
| def __exit__(self, type, value, tb): | |||||
| pass | |||||
| def processbundle(repo, unbundler, transactiongetter=None, op=None): | def processbundle(repo, unbundler, transactiongetter=None, op=None): | ||||
| """This function process a bundle, apply effect to/from a repo | """This function process a bundle, apply effect to/from a repo | ||||
| It iterates over each part then searches for and uses the proper handling | It iterates over each part then searches for and uses the proper handling | ||||
| code to process the part. Parts are processed in order. | code to process the part. Parts are processed in order. | ||||
| Unknown Mandatory part will abort the process. | Unknown Mandatory part will abort the process. | ||||
| if unbundler.params: | if unbundler.params: | ||||
| msg.append(' %i params' % len(unbundler.params)) | msg.append(' %i params' % len(unbundler.params)) | ||||
| if op._gettransaction is None or op._gettransaction is _notransaction: | if op._gettransaction is None or op._gettransaction is _notransaction: | ||||
| msg.append(' no-transaction') | msg.append(' no-transaction') | ||||
| else: | else: | ||||
| msg.append(' with-transaction') | msg.append(' with-transaction') | ||||
| msg.append('\n') | msg.append('\n') | ||||
| repo.ui.debug(''.join(msg)) | repo.ui.debug(''.join(msg)) | ||||
| iterparts = enumerate(unbundler.iterparts()) | |||||
| with partiterator(unbundler) as parts: | |||||
| part = None | part = None | ||||
| nbpart = 0 | nbpart = 0 | ||||
| try: | try: | ||||
| for nbpart, part in iterparts: | for nbpart, part in parts: | ||||
| _processpart(op, part) | _processpart(op, part) | ||||
| except Exception as exc: | except Exception as exc: | ||||
| # Any exceptions seeking to the end of the bundle at this point are | # Any exceptions seeking to the end of the bundle at this point are | ||||
| # almost certainly related to the underlying stream being bad. | # almost certainly related to the underlying stream being bad. | ||||
| # And, chances are that the exception we're handling is related to | # And, chances are that the exception we're handling is related to | ||||
| # getting in that bad state. So, we swallow the seeking error and | # getting in that bad state. So, we swallow the seeking error and | ||||
| # re-raise the original error. | # re-raise the original error. | ||||
| seekerror = False | seekerror = False | ||||
| try: | try: | ||||
| for nbpart, part in iterparts: | for nbpart, part in parts: | ||||
| # consume the bundle content | # consume the bundle content | ||||
| part.seek(0, 2) | part.seek(0, 2) | ||||
| except Exception: | except Exception: | ||||
| seekerror = True | seekerror = True | ||||
| # Small hack to let caller code distinguish exceptions from bundle2 | # Small hack to let caller code distinguish exceptions from bundle2 | ||||
| # processing from processing the old format. This is mostly | # processing from processing the old format. This is mostly needed | ||||
| # needed to handle different return codes to unbundle according to the | # to handle different return codes to unbundle according to the type | ||||
| # type of bundle. We should probably clean up or drop this return code | # of bundle. We should probably clean up or drop this return code | ||||
| # craziness in a future version. | # craziness in a future version. | ||||
| exc.duringunbundle2 = True | exc.duringunbundle2 = True | ||||
| salvaged = [] | salvaged = [] | ||||
| replycaps = None | replycaps = None | ||||
| if op.reply is not None: | if op.reply is not None: | ||||
| salvaged = op.reply.salvageoutput() | salvaged = op.reply.salvageoutput() | ||||
| replycaps = op.reply.capabilities | replycaps = op.reply.capabilities | ||||
| exc._replycaps = replycaps | exc._replycaps = replycaps | ||||
| exc._bundle2salvagedoutput = salvaged | exc._bundle2salvagedoutput = salvaged | ||||
| # Re-raising from a variable loses the original stack. So only use | # Re-raising from a variable loses the original stack. So only use | ||||
| # that form if we need to. | # that form if we need to. | ||||
| if seekerror: | if seekerror: | ||||
| raise exc | raise exc | ||||
| else: | else: | ||||
| raise | raise | ||||
| finally: | finally: | ||||
| repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart) | repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart) | ||||
| return op | return op | ||||
| 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, | ||||
| }) | }) | ||||