This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5946

server: allow customizing the default repo filter
ClosedPublic

Authored by joerg.sonnenberger on Feb 12 2019, 1:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6569f1e9b37: server: allow customizing the default repo filter
Summary

hgweb has the (undocument) configuration option web.view that allows
restricting visible revisions to immutable. This is useful for serving
the same storage as publishing and non-publishing repo. Add the new
server.view option to serve the same purpose by changing the default
behavior of getdispatchrepo. Drop the hard-coded 'served' filter in the
batch handler of v1 of the wire proto, this is a left-over from the days
before getdispatchrepo existed.

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

Closed by commit rHGd6569f1e9b37: server: allow customizing the default repo filter (authored by joerg.sonnenberger). · Explain WhyMar 4 2019, 12:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14345

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem('server', 'uncompressed', coreconfigitem('server', 'uncompressed',
default=True, default=True,
) )
coreconfigitem('server', 'uncompressedallowsecret', coreconfigitem('server', 'uncompressedallowsecret',
default=False, default=False,
) )
coreconfigitem('server', 'view',
default='served',
)
coreconfigitem('server', 'validate', coreconfigitem('server', 'validate',
default=False, default=False,
) )
coreconfigitem('server', 'zliblevel', coreconfigitem('server', 'zliblevel',
default=-1, default=-1,
) )
coreconfigitem('server', 'zstdlevel', coreconfigitem('server', 'zstdlevel',
default=3, default=3,

mercurial/help/config.txt

The default (``3``) should be significantly faster than zlib while likely The default (``3``) should be significantly faster than zlib while likely
delivering better compression ratios. delivering better compression ratios.
This option only impacts the HTTP server. This option only impacts the HTTP server.
See also ``server.zliblevel``. See also ``server.zliblevel``.
``view``
Repository filter used when exchanging revisions with the peer.
The default view (``served``) excludes secret and hidden changesets.
Another useful value is ``immutable`` (no draft, secret or hidden changesets).
``smtp`` ``smtp``
-------- --------
Configuration for extensions that need to send email messages. Configuration for extensions that need to send email messages.
``host`` ``host``
Host name of mail server, e.g. "mail.example.com". Host name of mail server, e.g. "mail.example.com".

mercurial/wireprotov1server.py

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.
""" """
return repo.filtered('served') viewconfig = repo.ui.config('server', 'view')
return repo.filtered(viewconfig)
def dispatch(repo, proto, command): def dispatch(repo, proto, command):
repo = getdispatchrepo(repo, proto, command) repo = getdispatchrepo(repo, proto, command)
func, spec = commands[command] func, spec = commands[command]
args = proto.getargs(spec) args = proto.getargs(spec)
return func(repo, proto, *args) return func(repo, proto, *args)
return func return func
return register return register
# TODO define a more appropriate permissions type to use for this. # TODO define a more appropriate permissions type to use for this.
@wireprotocommand('batch', 'cmds *', permission='pull') @wireprotocommand('batch', 'cmds *', permission='pull')
def batch(repo, proto, cmds, others): def batch(repo, proto, cmds, others):
unescapearg = wireprototypes.unescapebatcharg unescapearg = wireprototypes.unescapebatcharg
repo = repo.filtered("served")
res = [] res = []
for pair in cmds.split(';'): for pair in cmds.split(';'):
op, args = pair.split(' ', 1) op, args = pair.split(' ', 1)
vals = {} vals = {}
for a in args.split(','): for a in args.split(','):
if a: if a:
n, v = a.split('=') n, v = a.split('=')
vals[unescapearg(n)] = unescapearg(v) vals[unescapearg(n)] = unescapearg(v)

mercurial/wireprotov2server.py

return True return True
elif action == 'noop': elif action == 'noop':
return False return False
else: else:
raise error.ProgrammingError('unhandled event from reactor: %s' % raise error.ProgrammingError('unhandled event from reactor: %s' %
action) action)
def getdispatchrepo(repo, proto, command): def getdispatchrepo(repo, proto, command):
return repo.filtered('served') viewconfig = repo.ui.config('server', 'view')
return repo.filtered(viewconfig)
def dispatch(repo, proto, command, redirect): def dispatch(repo, proto, command, redirect):
"""Run a wire protocol command. """Run a wire protocol command.
Returns an iterable of objects that will be sent to the client. Returns an iterable of objects that will be sent to the client.
""" """
repo = getdispatchrepo(repo, proto, command) repo = getdispatchrepo(repo, proto, command)

tests/test-server-view.t

  • This file was added.
$ hg init test
$ cd test
$ hg debugbuilddag '+2'
$ hg phase --public 0
$ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ cd ..
$ hg init test2
$ cd test2
$ hg incoming http://foo:xyzzy@localhost:$HGPORT/
comparing with http://foo:***@localhost:$HGPORT/
changeset: 0:1ea73414a91b
user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000
summary: r0
changeset: 1:66f7d451a68b
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
$ killdaemons.py
$ cd ../test
$ hg --config server.view=immutable serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ cd ../test2
$ hg incoming http://foo:xyzzy@localhost:$HGPORT/
comparing with http://foo:***@localhost:$HGPORT/
changeset: 0:1ea73414a91b
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:00 1970 +0000
summary: r0
$ killdaemons.py

tests/test-wireproto.py

@wireprotov1peer.batchable @wireprotov1peer.batchable
def greet(self, name): def greet(self, name):
f = wireprotov1peer.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 __init__(self, ui):
self.ui = ui
def greet(self, name): def greet(self, name):
return b"Hello, " + name return b"Hello, " + name
def filtered(self, name): def filtered(self, name):
return self return self
def mangle(s): def mangle(s):
return b''.join(pycompat.bytechr(ord(c) + 1) for c in pycompat.bytestr(s)) return b''.join(pycompat.bytechr(ord(c) + 1) for c in pycompat.bytestr(s))
def unmangle(s): def unmangle(s):
return b''.join(pycompat.bytechr(ord(c) - 1) for c in pycompat.bytestr(s)) return b''.join(pycompat.bytechr(ord(c) - 1) for c in pycompat.bytestr(s))
def greet(repo, proto, name): def greet(repo, proto, name):
return mangle(repo.greet(unmangle(name))) return mangle(repo.greet(unmangle(name)))
wireprotov1server.commands[b'greet'] = (greet, b'name') wireprotov1server.commands[b'greet'] = (greet, b'name')
srv = serverrepo() srv = serverrepo(uimod.ui())
clt = clientpeer(srv, uimod.ui()) clt = clientpeer(srv, uimod.ui())
def printb(data, end=b'\n'): def printb(data, end=b'\n'):
out = getattr(sys.stdout, 'buffer', sys.stdout) out = getattr(sys.stdout, 'buffer', sys.stdout)
out.write(data + end) out.write(data + end)
out.flush() out.flush()
printb(clt.greet(b"Foobar")) printb(clt.greet(b"Foobar"))
with clt.commandexecutor() as e: with clt.commandexecutor() as e:
fgreet1 = e.callcommand(b'greet', {b'name': b'Fo, =;:<o'}) fgreet1 = e.callcommand(b'greet', {b'name': b'Fo, =;:<o'})
fgreet2 = e.callcommand(b'greet', {b'name': b'Bar'}) fgreet2 = e.callcommand(b'greet', {b'name': b'Bar'})
printb(stringutil.pprint([f.result() for f in (fgreet1, fgreet2)], printb(stringutil.pprint([f.result() for f in (fgreet1, fgreet2)],
bprefix=True)) bprefix=True))