This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3316

exchange: use command executor for getbundle
ClosedPublic

Authored by indygreg on Apr 13 2018, 3:14 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8f3c6fb55369: exchange: use command executor for getbundle
Summary

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.)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 13 2018, 3:14 PM
durin42 accepted this revision.Apr 13 2018, 5:59 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:59 PM
Closed by commit rHG8f3c6fb55369: exchange: use command executor for getbundle (authored by indygreg). · Explain WhyApr 13 2018, 6:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (27 lines)

Diff 8184

mercurial/exchange.py

if pullop.heads is None and list(pullop.common) == [nullid]: if pullop.heads is None and list(pullop.common) == [nullid]:
pullop.repo.ui.status(_("requesting all changes\n")) pullop.repo.ui.status(_("requesting all changes\n"))
if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): if obsolete.isenabled(pullop.repo, obsolete.exchangeopt):
remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps) remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps)
if obsolete.commonversion(remoteversions) is not None: if obsolete.commonversion(remoteversions) is not None:
kwargs['obsmarkers'] = True kwargs['obsmarkers'] = True
pullop.stepsdone.add('obsmarkers') pullop.stepsdone.add('obsmarkers')
_pullbundle2extraprepare(pullop, kwargs) _pullbundle2extraprepare(pullop, kwargs)
bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
with pullop.remote.commandexecutor() as e:
args = dict(kwargs)
args['source'] = 'pull'
bundle = e.callcommand('getbundle', args).result()
try: try:
op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction, op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction,
source='pull') source='pull')
op.modes['bookmarks'] = 'records' op.modes['bookmarks'] = 'records'
bundle2.processbundle(pullop.repo, bundle, op=op) bundle2.processbundle(pullop.repo, bundle, op=op)
except bundle2.AbortFromPart as exc: except bundle2.AbortFromPart as exc:
pullop.repo.ui.status(_('remote: abort: %s\n') % exc) pullop.repo.ui.status(_('remote: abort: %s\n') % exc)
raise error.Abort(_('pull failed on remote'), hint=exc.hint) raise error.Abort(_('pull failed on remote'), hint=exc.hint)
except error.BundleValueError as exc: except error.BundleValueError as exc:
raise error.Abort(_('missing support for %s') % exc) raise error.Abort(_('missing support for %s') % exc)
if pullop.fetch: if pullop.fetch:
pullop.cgresult = bundle2.combinechangegroupresults(op) pullop.cgresult = bundle2.combinechangegroupresults(op)
# processing phases change # processing phases change
for namespace, value in op.records['listkeys']: for namespace, value in op.records['listkeys']:
if namespace == 'phases': if namespace == 'phases':
_pullapplyphases(pullop, value) _pullapplyphases(pullop, value)