| indygreg |
| hg-reviewers |
This will help us to pass the source variable to bundleoperation class.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| def applybundle(repo, unbundler, tr, source=None, url=None, **kwargs): | def applybundle(repo, unbundler, tr, source=None, url=None, **kwargs): | ||||
| # transform me into unbundler.apply() as soon as the freeze is lifted | # transform me into unbundler.apply() as soon as the freeze is lifted | ||||
| if isinstance(unbundler, unbundle20): | if isinstance(unbundler, unbundle20): | ||||
| tr.hookargs['bundle2'] = '1' | tr.hookargs['bundle2'] = '1' | ||||
| if source is not None and 'source' not in tr.hookargs: | if source is not None and 'source' not in tr.hookargs: | ||||
| tr.hookargs['source'] = source | tr.hookargs['source'] = source | ||||
| if url is not None and 'url' not in tr.hookargs: | if url is not None and 'url' not in tr.hookargs: | ||||
| tr.hookargs['url'] = url | tr.hookargs['url'] = url | ||||
| return processbundle(repo, unbundler, lambda: tr) | return processbundle(repo, unbundler, lambda: tr, source=source) | ||||
| 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): | class partiterator(object): | ||||
| def __init__(self, repo, op, unbundler): | def __init__(self, repo, op, unbundler): | ||||
| # 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 | ||||
| self.repo.ui.debug('bundle2-input-bundle: %i parts total\n' % | self.repo.ui.debug('bundle2-input-bundle: %i parts total\n' % | ||||
| self.count) | self.count) | ||||
| def processbundle(repo, unbundler, transactiongetter=None, op=None): | def processbundle(repo, unbundler, transactiongetter=None, op=None, source=''): | ||||
| """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. | ||||
| It is temporarily possible to provide a prebuilt bundleoperation to the | It is temporarily possible to provide a prebuilt bundleoperation to the | ||||