| SimonSapin | |
| Alphare |
| hg-reviewers |
This will help us in better handling of error caused when trying to
load --config values.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/config/config.rs (15 lines) | |||
| M | rust/rhg/src/main.rs (18 lines) |
| ) | ) | ||||
| } | } | ||||
| } | } | ||||
| impl Config { | impl Config { | ||||
| /// Load system and user configuration from various files. | /// Load system and user configuration from various files. | ||||
| /// | /// | ||||
| /// This is also affected by some environment variables. | /// This is also affected by some environment variables. | ||||
| pub fn load( | pub fn load_non_repo() -> Result<Self, ConfigError> { | ||||
| cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, | |||||
| ) -> Result<Self, ConfigError> { | |||||
| let mut config = Self { layers: Vec::new() }; | let mut config = Self { layers: Vec::new() }; | ||||
| let opt_rc_path = env::var_os("HGRCPATH"); | let opt_rc_path = env::var_os("HGRCPATH"); | ||||
| // HGRCPATH replaces system config | // HGRCPATH replaces system config | ||||
| if opt_rc_path.is_none() { | if opt_rc_path.is_none() { | ||||
| config.add_system_config()? | config.add_system_config()? | ||||
| } | } | ||||
| config.add_for_environment_variable("EDITOR", b"ui", b"editor"); | config.add_for_environment_variable("EDITOR", b"ui", b"editor"); | ||||
| if path.is_dir() { | if path.is_dir() { | ||||
| config.add_trusted_dir(&path)? | config.add_trusted_dir(&path)? | ||||
| } else { | } else { | ||||
| config.add_trusted_file(&path)? | config.add_trusted_file(&path)? | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Ok(config) | |||||
| } | |||||
| pub fn load_cli_args_config( | |||||
| &mut self, | |||||
| cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>, | |||||
| ) -> Result<(), ConfigError> { | |||||
| if let Some(layer) = ConfigLayer::parse_cli_args(cli_config_args)? { | if let Some(layer) = ConfigLayer::parse_cli_args(cli_config_args)? { | ||||
| config.layers.push(layer) | self.layers.push(layer) | ||||
| } | } | ||||
| Ok(config) | Ok(()) | ||||
| } | } | ||||
| fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> { | fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> { | ||||
| if let Some(entries) = std::fs::read_dir(path) | if let Some(entries) = std::fs::read_dir(path) | ||||
| .when_reading_file(path) | .when_reading_file(path) | ||||
| .io_not_found_as_none()? | .io_not_found_as_none()? | ||||
| { | { | ||||
| let mut file_paths = entries | let mut file_paths = entries | ||||
| error, | error, | ||||
| cwd.display() | cwd.display() | ||||
| ))), | ))), | ||||
| false, | false, | ||||
| ) | ) | ||||
| }) | }) | ||||
| }); | }); | ||||
| let non_repo_config = | let mut non_repo_config = | ||||
| Config::load(early_args.config).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, | &ui, | ||||
| on_unsupported, | on_unsupported, | ||||
| Err(error.into()), | Err(error.into()), | ||||
| false, | false, | ||||
| ) | ) | ||||
| }); | }); | ||||
| non_repo_config | |||||
| .load_cli_args_config(early_args.config) | |||||
| .unwrap_or_else(|error| { | |||||
| exit( | |||||
| &initial_current_dir, | |||||
| &ui, | |||||
| OnUnsupported::from_config(&ui, &non_repo_config), | |||||
| Err(error.into()), | |||||
| non_repo_config | |||||
| .get_bool(b"ui", b"detailed-exit-code") | |||||
| .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( | ||||