This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12165

rhg: Make Ui::new falliable, add Ui::new_infallible
ClosedPublic

Authored by SimonSapin on Feb 10 2022, 2:18 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf591b377375f: rhg: Make Ui::new falliable, add Ui::new_infallible
Summary

This allows propagating color configuration errors

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 10 2022, 2:18 PM
SimonSapin updated this revision to Diff 32144.Feb 11 2022, 6:42 AM
Alphare accepted this revision.Feb 12 2022, 6:21 PM
This revision is now accepted and ready to land.Feb 12 2022, 6:21 PM
SimonSapin added a commit: rHGf591b377375f: rhg: Make Ui::new falliable, add Ui::new_infallible.Feb 14 2022, 5:24 AM
Closed by commit rHGf591b377375f: rhg: Make Ui::new falliable, add Ui::new_infallible (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (22 lines)
Mrust/rhg/src/ui.rs (13 lines)

Diff 32157

rust/rhg/src/main.rs

std::env::current_dir() std::env::current_dir()
.and_then(|initial| { .and_then(|initial| {
std::env::set_current_dir(cwd)?; std::env::set_current_dir(cwd)?;
Ok(initial) Ok(initial)
}) })
.unwrap_or_else(|error| { .unwrap_or_else(|error| {
exit( exit(
&None, &None,
&Ui::new(&Config::empty()), &Ui::new_infallible(&Config::empty()),
OnUnsupported::Abort, OnUnsupported::Abort,
Err(CommandError::abort(format!( Err(CommandError::abort(format!(
"abort: {}: '{}'", "abort: {}: '{}'",
error, error,
cwd.display() cwd.display()
))), ))),
false, false,
) )
}) })
}); });
let mut non_repo_config = let mut non_repo_config =
Config::load_non_repo().unwrap_or_else(|error| { Config::load_non_repo().unwrap_or_else(|error| {
// 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( exit(
&initial_current_dir, &initial_current_dir,
&Ui::new(&Config::empty()), &Ui::new_infallible(&Config::empty()),
on_unsupported, on_unsupported,
Err(error.into()), Err(error.into()),
false, false,
) )
}); });
non_repo_config non_repo_config
.load_cli_args_config(early_args.config) .load_cli_args_config(early_args.config)
.unwrap_or_else(|error| { .unwrap_or_else(|error| {
exit( exit(
&initial_current_dir, &initial_current_dir,
&Ui::new(&non_repo_config), &Ui::new_infallible(&non_repo_config),
OnUnsupported::from_config(&non_repo_config), OnUnsupported::from_config(&non_repo_config),
Err(error.into()), Err(error.into()),
non_repo_config non_repo_config
.get_bool(b"ui", b"detailed-exit-code") .get_bool(b"ui", b"detailed-exit-code")
.unwrap_or(false), .unwrap_or(false),
) )
}); });
if let Some(repo_path_bytes) = &early_args.repo { if let Some(repo_path_bytes) = &early_args.repo {
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref SCHEME_RE: regex::bytes::Regex = static ref SCHEME_RE: regex::bytes::Regex =
// Same as `_matchscheme` in `mercurial/util.py` // Same as `_matchscheme` in `mercurial/util.py`
regex::bytes::Regex::new("^[a-zA-Z0-9+.\\-]+:").unwrap(); regex::bytes::Regex::new("^[a-zA-Z0-9+.\\-]+:").unwrap();
} }
if SCHEME_RE.is_match(&repo_path_bytes) { if SCHEME_RE.is_match(&repo_path_bytes) {
exit( exit(
&initial_current_dir, &initial_current_dir,
&Ui::new(&non_repo_config), &Ui::new_infallible(&non_repo_config),
OnUnsupported::from_config(&non_repo_config), OnUnsupported::from_config(&non_repo_config),
Err(CommandError::UnsupportedFeature { Err(CommandError::UnsupportedFeature {
message: format_bytes!( message: format_bytes!(
b"URL-like --repository {}", b"URL-like --repository {}",
repo_path_bytes repo_path_bytes
), ),
}), }),
// TODO: show a warning or combine with original error if // TODO: show a warning or combine with original error if
{ {
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(
&initial_current_dir, &initial_current_dir,
&Ui::new(&non_repo_config), &Ui::new_infallible(&non_repo_config),
OnUnsupported::from_config(&non_repo_config), OnUnsupported::from_config(&non_repo_config),
Err(error.into()), Err(error.into()),
// TODO: show a warning or combine with original error if // TODO: show a warning or combine with original error if
// `get_bool` returns an error // `get_bool` returns an error
non_repo_config non_repo_config
.get_bool(b"ui", b"detailed-exit-code") .get_bool(b"ui", b"detailed-exit-code")
.unwrap_or(false), .unwrap_or(false),
), ),
}; };
let config = if let Ok(repo) = &repo_result { let config = if let Ok(repo) = &repo_result {
repo.config() repo.config()
} else { } else {
&non_repo_config &non_repo_config
}; };
let ui = Ui::new(&config); let ui = Ui::new(&config).unwrap_or_else(|error| {
exit(
&initial_current_dir,
&Ui::new_infallible(&config),
OnUnsupported::from_config(&config),
Err(error.into()),
config
.get_bool(b"ui", b"detailed-exit-code")
.unwrap_or(false),
)
});
let on_unsupported = OnUnsupported::from_config(config); let on_unsupported = OnUnsupported::from_config(config);
let result = main_with_result( let result = main_with_result(
&process_start_time, &process_start_time,
&ui, &ui,
repo_result.as_ref(), repo_result.as_ref(),
config, config,
); );

rust/rhg/src/ui.rs

use format_bytes::format_bytes; use format_bytes::format_bytes;
use hg::config::Config; use hg::config::Config;
use hg::errors::HgError;
use hg::utils::files::get_bytes_from_os_string; use hg::utils::files::get_bytes_from_os_string;
use std::borrow::Cow; use std::borrow::Cow;
use std::env; use std::env;
use std::io; use std::io;
use std::io::{ErrorKind, Write}; use std::io::{ErrorKind, Write};
#[derive(Debug)] #[derive(Debug)]
pub struct Ui { pub struct Ui {
stdout: std::io::Stdout, stdout: std::io::Stdout,
stderr: std::io::Stderr, stderr: std::io::Stderr,
} }
/// The kind of user interface error /// The kind of user interface error
pub enum UiError { pub enum UiError {
/// The standard output stream cannot be written to /// The standard output stream cannot be written to
StdoutError(io::Error), StdoutError(io::Error),
/// The standard error stream cannot be written to /// The standard error stream cannot be written to
StderrError(io::Error), StderrError(io::Error),
} }
/// The commandline user interface /// The commandline user interface
impl Ui { impl Ui {
pub fn new(_config: &Config) -> Self { pub fn new(_config: &Config) -> Result<Self, HgError> {
Ok(Ui {
stdout: std::io::stdout(),
stderr: std::io::stderr(),
})
}
/// Default to no color if color configuration errors.
///
/// Useful when we’re already handling another error.
pub fn new_infallible(_config: &Config) -> Self {
Ui { Ui {
stdout: std::io::stdout(), stdout: std::io::stdout(),
stderr: std::io::stderr(), stderr: std::io::stderr(),
} }
} }
/// Returns a buffered handle on stdout for faster batch printing /// Returns a buffered handle on stdout for faster batch printing
/// operations. /// operations.