This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3314

wireproto: use command executor for unbundle
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG72e26319f3b8: wireproto: use command executor for unbundle
Summary

This also required unifying the name of the argument because the
new API always passes arguments by keyword. I decided to change
implementations to "bundle" instead of the interface to "cg"
because "bundle" is more appropriate in a modern world.

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 rHG72e26319f3b8: wireproto: use command executor for unbundle (authored by indygreg). · Explain WhyApr 13 2018, 6:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8182

mercurial/exchange.py

if callable(ret): if callable(ret):
replyhandlers.append(ret) replyhandlers.append(ret)
# do not push if nothing to push # do not push if nothing to push
if bundler.nbparts <= 1: if bundler.nbparts <= 1:
return return
stream = util.chunkbuffer(bundler.getchunks()) stream = util.chunkbuffer(bundler.getchunks())
try: try:
try: try:
reply = pushop.remote.unbundle( with pushop.remote.commandexecutor() as e:
stream, ['force'], pushop.remote.url()) reply = e.callcommand('unbundle', {
'bundle': stream,
'heads': ['force'],
'url': pushop.remote.url(),
}).result()
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)
try: try:
trgetter = None trgetter = None
if pushback: if pushback:
trgetter = pushop.trmanager.transaction trgetter = pushop.trmanager.transaction
op = bundle2.processbundle(pushop.repo, reply, trgetter) op = bundle2.processbundle(pushop.repo, reply, trgetter)
except error.BundleValueError as exc: except error.BundleValueError as exc:

mercurial/localrepo.py

def pushkey(self, namespace, key, old, new): def pushkey(self, namespace, key, old, new):
return self._repo.pushkey(namespace, key, old, new) return self._repo.pushkey(namespace, key, old, new)
def stream_out(self): def stream_out(self):
raise error.Abort(_('cannot perform stream clone against local ' raise error.Abort(_('cannot perform stream clone against local '
'peer')) 'peer'))
def unbundle(self, cg, heads, url): def unbundle(self, bundle, heads, url):
"""apply a bundle on a repo """apply a bundle on a repo
This function handles the repo locking itself.""" This function handles the repo locking itself."""
try: try:
try: try:
cg = exchange.readbundle(self.ui, cg, None) bundle = exchange.readbundle(self.ui, bundle, None)
ret = exchange.unbundle(self._repo, cg, heads, 'push', url) ret = exchange.unbundle(self._repo, bundle, heads, 'push', url)
if util.safehasattr(ret, 'getchunks'): if util.safehasattr(ret, 'getchunks'):
# This is a bundle20 object, turn it into an unbundler. # This is a bundle20 object, turn it into an unbundler.
# This little dance should be dropped eventually when the # This little dance should be dropped eventually when the
# API is finally improved. # API is finally improved.
stream = util.chunkbuffer(ret.getchunks()) stream = util.chunkbuffer(ret.getchunks())
ret = bundle2.getunbundler(self.ui, stream) ret = bundle2.getunbundler(self.ui, stream)
return ret return ret
except Exception as exc: except Exception as exc:

mercurial/wireprotov1peer.py

% keytype) % keytype)
opts[key] = value opts[key] = value
f = self._callcompressable("getbundle", **pycompat.strkwargs(opts)) f = self._callcompressable("getbundle", **pycompat.strkwargs(opts))
if any((cap.startswith('HG2') for cap in bundlecaps)): if any((cap.startswith('HG2') for cap in bundlecaps)):
return bundle2.getunbundler(self.ui, f) return bundle2.getunbundler(self.ui, f)
else: else:
return changegroupmod.cg1unpacker(f, 'UN') return changegroupmod.cg1unpacker(f, 'UN')
def unbundle(self, cg, heads, url): def unbundle(self, bundle, heads, url):
'''Send cg (a readable file-like object representing the '''Send cg (a readable file-like object representing the
changegroup to push, typically a chunkbuffer object) to the changegroup to push, typically a chunkbuffer object) to the
remote server as a bundle. remote server as a bundle.
When pushing a bundle10 stream, return an integer indicating the When pushing a bundle10 stream, return an integer indicating the
result of the push (see changegroup.apply()). result of the push (see changegroup.apply()).
When pushing a bundle20 stream, return a bundle20 stream. When pushing a bundle20 stream, return a bundle20 stream.
`url` is the url the client thinks it's pushing to, which is `url` is the url the client thinks it's pushing to, which is
visible to hooks. visible to hooks.
''' '''
if heads != ['force'] and self.capable('unbundlehash'): if heads != ['force'] and self.capable('unbundlehash'):
heads = wireprototypes.encodelist( heads = wireprototypes.encodelist(
['hashed', hashlib.sha1(''.join(sorted(heads))).digest()]) ['hashed', hashlib.sha1(''.join(sorted(heads))).digest()])
else: else:
heads = wireprototypes.encodelist(heads) heads = wireprototypes.encodelist(heads)
if util.safehasattr(cg, 'deltaheader'): if util.safehasattr(bundle, 'deltaheader'):
# this a bundle10, do the old style call sequence # this a bundle10, do the old style call sequence
ret, output = self._callpush("unbundle", cg, heads=heads) ret, output = self._callpush("unbundle", bundle, heads=heads)
if ret == "": if ret == "":
raise error.ResponseError( raise error.ResponseError(
_('push failed:'), output) _('push failed:'), output)
try: try:
ret = int(ret) ret = int(ret)
except ValueError: except ValueError:
raise error.ResponseError( raise error.ResponseError(
_('push failed (unexpected response):'), ret) _('push failed (unexpected response):'), ret)
for l in output.splitlines(True): for l in output.splitlines(True):
self.ui.status(_('remote: '), l) self.ui.status(_('remote: '), l)
else: else:
# bundle2 push. Send a stream, fetch a stream. # bundle2 push. Send a stream, fetch a stream.
stream = self._calltwowaystream('unbundle', cg, heads=heads) stream = self._calltwowaystream('unbundle', bundle, heads=heads)
ret = bundle2.getunbundler(self.ui, stream) ret = bundle2.getunbundler(self.ui, stream)
return ret return ret
# End of ipeercommands interface. # End of ipeercommands interface.
# Begin of ipeerlegacycommands interface. # Begin of ipeerlegacycommands interface.
def branches(self, nodes): def branches(self, nodes):