comparison tests/run-tests.py @ 35569:964212780daf

rust: implementation of `hg` This commit provides a mostly-working implementation of the `hg` script in Rust along with scaffolding to support Rust in the repository. If you are familiar with Rust, the contents of the added rust/ directory should be pretty straightforward. We create an "hgcli" package that implements a binary application to run Mercurial. The output of this package is an "hg" binary. Our Rust `hg` (henceforth "rhg") essentially is a port of the existing `hg` Python script. The main difference is the creation of the embedded CPython interpreter is handled by the binary itself instead of relying on the shebang. In that sense, rhg is more similar to the "exe wrapper" we currently use on Windows. However, unlike the exe wrapper, rhg does not call the `hg` Python script. Instead, it uses the CPython APIs to import mercurial modules and call appropriate functions. The amount of code here is surprisingly small. It is my intent to replace the existing C-based exe wrapper with rhg. Preferably in the next Mercurial release. This should be achievable - at least for some Mercurial distributions. The future/timeline for rhg on other platforms is less clear. We already ship a hg.exe on Windows. So if we get the quirks with Rust worked out, shipping a Rust-based hg.exe should hopefully not be too contentious. Now onto the implementation. We're using python27-sys and the cpython crates for talking to the CPython API. We currently don't use too much functionality of the cpython crate and could have probably cut it out. However, it does provide a reasonable abstraction over unsafe {} CPython function calls. While we still have our fair share of those, at least we're not dealing with too much refcounting, error checking, etc. So I think the use of the cpython crate is justified. Plus, there is not-yet-implemented functionality that could benefit from cpython. I see our use of this crate only increasing. The cpython and python27-sys crates are not without their issues. The cpython crate didn't seem to account for the embedding use case in its design. Instead, it seems to assume that you are building a Python extension. It is making some questionable decisions around certain CPython APIs. For example, it insists that PyEval_ThreadsInitialized() is called and that the Python code likely isn't the main thread in the underlying application. It is also missing some functionality that is important for embedded use cases (such as exporting the path to the Python interpreter from its build script). After spending several hours trying to wrangle python27-sys and cpython, I gave up and forked the project on GitHub. Our Cargo.toml tracks this fork. I'm optimistic that the upstream project will accept our contributions and we can eventually unfork. There is a non-trivial amount of code in our custom Cargo build script. Our build.rs (which is called as part of building the hgcli crate): * Validates that the Python interpreter that was detected by the python27-sys crate provides a shared library (we only support shared library linking at this time - although this restriction could be loosened). * Validates that the Python is built with UCS-4 support. This ensures maximum Unicode compatibility. * Exports variables to the crate build allowing the built crate to e.g. find the path to the Python interpreter. The produced rhg should be considered alpha quality. There are several known deficiencies. Many of these are documented with inline TODOs. Probably the biggest limitation of rhg is that it assumes it is running from the ./rust/target/<target> directory of a source distribution. So, rhg is currently not very practical for real-world use. But, if you can `cargo build` it, running the binary *should* yield a working Mercurial CLI. In order to support using rhg with the test harness, we needed to hack up run-tests.py so the path to Mercurial's Python files is set properly. The change is extremely hacky and is only intended to be a stop-gap until the test harness gains first-class support for installing rhg. This will likely occur after we support running rhg outside the source directory. Despite its officially alpha quality, rhg copes extremely well with the test harness (at least on Linux). Using `run-tests.py --with-hg ../rust/target/debug/hg`, I only encounter the following failures: * test-run-tests.t -- Warnings emitted about using an unexpected Mercurial library. This is due to the hacky nature of setting the Python directory when run-tests.py detected rhg. * test-devel-warnings.t -- Expected stack trace missing frame for `hg` (This is expected since we no longer have an `hg` script!) * test-convert.t -- Test running `$PYTHON "$BINDIR"/hg`, which obviously assumes `hg` is a Python script. * test-merge-tools.t -- Same assumption about `hg` being executable with Python. * test-http-bad-server.t -- Seeing exit code 255 instead of 1 around line 358. * test-blackbox.t -- Exit code 255 instead of 1. * test-basic.t -- Exit code 255 instead of 1. It certainly looks like we have a bug around exit code handling. I don't think it is severe enough to hold up review and landing of this initial implementation. Perfect is the enemy of good. Differential Revision: https://phab.mercurial-scm.org/D1581
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 10 Jan 2018 08:53:22 -0800
parents f04d16bef2c7
children 31acf6619f08
comparison
equal deleted inserted replaced
35568:ebf14075a5c1 35569:964212780daf
2433 assert isinstance(self._bindir, bytes) 2433 assert isinstance(self._bindir, bytes)
2434 self._hgcommand = os.path.basename(whg) 2434 self._hgcommand = os.path.basename(whg)
2435 self._tmpbindir = os.path.join(self._hgtmp, b'install', b'bin') 2435 self._tmpbindir = os.path.join(self._hgtmp, b'install', b'bin')
2436 os.makedirs(self._tmpbindir) 2436 os.makedirs(self._tmpbindir)
2437 2437
2438 # This looks redundant with how Python initializes sys.path from 2438 normbin = os.path.normpath(os.path.abspath(whg))
2439 # the location of the script being executed. Needed because the 2439 normbin = normbin.replace(os.sep.encode('ascii'), b'/')
2440 # "hg" specified by --with-hg is not the only Python script 2440
2441 # executed in the test suite that needs to import 'mercurial' 2441 # Other Python scripts in the test harness need to
2442 # ... which means it's not really redundant at all. 2442 # `import mercurial`. If `hg` is a Python script, we assume
2443 self._pythondir = self._bindir 2443 # the Mercurial modules are relative to its path and tell the tests
2444 # to load Python modules from its directory.
2445 with open(whg, 'rb') as fh:
2446 initial = fh.read(1024)
2447
2448 if re.match(b'#!.*python', initial):
2449 self._pythondir = self._bindir
2450 # If it looks like our in-repo Rust binary, use the source root.
2451 # This is a bit hacky. But rhg is still not supported outside the
2452 # source directory. So until it is, do the simple thing.
2453 elif re.search(b'|/rust/target/[^/]+/hg', normbin):
2454 self._pythondir = os.path.dirname(self._testdir)
2455 # Fall back to the legacy behavior.
2456 else:
2457 self._pythondir = self._bindir
2458
2444 else: 2459 else:
2445 self._installdir = os.path.join(self._hgtmp, b"install") 2460 self._installdir = os.path.join(self._hgtmp, b"install")
2446 self._bindir = os.path.join(self._installdir, b"bin") 2461 self._bindir = os.path.join(self._installdir, b"bin")
2447 self._hgcommand = b'hg' 2462 self._hgcommand = b'hg'
2448 self._tmpbindir = self._bindir 2463 self._tmpbindir = self._bindir