changeset 47406:3237ed4dcda4

rhg: split non_repo_config and `--config` loading in different functions

This will help us in better handling of error caused when trying to
load `--config` values.

Differential Revision: https://phab.mercurial-scm.org/D10837

--- a/rust/hg-core/src/config/config.rs	Mon May 24 16:27:54 2021 +0530
+++ b/rust/hg-core/src/config/config.rs	Mon Jun 07 17:19:46 2021 +0530
@@ -88,9 +88,7 @@
     /// Load system and user configuration from various files.
     ///
     /// This is also affected by some environment variables.
-    pub fn load(
-        cli_config_args: impl IntoIterator<Item = impl AsRef<[u8]>>,
-    ) -> Result<Self, ConfigError> {
+    pub fn load_non_repo() -> Result<Self, ConfigError> {
         let mut config = Self { layers: Vec::new() };
         let opt_rc_path = env::var_os("HGRCPATH");
         // HGRCPATH replaces system config
@@ -133,10 +131,17 @@
                 }
             }
         }
+        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)? {
-            config.layers.push(layer)
+            self.layers.push(layer)
         }
-        Ok(config)
+        Ok(())
     }
 
     fn add_trusted_dir(&mut self, path: &Path) -> Result<(), ConfigError> {

--- a/rust/rhg/src/main.rs	Mon May 24 16:27:54 2021 +0530
+++ b/rust/rhg/src/main.rs	Mon Jun 07 17:19:46 2021 +0530
@@ -126,8 +126,8 @@
             })
     });
 
-    let non_repo_config =
-        Config::load(early_args.config).unwrap_or_else(|error| {
+    let mut non_repo_config =
+        Config::load_non_repo().unwrap_or_else(|error| {
             // Normally this is decided based on config, but we don’t have that
             // available. As of this writing config loading never returns an
             // "unsupported" error but that is not enforced by the type system.
@@ -142,6 +142,20 @@
             )
         });
 
+    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 {
         lazy_static::lazy_static! {
             static ref SCHEME_RE: regex::bytes::Regex =