config: Allow hiding the 'how to resolve conflicts' hint

This only deals with a single hint for now to resolve any discussions
around naming and approach.

CHANGELOG.md

···
 
 ### New features
 
+* The 'how to resolve conflicts' hint that is shown when conflicts appear can
+  be hidden by setting `hints.resolving-conflicts = false`.
+
 ### Fixed bugs
 
 ## [0.27.0] - 2025-03-05

cli/src/cli_util.rs

···
         repo: &ReadonlyRepo,
         conflicted_commits: Vec<CommitId>,
     ) -> Result<(), CommandError> {
+        if !self.settings().get_bool("hints.resolving-conflicts")? {
+            return Ok(());
+        }
+
         let only_one_conflicted_commit = conflicted_commits.len() == 1;
         let root_conflicts_revset = RevsetExpression::commits(conflicted_commits)
             .roots()

cli/src/config-schema.json

···
                     "default": false
                 }
             }
+        },
+        "hints": {
+            "type": "object",
+            "description": "Various hints in jj's UI that can be disabled",
+            "additionalProperties": {
+                "type": "boolean"
+            }
         }
     }
 }

cli/src/config.rs

···
     let parse = |text: &'static str| ConfigLayer::parse(ConfigSource::Default, text).unwrap();
     let mut layers = vec![
         parse(include_str!("config/colors.toml")),
+        parse(include_str!("config/hints.toml")),
         parse(include_str!("config/merge_tools.toml")),
         parse(include_str!("config/misc.toml")),
         parse(include_str!("config/revsets.toml")),

cli/src/config/hints.toml

···
+[hints]
+resolving-conflicts = true

cli/tests/test_repo_change_report.rs

···
     [EOF]
     ");
 }
+
+#[test]
+fn test_report_conflicts_with_resolving_conflicts_hint_disabled() {
+    let test_env = TestEnvironment::default();
+    test_env.run_jj_in(".", ["git", "init", "repo"]).success();
+    let repo_path = test_env.env_root().join("repo");
+
+    std::fs::write(repo_path.join("file"), "A\n").unwrap();
+    test_env.run_jj_in(&repo_path, ["commit", "-m=A"]).success();
+    std::fs::write(repo_path.join("file"), "B\n").unwrap();
+    test_env.run_jj_in(&repo_path, ["commit", "-m=B"]).success();
+    std::fs::write(repo_path.join("file"), "C\n").unwrap();
+    test_env.run_jj_in(&repo_path, ["commit", "-m=C"]).success();
+
+    let output = test_env.run_jj_in(
+        &repo_path,
+        [
+            "rebase",
+            "-s=description(B)",
+            "-d=root()",
+            "--config=hints.resolving-conflicts=false",
+        ],
+    );
+    insta::assert_snapshot!(output, @r"
+    ------- stderr -------
+    Rebased 3 commits onto destination
+    Working copy now at: zsuskuln f8a2c4e0 (conflict) (empty) (no description set)
+    Parent commit      : kkmpptxz 2271a49e (conflict) C
+    Added 0 files, modified 1 files, removed 0 files
+    Warning: There are unresolved conflicts at these paths:
+    file    2-sided conflict including 1 deletion
+    New conflicts appeared in these commits:
+      kkmpptxz 2271a49e (conflict) C
+      rlvkpnrz b7d83633 (conflict) B
+    [EOF]
+    ");
+}

cli/tests/test_status_command.rs

···
     [EOF]
     ");
 
+    let output = test_env.run_jj_in(
+        &repo_path,
+        ["status", "--config=hints.resolving-conflicts=false"],
+    );
+    insta::assert_snapshot!(output, @r"
+    The working copy has no changes.
+    Working copy : yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
+    Parent commit: royxmykx 664a4c6c (conflict) (empty) boom-cont
+    Warning: There are unresolved conflicts at these paths:
+    conflicted.txt    2-sided conflict
+    [EOF]
+    ");
+
     // Resolve conflict
     test_env
         .run_jj_in(&repo_path, ["new", "--message", "fixed 1"])
···
     let output = test_env.run_jj_in(&repo_path, ["log", "-r", "::"]);
 
     insta::assert_snapshot!(output, @r"
-    @  kmkuslsw [e-mail] 2001-02-03 08:05:19 caa7e9d5
+    @  wqnwkozp [e-mail] 2001-02-03 08:05:20 c4a6dbc2
     │  fixed 2
-    ○  kpqxywon [e-mail] 2001-02-03 08:05:18 26bf6863
+    ○  kmkuslsw [e-mail] 2001-02-03 08:05:19 fcebf6ee
     │  fixed 1
     ×  yqosqzyt [e-mail] 2001-02-03 08:05:13 dcb25635 conflict
     │  (empty) boom-cont-2
···
     insta::assert_snapshot!(output, @r"
     Working copy changes:
     M conflicted.txt
-    Working copy : kmkuslsw caa7e9d5 fixed 2
-    Parent commit: kpqxywon 26bf6863 fixed 1
+    Working copy : wqnwkozp c4a6dbc2 fixed 2
+    Parent commit: kmkuslsw fcebf6ee fixed 1
     [EOF]
     ");
 
···
     let output = test_env.run_jj_in(&repo_path, ["log", "-r", "::"]);
 
     insta::assert_snapshot!(output, @r"
-    ○  kmkuslsw [e-mail] 2001-02-03 08:05:19 caa7e9d5
+    ○  wqnwkozp [e-mail] 2001-02-03 08:05:20 c4a6dbc2
     │  fixed 2
-    @  kpqxywon [e-mail] 2001-02-03 08:05:18 26bf6863
+    @  kmkuslsw [e-mail] 2001-02-03 08:05:19 fcebf6ee
     │  fixed 1
     ×  yqosqzyt [e-mail] 2001-02-03 08:05:13 dcb25635 conflict
     │  (empty) boom-cont-2
···
     insta::assert_snapshot!(output, @r"
     Working copy changes:
     M conflicted.txt
-    Working copy : kpqxywon 26bf6863 fixed 1
+    Working copy : kmkuslsw fcebf6ee fixed 1
     Parent commit: yqosqzyt dcb25635 (conflict) (empty) boom-cont-2
     Hint: Conflict in parent commit has been resolved in working copy
     [EOF]
···
     let output = test_env.run_jj_in(&repo_path, ["log", "-r", "::"]);
 
     insta::assert_snapshot!(output, @r"
-    ○  kmkuslsw [e-mail] 2001-02-03 08:05:19 caa7e9d5
+    ○  wqnwkozp [e-mail] 2001-02-03 08:05:20 c4a6dbc2
     │  fixed 2
-    ○  kpqxywon [e-mail] 2001-02-03 08:05:18 26bf6863
+    ○  kmkuslsw [e-mail] 2001-02-03 08:05:19 fcebf6ee
     │  fixed 1
     ×  yqosqzyt [e-mail] 2001-02-03 08:05:13 dcb25635 conflict
     │  (empty) boom-cont-2