This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3259

wireproto: move version 1 peer functionality to standalone module (API)
ClosedPublic

Authored by indygreg on Apr 11 2018, 7:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa81d02ea65db: wireproto: move version 1 peer functionality to standalone module (API)
Summary

wireproto.py contains code for both the client and the server. There
*should* be a somewhat strong separation between the two.

This commit extracts the client-side code from wireproto.py into a new
module - wireprotov1peer.

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 11 2018, 7:42 PM
durin42 accepted this revision.Apr 12 2018, 6:22 PM
This revision is now accepted and ready to land.Apr 12 2018, 6:22 PM
Closed by commit rHGa81d02ea65db: wireproto: move version 1 peer functionality to standalone module (API) (authored by indygreg). · Explain WhyApr 12 2018, 6:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/__init__.py (3 lines)
Mhgext/largefiles/proto.py (6 lines)
Mmercurial/httppeer.py (3 lines)
Mmercurial/sshpeer.py (5 lines)
Pmercurial/wireproto.py (399 lines)
Copied to mercurial/wireprotov1peer.py
Pmercurial/wireprotov1peer.py (847 lines)
Copied from mercurial/wireproto.py
Mtests/test-batching.py (4 lines)
Mtests/test-wireproto.py (7 lines)

Diff 8100

hgext/infinitepush/__init__.py

peer, peer,
phases, phases,
pushkey, pushkey,
pycompat, pycompat,
registrar, registrar,
util, util,
wireproto, wireproto,
wireprototypes, wireprototypes,
wireprotov1peer,
) )
from . import ( from . import (
bundleparts, bundleparts,
common, common,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
entry[1].append( entry[1].append(
('', 'bundle-store', None, ('', 'bundle-store', None,
_('force push to go to bundle store (EXPERIMENTAL)'))) _('force push to go to bundle store (EXPERIMENTAL)')))
extensions.wrapcommand(commands.table, 'pull', _pull) extensions.wrapcommand(commands.table, 'pull', _pull)
extensions.wrapfunction(discovery, 'checkheads', _checkheads) extensions.wrapfunction(discovery, 'checkheads', _checkheads)
wireproto.wirepeer.listkeyspatterns = listkeyspatterns wireprotov1peer.wirepeer.listkeyspatterns = listkeyspatterns
partorder = exchange.b2partsgenorder partorder = exchange.b2partsgenorder
index = partorder.index('changeset') index = partorder.index('changeset')
partorder.insert( partorder.insert(
index, partorder.pop(partorder.index(scratchbranchparttype))) index, partorder.pop(partorder.index(scratchbranchparttype)))
def _checkheads(orig, pushop): def _checkheads(orig, pushop):
if pushop.ui.configbool(experimental, configscratchpush, False): if pushop.ui.configbool(experimental, configscratchpush, False):

hgext/largefiles/proto.py

# Copyright 2011 Fog Creek Software # Copyright 2011 Fog Creek Software
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import re import re
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
httppeer, httppeer,
util, util,
wireproto,
wireprototypes, wireprototypes,
wireprotov1peer,
) )
from . import ( from . import (
lfutil, lfutil,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
# HTTP streams must hit the end to process the last empty # HTTP streams must hit the end to process the last empty
# chunk of Chunked-Encoding so the connection can be reused. # chunk of Chunked-Encoding so the connection can be reused.
if issubclass(self.__class__, httppeer.httppeer): if issubclass(self.__class__, httppeer.httppeer):
chunk = stream.read(1) chunk = stream.read(1)
if chunk: if chunk:
self._abort(error.ResponseError(_("unexpected response:"), self._abort(error.ResponseError(_("unexpected response:"),
chunk)) chunk))
@wireproto.batchable @wireprotov1peer.batchable
def statlfile(self, sha): def statlfile(self, sha):
f = wireproto.future() f = wireprotov1peer.future()
result = {'sha': sha} result = {'sha': sha}
yield result, f yield result, f
try: try:
yield int(f.value) yield int(f.value)
except (ValueError, urlerr.httperror): except (ValueError, urlerr.httperror):
# If the server returns anything but an integer followed by a # If the server returns anything but an integer followed by a
# newline, newline, it's not speaking our language; if we get # newline, newline, it's not speaking our language; if we get
# an HTTP error, we can't be sure the largefile is present; # an HTTP error, we can't be sure the largefile is present;

mercurial/httppeer.py

pycompat, pycompat,
repository, repository,
statichttprepo, statichttprepo,
url as urlmod, url as urlmod,
util, util,
wireproto, wireproto,
wireprotoframing, wireprotoframing,
wireprototypes, wireprototypes,
wireprotov1peer,
wireprotov2server, wireprotov2server,
) )
httplib = util.httplib httplib = util.httplib
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
def encodevalueinheaders(value, header, limit): def encodevalueinheaders(value, header, limit):
resp = engine.decompressorreader(resp) resp = engine.decompressorreader(resp)
else: else:
raise error.RepoError(_("'%s' uses newer protocol %s") % raise error.RepoError(_("'%s' uses newer protocol %s") %
(safeurl, subtype)) (safeurl, subtype))
return respurl, proto, resp return respurl, proto, resp
class httppeer(wireproto.wirepeer): class httppeer(wireprotov1peer.wirepeer):
def __init__(self, ui, path, url, opener, requestbuilder, caps): def __init__(self, ui, path, url, opener, requestbuilder, caps):
self.ui = ui self.ui = ui
self._path = path self._path = path
self._url = url self._url = url
self._caps = caps self._caps = caps
self._urlopener = opener self._urlopener = opener
self._requestbuilder = requestbuilder self._requestbuilder = requestbuilder

mercurial/sshpeer.py

from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
pycompat, pycompat,
util, util,
wireproto, wireproto,
wireprotoserver, wireprotoserver,
wireprototypes, wireprototypes,
wireprotov1peer,
) )
from .utils import ( from .utils import (
procutil, procutil,
) )
def _serverquote(s): def _serverquote(s):
"""quote a string for the remote shell ... which we assume is sh""" """quote a string for the remote shell ... which we assume is sh"""
if not s: if not s:
if not caps: if not caps:
badresponse() badresponse()
# Flush any output on stderr before proceeding. # Flush any output on stderr before proceeding.
_forwardoutput(ui, stderr) _forwardoutput(ui, stderr)
return protoname, caps return protoname, caps
class sshv1peer(wireproto.wirepeer): class sshv1peer(wireprotov1peer.wirepeer):
def __init__(self, ui, url, proc, stdin, stdout, stderr, caps, def __init__(self, ui, url, proc, stdin, stdout, stderr, caps,
autoreadstderr=True): autoreadstderr=True):
"""Create a peer from an existing SSH connection. """Create a peer from an existing SSH connection.
``proc`` is a handle on the underlying SSH process. ``proc`` is a handle on the underlying SSH process.
``stdin``, ``stdout``, and ``stderr`` are handles on the stdio ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio
pipes for that process. pipes for that process.
``caps`` is a set of capabilities supported by the remote. ``caps`` is a set of capabilities supported by the remote.
else: else:
_cleanuppipes(ui, stdout, stdin, stderr) _cleanuppipes(ui, stdout, stdin, stderr)
raise error.RepoError(_('unknown version of SSH protocol: %s') % raise error.RepoError(_('unknown version of SSH protocol: %s') %
protoname) protoname)
def instance(ui, path, create): def instance(ui, path, create):
"""Create an SSH peer. """Create an SSH peer.
The returned object conforms to the ``wireproto.wirepeer`` interface. The returned object conforms to the ``wireprotov1peer.wirepeer`` interface.
""" """
u = util.url(path, parsequery=False, parsefragment=False) u = util.url(path, parsequery=False, parsefragment=False)
if u.scheme != 'ssh' or not u.host or u.path is None: if u.scheme != 'ssh' or not u.host or u.path is None:
raise error.RepoError(_("couldn't parse location %s") % path) raise error.RepoError(_("couldn't parse location %s") % path)
util.checksafessh(path) util.checksafessh(path)
if u.passwd is not None: if u.passwd is not None:

mercurial/wireproto.py

  • This file was copied to mercurial/wireprotov1peer.py.
# wireproto.py - generic wire protocol support functions # wireproto.py - generic wire protocol support functions
# #
# Copyright 2005-2010 Matt Mackall <mpm@selenic.com> # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import hashlib
import os import os
import tempfile import tempfile
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin,
hex, hex,
nullid, nullid,
) )
from . import ( from . import (
bundle2, bundle2,
changegroup as changegroupmod, changegroup as changegroupmod,
discovery, discovery,
encoding, encoding,
error, error,
exchange, exchange,
peer,
pushkey as pushkeymod, pushkey as pushkeymod,
pycompat, pycompat,
repository,
streamclone, streamclone,
util, util,
wireprototypes, wireprototypes,
) )
from .utils import ( from .utils import (
procutil, procutil,
stringutil, stringutil,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
bundle2requiredmain = _('incompatible Mercurial client; bundle2 required') bundle2requiredmain = _('incompatible Mercurial client; bundle2 required')
bundle2requiredhint = _('see https://www.mercurial-scm.org/wiki/' bundle2requiredhint = _('see https://www.mercurial-scm.org/wiki/'
'IncompatibleClient') 'IncompatibleClient')
bundle2required = '%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint) bundle2required = '%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
class remoteiterbatcher(peer.iterbatcher):
def __init__(self, remote):
super(remoteiterbatcher, self).__init__()
self._remote = remote
def __getattr__(self, name):
# Validate this method is batchable, since submit() only supports
# batchable methods.
fn = getattr(self._remote, name)
if not getattr(fn, 'batchable', None):
raise error.ProgrammingError('Attempted to batch a non-batchable '
'call to %r' % name)
return super(remoteiterbatcher, self).__getattr__(name)
def submit(self):
"""Break the batch request into many patch calls and pipeline them.
This is mostly valuable over http where request sizes can be
limited, but can be used in other places as well.
"""
# 2-tuple of (command, arguments) that represents what will be
# sent over the wire.
requests = []
# 4-tuple of (command, final future, @batchable generator, remote
# future).
results = []
for command, args, opts, finalfuture in self.calls:
mtd = getattr(self._remote, command)
batchable = mtd.batchable(mtd.__self__, *args, **opts)
commandargs, fremote = next(batchable)
assert fremote
requests.append((command, commandargs))
results.append((command, finalfuture, batchable, fremote))
if requests:
self._resultiter = self._remote._submitbatch(requests)
self._results = results
def results(self):
for command, finalfuture, batchable, remotefuture in self._results:
# Get the raw result, set it in the remote future, feed it
# back into the @batchable generator so it can be decoded, and
# set the result on the final future to this value.
remoteresult = next(self._resultiter)
remotefuture.set(remoteresult)
finalfuture.set(next(batchable))
# Verify our @batchable generators only emit 2 values.
try:
next(batchable)
except StopIteration:
pass
else:
raise error.ProgrammingError('%s @batchable generator emitted '
'unexpected value count' % command)
yield finalfuture.value
# Forward a couple of names from peer to make wireproto interactions
# slightly more sensible.
batchable = peer.batchable
future = peer.future
def encodebatchcmds(req):
"""Return a ``cmds`` argument value for the ``batch`` command."""
escapearg = wireprototypes.escapebatcharg
cmds = []
for op, argsdict in req:
# Old servers didn't properly unescape argument names. So prevent
# the sending of argument names that may not be decoded properly by
# servers.
assert all(escapearg(k) == k for k in argsdict)
args = ','.join('%s=%s' % (escapearg(k), escapearg(v))
for k, v in argsdict.iteritems())
cmds.append('%s %s' % (op, args))
return ';'.join(cmds)
def clientcompressionsupport(proto): def clientcompressionsupport(proto):
"""Returns a list of compression methods supported by the client. """Returns a list of compression methods supported by the client.
Returns a list of the compression methods supported by the client Returns a list of the compression methods supported by the client
according to the protocol capabilities. If no such capability has according to the protocol capabilities. If no such capability has
been announced, fallback to the default of zlib and uncompressed. been announced, fallback to the default of zlib and uncompressed.
""" """
for cap in proto.getprotocaps(): for cap in proto.getprotocaps():
if cap.startswith('comp='): if cap.startswith('comp='):
return cap[5:].split(',') return cap[5:].split(',')
return ['zlib', 'none'] return ['zlib', 'none']
# client side
class wirepeer(repository.legacypeer):
"""Client-side interface for communicating with a peer repository.
Methods commonly call wire protocol commands of the same name.
See also httppeer.py and sshpeer.py for protocol-specific
implementations of this interface.
"""
# Begin of ipeercommands interface.
def iterbatch(self):
return remoteiterbatcher(self)
@batchable
def lookup(self, key):
self.requirecap('lookup', _('look up remote revision'))
f = future()
yield {'key': encoding.fromlocal(key)}, f
d = f.value
success, data = d[:-1].split(" ", 1)
if int(success):
yield bin(data)
else:
self._abort(error.RepoError(data))
@batchable
def heads(self):
f = future()
yield {}, f
d = f.value
try:
yield wireprototypes.decodelist(d[:-1])
except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), d))
@batchable
def known(self, nodes):
f = future()
yield {'nodes': wireprototypes.encodelist(nodes)}, f
d = f.value
try:
yield [bool(int(b)) for b in d]
except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), d))
@batchable
def branchmap(self):
f = future()
yield {}, f
d = f.value
try:
branchmap = {}
for branchpart in d.splitlines():
branchname, branchheads = branchpart.split(' ', 1)
branchname = encoding.tolocal(urlreq.unquote(branchname))
branchheads = wireprototypes.decodelist(branchheads)
branchmap[branchname] = branchheads
yield branchmap
except TypeError:
self._abort(error.ResponseError(_("unexpected response:"), d))
@batchable
def listkeys(self, namespace):
if not self.capable('pushkey'):
yield {}, None
f = future()
self.ui.debug('preparing listkeys for "%s"\n' % namespace)
yield {'namespace': encoding.fromlocal(namespace)}, f
d = f.value
self.ui.debug('received listkey for "%s": %i bytes\n'
% (namespace, len(d)))
yield pushkeymod.decodekeys(d)
@batchable
def pushkey(self, namespace, key, old, new):
if not self.capable('pushkey'):
yield False, None
f = future()
self.ui.debug('preparing pushkey for "%s:%s"\n' % (namespace, key))
yield {'namespace': encoding.fromlocal(namespace),
'key': encoding.fromlocal(key),
'old': encoding.fromlocal(old),
'new': encoding.fromlocal(new)}, f
d = f.value
d, output = d.split('\n', 1)
try:
d = bool(int(d))
except ValueError:
raise error.ResponseError(
_('push failed (unexpected response):'), d)
for l in output.splitlines(True):
self.ui.status(_('remote: '), l)
yield d
def stream_out(self):
return self._callstream('stream_out')
def getbundle(self, source, **kwargs):
kwargs = pycompat.byteskwargs(kwargs)
self.requirecap('getbundle', _('look up remote changes'))
opts = {}
bundlecaps = kwargs.get('bundlecaps') or set()
for key, value in kwargs.iteritems():
if value is None:
continue
keytype = wireprototypes.GETBUNDLE_ARGUMENTS.get(key)
if keytype is None:
raise error.ProgrammingError(
'Unexpectedly None keytype for key %s' % key)
elif keytype == 'nodes':
value = wireprototypes.encodelist(value)
elif keytype == 'csv':
value = ','.join(value)
elif keytype == 'scsv':
value = ','.join(sorted(value))
elif keytype == 'boolean':
value = '%i' % bool(value)
elif keytype != 'plain':
raise KeyError('unknown getbundle option type %s'
% keytype)
opts[key] = value
f = self._callcompressable("getbundle", **pycompat.strkwargs(opts))
if any((cap.startswith('HG2') for cap in bundlecaps)):
return bundle2.getunbundler(self.ui, f)
else:
return changegroupmod.cg1unpacker(f, 'UN')
def unbundle(self, cg, heads, url):
'''Send cg (a readable file-like object representing the
changegroup to push, typically a chunkbuffer object) to the
remote server as a bundle.
When pushing a bundle10 stream, return an integer indicating the
result of the push (see changegroup.apply()).
When pushing a bundle20 stream, return a bundle20 stream.
`url` is the url the client thinks it's pushing to, which is
visible to hooks.
'''
if heads != ['force'] and self.capable('unbundlehash'):
heads = wireprototypes.encodelist(
['hashed', hashlib.sha1(''.join(sorted(heads))).digest()])
else:
heads = wireprototypes.encodelist(heads)
if util.safehasattr(cg, 'deltaheader'):
# this a bundle10, do the old style call sequence
ret, output = self._callpush("unbundle", cg, heads=heads)
if ret == "":
raise error.ResponseError(
_('push failed:'), output)
try:
ret = int(ret)
except ValueError:
raise error.ResponseError(
_('push failed (unexpected response):'), ret)
for l in output.splitlines(True):
self.ui.status(_('remote: '), l)
else:
# bundle2 push. Send a stream, fetch a stream.
stream = self._calltwowaystream('unbundle', cg, heads=heads)
ret = bundle2.getunbundler(self.ui, stream)
return ret
# End of ipeercommands interface.
# Begin of ipeerlegacycommands interface.
def branches(self, nodes):
n = wireprototypes.encodelist(nodes)
d = self._call("branches", nodes=n)
try:
br = [tuple(wireprototypes.decodelist(b)) for b in d.splitlines()]
return br
except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), d))
def between(self, pairs):
batch = 8 # avoid giant requests
r = []
for i in xrange(0, len(pairs), batch):
n = " ".join([wireprototypes.encodelist(p, '-')
for p in pairs[i:i + batch]])
d = self._call("between", pairs=n)
try:
r.extend(l and wireprototypes.decodelist(l) or []
for l in d.splitlines())
except ValueError:
self._abort(error.ResponseError(_("unexpected response:"), d))
return r
def changegroup(self, nodes, kind):
n = wireprototypes.encodelist(nodes)
f = self._callcompressable("changegroup", roots=n)
return changegroupmod.cg1unpacker(f, 'UN')
def changegroupsubset(self, bases, heads, kind):
self.requirecap('changegroupsubset', _('look up remote changes'))
bases = wireprototypes.encodelist(bases)
heads = wireprototypes.encodelist(heads)
f = self._callcompressable("changegroupsubset",
bases=bases, heads=heads)
return changegroupmod.cg1unpacker(f, 'UN')
# End of ipeerlegacycommands interface.
def _submitbatch(self, req):
"""run batch request <req> on the server
Returns an iterator of the raw responses from the server.
"""
ui = self.ui
if ui.debugflag and ui.configbool('devel', 'debug.peer-request'):
ui.debug('devel-peer-request: batched-content\n')
for op, args in req:
msg = 'devel-peer-request: - %s (%d arguments)\n'
ui.debug(msg % (op, len(args)))
unescapearg = wireprototypes.unescapebatcharg
rsp = self._callstream("batch", cmds=encodebatchcmds(req))
chunk = rsp.read(1024)
work = [chunk]
while chunk:
while ';' not in chunk and chunk:
chunk = rsp.read(1024)
work.append(chunk)
merged = ''.join(work)
while ';' in merged:
one, merged = merged.split(';', 1)
yield unescapearg(one)
chunk = rsp.read(1024)
work = [merged, chunk]
yield unescapearg(''.join(work))
def _submitone(self, op, args):
return self._call(op, **pycompat.strkwargs(args))
def debugwireargs(self, one, two, three=None, four=None, five=None):
# don't pass optional arguments left at their default value
opts = {}
if three is not None:
opts[r'three'] = three
if four is not None:
opts[r'four'] = four
return self._call('debugwireargs', one=one, two=two, **opts)
def _call(self, cmd, **args):
"""execute <cmd> on the server
The command is expected to return a simple string.
returns the server reply as a string."""
raise NotImplementedError()
def _callstream(self, cmd, **args):
"""execute <cmd> on the server
The command is expected to return a stream. Note that if the
command doesn't return a stream, _callstream behaves
differently for ssh and http peers.
returns the server reply as a file like object.
"""
raise NotImplementedError()
def _callcompressable(self, cmd, **args):
"""execute <cmd> on the server
The command is expected to return a stream.
The stream may have been compressed in some implementations. This
function takes care of the decompression. This is the only difference
with _callstream.
returns the server reply as a file like object.
"""
raise NotImplementedError()
def _callpush(self, cmd, fp, **args):
"""execute a <cmd> on server
The command is expected to be related to a push. Push has a special
return method.
returns the server reply as a (ret, output) tuple. ret is either
empty (error) or a stringified int.
"""
raise NotImplementedError()
def _calltwowaystream(self, cmd, fp, **args):
"""execute <cmd> on server
The command will send a stream to the server and get a stream in reply.
"""
raise NotImplementedError()
def _abort(self, exception):
"""clearly abort the wire protocol connection and raise the exception
"""
raise NotImplementedError()
# server side
# wire protocol command can either return a string or one of these classes. # wire protocol command can either return a string or one of these classes.
def getdispatchrepo(repo, proto, command): def getdispatchrepo(repo, proto, command):
"""Obtain the repo used for processing wire protocol commands. """Obtain the repo used for processing wire protocol commands.
The intent of this function is to serve as a monkeypatch point for The intent of this function is to serve as a monkeypatch point for
extensions that need commands to operate on different repo views under extensions that need commands to operate on different repo views under
specialized circumstances. specialized circumstances.

mercurial/wireprotov1peer.py

  • This file was copied from mercurial/wireproto.py.
# wireproto.py - generic wire protocol support functions # wireprotov1peer.py - Client-side functionality for wire protocol version 1.
# #
# Copyright 2005-2010 Matt Mackall <mpm@selenic.com> # Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import hashlib import hashlib
import os
import tempfile
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex,
nullid,
) )
from . import ( from . import (
bundle2, bundle2,
changegroup as changegroupmod, changegroup as changegroupmod,
discovery,
encoding, encoding,
error, error,
exchange,
peer, peer,
pushkey as pushkeymod, pushkey as pushkeymod,
pycompat, pycompat,
repository, repository,
streamclone,
util, util,
wireprototypes, wireprototypes,
) )
from .utils import (
procutil,
stringutil,
)
urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
bundle2requiredmain = _('incompatible Mercurial client; bundle2 required')
bundle2requiredhint = _('see https://www.mercurial-scm.org/wiki/'
'IncompatibleClient')
bundle2required = '%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
class remoteiterbatcher(peer.iterbatcher): class remoteiterbatcher(peer.iterbatcher):
def __init__(self, remote): def __init__(self, remote):
super(remoteiterbatcher, self).__init__() super(remoteiterbatcher, self).__init__()
self._remote = remote self._remote = remote
def __getattr__(self, name): def __getattr__(self, name):
# Validate this method is batchable, since submit() only supports # Validate this method is batchable, since submit() only supports
# batchable methods. # batchable methods.
yield finalfuture.value yield finalfuture.value
# Forward a couple of names from peer to make wireproto interactions # Forward a couple of names from peer to make wireproto interactions
# slightly more sensible. # slightly more sensible.
batchable = peer.batchable batchable = peer.batchable
future = peer.future future = peer.future
def encodebatchcmds(req): def encodebatchcmds(req):
"""Return a ``cmds`` argument value for the ``batch`` command.""" """Return a ``cmds`` argument value for the ``batch`` command."""
escapearg = wireprototypes.escapebatcharg escapearg = wireprototypes.escapebatcharg
cmds = [] cmds = []
for op, argsdict in req: for op, argsdict in req:
# Old servers didn't properly unescape argument names. So prevent # Old servers didn't properly unescape argument names. So prevent
# the sending of argument names that may not be decoded properly by # the sending of argument names that may not be decoded properly by
# servers. # servers.
assert all(escapearg(k) == k for k in argsdict) assert all(escapearg(k) == k for k in argsdict)
args = ','.join('%s=%s' % (escapearg(k), escapearg(v)) args = ','.join('%s=%s' % (escapearg(k), escapearg(v))
for k, v in argsdict.iteritems()) for k, v in argsdict.iteritems())
cmds.append('%s %s' % (op, args)) cmds.append('%s %s' % (op, args))
return ';'.join(cmds) return ';'.join(cmds)
def clientcompressionsupport(proto):
"""Returns a list of compression methods supported by the client.
Returns a list of the compression methods supported by the client
according to the protocol capabilities. If no such capability has
been announced, fallback to the default of zlib and uncompressed.
"""
for cap in proto.getprotocaps():
if cap.startswith('comp='):
return cap[5:].split(',')
return ['zlib', 'none']
# client side
class wirepeer(repository.legacypeer): class wirepeer(repository.legacypeer):
"""Client-side interface for communicating with a peer repository. """Client-side interface for communicating with a peer repository.
Methods commonly call wire protocol commands of the same name. Methods commonly call wire protocol commands of the same name.
See also httppeer.py and sshpeer.py for protocol-specific See also httppeer.py and sshpeer.py for protocol-specific
implementations of this interface. implementations of this interface.
""" """
The command will send a stream to the server and get a stream in reply. The command will send a stream to the server and get a stream in reply.
""" """
raise NotImplementedError() raise NotImplementedError()
def _abort(self, exception): def _abort(self, exception):
"""clearly abort the wire protocol connection and raise the exception """clearly abort the wire protocol connection and raise the exception
""" """
raise NotImplementedError() raise NotImplementedError()
# server side
# wire protocol command can either return a string or one of these classes.
def getdispatchrepo(repo, proto, command):
"""Obtain the repo used for processing wire protocol commands.
The intent of this function is to serve as a monkeypatch point for
extensions that need commands to operate on different repo views under
specialized circumstances.
"""
return repo.filtered('served')
def dispatch(repo, proto, command):
repo = getdispatchrepo(repo, proto, command)
transportversion = wireprototypes.TRANSPORTS[proto.name]['version']
commandtable = commandsv2 if transportversion == 2 else commands
func, spec = commandtable[command]
args = proto.getargs(spec)
# Version 1 protocols define arguments as a list. Version 2 uses a dict.
if isinstance(args, list):
return func(repo, proto, *args)
elif isinstance(args, dict):
return func(repo, proto, **args)
else:
raise error.ProgrammingError('unexpected type returned from '
'proto.getargs(): %s' % type(args))
def options(cmd, keys, others):
opts = {}
for k in keys:
if k in others:
opts[k] = others[k]
del others[k]
if others:
procutil.stderr.write("warning: %s ignored unexpected arguments %s\n"
% (cmd, ",".join(others)))
return opts
def bundle1allowed(repo, action):
"""Whether a bundle1 operation is allowed from the server.
Priority is:
1. server.bundle1gd.<action> (if generaldelta active)
2. server.bundle1.<action>
3. server.bundle1gd (if generaldelta active)
4. server.bundle1
"""
ui = repo.ui
gd = 'generaldelta' in repo.requirements
if gd:
v = ui.configbool('server', 'bundle1gd.%s' % action)
if v is not None:
return v
v = ui.configbool('server', 'bundle1.%s' % action)
if v is not None:
return v
if gd:
v = ui.configbool('server', 'bundle1gd')
if v is not None:
return v
return ui.configbool('server', 'bundle1')
def supportedcompengines(ui, role):
"""Obtain the list of supported compression engines for a request."""
assert role in (util.CLIENTROLE, util.SERVERROLE)
compengines = util.compengines.supportedwireengines(role)
# Allow config to override default list and ordering.
if role == util.SERVERROLE:
configengines = ui.configlist('server', 'compressionengines')
config = 'server.compressionengines'
else:
# This is currently implemented mainly to facilitate testing. In most
# cases, the server should be in charge of choosing a compression engine
# because a server has the most to lose from a sub-optimal choice. (e.g.
# CPU DoS due to an expensive engine or a network DoS due to poor
# compression ratio).
configengines = ui.configlist('experimental',
'clientcompressionengines')
config = 'experimental.clientcompressionengines'
# No explicit config. Filter out the ones that aren't supposed to be
# advertised and return default ordering.
if not configengines:
attr = 'serverpriority' if role == util.SERVERROLE else 'clientpriority'
return [e for e in compengines
if getattr(e.wireprotosupport(), attr) > 0]
# If compression engines are listed in the config, assume there is a good
# reason for it (like server operators wanting to achieve specific
# performance characteristics). So fail fast if the config references
# unusable compression engines.
validnames = set(e.name() for e in compengines)
invalidnames = set(e for e in configengines if e not in validnames)
if invalidnames:
raise error.Abort(_('invalid compression engine defined in %s: %s') %
(config, ', '.join(sorted(invalidnames))))
compengines = [e for e in compengines if e.name() in configengines]
compengines = sorted(compengines,
key=lambda e: configengines.index(e.name()))
if not compengines:
raise error.Abort(_('%s config option does not specify any known '
'compression engines') % config,
hint=_('usable compression engines: %s') %
', '.sorted(validnames))
return compengines
class commandentry(object):
"""Represents a declared wire protocol command."""
def __init__(self, func, args='', transports=None,
permission='push'):
self.func = func
self.args = args
self.transports = transports or set()
self.permission = permission
def _merge(self, func, args):
"""Merge this instance with an incoming 2-tuple.
This is called when a caller using the old 2-tuple API attempts
to replace an instance. The incoming values are merged with
data not captured by the 2-tuple and a new instance containing
the union of the two objects is returned.
"""
return commandentry(func, args=args, transports=set(self.transports),
permission=self.permission)
# Old code treats instances as 2-tuples. So expose that interface.
def __iter__(self):
yield self.func
yield self.args
def __getitem__(self, i):
if i == 0:
return self.func
elif i == 1:
return self.args
else:
raise IndexError('can only access elements 0 and 1')
class commanddict(dict):
"""Container for registered wire protocol commands.
It behaves like a dict. But __setitem__ is overwritten to allow silent
coercion of values from 2-tuples for API compatibility.
"""
def __setitem__(self, k, v):
if isinstance(v, commandentry):
pass
# Cast 2-tuples to commandentry instances.
elif isinstance(v, tuple):
if len(v) != 2:
raise ValueError('command tuples must have exactly 2 elements')
# It is common for extensions to wrap wire protocol commands via
# e.g. ``wireproto.commands[x] = (newfn, args)``. Because callers
# doing this aren't aware of the new API that uses objects to store
# command entries, we automatically merge old state with new.
if k in self:
v = self[k]._merge(v[0], v[1])
else:
# Use default values from @wireprotocommand.
v = commandentry(v[0], args=v[1],
transports=set(wireprototypes.TRANSPORTS),
permission='push')
else:
raise ValueError('command entries must be commandentry instances '
'or 2-tuples')
return super(commanddict, self).__setitem__(k, v)
def commandavailable(self, command, proto):
"""Determine if a command is available for the requested protocol."""
assert proto.name in wireprototypes.TRANSPORTS
entry = self.get(command)
if not entry:
return False
if proto.name not in entry.transports:
return False
return True
# Constants specifying which transports a wire protocol command should be
# available on. For use with @wireprotocommand.
POLICY_V1_ONLY = 'v1-only'
POLICY_V2_ONLY = 'v2-only'
# For version 1 transports.
commands = commanddict()
# For version 2 transports.
commandsv2 = commanddict()
def wireprotocommand(name, args=None, transportpolicy=POLICY_V1_ONLY,
permission='push'):
"""Decorator to declare a wire protocol command.
``name`` is the name of the wire protocol command being provided.
``args`` defines the named arguments accepted by the command. It is
ideally a dict mapping argument names to their types. For backwards
compatibility, it can be a space-delimited list of argument names. For
version 1 transports, ``*`` denotes a special value that says to accept
all named arguments.
``transportpolicy`` is a POLICY_* constant denoting which transports
this wire protocol command should be exposed to. By default, commands
are exposed to all wire protocol transports.
``permission`` defines the permission type needed to run this command.
Can be ``push`` or ``pull``. These roughly map to read-write and read-only,
respectively. Default is to assume command requires ``push`` permissions
because otherwise commands not declaring their permissions could modify
a repository that is supposed to be read-only.
"""
if transportpolicy == POLICY_V1_ONLY:
transports = {k for k, v in wireprototypes.TRANSPORTS.items()
if v['version'] == 1}
transportversion = 1
elif transportpolicy == POLICY_V2_ONLY:
transports = {k for k, v in wireprototypes.TRANSPORTS.items()
if v['version'] == 2}
transportversion = 2
else:
raise error.ProgrammingError('invalid transport policy value: %s' %
transportpolicy)
# Because SSHv2 is a mirror of SSHv1, we allow "batch" commands through to
# SSHv2.
# TODO undo this hack when SSH is using the unified frame protocol.
if name == b'batch':
transports.add(wireprototypes.SSHV2)
if permission not in ('push', 'pull'):
raise error.ProgrammingError('invalid wire protocol permission; '
'got %s; expected "push" or "pull"' %
permission)
if transportversion == 1:
if args is None:
args = ''
if not isinstance(args, bytes):
raise error.ProgrammingError('arguments for version 1 commands '
'must be declared as bytes')
elif transportversion == 2:
if args is None:
args = {}
if not isinstance(args, dict):
raise error.ProgrammingError('arguments for version 2 commands '
'must be declared as dicts')
def register(func):
if transportversion == 1:
if name in commands:
raise error.ProgrammingError('%s command already registered '
'for version 1' % name)
commands[name] = commandentry(func, args=args,
transports=transports,
permission=permission)
elif transportversion == 2:
if name in commandsv2:
raise error.ProgrammingError('%s command already registered '
'for version 2' % name)
commandsv2[name] = commandentry(func, args=args,
transports=transports,
permission=permission)
else:
raise error.ProgrammingError('unhandled transport version: %d' %
transportversion)
return func
return register
# TODO define a more appropriate permissions type to use for this.
@wireprotocommand('batch', 'cmds *', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def batch(repo, proto, cmds, others):
unescapearg = wireprototypes.unescapebatcharg
repo = repo.filtered("served")
res = []
for pair in cmds.split(';'):
op, args = pair.split(' ', 1)
vals = {}
for a in args.split(','):
if a:
n, v = a.split('=')
vals[unescapearg(n)] = unescapearg(v)
func, spec = commands[op]
# Validate that client has permissions to perform this command.
perm = commands[op].permission
assert perm in ('push', 'pull')
proto.checkperm(perm)
if spec:
keys = spec.split()
data = {}
for k in keys:
if k == '*':
star = {}
for key in vals.keys():
if key not in keys:
star[key] = vals[key]
data['*'] = star
else:
data[k] = vals[k]
result = func(repo, proto, *[data[k] for k in keys])
else:
result = func(repo, proto)
if isinstance(result, wireprototypes.ooberror):
return result
# For now, all batchable commands must return bytesresponse or
# raw bytes (for backwards compatibility).
assert isinstance(result, (wireprototypes.bytesresponse, bytes))
if isinstance(result, wireprototypes.bytesresponse):
result = result.data
res.append(wireprototypes.escapebatcharg(result))
return wireprototypes.bytesresponse(';'.join(res))
@wireprotocommand('between', 'pairs', transportpolicy=POLICY_V1_ONLY,
permission='pull')
def between(repo, proto, pairs):
pairs = [wireprototypes.decodelist(p, '-') for p in pairs.split(" ")]
r = []
for b in repo.between(pairs):
r.append(wireprototypes.encodelist(b) + "\n")
return wireprototypes.bytesresponse(''.join(r))
@wireprotocommand('branchmap', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def branchmap(repo, proto):
branchmap = repo.branchmap()
heads = []
for branch, nodes in branchmap.iteritems():
branchname = urlreq.quote(encoding.fromlocal(branch))
branchnodes = wireprototypes.encodelist(nodes)
heads.append('%s %s' % (branchname, branchnodes))
return wireprototypes.bytesresponse('\n'.join(heads))
@wireprotocommand('branches', 'nodes', transportpolicy=POLICY_V1_ONLY,
permission='pull')
def branches(repo, proto, nodes):
nodes = wireprototypes.decodelist(nodes)
r = []
for b in repo.branches(nodes):
r.append(wireprototypes.encodelist(b) + "\n")
return wireprototypes.bytesresponse(''.join(r))
@wireprotocommand('clonebundles', '', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def clonebundles(repo, proto):
"""Server command for returning info for available bundles to seed clones.
Clients will parse this response and determine what bundle to fetch.
Extensions may wrap this command to filter or dynamically emit data
depending on the request. e.g. you could advertise URLs for the closest
data center given the client's IP address.
"""
return wireprototypes.bytesresponse(
repo.vfs.tryread('clonebundles.manifest'))
wireprotocaps = ['lookup', 'branchmap', 'pushkey',
'known', 'getbundle', 'unbundlehash']
def _capabilities(repo, proto):
"""return a list of capabilities for a repo
This function exists to allow extensions to easily wrap capabilities
computation
- returns a lists: easy to alter
- change done here will be propagated to both `capabilities` and `hello`
command without any other action needed.
"""
# copy to prevent modification of the global list
caps = list(wireprotocaps)
# Command of same name as capability isn't exposed to version 1 of
# transports. So conditionally add it.
if commands.commandavailable('changegroupsubset', proto):
caps.append('changegroupsubset')
if streamclone.allowservergeneration(repo):
if repo.ui.configbool('server', 'preferuncompressed'):
caps.append('stream-preferred')
requiredformats = repo.requirements & repo.supportedformats
# if our local revlogs are just revlogv1, add 'stream' cap
if not requiredformats - {'revlogv1'}:
caps.append('stream')
# otherwise, add 'streamreqs' detailing our local revlog format
else:
caps.append('streamreqs=%s' % ','.join(sorted(requiredformats)))
if repo.ui.configbool('experimental', 'bundle2-advertise'):
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role='server'))
caps.append('bundle2=' + urlreq.quote(capsblob))
caps.append('unbundle=%s' % ','.join(bundle2.bundlepriority))
return proto.addcapabilities(repo, caps)
# If you are writing an extension and consider wrapping this function. Wrap
# `_capabilities` instead.
@wireprotocommand('capabilities', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def capabilities(repo, proto):
caps = _capabilities(repo, proto)
return wireprototypes.bytesresponse(' '.join(sorted(caps)))
@wireprotocommand('changegroup', 'roots', transportpolicy=POLICY_V1_ONLY,
permission='pull')
def changegroup(repo, proto, roots):
nodes = wireprototypes.decodelist(roots)
outgoing = discovery.outgoing(repo, missingroots=nodes,
missingheads=repo.heads())
cg = changegroupmod.makechangegroup(repo, outgoing, '01', 'serve')
gen = iter(lambda: cg.read(32768), '')
return wireprototypes.streamres(gen=gen)
@wireprotocommand('changegroupsubset', 'bases heads',
transportpolicy=POLICY_V1_ONLY,
permission='pull')
def changegroupsubset(repo, proto, bases, heads):
bases = wireprototypes.decodelist(bases)
heads = wireprototypes.decodelist(heads)
outgoing = discovery.outgoing(repo, missingroots=bases,
missingheads=heads)
cg = changegroupmod.makechangegroup(repo, outgoing, '01', 'serve')
gen = iter(lambda: cg.read(32768), '')
return wireprototypes.streamres(gen=gen)
@wireprotocommand('debugwireargs', 'one two *',
permission='pull', transportpolicy=POLICY_V1_ONLY)
def debugwireargs(repo, proto, one, two, others):
# only accept optional args from the known set
opts = options('debugwireargs', ['three', 'four'], others)
return wireprototypes.bytesresponse(repo.debugwireargs(
one, two, **pycompat.strkwargs(opts)))
def find_pullbundle(repo, proto, opts, clheads, heads, common):
"""Return a file object for the first matching pullbundle.
Pullbundles are specified in .hg/pullbundles.manifest similar to
clonebundles.
For each entry, the bundle specification is checked for compatibility:
- Client features vs the BUNDLESPEC.
- Revisions shared with the clients vs base revisions of the bundle.
A bundle can be applied only if all its base revisions are known by
the client.
- At least one leaf of the bundle's DAG is missing on the client.
- Every leaf of the bundle's DAG is part of node set the client wants.
E.g. do not send a bundle of all changes if the client wants only
one specific branch of many.
"""
def decodehexstring(s):
return set([h.decode('hex') for h in s.split(';')])
manifest = repo.vfs.tryread('pullbundles.manifest')
if not manifest:
return None
res = exchange.parseclonebundlesmanifest(repo, manifest)
res = exchange.filterclonebundleentries(repo, res)
if not res:
return None
cl = repo.changelog
heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True)
common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True)
compformats = clientcompressionsupport(proto)
for entry in res:
if 'COMPRESSION' in entry and entry['COMPRESSION'] not in compformats:
continue
# No test yet for VERSION, since V2 is supported by any client
# that advertises partial pulls
if 'heads' in entry:
try:
bundle_heads = decodehexstring(entry['heads'])
except TypeError:
# Bad heads entry
continue
if bundle_heads.issubset(common):
continue # Nothing new
if all(cl.rev(rev) in common_anc for rev in bundle_heads):
continue # Still nothing new
if any(cl.rev(rev) not in heads_anc and
cl.rev(rev) not in common_anc for rev in bundle_heads):
continue
if 'bases' in entry:
try:
bundle_bases = decodehexstring(entry['bases'])
except TypeError:
# Bad bases entry
continue
if not all(cl.rev(rev) in common_anc for rev in bundle_bases):
continue
path = entry['URL']
repo.ui.debug('sending pullbundle "%s"\n' % path)
try:
return repo.vfs.open(path)
except IOError:
repo.ui.debug('pullbundle "%s" not accessible\n' % path)
continue
return None
@wireprotocommand('getbundle', '*', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def getbundle(repo, proto, others):
opts = options('getbundle', wireprototypes.GETBUNDLE_ARGUMENTS.keys(),
others)
for k, v in opts.iteritems():
keytype = wireprototypes.GETBUNDLE_ARGUMENTS[k]
if keytype == 'nodes':
opts[k] = wireprototypes.decodelist(v)
elif keytype == 'csv':
opts[k] = list(v.split(','))
elif keytype == 'scsv':
opts[k] = set(v.split(','))
elif keytype == 'boolean':
# Client should serialize False as '0', which is a non-empty string
# so it evaluates as a True bool.
if v == '0':
opts[k] = False
else:
opts[k] = bool(v)
elif keytype != 'plain':
raise KeyError('unknown getbundle option type %s'
% keytype)
if not bundle1allowed(repo, 'pull'):
if not exchange.bundle2requested(opts.get('bundlecaps')):
if proto.name == 'http-v1':
return wireprototypes.ooberror(bundle2required)
raise error.Abort(bundle2requiredmain,
hint=bundle2requiredhint)
prefercompressed = True
try:
clheads = set(repo.changelog.heads())
heads = set(opts.get('heads', set()))
common = set(opts.get('common', set()))
common.discard(nullid)
if (repo.ui.configbool('server', 'pullbundle') and
'partial-pull' in proto.getprotocaps()):
# Check if a pre-built bundle covers this request.
bundle = find_pullbundle(repo, proto, opts, clheads, heads, common)
if bundle:
return wireprototypes.streamres(gen=util.filechunkiter(bundle),
prefer_uncompressed=True)
if repo.ui.configbool('server', 'disablefullbundle'):
# Check to see if this is a full clone.
changegroup = opts.get('cg', True)
if changegroup and not common and clheads == heads:
raise error.Abort(
_('server has pull-based clones disabled'),
hint=_('remove --pull if specified or upgrade Mercurial'))
info, chunks = exchange.getbundlechunks(repo, 'serve',
**pycompat.strkwargs(opts))
prefercompressed = info.get('prefercompressed', True)
except error.Abort as exc:
# cleanly forward Abort error to the client
if not exchange.bundle2requested(opts.get('bundlecaps')):
if proto.name == 'http-v1':
return wireprototypes.ooberror(pycompat.bytestr(exc) + '\n')
raise # cannot do better for bundle1 + ssh
# bundle2 request expect a bundle2 reply
bundler = bundle2.bundle20(repo.ui)
manargs = [('message', pycompat.bytestr(exc))]
advargs = []
if exc.hint is not None:
advargs.append(('hint', exc.hint))
bundler.addpart(bundle2.bundlepart('error:abort',
manargs, advargs))
chunks = bundler.getchunks()
prefercompressed = False
return wireprototypes.streamres(
gen=chunks, prefer_uncompressed=not prefercompressed)
@wireprotocommand('heads', permission='pull', transportpolicy=POLICY_V1_ONLY)
def heads(repo, proto):
h = repo.heads()
return wireprototypes.bytesresponse(wireprototypes.encodelist(h) + '\n')
@wireprotocommand('hello', permission='pull', transportpolicy=POLICY_V1_ONLY)
def hello(repo, proto):
"""Called as part of SSH handshake to obtain server info.
Returns a list of lines describing interesting things about the
server, in an RFC822-like format.
Currently, the only one defined is ``capabilities``, which consists of a
line of space separated tokens describing server abilities:
capabilities: <token0> <token1> <token2>
"""
caps = capabilities(repo, proto).data
return wireprototypes.bytesresponse('capabilities: %s\n' % caps)
@wireprotocommand('listkeys', 'namespace', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def listkeys(repo, proto, namespace):
d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return wireprototypes.bytesresponse(pushkeymod.encodekeys(d))
@wireprotocommand('lookup', 'key', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def lookup(repo, proto, key):
try:
k = encoding.tolocal(key)
n = repo.lookup(k)
r = hex(n)
success = 1
except Exception as inst:
r = stringutil.forcebytestr(inst)
success = 0
return wireprototypes.bytesresponse('%d %s\n' % (success, r))
@wireprotocommand('known', 'nodes *', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def known(repo, proto, nodes, others):
v = ''.join(b and '1' or '0'
for b in repo.known(wireprototypes.decodelist(nodes)))
return wireprototypes.bytesresponse(v)
@wireprotocommand('protocaps', 'caps', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def protocaps(repo, proto, caps):
if proto.name == wireprototypes.SSHV1:
proto._protocaps = set(caps.split(' '))
return wireprototypes.bytesresponse('OK')
@wireprotocommand('pushkey', 'namespace key old new', permission='push',
transportpolicy=POLICY_V1_ONLY)
def pushkey(repo, proto, namespace, key, old, new):
# compatibility with pre-1.8 clients which were accidentally
# sending raw binary nodes rather than utf-8-encoded hex
if len(new) == 20 and stringutil.escapestr(new) != new:
# looks like it could be a binary node
try:
new.decode('utf-8')
new = encoding.tolocal(new) # but cleanly decodes as UTF-8
except UnicodeDecodeError:
pass # binary, leave unmodified
else:
new = encoding.tolocal(new) # normal path
with proto.mayberedirectstdio() as output:
r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
encoding.tolocal(old), new) or False
output = output.getvalue() if output else ''
return wireprototypes.bytesresponse('%d\n%s' % (int(r), output))
@wireprotocommand('stream_out', permission='pull',
transportpolicy=POLICY_V1_ONLY)
def stream(repo, proto):
'''If the server supports streaming clone, it advertises the "stream"
capability with a value representing the version and flags of the repo
it is serving. Client checks to see if it understands the format.
'''
return wireprototypes.streamreslegacy(
streamclone.generatev1wireproto(repo))
@wireprotocommand('unbundle', 'heads', permission='push',
transportpolicy=POLICY_V1_ONLY)
def unbundle(repo, proto, heads):
their_heads = wireprototypes.decodelist(heads)
with proto.mayberedirectstdio() as output:
try:
exchange.check_heads(repo, their_heads, 'preparing changes')
cleanup = lambda: None
try:
payload = proto.getpayload()
if repo.ui.configbool('server', 'streamunbundle'):
def cleanup():
# Ensure that the full payload is consumed, so
# that the connection doesn't contain trailing garbage.
for p in payload:
pass
fp = util.chunkbuffer(payload)
else:
# write bundle data to temporary file as it can be big
fp, tempname = None, None
def cleanup():
if fp:
fp.close()
if tempname:
os.unlink(tempname)
fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
repo.ui.debug('redirecting incoming bundle to %s\n' %
tempname)
fp = os.fdopen(fd, pycompat.sysstr('wb+'))
r = 0
for p in payload:
fp.write(p)
fp.seek(0)
gen = exchange.readbundle(repo.ui, fp, None)
if (isinstance(gen, changegroupmod.cg1unpacker)
and not bundle1allowed(repo, 'push')):
if proto.name == 'http-v1':
# need to special case http because stderr do not get to
# the http client on failed push so we need to abuse
# some other error type to make sure the message get to
# the user.
return wireprototypes.ooberror(bundle2required)
raise error.Abort(bundle2requiredmain,
hint=bundle2requiredhint)
r = exchange.unbundle(repo, gen, their_heads, 'serve',
proto.client())
if util.safehasattr(r, 'addpart'):
# The return looks streamable, we are in the bundle2 case
# and should return a stream.
return wireprototypes.streamreslegacy(gen=r.getchunks())
return wireprototypes.pushres(
r, output.getvalue() if output else '')
finally:
cleanup()
except (error.BundleValueError, error.Abort, error.PushRaced) as exc:
# handle non-bundle2 case first
if not getattr(exc, 'duringunbundle2', False):
try:
raise
except error.Abort:
# The old code we moved used procutil.stderr directly.
# We did not change it to minimise code change.
# This need to be moved to something proper.
# Feel free to do it.
procutil.stderr.write("abort: %s\n" % exc)
if exc.hint is not None:
procutil.stderr.write("(%s)\n" % exc.hint)
procutil.stderr.flush()
return wireprototypes.pushres(
0, output.getvalue() if output else '')
except error.PushRaced:
return wireprototypes.pusherr(
pycompat.bytestr(exc),
output.getvalue() if output else '')
bundler = bundle2.bundle20(repo.ui)
for out in getattr(exc, '_bundle2salvagedoutput', ()):
bundler.addpart(out)
try:
try:
raise
except error.PushkeyFailed as exc:
# check client caps
remotecaps = getattr(exc, '_replycaps', None)
if (remotecaps is not None
and 'pushkey' not in remotecaps.get('error', ())):
# no support remote side, fallback to Abort handler.
raise
part = bundler.newpart('error:pushkey')
part.addparam('in-reply-to', exc.partid)
if exc.namespace is not None:
part.addparam('namespace', exc.namespace,
mandatory=False)
if exc.key is not None:
part.addparam('key', exc.key, mandatory=False)
if exc.new is not None:
part.addparam('new', exc.new, mandatory=False)
if exc.old is not None:
part.addparam('old', exc.old, mandatory=False)
if exc.ret is not None:
part.addparam('ret', exc.ret, mandatory=False)
except error.BundleValueError as exc:
errpart = bundler.newpart('error:unsupportedcontent')
if exc.parttype is not None:
errpart.addparam('parttype', exc.parttype)
if exc.params:
errpart.addparam('params', '\0'.join(exc.params))
except error.Abort as exc:
manargs = [('message', stringutil.forcebytestr(exc))]
advargs = []
if exc.hint is not None:
advargs.append(('hint', exc.hint))
bundler.addpart(bundle2.bundlepart('error:abort',
manargs, advargs))
except error.PushRaced as exc:
bundler.newpart('error:pushraced',
[('message', stringutil.forcebytestr(exc))])
return wireprototypes.streamreslegacy(gen=bundler.getchunks())

tests/test-batching.py

# test-batching.py - tests for transparent command batching # test-batching.py - tests for transparent command batching
# #
# Copyright 2011 Peter Arrenbrecht <peter@arrenbrecht.ch> # Copyright 2011 Peter Arrenbrecht <peter@arrenbrecht.ch>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
from mercurial import ( from mercurial import (
error, error,
peer, peer,
util, util,
wireproto, wireprotov1peer,
) )
# equivalent of repo.repository # equivalent of repo.repository
class thing(object): class thing(object):
def hello(self): def hello(self):
return "Ready." return "Ready."
# equivalent of localrepo.localrepository # equivalent of localrepo.localrepository
args = ','.join(n + '=' + escapearg(v) for n, v in args) args = ','.join(n + '=' + escapearg(v) for n, v in args)
req.append(name + ':' + args) req.append(name + ':' + args)
req = ';'.join(req) req = ';'.join(req)
res = self._submitone('batch', [('cmds', req,)]) res = self._submitone('batch', [('cmds', req,)])
for r in res.split(';'): for r in res.split(';'):
yield r yield r
def batchiter(self): def batchiter(self):
return wireproto.remoteiterbatcher(self) return wireprotov1peer.remoteiterbatcher(self)
@peer.batchable @peer.batchable
def foo(self, one, two=None): def foo(self, one, two=None):
encargs = [('one', mangle(one),), ('two', mangle(two),)] encargs = [('one', mangle(one),), ('two', mangle(two),)]
encresref = peer.future() encresref = peer.future()
yield encargs, encresref yield encargs, encresref
yield unmangle(encresref.value) yield unmangle(encresref.value)

tests/test-wireproto.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
from mercurial import ( from mercurial import (
error, error,
pycompat, pycompat,
ui as uimod, ui as uimod,
util, util,
wireproto, wireproto,
wireprototypes, wireprototypes,
wireprotov1peer,
) )
stringio = util.stringio stringio = util.stringio
class proto(object): class proto(object):
def __init__(self, args): def __init__(self, args):
self.args = args self.args = args
self.name = 'dummyproto' self.name = 'dummyproto'
def getargs(self, spec): def getargs(self, spec):
args = self.args args = self.args
args.setdefault(b'*', {}) args.setdefault(b'*', {})
names = spec.split() names = spec.split()
return [args[n] for n in names] return [args[n] for n in names]
def checkperm(self, perm): def checkperm(self, perm):
pass pass
wireprototypes.TRANSPORTS['dummyproto'] = { wireprototypes.TRANSPORTS['dummyproto'] = {
'transport': 'dummy', 'transport': 'dummy',
'version': 1, 'version': 1,
} }
class clientpeer(wireproto.wirepeer): class clientpeer(wireprotov1peer.wirepeer):
def __init__(self, serverrepo, ui): def __init__(self, serverrepo, ui):
self.serverrepo = serverrepo self.serverrepo = serverrepo
self.ui = ui self.ui = ui
def url(self): def url(self):
return b'test' return b'test'
def local(self): def local(self):
elif isinstance(res, bytes): elif isinstance(res, bytes):
return res return res
else: else:
raise error.Abort('dummy client does not support response type') raise error.Abort('dummy client does not support response type')
def _callstream(self, cmd, **args): def _callstream(self, cmd, **args):
return stringio(self._call(cmd, **args)) return stringio(self._call(cmd, **args))
@wireproto.batchable @wireprotov1peer.batchable
def greet(self, name): def greet(self, name):
f = wireproto.future() f = wireprotov1peer.future()
yield {b'name': mangle(name)}, f yield {b'name': mangle(name)}, f
yield unmangle(f.value) yield unmangle(f.value)
class serverrepo(object): class serverrepo(object):
def greet(self, name): def greet(self, name):
return b"Hello, " + name return b"Hello, " + name
def filtered(self, name): def filtered(self, name):