##// END OF EJS Templates
copies: no longer cache the ChangedFiles during copy tracing...
copies: no longer cache the ChangedFiles during copy tracing Now that the copies information for both parents are processed all at once, we no longer needs to cache this information, so we simplify the code. The simpler code is also a (tiny) bit faster overall. Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000041 s, 0.000041 s, +0.000000 s, × 1.0000, 41 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000102 s, 0.000096 s, -0.000006 s, × 0.9412, 16 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004254 s, 0.004039 s, -0.000215 s, × 0.9495, 3 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000282 s, 0.000189 s, -0.000093 s, × 0.6702, 21 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000048 s, 0.000047 s, -0.000001 s, × 0.9792, 47 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000211 s, 0.000103 s, -0.000108 s, × 0.4882, 14 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000375 s, 0.000286 s, -0.000089 s, × 0.7627, 286 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010574 s, 0.010436 s, -0.000138 s, × 0.9869, 1739 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.049974 s, 0.047465 s, -0.002509 s, × 0.9498, 9 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.084300 s, 0.082351 s, -0.001949 s, × 0.9769, 12 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.060128 s, 0.058757 s, -0.001371 s, × 0.9772, 10 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.686542 s, 0.674129 s, -0.012413 s, × 0.9819, 15 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.009277 s, 0.009434 s, +0.000157 s, × 1.0169, 4717 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.114733 s, 0.111935 s, -0.002798 s, × 0.9756, 9 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000081 s, 0.000078 s, -0.000003 s, × 0.9630, 39 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000107 s, 0.000106 s, -0.000001 s, × 0.9907, 53 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000173 s, 0.000162 s, -0.000011 s, × 0.9364, 54 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000698 s, 0.000695 s, -0.000003 s, × 0.9957, 77 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009248 s, 0.008901 s, -0.000347 s, × 0.9625, 6 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.015446 s, 0.014333 s, -0.001113 s, × 0.9279, 9 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.074373 s, 0.071998 s, -0.002375 s, × 0.9681, 12 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.639870 s, 0.615346 s, -0.024524 s, × 0.9617, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000088 s, 0.000085 s, -0.000003 s, × 0.9659, 42 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000199 s, 0.000199 s, +0.000000 s, × 1.0000, 24 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000171 s, 0.000169 s, -0.000002 s, × 0.9883, 18 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000592 s, 0.000590 s, -0.000002 s, × 0.9966, 84 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003151 s, 0.003122 s, -0.000029 s, × 0.9908, 1040 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.061612 s, 0.061192 s, -0.000420 s, × 0.9932, 10198 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005381 s, 0.005137 s, -0.000244 s, × 0.9547, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.003742 s, 0.003585 s, -0.000157 s, × 0.9580, 87 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.061983 s, 0.060592 s, -0.001391 s, × 0.9776, 7 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.019861 s, 0.019596 s, -0.000265 s, × 0.9867, 31 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.188101 s, 0.183558 s, -0.004543 s, × 0.9758, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.806696 s, 1.758083 s, -0.048613 s, × 0.9731, 11 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.682987 s, 2.592955 s, -0.090032 s, × 0.9664, 12 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.000852 s, 0.000844 s, -0.000008 s, × 0.9906, 422 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.000859 s, 0.000861 s, +0.000002 s, × 1.0023, 430 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000150 s, 0.000150 s, +0.000000 s, × 1.0000, 37 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001158 s, 0.001166 s, +0.000008 s, × 1.0069, 583 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027240 s, 0.027359 s, +0.000119 s, × 1.0044, 27359 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062824 s, 0.061848 s, -0.000976 s, × 0.9845, 10308 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005463 s, 0.005110 s, -0.000353 s, × 0.9354, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.004238 s, 0.004168 s, -0.000070 s, × 0.9835, 101 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.064113 s, 0.063414 s, -0.000699 s, × 0.9891, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.294063 s, 0.288301 s, -0.005762 s, × 0.9804, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.281493 s, 0.275798 s, -0.005695 s, × 0.9798, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.076323 s, 0.074640 s, -0.001683 s, × 0.9779, 8 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.020390 s, 0.020327 s, -0.000063 s, × 0.9969, 33 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.023879 s, 2.970385 s, -0.053494 s, × 0.9823, 30 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.735549 s, 0.719432 s, -0.016117 s, × 0.9781, 13 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.568900 s, 18.165143 s, -0.403757 s, × 0.9783, 49 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.502584 s, 0.486769 s, -0.015815 s, × 0.9685, 14 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.356645 s, 17.913924 s, -0.442721 s, × 0.9759, 49 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.250393 s, 17.660113 s, -0.590280 s, × 0.9677, 49 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 2.792459 s, 2.709446 s, -0.083013 s, × 0.9703, 14 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 107.697264 s, 107.796891 s, +0.099627 s, × 1.0009, 470 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 63.961040 s, 63.575217 s, -0.385823 s, × 0.9940, 166 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9423

File last commit:

r46554:89a2afe3 default
r46765:a132aa59 default
Show More
wireprotov1server.py
747 lines | 26.5 KiB | text/x-python | PythonLexer
# wireprotov1server.py - Wire protocol version 1 server functionality
#
# Copyright 2005-2010 Matt Mackall <mpm@selenic.com>
#
# 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
import binascii
import os
from .i18n import _
from .node import (
hex,
nullid,
)
from .pycompat import getattr
from . import (
bundle2,
bundlecaches,
changegroup as changegroupmod,
discovery,
encoding,
error,
exchange,
pushkey as pushkeymod,
pycompat,
streamclone,
util,
wireprototypes,
)
from .utils import (
procutil,
stringutil,
)
urlerr = util.urlerr
urlreq = util.urlreq
bundle2requiredmain = _(b'incompatible Mercurial client; bundle2 required')
bundle2requiredhint = _(
b'see https://www.mercurial-scm.org/wiki/IncompatibleClient'
)
bundle2required = b'%s\n(%s)\n' % (bundle2requiredmain, bundle2requiredhint)
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(b'comp='):
return cap[5:].split(b',')
return [b'zlib', b'none']
# 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.
"""
viewconfig = repo.ui.config(b'server', b'view')
return repo.filtered(viewconfig)
def dispatch(repo, proto, command):
repo = getdispatchrepo(repo, proto, command)
func, spec = commands[command]
args = proto.getargs(spec)
return func(repo, proto, *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(
b"warning: %s ignored unexpected arguments %s\n"
% (cmd, b",".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 = b'generaldelta' in repo.requirements
if gd:
v = ui.configbool(b'server', b'bundle1gd.%s' % action)
if v is not None:
return v
v = ui.configbool(b'server', b'bundle1.%s' % action)
if v is not None:
return v
if gd:
v = ui.configbool(b'server', b'bundle1gd')
if v is not None:
return v
return ui.configbool(b'server', b'bundle1')
commands = wireprototypes.commanddict()
def wireprotocommand(name, args=None, permission=b'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
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.
"""
transports = {
k for k, v in wireprototypes.TRANSPORTS.items() if v[b'version'] == 1
}
# 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 (b'push', b'pull'):
raise error.ProgrammingError(
b'invalid wire protocol permission; '
b'got %s; expected "push" or "pull"' % permission
)
if args is None:
args = b''
if not isinstance(args, bytes):
raise error.ProgrammingError(
b'arguments for version 1 commands must be declared as bytes'
)
def register(func):
if name in commands:
raise error.ProgrammingError(
b'%s command already registered for version 1' % name
)
commands[name] = wireprototypes.commandentry(
func, args=args, transports=transports, permission=permission
)
return func
return register
# TODO define a more appropriate permissions type to use for this.
@wireprotocommand(b'batch', b'cmds *', permission=b'pull')
def batch(repo, proto, cmds, others):
unescapearg = wireprototypes.unescapebatcharg
res = []
for pair in cmds.split(b';'):
op, args = pair.split(b' ', 1)
vals = {}
for a in args.split(b','):
if a:
n, v = a.split(b'=')
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 (b'push', b'pull')
proto.checkperm(perm)
if spec:
keys = spec.split()
data = {}
for k in keys:
if k == b'*':
star = {}
for key in vals.keys():
if key not in keys:
star[key] = vals[key]
data[b'*'] = 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(b';'.join(res))
@wireprotocommand(b'between', b'pairs', permission=b'pull')
def between(repo, proto, pairs):
pairs = [wireprototypes.decodelist(p, b'-') for p in pairs.split(b" ")]
r = []
for b in repo.between(pairs):
r.append(wireprototypes.encodelist(b) + b"\n")
return wireprototypes.bytesresponse(b''.join(r))
@wireprotocommand(b'branchmap', permission=b'pull')
def branchmap(repo, proto):
branchmap = repo.branchmap()
heads = []
for branch, nodes in pycompat.iteritems(branchmap):
branchname = urlreq.quote(encoding.fromlocal(branch))
branchnodes = wireprototypes.encodelist(nodes)
heads.append(b'%s %s' % (branchname, branchnodes))
return wireprototypes.bytesresponse(b'\n'.join(heads))
@wireprotocommand(b'branches', b'nodes', permission=b'pull')
def branches(repo, proto, nodes):
nodes = wireprototypes.decodelist(nodes)
r = []
for b in repo.branches(nodes):
r.append(wireprototypes.encodelist(b) + b"\n")
return wireprototypes.bytesresponse(b''.join(r))
@wireprotocommand(b'clonebundles', b'', permission=b'pull')
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(bundlecaches.CB_MANIFEST_FILE)
)
wireprotocaps = [
b'lookup',
b'branchmap',
b'pushkey',
b'known',
b'getbundle',
b'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(b'changegroupsubset', proto):
caps.append(b'changegroupsubset')
if streamclone.allowservergeneration(repo):
if repo.ui.configbool(b'server', b'preferuncompressed'):
caps.append(b'stream-preferred')
requiredformats = repo.requirements & repo.supportedformats
# if our local revlogs are just revlogv1, add 'stream' cap
if not requiredformats - {b'revlogv1'}:
caps.append(b'stream')
# otherwise, add 'streamreqs' detailing our local revlog format
else:
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))
if repo.ui.configbool(b'experimental', b'narrow'):
caps.append(wireprototypes.NARROWCAP)
if repo.ui.configbool(b'experimental', b'narrowservebrokenellipses'):
caps.append(wireprototypes.ELLIPSESCAP)
return proto.addcapabilities(repo, caps)
# If you are writing an extension and consider wrapping this function. Wrap
# `_capabilities` instead.
@wireprotocommand(b'capabilities', permission=b'pull')
def capabilities(repo, proto):
caps = _capabilities(repo, proto)
return wireprototypes.bytesresponse(b' '.join(sorted(caps)))
@wireprotocommand(b'changegroup', b'roots', permission=b'pull')
def changegroup(repo, proto, roots):
nodes = wireprototypes.decodelist(roots)
outgoing = discovery.outgoing(
repo, missingroots=nodes, ancestorsof=repo.heads()
)
cg = changegroupmod.makechangegroup(repo, outgoing, b'01', b'serve')
gen = iter(lambda: cg.read(32768), b'')
return wireprototypes.streamres(gen=gen)
@wireprotocommand(b'changegroupsubset', b'bases heads', permission=b'pull')
def changegroupsubset(repo, proto, bases, heads):
bases = wireprototypes.decodelist(bases)
heads = wireprototypes.decodelist(heads)
outgoing = discovery.outgoing(repo, missingroots=bases, ancestorsof=heads)
cg = changegroupmod.makechangegroup(repo, outgoing, b'01', b'serve')
gen = iter(lambda: cg.read(32768), b'')
return wireprototypes.streamres(gen=gen)
@wireprotocommand(b'debugwireargs', b'one two *', permission=b'pull')
def debugwireargs(repo, proto, one, two, others):
# only accept optional args from the known set
opts = options(b'debugwireargs', [b'three', b'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 {binascii.unhexlify(h) for h in s.split(b';')}
manifest = repo.vfs.tryread(b'pullbundles.manifest')
if not manifest:
return None
res = bundlecaches.parseclonebundlesmanifest(repo, manifest)
res = bundlecaches.filterclonebundleentries(repo, res)
if not res:
return None
cl = repo.unfiltered().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:
comp = entry.get(b'COMPRESSION')
altcomp = util.compengines._bundlenames.get(comp)
if comp and comp not in compformats and altcomp not in compformats:
continue
# No test yet for VERSION, since V2 is supported by any client
# that advertises partial pulls
if b'heads' in entry:
try:
bundle_heads = decodehexstring(entry[b'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 b'bases' in entry:
try:
bundle_bases = decodehexstring(entry[b'bases'])
except TypeError:
# Bad bases entry
continue
if not all(cl.rev(rev) in common_anc for rev in bundle_bases):
continue
path = entry[b'URL']
repo.ui.debug(b'sending pullbundle "%s"\n' % path)
try:
return repo.vfs.open(path)
except IOError:
repo.ui.debug(b'pullbundle "%s" not accessible\n' % path)
continue
return None
@wireprotocommand(b'getbundle', b'*', permission=b'pull')
def getbundle(repo, proto, others):
opts = options(
b'getbundle', wireprototypes.GETBUNDLE_ARGUMENTS.keys(), others
)
for k, v in pycompat.iteritems(opts):
keytype = wireprototypes.GETBUNDLE_ARGUMENTS[k]
if keytype == b'nodes':
opts[k] = wireprototypes.decodelist(v)
elif keytype == b'csv':
opts[k] = list(v.split(b','))
elif keytype == b'scsv':
opts[k] = set(v.split(b','))
elif keytype == b'boolean':
# Client should serialize False as '0', which is a non-empty string
# so it evaluates as a True bool.
if v == b'0':
opts[k] = False
else:
opts[k] = bool(v)
elif keytype != b'plain':
raise KeyError(b'unknown getbundle option type %s' % keytype)
if not bundle1allowed(repo, b'pull'):
if not exchange.bundle2requested(opts.get(b'bundlecaps')):
if proto.name == b'http-v1':
return wireprototypes.ooberror(bundle2required)
raise error.Abort(bundle2requiredmain, hint=bundle2requiredhint)
try:
clheads = set(repo.changelog.heads())
heads = set(opts.get(b'heads', set()))
common = set(opts.get(b'common', set()))
common.discard(nullid)
if (
repo.ui.configbool(b'server', b'pullbundle')
and b'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(b'server', b'disablefullbundle'):
# Check to see if this is a full clone.
changegroup = opts.get(b'cg', True)
if changegroup and not common and clheads == heads:
raise error.Abort(
_(b'server has pull-based clones disabled'),
hint=_(b'remove --pull if specified or upgrade Mercurial'),
)
info, chunks = exchange.getbundlechunks(
repo, b'serve', **pycompat.strkwargs(opts)
)
prefercompressed = info.get(b'prefercompressed', True)
except error.Abort as exc:
# cleanly forward Abort error to the client
if not exchange.bundle2requested(opts.get(b'bundlecaps')):
if proto.name == b'http-v1':
return wireprototypes.ooberror(exc.message + b'\n')
raise # cannot do better for bundle1 + ssh
# bundle2 request expect a bundle2 reply
bundler = bundle2.bundle20(repo.ui)
manargs = [(b'message', exc.message)]
advargs = []
if exc.hint is not None:
advargs.append((b'hint', exc.hint))
bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))
chunks = bundler.getchunks()
prefercompressed = False
return wireprototypes.streamres(
gen=chunks, prefer_uncompressed=not prefercompressed
)
@wireprotocommand(b'heads', permission=b'pull')
def heads(repo, proto):
h = repo.heads()
return wireprototypes.bytesresponse(wireprototypes.encodelist(h) + b'\n')
@wireprotocommand(b'hello', permission=b'pull')
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(b'capabilities: %s\n' % caps)
@wireprotocommand(b'listkeys', b'namespace', permission=b'pull')
def listkeys(repo, proto, namespace):
d = sorted(repo.listkeys(encoding.tolocal(namespace)).items())
return wireprototypes.bytesresponse(pushkeymod.encodekeys(d))
@wireprotocommand(b'lookup', b'key', permission=b'pull')
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(b'%d %s\n' % (success, r))
@wireprotocommand(b'known', b'nodes *', permission=b'pull')
def known(repo, proto, nodes, others):
v = b''.join(
b and b'1' or b'0' for b in repo.known(wireprototypes.decodelist(nodes))
)
return wireprototypes.bytesresponse(v)
@wireprotocommand(b'protocaps', b'caps', permission=b'pull')
def protocaps(repo, proto, caps):
if proto.name == wireprototypes.SSHV1:
proto._protocaps = set(caps.split(b' '))
return wireprototypes.bytesresponse(b'OK')
@wireprotocommand(b'pushkey', b'namespace key old new', permission=b'push')
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 b''
return wireprototypes.bytesresponse(b'%d\n%s' % (int(r), output))
@wireprotocommand(b'stream_out', permission=b'pull')
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(b'unbundle', b'heads', permission=b'push')
def unbundle(repo, proto, heads):
their_heads = wireprototypes.decodelist(heads)
with proto.mayberedirectstdio() as output:
try:
exchange.check_heads(repo, their_heads, b'preparing changes')
cleanup = lambda: None
try:
payload = proto.getpayload()
if repo.ui.configbool(b'server', b'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 = pycompat.mkstemp(prefix=b'hg-unbundle-')
repo.ui.debug(
b'redirecting incoming bundle to %s\n' % tempname
)
fp = os.fdopen(fd, pycompat.sysstr(b'wb+'))
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, b'push'):
if proto.name == b'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, b'serve', proto.client()
)
if util.safehasattr(r, b'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 b''
)
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 as exc:
# 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(exc.format())
procutil.stderr.flush()
return wireprototypes.pushres(
0, output.getvalue() if output else b''
)
except error.PushRaced:
return wireprototypes.pusherr(
pycompat.bytestr(exc),
output.getvalue() if output else b'',
)
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 b'pushkey' not in remotecaps.get(b'error', ())
):
# no support remote side, fallback to Abort handler.
raise
part = bundler.newpart(b'error:pushkey')
part.addparam(b'in-reply-to', exc.partid)
if exc.namespace is not None:
part.addparam(
b'namespace', exc.namespace, mandatory=False
)
if exc.key is not None:
part.addparam(b'key', exc.key, mandatory=False)
if exc.new is not None:
part.addparam(b'new', exc.new, mandatory=False)
if exc.old is not None:
part.addparam(b'old', exc.old, mandatory=False)
if exc.ret is not None:
part.addparam(b'ret', exc.ret, mandatory=False)
except error.BundleValueError as exc:
errpart = bundler.newpart(b'error:unsupportedcontent')
if exc.parttype is not None:
errpart.addparam(b'parttype', exc.parttype)
if exc.params:
errpart.addparam(b'params', b'\0'.join(exc.params))
except error.Abort as exc:
manargs = [(b'message', exc.message)]
advargs = []
if exc.hint is not None:
advargs.append((b'hint', exc.hint))
bundler.addpart(
bundle2.bundlepart(b'error:abort', manargs, advargs)
)
except error.PushRaced as exc:
bundler.newpart(
b'error:pushraced',
[(b'message', stringutil.forcebytestr(exc))],
)
return wireprototypes.streamreslegacy(gen=bundler.getchunks())