Mercurial > hg
changeset 37648:8f3c6fb55369
exchange: use command executor for getbundle
The code consuming the bundle has been moved to inside the
context manager, as that is supposed to be part of the API.
(Although it doesn't matter for version 1 peers.)
Differential Revision: https://phab.mercurial-scm.org/D3316
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 13 Apr 2018 11:37:37 -0700 |
| parents | 516b5a5edae3 |
| children | a168799687e5 |
| files | mercurial/exchange.py |
| diffstat | 1 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/exchange.py Fri Apr 13 11:45:38 2018 -0700 +++ b/mercurial/exchange.py Fri Apr 13 11:37:37 2018 -0700 @@ -1648,17 +1648,22 @@ kwargs['obsmarkers'] = True pullop.stepsdone.add('obsmarkers') _pullbundle2extraprepare(pullop, kwargs) - bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs)) - try: - op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction, - source='pull') - op.modes['bookmarks'] = 'records' - bundle2.processbundle(pullop.repo, bundle, op=op) - except bundle2.AbortFromPart as exc: - pullop.repo.ui.status(_('remote: abort: %s\n') % exc) - raise error.Abort(_('pull failed on remote'), hint=exc.hint) - except error.BundleValueError as exc: - raise error.Abort(_('missing support for %s') % exc) + + with pullop.remote.commandexecutor() as e: + args = dict(kwargs) + args['source'] = 'pull' + bundle = e.callcommand('getbundle', args).result() + + try: + op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction, + source='pull') + op.modes['bookmarks'] = 'records' + bundle2.processbundle(pullop.repo, bundle, op=op) + except bundle2.AbortFromPart as exc: + pullop.repo.ui.status(_('remote: abort: %s\n') % exc) + raise error.Abort(_('pull failed on remote'), hint=exc.hint) + except error.BundleValueError as exc: + raise error.Abort(_('missing support for %s') % exc) if pullop.fetch: pullop.cgresult = bundle2.combinechangegroupresults(op)