Make tree-level-conflicts the default in tests

ilyagr · May 3, 2024 · b364631 · b364631
1 parent 90d6340
commit b364631
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/cli/src/config/misc.toml b/cli/src/config/misc.toml
@@ -5,9 +5,6 @@ amend = ["squash"]
 co = ["checkout"]
 unamend = ["unsquash"]
 
-[format]
-tree-level-conflicts = true
-
 [ui]
 allow-filesets = false
 always-allow-large-revsets = false

diff --git a/lib/src/settings.rs b/lib/src/settings.rs
@@ -150,7 +150,7 @@ impl UserSettings {
     pub fn use_tree_conflict_format(&self) -> bool {
         self.config
             .get_bool("format.tree-level-conflicts")
-            .unwrap_or(false)
+            .unwrap_or(true)
     }
 
     pub fn user_name(&self) -> String {

diff --git a/lib/tests/test_merged_tree.rs b/lib/tests/test_merged_tree.rs
@@ -26,7 +26,7 @@ use jj_lib::repo::Repo;
 use jj_lib::repo_path::{RepoPath, RepoPathComponent};
 use jj_lib::tree::merge_trees;
 use pretty_assertions::assert_eq;
-use testutils::{create_single_tree, write_file, TestRepo};
+use testutils::{create_single_tree, user_settings_with_extra_config, write_file, TestRepo};
 
 fn file_value(file_id: &FileId) -> TreeValue {
     TreeValue::File {
@@ -50,7 +50,12 @@ fn diff_stream_equals_iter(tree1: &MergedTree, tree2: &MergedTree, matcher: &dyn
 
 #[test]
 fn test_from_legacy_tree() {
-    let test_repo = TestRepo::init();
+    // TODO: Find out why this test does not works with tree-level conflicts
+    let test_repo =
+        TestRepo::init_with_settings(&user_settings_with_extra_config(config::File::from_str(
+            "format.tree-level-conflicts=false",
+            config::FileFormat::Toml,
+        )));
     let repo = &test_repo.repo;
     let store = repo.store();
 
@@ -218,6 +223,7 @@ fn test_from_legacy_tree() {
         tree_builder.set_or_remove(path, Merge::normal(value));
     }
     let recreated_legacy_id = tree_builder.write_tree(store).unwrap();
+    // TODO FIXME
     assert_eq!(recreated_legacy_id, MergedTreeId::Legacy(tree_id.clone()));
 
     // Create the merged tree by starting from an empty merged tree and adding

diff --git a/lib/testutils/src/lib.rs b/lib/testutils/src/lib.rs
@@ -100,6 +100,13 @@ pub fn user_settings() -> UserSettings {
     UserSettings::from_config(config)
 }
 
+pub fn user_settings_with_extra_config(
+    extra_source: impl config::Source + Send + Sync + 'static,
+) -> UserSettings {
+    let config = base_config().add_source(extra_source).build().unwrap();
+    UserSettings::from_config(config)
+}
+
 pub struct TestRepo {
     _temp_dir: TempDir,
     pub repo: Arc<ReadonlyRepo>,