##// END OF EJS Templates
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1...
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Now that the `DirstateItem` python class is implemented in Rust containing a `DirstateEntry` value, use that value directly instead of reconstructing it from v1 data. Also rename from `set_v1` since dirstate-v1 data is not used anymore. Differential Revision: https://phab.mercurial-scm.org/D11487

File last commit:

r47758:07b9ebea default
r48859:32ef6478 default
Show More
wireprotov1server.py
745 lines | 26.6 KiB | text/x-python | PythonLexer
/ mercurial / wireprotov1server.py
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # wireprotov1server.py - Wire protocol version 1 server functionality
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005-2010 Olivia Mackall <olivia@selenic.com>
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 #
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
Gregory Szorc
wireprotov1server: use binascii.unhexlify...
r41609 import binascii
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 import os
from .i18n import _
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 from .node import hex
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from .pycompat import getattr
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
from . import (
bundle2,
clonebundles: move a bundle of clone bundle related code to a new module...
r46369 bundlecaches,
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 changegroup as changegroupmod,
discovery,
encoding,
error,
exchange,
pushkey as pushkeymod,
pycompat,
Raphaël Gomès
requirements: add constant for revlog v1 requirement...
r47371 requirements as requirementsmod,
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 streamclone,
util,
wireprototypes,
)
from .utils import (
procutil,
stringutil,
)
urlerr = util.urlerr
urlreq = util.urlreq
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 bundle2requiredmain = _(b'incompatible Mercurial client; bundle2 required')
Augie Fackler
formatting: blacken the codebase...
r43346 bundle2requiredhint = _(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'see https://www.mercurial-scm.org/wiki/IncompatibleClient'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 bundle2required = b'%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if cap.startswith(b'comp='):
return cap[5:].split(b',')
return [b'zlib', b'none']
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # wire protocol command can either return a string or one of these classes.
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 viewconfig = repo.ui.config(b'server', b'view')
Joerg Sonnenberger
server: allow customizing the default repo filter...
r42006 return repo.filtered(viewconfig)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def dispatch(repo, proto, command):
repo = getdispatchrepo(repo, proto, command)
func, spec = commands[command]
args = proto.getargs(spec)
return func(repo, proto, *args)
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def options(cmd, keys, others):
opts = {}
for k in keys:
if k in others:
opts[k] = others[k]
del others[k]
if others:
Augie Fackler
formatting: blacken the codebase...
r43346 procutil.stderr.write(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"warning: %s ignored unexpected arguments %s\n"
% (cmd, b",".join(others))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return opts
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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
Raphaël Gomès
requirements: also add a generaldelta constant...
r47372 gd = requirementsmod.GENERALDELTA_REQUIREMENT in repo.requirements
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
if gd:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 v = ui.configbool(b'server', b'bundle1gd.%s' % action)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if v is not None:
return v
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 v = ui.configbool(b'server', b'bundle1.%s' % action)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if v is not None:
return v
if gd:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 v = ui.configbool(b'server', b'bundle1gd')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if v is not None:
return v
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return ui.configbool(b'server', b'bundle1')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 commands = wireprototypes.commanddict()
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def wireprotocommand(name, args=None, permission=b'push'):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 """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
a space-delimited list of argument names. ``*`` denotes a special value
that says to accept all named arguments.
``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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346 transports = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 k for k, v in wireprototypes.TRANSPORTS.items() if v[b'version'] == 1
Augie Fackler
formatting: blacken the codebase...
r43346 }
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
# 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)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if permission not in (b'push', b'pull'):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'invalid wire protocol permission; '
b'got %s; expected "push" or "pull"' % permission
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
if args is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 args = b''
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
if not isinstance(args, bytes):
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'arguments for version 1 commands must be declared as bytes'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
def register(func):
if name in commands:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'%s command already registered for version 1' % name
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 commands[name] = wireprototypes.commandentry(
Augie Fackler
formatting: blacken the codebase...
r43346 func, args=args, transports=transports, permission=permission
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
return func
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return register
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # TODO define a more appropriate permissions type to use for this.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'batch', b'cmds *', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def batch(repo, proto, cmds, others):
unescapearg = wireprototypes.unescapebatcharg
res = []
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for pair in cmds.split(b';'):
op, args = pair.split(b' ', 1)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 vals = {}
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for a in args.split(b','):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if a:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 n, v = a.split(b'=')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 vals[unescapearg(n)] = unescapearg(v)
func, spec = commands[op]
# Validate that client has permissions to perform this command.
perm = commands[op].permission
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 assert perm in (b'push', b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 proto.checkperm(perm)
if spec:
keys = spec.split()
data = {}
for k in keys:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if k == b'*':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 star = {}
for key in vals.keys():
if key not in keys:
star[key] = vals[key]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 data[b'*'] = star
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b';'.join(res))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'between', b'pairs', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def between(repo, proto, pairs):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 pairs = [wireprototypes.decodelist(p, b'-') for p in pairs.split(b" ")]
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 r = []
for b in repo.between(pairs):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 r.append(wireprototypes.encodelist(b) + b"\n")
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b''.join(r))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'branchmap', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def branchmap(repo, proto):
branchmap = repo.branchmap()
heads = []
Gregory Szorc
py3: finish porting iteritems() to pycompat and remove source transformer...
r43376 for branch, nodes in pycompat.iteritems(branchmap):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 branchname = urlreq.quote(encoding.fromlocal(branch))
branchnodes = wireprototypes.encodelist(nodes)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 heads.append(b'%s %s' % (branchname, branchnodes))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b'\n'.join(heads))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'branches', b'nodes', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def branches(repo, proto, nodes):
nodes = wireprototypes.decodelist(nodes)
r = []
for b in repo.branches(nodes):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 r.append(wireprototypes.encodelist(b) + b"\n")
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b''.join(r))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'clonebundles', b'', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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(
clonebundle: move the manifest filename to a constant...
r46370 repo.vfs.tryread(bundlecaches.CB_MANIFEST_FILE)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346 wireprotocaps = [
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'lookup',
b'branchmap',
b'pushkey',
b'known',
b'getbundle',
b'unbundlehash',
Augie Fackler
formatting: blacken the codebase...
r43346 ]
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
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.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if commands.commandavailable(b'changegroupsubset', proto):
caps.append(b'changegroupsubset')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
if streamclone.allowservergeneration(repo):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.ui.configbool(b'server', b'preferuncompressed'):
caps.append(b'stream-preferred')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 requiredformats = repo.requirements & repo.supportedformats
# if our local revlogs are just revlogv1, add 'stream' cap
Raphaël Gomès
requirements: add constant for revlog v1 requirement...
r47371 if not requiredformats - {requirementsmod.REVLOGV1_REQUIREMENT}:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 caps.append(b'stream')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # otherwise, add 'streamreqs' detailing our local revlog format
else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 caps.append(b'streamreqs=%s' % b','.join(sorted(requiredformats)))
if repo.ui.configbool(b'experimental', b'bundle2-advertise'):
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=b'server'))
caps.append(b'bundle2=' + urlreq.quote(capsblob))
caps.append(b'unbundle=%s' % b','.join(bundle2.bundlepriority))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.ui.configbool(b'experimental', b'narrow'):
Pulkit Goyal
narrow: move adding of narrow server capabilities to core...
r40111 caps.append(wireprototypes.NARROWCAP)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.ui.configbool(b'experimental', b'narrowservebrokenellipses'):
Pulkit Goyal
narrow: move adding of narrow server capabilities to core...
r40111 caps.append(wireprototypes.ELLIPSESCAP)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return proto.addcapabilities(repo, caps)
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # If you are writing an extension and consider wrapping this function. Wrap
# `_capabilities` instead.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'capabilities', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def capabilities(repo, proto):
caps = _capabilities(repo, proto)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b' '.join(sorted(caps)))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'changegroup', b'roots', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def changegroup(repo, proto, roots):
nodes = wireprototypes.decodelist(roots)
Augie Fackler
formatting: blacken the codebase...
r43346 outgoing = discovery.outgoing(
Manuel Jacob
discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof`...
r45704 repo, missingroots=nodes, ancestorsof=repo.heads()
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 cg = changegroupmod.makechangegroup(repo, outgoing, b'01', b'serve')
gen = iter(lambda: cg.read(32768), b'')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return wireprototypes.streamres(gen=gen)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'changegroupsubset', b'bases heads', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def changegroupsubset(repo, proto, bases, heads):
bases = wireprototypes.decodelist(bases)
heads = wireprototypes.decodelist(heads)
Manuel Jacob
discovery: change users of `outgoing.missingheads` to `outgoing.ancestorsof`...
r45704 outgoing = discovery.outgoing(repo, missingroots=bases, ancestorsof=heads)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 cg = changegroupmod.makechangegroup(repo, outgoing, b'01', b'serve')
gen = iter(lambda: cg.read(32768), b'')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return wireprototypes.streamres(gen=gen)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'debugwireargs', b'one two *', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def debugwireargs(repo, proto, one, two, others):
# only accept optional args from the known set
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 opts = options(b'debugwireargs', [b'three', b'four'], others)
Augie Fackler
formatting: blacken the codebase...
r43346 return wireprototypes.bytesresponse(
repo.debugwireargs(one, two, **pycompat.strkwargs(opts))
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def decodehexstring(s):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return {binascii.unhexlify(h) for h in s.split(b';')}
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 manifest = repo.vfs.tryread(b'pullbundles.manifest')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if not manifest:
return None
clonebundles: move a bundle of clone bundle related code to a new module...
r46369 res = bundlecaches.parseclonebundlesmanifest(repo, manifest)
res = bundlecaches.filterclonebundleentries(repo, res)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if not res:
return None
Joerg Sonnenberger
pullbundles: use unfiltered repo for head/base matching...
r45305 cl = repo.unfiltered().changelog
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 comp = entry.get(b'COMPRESSION')
Joerg Sonnenberger
pullbundle: fix handling of gzip bundlespecs...
r38700 altcomp = util.compengines._bundlenames.get(comp)
if comp and comp not in compformats and altcomp not in compformats:
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 continue
# No test yet for VERSION, since V2 is supported by any client
# that advertises partial pulls
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'heads' in entry:
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 bundle_heads = decodehexstring(entry[b'heads'])
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except TypeError:
# Bad heads entry
continue
if bundle_heads.issubset(common):
Augie Fackler
formatting: blacken the codebase...
r43346 continue # Nothing new
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if all(cl.rev(rev) in common_anc for rev in bundle_heads):
Augie Fackler
formatting: blacken the codebase...
r43346 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
):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 continue
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'bases' in entry:
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 bundle_bases = decodehexstring(entry[b'bases'])
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except TypeError:
# Bad bases entry
continue
if not all(cl.rev(rev) in common_anc for rev in bundle_bases):
continue
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 path = entry[b'URL']
repo.ui.debug(b'sending pullbundle "%s"\n' % path)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 try:
return repo.vfs.open(path)
except IOError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo.ui.debug(b'pullbundle "%s" not accessible\n' % path)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 continue
return None
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'getbundle', b'*', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def getbundle(repo, proto, others):
Augie Fackler
formatting: blacken the codebase...
r43346 opts = options(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'getbundle', wireprototypes.GETBUNDLE_ARGUMENTS.keys(), others
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
py3: finish porting iteritems() to pycompat and remove source transformer...
r43376 for k, v in pycompat.iteritems(opts):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 keytype = wireprototypes.GETBUNDLE_ARGUMENTS[k]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if keytype == b'nodes':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 opts[k] = wireprototypes.decodelist(v)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif keytype == b'csv':
opts[k] = list(v.split(b','))
elif keytype == b'scsv':
opts[k] = set(v.split(b','))
elif keytype == b'boolean':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # Client should serialize False as '0', which is a non-empty string
# so it evaluates as a True bool.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if v == b'0':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 opts[k] = False
else:
opts[k] = bool(v)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif keytype != b'plain':
raise KeyError(b'unknown getbundle option type %s' % keytype)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if not bundle1allowed(repo, b'pull'):
if not exchange.bundle2requested(opts.get(b'bundlecaps')):
if proto.name == b'http-v1':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return wireprototypes.ooberror(bundle2required)
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(bundle2requiredmain, hint=bundle2requiredhint)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
try:
clheads = set(repo.changelog.heads())
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 heads = set(opts.get(b'heads', set()))
common = set(opts.get(b'common', set()))
Joerg Sonnenberger
node: replace nullid and friends with nodeconstants class...
r47771 common.discard(repo.nullid)
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo.ui.configbool(b'server', b'pullbundle')
and b'partial-pull' in proto.getprotocaps()
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # Check if a pre-built bundle covers this request.
bundle = find_pullbundle(repo, proto, opts, clheads, heads, common)
if bundle:
Augie Fackler
formatting: blacken the codebase...
r43346 return wireprototypes.streamres(
gen=util.filechunkiter(bundle), prefer_uncompressed=True
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.ui.configbool(b'server', b'disablefullbundle'):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # Check to see if this is a full clone.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 changegroup = opts.get(b'cg', True)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if changegroup and not common and clheads == heads:
raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'server has pull-based clones disabled'),
hint=_(b'remove --pull if specified or upgrade Mercurial'),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346 info, chunks = exchange.getbundlechunks(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo, b'serve', **pycompat.strkwargs(opts)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 prefercompressed = info.get(b'prefercompressed', True)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except error.Abort as exc:
# cleanly forward Abort error to the client
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if not exchange.bundle2requested(opts.get(b'bundlecaps')):
if proto.name == b'http-v1':
Martin von Zweigbergk
errors: name arguments to Abort constructor...
r46274 return wireprototypes.ooberror(exc.message + b'\n')
Augie Fackler
formatting: blacken the codebase...
r43346 raise # cannot do better for bundle1 + ssh
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # bundle2 request expect a bundle2 reply
bundler = bundle2.bundle20(repo.ui)
Martin von Zweigbergk
errors: name arguments to Abort constructor...
r46274 manargs = [(b'message', exc.message)]
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 advargs = []
if exc.hint is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 advargs.append((b'hint', exc.hint))
bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 chunks = bundler.getchunks()
prefercompressed = False
return wireprototypes.streamres(
Augie Fackler
formatting: blacken the codebase...
r43346 gen=chunks, prefer_uncompressed=not prefercompressed
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'heads', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def heads(repo, proto):
h = repo.heads()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(wireprototypes.encodelist(h) + b'\n')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'hello', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b'capabilities: %s\n' % caps)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'listkeys', b'namespace', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def listkeys(repo, proto, namespace):
d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return wireprototypes.bytesresponse(pushkeymod.encodekeys(d))
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'lookup', b'key', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return wireprototypes.bytesresponse(b'%d %s\n' % (success, r))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'known', b'nodes *', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def known(repo, proto, nodes, others):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 v = b''.join(
b and b'1' or b'0' for b in repo.known(wireprototypes.decodelist(nodes))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return wireprototypes.bytesresponse(v)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'protocaps', b'caps', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def protocaps(repo, proto, caps):
if proto.name == wireprototypes.SSHV1:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 proto._protocaps = set(caps.split(b' '))
return wireprototypes.bytesresponse(b'OK')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'pushkey', b'namespace key old new', permission=b'push')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 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')
Augie Fackler
formatting: blacken the codebase...
r43346 new = encoding.tolocal(new) # but cleanly decodes as UTF-8
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except UnicodeDecodeError:
Augie Fackler
formatting: blacken the codebase...
r43346 pass # binary, leave unmodified
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 else:
Augie Fackler
formatting: blacken the codebase...
r43346 new = encoding.tolocal(new) # normal path
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
with proto.mayberedirectstdio() as output:
Augie Fackler
formatting: blacken the codebase...
r43346 r = (
repo.pushkey(
encoding.tolocal(namespace),
encoding.tolocal(key),
encoding.tolocal(old),
new,
)
or False
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 output = output.getvalue() if output else b''
return wireprototypes.bytesresponse(b'%d\n%s' % (int(r), output))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'stream_out', permission=b'pull')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def stream(repo, proto):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """If the server supports streaming clone, it advertises the "stream"
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 capability with a value representing the version and flags of the repo
it is serving. Client checks to see if it understands the format.
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
formatting: blacken the codebase...
r43346 return wireprototypes.streamreslegacy(streamclone.generatev1wireproto(repo))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 @wireprotocommand(b'unbundle', b'heads', permission=b'push')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def unbundle(repo, proto, heads):
their_heads = wireprototypes.decodelist(heads)
with proto.mayberedirectstdio() as output:
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exchange.check_heads(repo, their_heads, b'preparing changes')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 cleanup = lambda: None
try:
payload = proto.getpayload()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.ui.configbool(b'server', b'streamunbundle'):
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def cleanup():
# Ensure that the full payload is consumed, so
# that the connection doesn't contain trailing garbage.
for p in payload:
pass
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 fp = util.chunkbuffer(payload)
else:
# write bundle data to temporary file as it can be big
fp, tempname = None, None
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 def cleanup():
if fp:
fp.close()
if tempname:
os.unlink(tempname)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fd, tempname = pycompat.mkstemp(prefix=b'hg-unbundle-')
Augie Fackler
formatting: blacken the codebase...
r43346 repo.ui.debug(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'redirecting incoming bundle to %s\n' % tempname
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fp = os.fdopen(fd, pycompat.sysstr(b'wb+'))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 for p in payload:
fp.write(p)
fp.seek(0)
gen = exchange.readbundle(repo.ui, fp, None)
Augie Fackler
formatting: blacken the codebase...
r43346 if isinstance(
gen, changegroupmod.cg1unpacker
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ) and not bundle1allowed(repo, b'push'):
if proto.name == b'http-v1':
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # 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)
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
bundle2requiredmain, hint=bundle2requiredhint
)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
Augie Fackler
formatting: blacken the codebase...
r43346 r = exchange.unbundle(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo, gen, their_heads, b'serve', proto.client()
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if util.safehasattr(r, b'addpart'):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # The return looks streamable, we are in the bundle2 case
# and should return a stream.
return wireprototypes.streamreslegacy(gen=r.getchunks())
return wireprototypes.pushres(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 r, output.getvalue() if output else b''
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
finally:
cleanup()
except (error.BundleValueError, error.Abort, error.PushRaced) as exc:
# handle non-bundle2 case first
if not getattr(exc, 'duringunbundle2', False):
try:
raise
Matt Harbison
wireprotov1server: capture Abort type before accessing the `hint` attribute...
r44122 except error.Abort as exc:
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # 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.
Martin von Zweigbergk
errors: format "abort: " text in a new Abort.format() method...
r46497 procutil.stderr.write(exc.format())
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 procutil.stderr.flush()
return wireprototypes.pushres(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 0, output.getvalue() if output else b''
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except error.PushRaced:
return wireprototypes.pusherr(
pycompat.bytestr(exc),
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 output.getvalue() if output else b'',
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803
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)
Augie Fackler
formatting: blacken the codebase...
r43346 if (
remotecaps is not None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and b'pushkey' not in remotecaps.get(b'error', ())
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 # no support remote side, fallback to Abort handler.
raise
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 part = bundler.newpart(b'error:pushkey')
part.addparam(b'in-reply-to', exc.partid)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.namespace is not None:
Augie Fackler
formatting: blacken the codebase...
r43346 part.addparam(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'namespace', exc.namespace, mandatory=False
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.key is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 part.addparam(b'key', exc.key, mandatory=False)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.new is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 part.addparam(b'new', exc.new, mandatory=False)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.old is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 part.addparam(b'old', exc.old, mandatory=False)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.ret is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 part.addparam(b'ret', exc.ret, mandatory=False)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except error.BundleValueError as exc:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 errpart = bundler.newpart(b'error:unsupportedcontent')
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.parttype is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 errpart.addparam(b'parttype', exc.parttype)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 if exc.params:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 errpart.addparam(b'params', b'\0'.join(exc.params))
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except error.Abort as exc:
Martin von Zweigbergk
errors: name arguments to Abort constructor...
r46274 manargs = [(b'message', exc.message)]
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 advargs = []
if exc.hint is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 advargs.append((b'hint', exc.hint))
Augie Fackler
formatting: blacken the codebase...
r43346 bundler.addpart(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 bundle2.bundlepart(b'error:abort', manargs, advargs)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 except error.PushRaced as exc:
Augie Fackler
formatting: blacken the codebase...
r43346 bundler.newpart(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'error:pushraced',
[(b'message', stringutil.forcebytestr(exc))],
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 return wireprototypes.streamreslegacy(gen=bundler.getchunks())