martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-20 10:18:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

working_copy: avoid a nested TreeBuilder in a test

Browse Source 
It's just slightly simpler to not create a `TreeBuilder` to create a
`TreeValue`; we can instead write to the outer builder.
This commit is contained in:
Martin von Zweigbergk 2023-08-29 09:36:00 -07:00 committed by Martin von Zweigbergk
parent 7e6930b56f
commit 6b3fa3ee79
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tests/test_working_copy.rs
View File

@ -149,17 +149,14 @@ fn test_checkout_file_transitions(use_git: bool) {
TreeValue::Symlink(id)
}
Kind::Tree => {
let mut sub_tree_builder = store.tree_builder(store.empty_tree_id().clone());
let file_path = path.join(&RepoPathComponent::from("file"));
write_path(
settings,
repo,
&mut sub_tree_builder,
Kind::Normal,
&file_path,
);
let id = sub_tree_builder.write_tree();
TreeValue::Tree(id)
let id = testutils::write_file(store, &file_path, "normal file contents");
let value = TreeValue::File {
id,
executable: false,
};
tree_builder.set(file_path, value);
return;
}
Kind::GitSubmodule => {
let mut tx = repo.start_transaction(settings, "test");