This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9972

rhg: add limited support for the `config` sub-command
ClosedPublic

Authored by SimonSapin on Feb 8 2021, 5:44 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa25033eb43b5: rhg: add limited support for the `config` sub-command
rHGfb0ad038811d: rhg: add limited support for the `config` sub-command
Summary

Only with one argument and no flag. This is mostly for testing.

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

SimonSapin created this revision.Feb 8 2021, 5:44 PM
Alphare added a subscriber: Alphare.Feb 9 2021, 4:33 AM

It looks like you've recorded copy information about rust/rhg/src/commands/root.rs and rust/rhg/src/commands/config.rs. Was that on purpose?

rust/hg-core/src/utils.rs
121

I was going to suggest putting this here in the previous patch. :)

SimonSapin added a comment.Feb 9 2021, 1:44 PM

Yes, when typing that hg cp command I thought that this copy record isn’t wrong since that’s indeed how the new file started. Is there a reason to prefer *not* having that recorded as a copy?

Alphare accepted this revision.Feb 9 2021, 3:36 PM
In D9972#151015, @SimonSapin wrote:

Yes, when typing that hg cp command I thought that this copy record isn’t wrong since that’s indeed how the new file started. Is there a reason to prefer *not* having that recorded as a copy?

No, I was simply wondering if maybe your IDE had done that for you behind your back (that has happened to me at first).

SimonSapin added a commit: rHGfb0ad038811d: rhg: add limited support for the `config` sub-command.Feb 11 2021, 11:37 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGfb0ad038811d: rhg: add limited support for the `config` sub-command (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/config/layer.rs (11 lines)
Mrust/hg-core/src/repo.rs (32 lines)
Mrust/hg-core/src/utils.rs (8 lines)
Prust/rhg/src/commands/config.rs (40 lines)
Copied from rust/rhg/src/commands/root.rs
Prust/rhg/src/commands/root.rs
Copied to rust/rhg/src/commands/config.rs
Mrust/rhg/src/main.rs (1 line)
Mtests/test-rhg.t (12 lines)

Diff 25563

rust/hg-core/src/config/layer.rs

/// Parse `--config` CLI arguments and return a layer if there’s any /// Parse `--config` CLI arguments and return a layer if there’s any
pub(crate) fn parse_cli_args( pub(crate) fn parse_cli_args(
cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>,
) -> Result<Option<Self>, ConfigError> { ) -> Result<Option<Self>, ConfigError> {
fn parse_one(arg: &[u8]) -> Option<(Vec<u8>, Vec<u8>, Vec<u8>)> { fn parse_one(arg: &[u8]) -> Option<(Vec<u8>, Vec<u8>, Vec<u8>)> {
use crate::utils::SliceExt; use crate::utils::SliceExt;
let (section_and_item, value) = split_2(arg, b'=')?; let (section_and_item, value) = arg.split_2(b'=')?;
let (section, item) = split_2(section_and_item.trim(), b'.')?; let (section, item) = section_and_item.trim().split_2(b'.')?;
Some(( Some((
section.to_owned(), section.to_owned(),
item.to_owned(), item.to_owned(),
value.trim().to_owned(), value.trim().to_owned(),
)) ))
} }
fn split_2(bytes: &[u8], separator: u8) -> Option<(&[u8], &[u8])> {
let mut iter = bytes.splitn(2, |&byte| byte == separator);
let a = iter.next()?;
let b = iter.next()?;
Some((a, b))
}
let mut layer = Self::new(ConfigOrigin::CommandLine); let mut layer = Self::new(ConfigOrigin::CommandLine);
for arg in cli_config_args { for arg in cli_config_args {
let arg = arg.as_ref(); let arg = arg.as_ref();
if let Some((section, item, value)) = parse_one(arg) { if let Some((section, item, value)) = parse_one(arg) {
layer.add(section, item, value, None); layer.add(section, item, value, None);
} else { } else {
Err(HgError::abort(format!( Err(HgError::abort(format!(
"malformed --config option: \"{}\" \ "malformed --config option: \"{}\" \

rust/hg-core/src/repo.rs

/// Filesystem access abstraction for the contents of a given "base" diretory /// Filesystem access abstraction for the contents of a given "base" diretory
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub(crate) struct Vfs<'a> { pub(crate) struct Vfs<'a> {
base: &'a Path, base: &'a Path,
} }
impl Repo { impl Repo {
/// Search the current directory and its ancestores for a repository: /// Find a repository, either at the given path (which must contain a `.hg`
/// a working directory that contains a `.hg` sub-directory. /// sub-directory) or by searching the current directory and its
/// ancestors.
/// ///
/// `explicit_path` is for `--repository` command-line arguments. /// A method with two very different "modes" like this usually a code smell
/// to make two methods instead, but in this case an `Option` is what rhg
/// sub-commands get from Clap for the `-R` / `--repository` CLI argument.
/// Having two methods would just move that `if` to almost all callers.
pub fn find( pub fn find(
config: &Config, config: &Config,
explicit_path: Option<&Path>, explicit_path: Option<&Path>,
) -> Result<Self, RepoError> { ) -> Result<Self, RepoError> {
if let Some(root) = explicit_path { if let Some(root) = explicit_path {
// Having an absolute path isn’t necessary here but can help code // Having an absolute path isn’t necessary here but can help code
// elsewhere // elsewhere
let root = current_dir()?.join(root); let root = current_dir()?.join(root);
} }
} }
Err(RepoError::NotFound { Err(RepoError::NotFound {
at: current_directory, at: current_directory,
}) })
} }
} }
/// Like `Repo::find`, but not finding a repository is not an error if no
/// explicit path is given. `Ok(None)` is returned in that case.
///
/// If an explicit path *is* given, not finding a repository there is still
/// an error.
///
/// For sub-commands that don’t need a repository, configuration should
/// still be affected by a repository’s `.hg/hgrc` file. This is the
/// constructor to use.
pub fn find_optional(
config: &Config,
explicit_path: Option<&Path>,
) -> Result<Option<Self>, RepoError> {
match Self::find(config, explicit_path) {
Ok(repo) => Ok(Some(repo)),
Err(RepoError::NotFound { .. }) if explicit_path.is_none() => {
Ok(None)
}
Err(error) => Err(error),
}
}
/// To be called after checking that `.hg` is a sub-directory /// To be called after checking that `.hg` is a sub-directory
fn new_at_path( fn new_at_path(
working_directory: PathBuf, working_directory: PathBuf,
config: &Config, config: &Config,
) -> Result<Self, RepoError> { ) -> Result<Self, RepoError> {
let dot_hg = working_directory.join(".hg"); let dot_hg = working_directory.join(".hg");
let mut repo_config_files = Vec::new(); let mut repo_config_files = Vec::new();

rust/hg-core/src/utils.rs

} }
} }
pub trait SliceExt { pub trait SliceExt {
fn trim_end(&self) -> &Self; fn trim_end(&self) -> &Self;
fn trim_start(&self) -> &Self; fn trim_start(&self) -> &Self;
fn trim(&self) -> &Self; fn trim(&self) -> &Self;
fn drop_prefix(&self, needle: &Self) -> Option<&Self>; fn drop_prefix(&self, needle: &Self) -> Option<&Self>;
fn split_2(&self, separator: u8) -> Option<(&[u8], &[u8])>;
} }
#[allow(clippy::trivially_copy_pass_by_ref)] #[allow(clippy::trivially_copy_pass_by_ref)]
fn is_not_whitespace(c: &u8) -> bool { fn is_not_whitespace(c: &u8) -> bool {
!(*c as char).is_whitespace() !(*c as char).is_whitespace()
} }
impl SliceExt for [u8] { impl SliceExt for [u8] {
fn drop_prefix(&self, needle: &Self) -> Option<&Self> { fn drop_prefix(&self, needle: &Self) -> Option<&Self> {
if self.starts_with(needle) { if self.starts_with(needle) {
Some(&self[needle.len()..]) Some(&self[needle.len()..])
} else { } else {
None None
} }
} }
fn split_2(&self, separator: u8) -> Option<(&[u8], &[u8])> {
AlphareUnsubmitted
Not Done

I was going to suggest putting this here in the previous patch. :)

Alphare: I was going to suggest putting this here in the previous patch. :)
let mut iter = self.splitn(2, |&byte| byte == separator);
let a = iter.next()?;
let b = iter.next()?;
Some((a, b))
}
} }
pub trait Escaped { pub trait Escaped {
/// Return bytes escaped for display to the user /// Return bytes escaped for display to the user
fn escaped_bytes(&self) -> Vec<u8>; fn escaped_bytes(&self) -> Vec<u8>;
} }
impl Escaped for u8 { impl Escaped for u8 {

rust/rhg/src/commands/config.rs

  • This file was copied from rust/rhg/src/commands/root.rs.
use crate::error::CommandError; use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::Ui;
use clap::Arg;
use clap::ArgMatches; use clap::ArgMatches;
use format_bytes::format_bytes; use format_bytes::format_bytes;
use hg::config::Config; use hg::config::Config;
use hg::errors::HgError;
use hg::repo::Repo; use hg::repo::Repo;
use hg::utils::files::get_bytes_from_path; use hg::utils::SliceExt;
use std::path::Path; use std::path::Path;
pub const HELP_TEXT: &str = " pub const HELP_TEXT: &str = "
Print the root directory of the current repository. With one argument of the form section.name, print just the value of that config item.
Returns 0 on success.
"; ";
pub fn args() -> clap::App<'static, 'static> { pub fn args() -> clap::App<'static, 'static> {
clap::SubCommand::with_name("root").about(HELP_TEXT) clap::SubCommand::with_name("config")
.arg(
Arg::with_name("name")
.help("the section.name to print")
.value_name("NAME")
.required(true)
.takes_value(true),
)
.about(HELP_TEXT)
} }
pub fn run( pub fn run(
ui: &Ui, ui: &Ui,
config: &Config, config: &Config,
repo_path: Option<&Path>, repo_path: Option<&Path>,
_args: &ArgMatches, args: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let repo = Repo::find(config, repo_path)?; let opt_repo = Repo::find_optional(config, repo_path)?;
let bytes = get_bytes_from_path(repo.working_directory_path()); let config = if let Some(repo) = &opt_repo {
ui.write_stdout(&format_bytes!(b"{}\n", bytes.as_slice()))?; repo.config()
} else {
config
};
let (section, name) = args
.value_of("name")
.expect("missing required CLI argument")
.as_bytes()
.split_2(b'.')
.ok_or_else(|| HgError::abort(""))?;
let value = config.get(section, name).unwrap_or(b"");
ui.write_stdout(&format_bytes!(b"{}\n", value))?;
Ok(()) Ok(())
} }

rust/rhg/src/commands/root.rs

  • This file was copied to rust/rhg/src/commands/config.rs.

rust/rhg/src/main.rs

} }
subcommands! { subcommands! {
cat cat
debugdata debugdata
debugrequirements debugrequirements
files files
root root
config
} }

tests/test-rhg.t

abort: no repository found in '$TESTTMP' (.hg not found)! abort: no repository found in '$TESTTMP' (.hg not found)!
[255] [255]
$ hg init repository $ hg init repository
$ cd repository $ cd repository
$ rhg root $ rhg root
$TESTTMP/repository $TESTTMP/repository
Reading and setting configuration
$ echo "[ui]" >> $HGRCPATH
$ echo "username = user1" >> $HGRCPATH
$ rhg config ui.username
user1
$ echo "[ui]" >> .hg/hgrc
$ echo "username = user2" >> .hg/hgrc
$ rhg config ui.username
user2
$ rhg --config ui.username=user3 config ui.username
user3
Unwritable file descriptor Unwritable file descriptor
$ rhg root > /dev/full $ rhg root > /dev/full
abort: No space left on device (os error 28) abort: No space left on device (os error 28)
[255] [255]
Deleted repository Deleted repository
$ rm -rf `pwd` $ rm -rf `pwd`
$ rhg root $ rhg root