##// END OF EJS Templates
wireprotov2: define and implement "manifestdata" command...
wireprotov2: define and implement "manifestdata" command The added command can be used for obtaining manifest data. Given a manifest path and set of manifest nodes, data about manifests can be retrieved. Unlike changeset data, we wish to emit deltas to describe manifest revisions. So the command uses the relatively new API for building delta requests and emitting them. The code calls into deltaparent(), which I'm not very keen of. There's still work to be done in delta generation land so implementation details of storage (e.g. exactly one delta is stored/available) don't creep into higher levels. But we can worry about this later (there is already a TODO on imanifestorage tracking this). On the subject of parent deltas, the server assumes parent revisions exist on the receiving end. This is obviously wrong for shallow clone. I've added TODOs to add a mechanism to the command to allow clients to specify desired behavior. This shouldn't be too difficult to implement. Another big change is that the client must explicitly request manifest nodes to retrieve. This is a major departure from "getbundle," where the server derives relevant manifests as it iterates changesets and sends them automatically. As implemented, the client must transmit each requested node to the server. At 20 bytes per node, we're looking at 2 MB per 100,000 nodes. Plus wire encoding overhead. This isn't ideal for clients with limited upload bandwidth. I plan to address this in the future by allowing alternate mechanisms for defining the revisions to retrieve. One idea is to define a range of changeset revisions whose manifest revisions to retrieve (similar to how "changesetdata" works). We almost certainly want an API to look up an individual manifest by node. And that's where I've chosen to start with the implementation. Again, a theme of this early exchangev2 work is I want to start by building primitives for accessing raw repository data first and see how far we can get with those before we need more complexity. Differential Revision: https://phab.mercurial-scm.org/D4488

File last commit:

r32769:efd6e941 default
r39673:c7a7c7e8 default
Show More
fsmonitor-run-tests.py
133 lines | 4.3 KiB | text/x-python | PythonLexer
/ tests / fsmonitor-run-tests.py
Siddharth Agarwal
tests: add a wrapper to run fsmonitor tests...
r32769 #!/usr/bin/env python
# fsmonitor-run-tests.py - Run Mercurial tests with fsmonitor enabled
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
#
# This is a wrapper around run-tests.py that spins up an isolated instance of
# Watchman and runs the Mercurial tests against it. This ensures that the global
# version of Watchman isn't affected by anything this test does.
from __future__ import absolute_import
from __future__ import print_function
import argparse
import contextlib
import json
import os
import shutil
import subprocess
import sys
import tempfile
import uuid
osenvironb = getattr(os, 'environb', os.environ)
if sys.version_info > (3, 5, 0):
PYTHON3 = True
xrange = range # we use xrange in one place, and we'd rather not use range
def _bytespath(p):
return p.encode('utf-8')
elif sys.version_info >= (3, 0, 0):
print('%s is only supported on Python 3.5+ and 2.7, not %s' %
(sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
else:
PYTHON3 = False
# In python 2.x, path operations are generally done using
# bytestrings by default, so we don't have to do any extra
# fiddling there. We define the wrapper functions anyway just to
# help keep code consistent between platforms.
def _bytespath(p):
return p
def getparser():
"""Obtain the argument parser used by the CLI."""
parser = argparse.ArgumentParser(
description='Run tests with fsmonitor enabled.',
epilog='Unrecognized options are passed to run-tests.py.')
# - keep these sorted
# - none of these options should conflict with any in run-tests.py
parser.add_argument('--keep-fsmonitor-tmpdir', action='store_true',
help='keep temporary directory with fsmonitor state')
parser.add_argument('--watchman',
help='location of watchman binary (default: watchman in PATH)',
default='watchman')
return parser
@contextlib.contextmanager
def watchman(args):
basedir = tempfile.mkdtemp(prefix='hg-fsmonitor')
try:
# Much of this configuration is borrowed from Watchman's test harness.
cfgfile = os.path.join(basedir, 'config.json')
# TODO: allow setting a config
with open(cfgfile, 'w') as f:
f.write(json.dumps({}))
logfile = os.path.join(basedir, 'log')
clilogfile = os.path.join(basedir, 'cli-log')
if os.name == 'nt':
sockfile = '\\\\.\\pipe\\watchman-test-%s' % uuid.uuid4().hex
else:
sockfile = os.path.join(basedir, 'sock')
pidfile = os.path.join(basedir, 'pid')
statefile = os.path.join(basedir, 'state')
argv = [
args.watchman,
'--sockname', sockfile,
'--logfile', logfile,
'--pidfile', pidfile,
'--statefile', statefile,
'--foreground',
'--log-level=2', # debug logging for watchman
]
envb = osenvironb.copy()
envb[b'WATCHMAN_CONFIG_FILE'] = _bytespath(cfgfile)
with open(clilogfile, 'wb') as f:
proc = subprocess.Popen(
argv, env=envb, stdin=None, stdout=f, stderr=f)
try:
yield sockfile
finally:
proc.terminate()
proc.kill()
finally:
if args.keep_fsmonitor_tmpdir:
print('fsmonitor dir available at %s' % basedir)
else:
shutil.rmtree(basedir, ignore_errors=True)
def run():
parser = getparser()
args, runtestsargv = parser.parse_known_args()
with watchman(args) as sockfile:
osenvironb[b'WATCHMAN_SOCK'] = _bytespath(sockfile)
# Indicate to hghave that we're running with fsmonitor enabled.
osenvironb[b'HGFSMONITOR_TESTS'] = b'1'
runtestdir = os.path.dirname(__file__)
runtests = os.path.join(runtestdir, 'run-tests.py')
blacklist = os.path.join(runtestdir, 'blacklists', 'fsmonitor')
runtestsargv.insert(0, runtests)
runtestsargv.extend([
'--extra-config',
'extensions.fsmonitor=',
'--blacklist',
blacklist,
])
return subprocess.call(runtestsargv)
if __name__ == '__main__':
sys.exit(run())