This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2995

bundleoperation: pass the source argument from all the users
ClosedPublic

Authored by pulkit on Mar 31 2018, 6:23 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf7d3915d5b3a: bundleoperation: pass the source argument from all the users
Summary

We now have a source attribute to the bundle2.bundleoperation class which stores
the operation which leads to the current bundling/unbundling. Let's make sure we
pass source argument from all the users of the command.

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

pulkit created this revision.Mar 31 2018, 6:23 AM
indygreg accepted this revision.Mar 31 2018, 1:15 PM
This revision is now accepted and ready to land.Mar 31 2018, 1:15 PM
Closed by commit rHGf7d3915d5b3a: bundleoperation: pass the source argument from all the users (authored by pulkit). · Explain WhyMar 31 2018, 1:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (4 lines)
Mmercurial/exchange.py (6 lines)

Diff 7472

mercurial/bundle2.py

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, source=source) 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, source=source)
_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):
self.repo = repo self.repo = repo
self.op = op self.op = op
self.unbundler = unbundler self.unbundler = unbundler
It is temporarily possible to provide a prebuilt bundleoperation to the It is temporarily possible to provide a prebuilt bundleoperation to the
function. This is used to ensure output is properly propagated in case of function. This is used to ensure output is properly propagated in case of
an error during the unbundling. This output capturing part will likely be an error during the unbundling. This output capturing part will likely be
reworked and this ability will probably go away in the process. reworked and this ability will probably go away in the process.
""" """
if op is None: if op is None:
if transactiongetter is None: if transactiongetter is None:
transactiongetter = _notransaction transactiongetter = _notransaction
op = bundleoperation(repo, transactiongetter) op = bundleoperation(repo, transactiongetter, source=source)
# todo: # todo:
# - replace this is a init function soon. # - replace this is a init function soon.
# - exception catching # - exception catching
unbundler.params unbundler.params
if repo.ui.debugflag: if repo.ui.debugflag:
msg = ['bundle2-input-bundle:'] msg = ['bundle2-input-bundle:']
if unbundler.params: if unbundler.params:
msg.append(' %i params' % len(unbundler.params)) msg.append(' %i params' % len(unbundler.params))

mercurial/exchange.py

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)) bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
try: try:
op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction) op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction,
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)
return lockandtr[2] return lockandtr[2]
# Do greedy locking by default until we're satisfied with lazy # Do greedy locking by default until we're satisfied with lazy
# locking. # locking.
if not repo.ui.configbool('experimental', 'bundle2lazylocking'): if not repo.ui.configbool('experimental', 'bundle2lazylocking'):
gettransaction() gettransaction()
op = bundle2.bundleoperation(repo, gettransaction, op = bundle2.bundleoperation(repo, gettransaction,
captureoutput=captureoutput) captureoutput=captureoutput,
source='push')
try: try:
op = bundle2.processbundle(repo, cg, op=op) op = bundle2.processbundle(repo, cg, op=op)
finally: finally:
r = op.reply r = op.reply
if captureoutput and r is not None: if captureoutput and r is not None:
repo.ui.pushbuffer(error=True, subproc=True) repo.ui.pushbuffer(error=True, subproc=True)
def recordout(output): def recordout(output):
r.newpart('output', data=output, mandatory=False) r.newpart('output', data=output, mandatory=False)