# HG changeset patch
# User Simon Sapin <simon.sapin@octobus.net>
# Date 1636479577 -3600
# Node ID 3bd62274cbc9fec5033e3c6afc3c0691851d61f3
# Parent  5b986503253368479b5e447419075c009467bb59
rhg: Propagate config errors in `rhg status`

This code was calling `Result::unwrap_or` instead of `Option::unwrap_or`
as was presumably intended.

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

diff -r 5b9865032533 -r 3bd62274cbc9 rust/rhg/src/commands/status.rs
--- a/rust/rhg/src/commands/status.rs	Tue Nov 09 17:09:40 2021 +0100
+++ b/rust/rhg/src/commands/status.rs	Tue Nov 09 18:39:37 2021 +0100
@@ -138,12 +138,12 @@
     }
 
     // TODO: lift these limitations
-    if invocation.config.get_bool(b"ui", b"tweakdefaults").ok() == Some(true) {
+    if invocation.config.get_bool(b"ui", b"tweakdefaults")? {
         return Err(CommandError::unsupported(
             "ui.tweakdefaults is not yet supported with rhg status",
         ));
     }
-    if invocation.config.get_bool(b"ui", b"statuscopies").ok() == Some(true) {
+    if invocation.config.get_bool(b"ui", b"statuscopies")? {
         return Err(CommandError::unsupported(
             "ui.statuscopies is not yet supported with rhg status",
         ));
@@ -263,10 +263,9 @@
     status_prefix: &[u8],
 ) -> Result<(), CommandError> {
     paths.sort_unstable();
-    let mut relative: bool =
-        config.get_bool(b"ui", b"relative-paths").unwrap_or(false);
+    let mut relative: bool = config.get_bool(b"ui", b"relative-paths")?;
     relative = config
-        .get_bool(b"commands", b"status.relative")
+        .get_option(b"commands", b"status.relative")?
         .unwrap_or(relative);
     if relative && !ui.plain() {
         relativize_paths(