( )⚙ D10101 rhg: Fall back to Python on --repository with an URL

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10101

rhg: Fall back to Python on --repository with an URL
ClosedPublic

Authored by SimonSapin on Mar 3 2021, 1:24 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG6cd9f53aaed8: rhg: Fall back to Python on --repository with an URL
Summary

A low-hanging fruit to improve on this would be to properly parse
and handle file: URLs. But other Python-based hg supports
some other URL schemes for features that rhg does not support yet.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

SimonSapin created this revision.Mar 3 2021, 1:24 PM
baymax updated this revision to Diff 26075.Mar 4 2021, 8:00 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare added a subscriber: Alphare.Mar 5 2021, 4:00 AM

Maybe I'm trying too hard, but is looking for : in the repo bytes too wide to detect an URL? I know actual URL parsing is out of the question right now, but maybe we can do a little bit more since : is allowed in filenames on many platforms. What do you think?

SimonSapin updated this revision to Diff 26168.Mar 9 2021, 4:39 AM
SimonSapin added a comment.Mar 9 2021, 8:04 AM

I’ve switched to using a regex that the Python code uses to find an URL’s "scheme".

baymax updated this revision to Diff 26186.Mar 9 2021, 8:39 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute accepted this revision.Mar 9 2021, 1:06 PM
SimonSapin edited the summary of this revision. (Show Details)Mar 12 2021, 5:06 PM
SimonSapin updated this revision to Diff 26288.
SimonSapin added a commit: rHG6cd9f53aaed8: rhg: Fall back to Python on --repository with an URL.Mar 16 2021, 5:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6cd9f53aaed8: rhg: Fall back to Python on --repository with an URL (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/Cargo.lock (2 lines)
Mrust/rhg/Cargo.toml (2 lines)
Mrust/rhg/src/main.rs (19 lines)

Diff 26288

rust/Cargo.lock

version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
"derive_more", "derive_more",
"env_logger", "env_logger",
"format-bytes", "format-bytes",
"hg-core", "hg-core",
"lazy_static",
"log", "log",
"micro-timer", "micro-timer",
"regex",
"users", "users",
] ]
[[package]] [[package]]
name = "rust-crypto" name = "rust-crypto"
version = "0.2.36" version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"

rust/rhg/Cargo.toml

[package] [package]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
authors = [ authors = [
"Antoine Cezar <antoine.cezar@octobus.net>", "Antoine Cezar <antoine.cezar@octobus.net>",
"Raphaël Gomès <raphael.gomes@octobus.net>", "Raphaël Gomès <raphael.gomes@octobus.net>",
] ]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
hg-core = { path = "../hg-core"} hg-core = { path = "../hg-core"}
chrono = "0.4.19" chrono = "0.4.19"
clap = "2.33.1" clap = "2.33.1"
derive_more = "0.99" derive_more = "0.99"
lazy_static = "1.4.0"
log = "0.4.11" log = "0.4.11"
micro-timer = "0.3.1" micro-timer = "0.3.1"
regex = "1.3.9"
env_logger = "0.7.1" env_logger = "0.7.1"
format-bytes = "0.2.0" format-bytes = "0.2.0"
users = "0.11.0" users = "0.11.0"

rust/rhg/src/main.rs

// Normally this is decided based on config, but we don’t have that // Normally this is decided based on config, but we don’t have that
// available. As of this writing config loading never returns an // available. As of this writing config loading never returns an
// "unsupported" error but that is not enforced by the type system. // "unsupported" error but that is not enforced by the type system.
let on_unsupported = OnUnsupported::Abort; let on_unsupported = OnUnsupported::Abort;
exit(&ui, on_unsupported, Err(error.into())) exit(&ui, on_unsupported, Err(error.into()))
}); });
if let Some(repo_path_bytes) = &early_args.repo {
lazy_static::lazy_static! {
static ref SCHEME_RE: regex::bytes::Regex =
// Same as `_matchscheme` in `mercurial/util.py`
regex::bytes::Regex::new("^[a-zA-Z0-9+.\\-]+:").unwrap();
}
if SCHEME_RE.is_match(&repo_path_bytes) {
exit(
&ui,
OnUnsupported::from_config(&non_repo_config),
Err(CommandError::UnsupportedFeature {
message: format_bytes!(
b"URL-like --repository {}",
repo_path_bytes
),
}),
)
}
}
let repo_path = early_args.repo.as_deref().map(get_path_from_bytes); let repo_path = early_args.repo.as_deref().map(get_path_from_bytes);
let repo_result = match Repo::find(&non_repo_config, repo_path) { let repo_result = match Repo::find(&non_repo_config, repo_path) {
Ok(repo) => Ok(repo), Ok(repo) => Ok(repo),
Err(RepoError::NotFound { at }) if repo_path.is_none() => { Err(RepoError::NotFound { at }) if repo_path.is_none() => {
// Not finding a repo is not fatal yet, if `-R` was not given // Not finding a repo is not fatal yet, if `-R` was not given
Err(NoRepoInCwdError { cwd: at }) Err(NoRepoInCwdError { cwd: at })
} }
Err(error) => exit( Err(error) => exit(