merge_tools: move "ui.diff-instructions" to CLI and config/misc.toml

There are no users of this option in jj-lib. Let's simplify it.
jj-vcs · Mar 2, 2024 · 5d62826 · 5d62826
1 parent ac47317
commit 5d62826
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/cli/src/config/misc.toml b/cli/src/config/misc.toml
@@ -5,6 +5,7 @@
 tree-level-conflicts = true
 
 [ui]
+diff-instructions = true
 paginate = "auto"
 pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
 log-word-wrap = false

diff --git a/cli/src/merge_tools/mod.rs b/cli/src/merge_tools/mod.rs
@@ -182,7 +182,7 @@ impl DiffEditor {
         Ok(DiffEditor {
             tool,
             base_ignores,
-            use_instructions: settings.diff_instructions(),
+            use_instructions: settings.config().get_bool("ui.diff-instructions")?,
         })
     }
 

diff --git a/lib/src/settings.rs b/lib/src/settings.rs
@@ -228,10 +228,6 @@ impl UserSettings {
             .unwrap_or(false)
     }
 
-    pub fn diff_instructions(&self) -> bool {
-        self.config.get_bool("ui.diff-instructions").unwrap_or(true)
-    }
-
     pub fn config(&self) -> &config::Config {
         &self.config
     }