mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 20:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

working_copy: leverage Store::get_root_tree() in current_tree()

Browse source 
I guess I forgot this when I added `Store::get_root_tree()`.
This commit is contained in:
Martin von Zweigbergk 2023-08-28 15:59:58 -07:00 committed by Martin von Zweigbergk
parent 2d50d8a077
commit f54b456e64
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/src/working_copy.rs
View file

@ -582,17 +582,7 @@ impl TreeState {
} }
fn current_tree(&self) -> Result<MergedTree, BackendError> { fn current_tree(&self) -> Result<MergedTree, BackendError> {
match &self.tree_id { self.store.get_root_tree(&self.tree_id)
MergedTreeId::Legacy(tree_id) => {
let current_tree = self.store.get_tree(&RepoPath::root(), tree_id)?;
Ok(MergedTree::legacy(current_tree))
}
MergedTreeId::Merge(tree_ids) => {
let tree_merge =
tree_ids.try_map(|tree_id| self.store.get_tree(&RepoPath::root(), tree_id))?;
Ok(MergedTree::new(tree_merge))
}
}
} }
fn write_file_to_store( fn write_file_to_store(