This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8613

rhg: add a limited `rhg root` subcommand
ClosedPublic

Authored by acezar on Jun 5 2020, 10:31 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG18f8d3b31baa: rhg: add a limited `rhg root` subcommand
rHGa097299ed2a0: rhg: add a limited `rhg root` subcommand
rHGef04f4ea771a: rhg: add a limited `rhg root` subcommand
rHG3707f6e7e04e: rhg: add a limited `rhg root` subcommand
Summary

Clap has been choosen for argument parsing for the following reasons:

  • it's a wildly used and maintained crate
  • it can deal with OS encoding making it suitable for any encoding
  • it supports nonambiguous prefix matching as already available in hg
  • it will soon allow for structopts-style declarative pattern instead of the currently used builder pattern

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

acezar created this revision.Jun 5 2020, 10:31 AM
Alphare requested changes to this revision.Jun 5 2020, 11:45 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
rust/rhg/src/main.rs
15

Clap will exit here with the help message and an error code. Use get_matches_safe to properly fall back to "UNIMPLEMENTED_COMMAND" if need be.

This revision now requires changes to proceed.Jun 5 2020, 11:45 AM
marmoute added a subscriber: marmoute.Jun 9 2020, 5:38 AM

The question of "how are we testing it" is going to appears. At first we can probably have a small test-rhg.t that checks a handful of command. But quickly, we will probably want to integrate this in the main test suite. Having a small piece of logic that recognise call we can fast path and switching them to call to rhg.

acezar updated this revision to Diff 21643.Jun 16 2020, 12:19 PM
Alphare accepted this revision.Jun 22 2020, 10:46 AM

nit: "it's a wild used" -> "it's a wildly used" and "it can deal with bytes"... technically it deals with OS encoding. Which is good for our purposes, but is slightly different.

acezar marked an inline comment as done.Jun 24 2020, 9:04 AM
acezar edited the summary of this revision. (Show Details)
acezar updated this revision to Diff 21698.
Alphare requested changes to this revision.Jun 24 2020, 10:04 AM
Alphare added inline comments.
rust/rhg/tests/test_t.rs
4 ↗(On Diff #21698)

I didn't see this test in my first pass, but I don't think it should exist. It creates a dependency on Mercurial from pure-Rust code through hardcoded paths and serves very little purpose.

This revision now requires changes to proceed.Jun 24 2020, 10:04 AM
acezar updated this revision to Diff 21724.Jun 29 2020, 4:20 AM
Alphare accepted this revision.Jul 1 2020, 5:15 AM
acezar marked an inline comment as done.Jul 1 2020, 6:33 PM
acezar added a commit: rHG3707f6e7e04e: rhg: add a limited `rhg root` subcommand.
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3707f6e7e04e: rhg: add a limited `rhg root` subcommand (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/Cargo.lock (7 lines)
Mrust/rhg/Cargo.toml (1 line)
Mrust/rhg/src/main.rs (36 lines)
Mtests/run-tests.py (7 lines)
AMtests/test-rhg.t (16 lines)

Diff 21749

rust/Cargo.lock

dependencies = [ dependencies = [
"num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "clap" name = "clap"
version = "2.33.0" version = "2.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
version = "0.4.2" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "hg-core" name = "hg-core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"micro-timer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "micro-timer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
dependencies = [ dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hg-core 0.1.0", "hg-core 0.1.0",
] ]
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.2.3" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" "checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" "checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
"checksum colored 1.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" "checksum colored 1.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
"checksum cpython 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfaf3847ab963e40c4f6dd8d6be279bdf74007ae2413786a0dcbb28c52139a95" "checksum cpython 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfaf3847ab963e40c4f6dd8d6be279bdf74007ae2413786a0dcbb28c52139a95"
"checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" "checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
"checksum crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" "checksum crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" "checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" "checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" "checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"

rust/rhg/Cargo.toml

[package] [package]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
authors = ["Antoine Cezar <antoine.cezar@octobus.net>"] authors = ["Antoine Cezar <antoine.cezar@octobus.net>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
hg-core = { path = "../hg-core"} hg-core = { path = "../hg-core"}
clap = "2.33.1"

rust/rhg/src/main.rs

use clap::App;
use clap::AppSettings;
use clap::SubCommand;
mod commands; mod commands;
mod error; mod error;
mod exitcode; mod exitcode;
mod ui; mod ui;
use commands::Command;
fn main() { fn main() {
let mut app = App::new("rhg")
.setting(AppSettings::AllowInvalidUtf8)
.setting(AppSettings::SubcommandRequired)
.setting(AppSettings::VersionlessSubcommands)
AlphareUnsubmitted
Done

Clap will exit here with the help message and an error code. Use get_matches_safe to properly fall back to "UNIMPLEMENTED_COMMAND" if need be.

Alphare: Clap will exit here with the help message and an error code. Use `get_matches_safe` to properly…
.version("0.0.1")
.subcommand(
SubCommand::with_name("root").about(commands::root::HELP_TEXT),
);
let matches = app.clone().get_matches_safe().unwrap_or_else(|_| {
std::process::exit(exitcode::UNIMPLEMENTED_COMMAND) std::process::exit(exitcode::UNIMPLEMENTED_COMMAND)
});
let command_result = match matches.subcommand_name() {
Some(name) => match name {
"root" => commands::root::RootCommand::new().run(),
_ => std::process::exit(exitcode::UNIMPLEMENTED_COMMAND),
},
_ => {
match app.print_help() {
Ok(_) => std::process::exit(exitcode::OK),
Err(_) => std::process::exit(exitcode::ABORT),
};
}
};
match command_result {
Ok(_) => std::process::exit(exitcode::OK),
Err(e) => e.exit(),
}
} }

tests/run-tests.py

keeptmpdir=False, keeptmpdir=False,
debug=False, debug=False,
first=False, first=False,
timeout=None, timeout=None,
startport=None, startport=None,
extraconfigopts=None, extraconfigopts=None,
shell=None, shell=None,
hgcommand=None, hgcommand=None,
rhgcommand=None,
slowtimeout=None, slowtimeout=None,
usechg=False, usechg=False,
chgdebug=False, chgdebug=False,
useipv6=False, useipv6=False,
): ):
"""Create a test from parameters. """Create a test from parameters.
path is the full path to the file defining the test. path is the full path to the file defining the test.
self._debug = debug self._debug = debug
self._first = first self._first = first
self._timeout = timeout self._timeout = timeout
self._slowtimeout = slowtimeout self._slowtimeout = slowtimeout
self._startport = startport self._startport = startport
self._extraconfigopts = extraconfigopts or [] self._extraconfigopts = extraconfigopts or []
self._shell = _sys2bytes(shell) self._shell = _sys2bytes(shell)
self._hgcommand = hgcommand or b'hg' self._hgcommand = hgcommand or b'hg'
self._rhgcommand = rhgcommand or _sys2bytes(
os.path.abspath('./rust/target/release/rhg')
)
self._usechg = usechg self._usechg = usechg
self._chgdebug = chgdebug self._chgdebug = chgdebug
self._useipv6 = useipv6 self._useipv6 = useipv6
self._aborted = False self._aborted = False
self._daemonpids = [] self._daemonpids = []
self._finished = None self._finished = None
self._ret = None self._ret = None
# We keep track of whether or not we're in a Python block so we # We keep track of whether or not we're in a Python block so we
# can generate the surrounding doctest magic. # can generate the surrounding doctest magic.
inpython = False inpython = False
if self._debug: if self._debug:
script.append(b'set -x\n') script.append(b'set -x\n')
if self._hgcommand != b'hg': if self._hgcommand != b'hg':
script.append(b'alias hg="%s"\n' % self._hgcommand) script.append(b'alias hg="%s"\n' % self._hgcommand)
if self._rhgcommand != b'rhg':
script.append(b'alias rhg="%s"\n' % self._rhgcommand)
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
script.append(b'alias pwd="pwd -W"\n') script.append(b'alias pwd="pwd -W"\n')
if hgcatapult and hgcatapult != os.devnull: if hgcatapult and hgcatapult != os.devnull:
if PYTHON3: if PYTHON3:
hgcatapult = hgcatapult.encode('utf8') hgcatapult = hgcatapult.encode('utf8')
cataname = self.name.encode('utf8') cataname = self.name.encode('utf8')
else: else:
self._hgtmp = None self._hgtmp = None
self._installdir = None self._installdir = None
self._bindir = None self._bindir = None
self._tmpbinddir = None self._tmpbinddir = None
self._pythondir = None self._pythondir = None
self._coveragefile = None self._coveragefile = None
self._createdfiles = [] self._createdfiles = []
self._hgcommand = None self._hgcommand = None
self._rhgcommand = None
self._hgpath = None self._hgpath = None
self._portoffset = 0 self._portoffset = 0
self._ports = {} self._ports = {}
def run(self, args, parser=None): def run(self, args, parser=None):
"""Run the test suite.""" """Run the test suite."""
oldmask = os.umask(0o22) oldmask = os.umask(0o22)
try: try:

tests/test-rhg.t

  • This file was added.
$ rhg unimplemented-command
[252]
$ rhg root
abort: no repository found in '$TESTTMP' (.hg not found)!
[255]
$ hg init repository
$ cd repository
$ rhg root
$TESTTMP/repository
$ rhg root > /dev/full
abort: No space left on device (os error 28)
[255]
$ rm -rf $PWD
$ rhg root
abort: error getting current working directory: $ENOENT$
[255]