mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

working_copy: extract function for updating the working copy files (#52)

Browse source 
Updating the working copy with new sparse patterns is very similar to
updating it with a new tree. We're going to reuse this extracted
function soon.
This commit is contained in:
Martin von Zweigbergk 2022-02-09 22:23:49 -08:00 committed by Martin von Zweigbergk
parent cb0ab6b360
commit ed2d2f8a4f
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/working_copy.rs
View file

@ -37,7 +37,7 @@ use crate::backend::{
use crate::conflicts::{materialize_conflict, update_conflict_from_content}; use crate::conflicts::{materialize_conflict, update_conflict_from_content};
use crate::gitignore::GitIgnoreFile; use crate::gitignore::GitIgnoreFile;
use crate::lock::FileLock; use crate::lock::FileLock;
use crate::matchers::EverythingMatcher; use crate::matchers::{EverythingMatcher, Matcher};
use crate::op_store::{OperationId, WorkspaceId}; use crate::op_store::{OperationId, WorkspaceId};
use crate::repo_path::{RepoPath, RepoPathComponent, RepoPathJoin}; use crate::repo_path::{RepoPath, RepoPathComponent, RepoPathJoin};
use crate::store::Store; use crate::store::Store;
@ -550,14 +550,24 @@ impl TreeState {
BackendError::NotFound => CheckoutError::SourceNotFound, BackendError::NotFound => CheckoutError::SourceNotFound,
other => CheckoutError::InternalBackendError(other), other => CheckoutError::InternalBackendError(other),
})?; })?;
let stats = self.update(&old_tree, new_tree, &EverythingMatcher)?;
self.tree_id = new_tree.id().clone();
Ok(stats)
}
fn update(
&mut self,
old_tree: &Tree,
new_tree: &Tree,
matcher: &dyn Matcher,
) -> Result<CheckoutStats, CheckoutError> {
let mut stats = CheckoutStats { let mut stats = CheckoutStats {
updated_files: 0, updated_files: 0,
added_files: 0, added_files: 0,
removed_files: 0, removed_files: 0,
}; };
for (path, diff) in old_tree.diff(new_tree, &EverythingMatcher) { for (path, diff) in old_tree.diff(new_tree, matcher) {
let disk_path = path.to_fs_path(&self.working_copy_path); let disk_path = path.to_fs_path(&self.working_copy_path);
// TODO: Check that the file has not changed before overwriting/removing it. // TODO: Check that the file has not changed before overwriting/removing it.
@ -629,7 +639,6 @@ impl TreeState {
} }
} }
} }
self.tree_id = new_tree.id().clone();
Ok(stats) Ok(stats)
} }