ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

working_copy: remove last use of current_tree()

Browse source 
We were using `current_tree()` only for an assertion where we were
walking its entries. Now that `MergedTree` supports that, we can
replace `current_tree()` by `current_merged_tree()`.

There's more work needed before the working copy can fully work with
tree-level conflicts. We still need to be able to store multiple tree
ids in the `tree_state` file, and we need to be able to create
multiple trees instead of writing conflict objects to the backend.
This commit is contained in:
Martin von Zweigbergk 2023-08-23 12:18:34 -07:00 committed by Martin von Zweigbergk
parent 416fa2741c
commit 0b27c33a13
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/working_copy.rs
View file

@ -566,11 +566,7 @@ impl TreeState {
Ok(())
}
fn current_tree(&self) -> Result<Tree, BackendError> {
self.store.get_tree(&RepoPath::root(), &self.tree_id)
}
fn current_merged_tree(&self) -> Result<MergedTree, BackendError> {
fn current_tree(&self) -> Result<MergedTree, BackendError> {
let tree = self.store.get_tree(&RepoPath::root(), &self.tree_id)?;
Ok(MergedTree::legacy(tree))
}
@ -659,7 +655,7 @@ impl TreeState {
trace_span!("traverse filesystem").in_scope(|| -> Result<(), SnapshotError> {
let matcher = IntersectionMatcher::new(sparse_matcher.as_ref(), fsmonitor_matcher);
let current_tree = self.current_merged_tree()?;
let current_tree = self.current_tree()?;
let directory_to_visit = DirectoryToVisit {
dir: RepoPath::root(),
disk_dir: self.working_copy_path.clone(),
@ -1174,7 +1170,7 @@ impl TreeState {
}
pub fn check_out(&mut self, new_tree: &MergedTree) -> Result<CheckoutStats, CheckoutError> {
let old_tree = self.current_merged_tree().map_err(|err| match err {
let old_tree = self.current_tree().map_err(|err| match err {
err @ BackendError::ObjectNotFound { .. } => CheckoutError::SourceNotFound {
source: Box::new(err),
},
@ -1189,7 +1185,7 @@ impl TreeState {
&mut self,
sparse_patterns: Vec<RepoPath>,
) -> Result<CheckoutStats, CheckoutError> {
let tree = self.current_merged_tree().map_err(|err| match err {
let tree = self.current_tree().map_err(|err| match err {
err @ BackendError::ObjectNotFound { .. } => CheckoutError::SourceNotFound {
source: Box::new(err),
},
@ -1293,7 +1289,7 @@ impl TreeState {
}
pub fn reset(&mut self, new_tree: &MergedTree) -> Result<(), ResetError> {
let old_tree = self.current_merged_tree().map_err(|err| match err {
let old_tree = self.current_tree().map_err(|err| match err {
err @ BackendError::ObjectNotFound { .. } => ResetError::SourceNotFound {
source: Box::new(err),
},