mercurial-scm/hg: rust/rhg/src/error.rs annotate

annotate rust/rhg/src/error.rs @ 49149:006688e36e12 stable

rhg: use `Command::exec` instead of `Command::status` `rhg` is supposed to be a transparent executable, using a subprocess defeats that purpose. See inline comments for more details. This also introduces the `which` crate to check if the fallback executable actually exists to help debugging (plain `execve` doesn't give much information). The error code 253 is used to signify that the fallback is not found, but may mean in the future that it is otherwise invalid if we start being more specific. Differential Revision: https://phab.mercurial-scm.org/D12578

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Tue, 19 Apr 2022 12:27:40 +0200
parents	ff97e793ed36
children	3f86ee422095

rev	line source
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	1 use crate::ui::utf8_to_local;
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	2 use crate::ui::UiError;
46593 5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	3 use crate::NoRepoInCwdError;
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	4 use format_bytes::format_bytes;
46797 bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	5 use hg::config::{ConfigError, ConfigParseError, ConfigValueParseError};
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	6 use hg::dirstate_tree::on_disk::DirstateV2ParseError;
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	7 use hg::errors::HgError;
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	8 use hg::exit_codes;
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	9 use hg::repo::RepoError;
46437 b274aa2f20fd rust: remove three enums that were identical to `RevlogError` Simon Sapin <simon.sapin@octobus.net> parents: 46436 diff changeset	10 use hg::revlog::revlog::RevlogError;
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	11 use hg::utils::files::get_bytes_from_path;
46797 bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	12 use hg::{DirstateError, DirstateMapError, StatusError};
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	13 use std::convert::From;
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	14
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	15 /// The kind of command error
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	16 #[derive(Debug)]
46434 3e2d539d0d1a rust: remove `FooError` structs with only `kind: FooErrorKind` enum field Simon Sapin <simon.sapin@octobus.net> parents: 45984 diff changeset	17 pub enum CommandError {
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	18 /// Exit with an error message and "standard" failure exit code.
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	19 Abort {
821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	20 message: Vec<u8>,
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	21 detailed_exit_code: exit_codes::ExitCode,
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	22 },
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	23
46744 b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46735 diff changeset	24 /// Exit with a failure exit code but no message.
b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46735 diff changeset	25 Unsuccessful,
b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46735 diff changeset	26
46666 33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	27 /// Encountered something (such as a CLI argument, repository layout, …)
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	28 /// not supported by this version of `rhg`. Depending on configuration
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	29 /// `rhg` may attempt to silently fall back to Python-based `hg`, which
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	30 /// may or may not support this feature.
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	31 UnsupportedFeature { message: Vec<u8> },
49149 006688e36e12 rhg: use `Command::exec` instead of `Command::status` Rapha?l Gom?s <rgomes@octobus.net> parents: 47674 diff changeset	32 /// The fallback executable does not exist (or has some other problem if
006688e36e12 rhg: use `Command::exec` instead of `Command::status` Rapha?l Gom?s <rgomes@octobus.net> parents: 47674 diff changeset	33 /// we end up being more precise about broken fallbacks).
006688e36e12 rhg: use `Command::exec` instead of `Command::status` Rapha?l Gom?s <rgomes@octobus.net> parents: 47674 diff changeset	34 InvalidFallback { path: Vec<u8>, err: String },
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	35 }
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	36
46434 3e2d539d0d1a rust: remove `FooError` structs with only `kind: FooErrorKind` enum field Simon Sapin <simon.sapin@octobus.net> parents: 45984 diff changeset	37 impl CommandError {
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	38 pub fn abort(message: impl AsRef<str>) -> Self {
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	39 CommandError::abort_with_exit_code(message, exit_codes::ABORT)
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	40 }
821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	41
821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	42 pub fn abort_with_exit_code(
821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	43 message: impl AsRef<str>,
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	44 detailed_exit_code: exit_codes::ExitCode,
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	45 ) -> Self {
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	46 CommandError::Abort {
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	47 // TODO: bytes-based (instead of Unicode-based) formatting
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	48 // of error messages to handle non-UTF-8 filenames etc:
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	49 // https://www.mercurial-scm.org/wiki/EncodingStrategy#Mixing_output
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	50 message: utf8_to_local(message.as_ref()).into(),
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	51 detailed_exit_code: detailed_exit_code,
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	52 }
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	53 }
46666 33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	54
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	55 pub fn unsupported(message: impl AsRef<str>) -> Self {
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	56 CommandError::UnsupportedFeature {
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	57 message: utf8_to_local(message.as_ref()).into(),
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	58 }
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	59 }
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	60 }
45361 47997afadf08 rhg: ask the error message from `CommandError` Antoine Cezar <antoine.cezar@octobus.net> parents: 45360 diff changeset	61
46591 21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	62 /// For now we don’t differenciate between invalid CLI args and valid for `hg`
21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	63 /// but not supported yet by `rhg`.
21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	64 impl From<clap::Error> for CommandError {
46666 33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	65 fn from(error: clap::Error) -> Self {
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	66 CommandError::unsupported(error.to_string())
46591 21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	67 }
21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	68 }
21d3b40b4c0e rhg: Remove error message on unsupported CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46503 diff changeset	69
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	70 impl From<HgError> for CommandError {
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	71 fn from(error: HgError) -> Self {
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	72 match error {
46666 33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	73 HgError::UnsupportedFeature(message) => {
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	74 CommandError::unsupported(message)
33f2d56acc73 rhg: Add a `rhg.on-unsupported` configuration key Simon Sapin <simon.sapin@octobus.net> parents: 46593 diff changeset	75 }
47408 7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	76 HgError::Abort {
7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	77 message,
7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	78 detailed_exit_code,
7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	79 } => {
7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	80 CommandError::abort_with_exit_code(message, detailed_exit_code)
7954ee2d7cf7 rhg: propogate error coming from HgError::Abort to CommandError Pulkit Goyal <7895pulkit@gmail.com> parents: 47407 diff changeset	81 }
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	82 _ => CommandError::abort(error.to_string()),
45361 47997afadf08 rhg: ask the error message from `CommandError` Antoine Cezar <antoine.cezar@octobus.net> parents: 45360 diff changeset	83 }
47997afadf08 rhg: ask the error message from `CommandError` Antoine Cezar <antoine.cezar@octobus.net> parents: 45360 diff changeset	84 }
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	85 }
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	86
46797 bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	87 impl From<ConfigValueParseError> for CommandError {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	88 fn from(error: ConfigValueParseError) -> Self {
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	89 CommandError::abort_with_exit_code(
821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	90 error.to_string(),
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	91 exit_codes::CONFIG_ERROR_ABORT,
46820 821929d59e01 rhg: add support for detailed exit code for ConfigParseError Pulkit Goyal <7895pulkit@gmail.com> parents: 46797 diff changeset	92 )
46797 bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	93 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	94 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	95
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	96 impl From<UiError> for CommandError {
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	97 fn from(_error: UiError) -> Self {
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	98 // If we already failed writing to stdout or stderr,
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	99 // writing an error message to stderr about it would be likely to fail
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	100 // too.
ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	101 CommandError::abort("")
45049 513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	102 }
513b3ef277a3 rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root` Antoine Cezar <antoine.cezar@octobus.net> parents: 44982 diff changeset	103 }
45363 5dbf875b3275 rhg: simplify `FindRootError` handling Antoine Cezar <antoine.cezar@octobus.net> parents: 45361 diff changeset	104
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	105 impl From<RepoError> for CommandError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	106 fn from(error: RepoError) -> Self {
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	107 match error {
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46499 diff changeset	108 RepoError::NotFound { at } => CommandError::Abort {
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	109 message: format_bytes!(
46735 12d59eec7f1d rhg: Align with Python on some more error messages Simon Sapin <simon.sapin@octobus.net> parents: 46731 diff changeset	110 b"abort: repository {} not found",
46503 d8730ff51d5a rhg: Add support for -R and --repository command-line arguments Simon Sapin <simon.sapin@octobus.net> parents: 46499 diff changeset	111 get_bytes_from_path(at)
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	112 ),
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	113 detailed_exit_code: exit_codes::ABORT,
46446 1dcd9c9975ed rust: Fold find_root and check_requirements into Repo::find Simon Sapin <simon.sapin@octobus.net> parents: 46445 diff changeset	114 },
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	115 RepoError::ConfigParseError(error) => error.into(),
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	116 RepoError::Other(error) => error.into(),
45363 5dbf875b3275 rhg: simplify `FindRootError` handling Antoine Cezar <antoine.cezar@octobus.net> parents: 45361 diff changeset	117 }
5dbf875b3275 rhg: simplify `FindRootError` handling Antoine Cezar <antoine.cezar@octobus.net> parents: 45361 diff changeset	118 }
5dbf875b3275 rhg: simplify `FindRootError` handling Antoine Cezar <antoine.cezar@octobus.net> parents: 45361 diff changeset	119 }
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	120
46593 5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	121 impl<'a> From<&'a NoRepoInCwdError> for CommandError {
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	122 fn from(error: &'a NoRepoInCwdError) -> Self {
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	123 let NoRepoInCwdError { cwd } = error;
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	124 CommandError::Abort {
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	125 message: format_bytes!(
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	126 b"abort: no repository found in '{}' (.hg not found)!",
46593 5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	127 get_bytes_from_path(cwd)
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	128 ),
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	129 detailed_exit_code: exit_codes::ABORT,
46593 5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	130 }
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	131 }
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	132 }
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()` Simon Sapin <simon.sapin@octobus.net> parents: 46591 diff changeset	133
46484 a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	134 impl From<ConfigError> for CommandError {
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	135 fn from(error: ConfigError) -> Self {
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	136 match error {
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	137 ConfigError::Parse(error) => error.into(),
46484 a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	138 ConfigError::Other(error) => error.into(),
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	139 }
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	140 }
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	141 }
a6e4e4650bac rhg: Parse system and user configuration at program start Simon Sapin <simon.sapin@octobus.net> parents: 46446 diff changeset	142
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	143 impl From<ConfigParseError> for CommandError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	144 fn from(error: ConfigParseError) -> Self {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	145 let ConfigParseError {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	146 origin,
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	147 line,
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	148 message,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	149 } = error;
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	150 let line_message = if let Some(line_number) = line {
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	151 format_bytes!(b":{}", line_number.to_string().into_bytes())
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	152 } else {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	153 Vec::new()
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	154 };
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	155 CommandError::Abort {
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	156 message: format_bytes!(
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	157 b"config error at {}{}: {}",
46499 eace48b4a786 rust: Use the DisplayBytes trait in config printing Simon Sapin <simon.sapin@octobus.net> parents: 46486 diff changeset	158 origin,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	159 line_message,
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	160 message
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	161 ),
47407 6e49769b7f97 rhg: add exit code to HgError::Abort() Pulkit Goyal <7895pulkit@gmail.com> parents: 46821 diff changeset	162 detailed_exit_code: exit_codes::CONFIG_ERROR_ABORT,
46486 d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	163 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	164 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	165 }
d7685105e504 rhg: Parse per-repository configuration Simon Sapin <simon.sapin@octobus.net> parents: 46484 diff changeset	166
46437 b274aa2f20fd rust: remove three enums that were identical to `RevlogError` Simon Sapin <simon.sapin@octobus.net> parents: 46436 diff changeset	167 impl From<(RevlogError, &str)> for CommandError {
b274aa2f20fd rust: remove three enums that were identical to `RevlogError` Simon Sapin <simon.sapin@octobus.net> parents: 46436 diff changeset	168 fn from((err, rev): (RevlogError, &str)) -> CommandError {
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	169 match err {
46821 e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46820 diff changeset	170 RevlogError::WDirUnsupported => CommandError::abort(
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46820 diff changeset	171 "abort: working directory revision cannot be specified",
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46820 diff changeset	172 ),
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	173 RevlogError::InvalidRevision => CommandError::abort(format!(
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	174 "abort: invalid revision identifier: {}",
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	175 rev
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	176 )),
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	177 RevlogError::AmbiguousPrefix => CommandError::abort(format!(
46731 3d692e724d06 rhg: Align config file parse error formatting with Python Simon Sapin <simon.sapin@octobus.net> parents: 46666 diff changeset	178 "abort: ambiguous revision identifier: {}",
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	179 rev
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	180 )),
46445 ca3f73cc3cf4 rhg: Simplify CommandError based on its use Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	181 RevlogError::Other(error) => error.into(),
46436 252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	182 }
252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	183 }
252d1bdba33d rhg: replace `map__error` functions with `From` impls Simon Sapin <simon.sapin@octobus.net>* parents: 46435 diff changeset	184 }
46797 bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	185
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	186 impl From<StatusError> for CommandError {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	187 fn from(error: StatusError) -> Self {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	188 CommandError::abort(format!("{}", error))
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	189 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	190 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	191
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	192 impl From<DirstateMapError> for CommandError {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	193 fn from(error: DirstateMapError) -> Self {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	194 CommandError::abort(format!("{}", error))
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	195 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	196 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	197
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	198 impl From<DirstateError> for CommandError {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	199 fn from(error: DirstateError) -> Self {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	200 match error {
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	201 DirstateError::Common(error) => error.into(),
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	202 DirstateError::Map(error) => error.into(),
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	203 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	204 }
bcdcb4423ae3 rhg: Add more conversions between error types Simon Sapin <simon.sapin@octobus.net> parents: 46744 diff changeset	205 }
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	206
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	207 impl From<DirstateV2ParseError> for CommandError {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	208 fn from(error: DirstateV2ParseError) -> Self {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	209 HgError::from(error).into()
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	210 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47408 diff changeset	211 }

Mercurial > public > mercurial-scm > hg

annotate rust/rhg/src/error.rs @ 49149:006688e36e12 stable