tests: make helpers create non-legacy trees

Extracted and modified from #3746 by @ilyagr.
jj-vcs · Jul 23, 2024 · abf77c8 · abf77c8
1 parent feceb62
commit abf77c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/tests/test_local_working_copy.rs b/lib/tests/test_local_working_copy.rs
@@ -969,7 +969,7 @@ fn test_gitignores_ignored_directory_already_tracked() {
             }
         }
         let id = tree_builder.write_tree().unwrap();
-        MergedTree::legacy(store.get_tree(RepoPath::root(), &id).unwrap())
+        MergedTree::resolved(store.get_tree(RepoPath::root(), &id).unwrap())
     };
 
     let gitignore_path = RepoPath::from_internal_string(".gitignore");

diff --git a/lib/testutils/src/lib.rs b/lib/testutils/src/lib.rs
@@ -326,7 +326,7 @@ pub fn create_single_tree(repo: &Arc<ReadonlyRepo>, path_contents: &[(&RepoPath,
 }
 
 pub fn create_tree(repo: &Arc<ReadonlyRepo>, path_contents: &[(&RepoPath, &str)]) -> MergedTree {
-    MergedTree::legacy(create_single_tree(repo, path_contents))
+    MergedTree::resolved(create_single_tree(repo, path_contents))
 }
 
 #[must_use]