mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 03:20:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

local_working_copy: extract helper function that emits new file value and state

Browse source 
visit_directory() is big. Let's make it fit in one screen.
This commit is contained in:
Yuya Nishihara 2024-12-03 17:14:18 +09:00
parent 632c07216f
commit 6d23d5ac8b
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
lib/src/local_working_copy.rs
View file

@ -1119,23 +1119,12 @@ impl FileSnapshotter<'_> {
} }
}; };
if let Some(new_file_state) = file_state(&metadata) { if let Some(new_file_state) = file_state(&metadata) {
present_files_tx.send(tracked_path.to_owned()).ok(); self.process_present_file(
let update = self.get_updated_tree_value( tracked_path.to_owned(),
tracked_path, &disk_path,
disk_path,
Some(&current_file_state), Some(&current_file_state),
&new_file_state, new_file_state,
)?; )?;
if let Some(tree_value) = update {
tree_entries_tx
.send((tracked_path.to_owned(), tree_value))
.ok();
}
if new_file_state != current_file_state {
file_states_tx
.send((tracked_path.to_owned(), new_file_state))
.ok();
}
} }
} }
} else { } else {
@ -1177,19 +1166,12 @@ impl FileSnapshotter<'_> {
}); });
} }
if let Some(new_file_state) = file_state(&metadata) { if let Some(new_file_state) = file_state(&metadata) {
present_files_tx.send(path.clone()).ok(); self.process_present_file(
let update = self.get_updated_tree_value( path,
&path, &entry.path(),
entry.path(),
maybe_current_file_state.as_ref(), maybe_current_file_state.as_ref(),
&new_file_state, new_file_state,
)?; )?;
if let Some(tree_value) = update {
tree_entries_tx.send((path.clone(), tree_value)).ok();
}
if Some(&new_file_state) != maybe_current_file_state.as_ref() {
file_states_tx.send((path, new_file_state)).ok();
}
} }
} }
} }
@ -1199,10 +1181,33 @@ impl FileSnapshotter<'_> {
Ok(()) Ok(())
} }
fn process_present_file(
&self,
path: RepoPathBuf,
disk_path: &Path,
maybe_current_file_state: Option<&FileState>,
new_file_state: FileState,
) -> Result<(), SnapshotError> {
self.present_files_tx.send(path.clone()).ok();
let update = self.get_updated_tree_value(
&path,
disk_path,
maybe_current_file_state,
&new_file_state,
)?;
if let Some(tree_value) = update {
self.tree_entries_tx.send((path.clone(), tree_value)).ok();
}
if Some(&new_file_state) != maybe_current_file_state {
self.file_states_tx.send((path, new_file_state)).ok();
}
Ok(())
}
fn get_updated_tree_value( fn get_updated_tree_value(
&self, &self,
repo_path: &RepoPath, repo_path: &RepoPath,
disk_path: PathBuf, disk_path: &Path,
maybe_current_file_state: Option<&FileState>, maybe_current_file_state: Option<&FileState>,
new_file_state: &FileState, new_file_state: &FileState,
) -> Result<Option<MergedTreeValue>, SnapshotError> { ) -> Result<Option<MergedTreeValue>, SnapshotError> {
@ -1235,11 +1240,11 @@ impl FileSnapshotter<'_> {
}; };
let new_tree_values = match new_file_type { let new_tree_values = match new_file_type {
FileType::Normal { executable } => self FileType::Normal { executable } => self
.write_path_to_store(repo_path, &disk_path, &current_tree_values, executable) .write_path_to_store(repo_path, disk_path, &current_tree_values, executable)
.block_on()?, .block_on()?,
FileType::Symlink => { FileType::Symlink => {
let id = self let id = self
.write_symlink_to_store(repo_path, &disk_path) .write_symlink_to_store(repo_path, disk_path)
.block_on()?; .block_on()?;
Merge::normal(TreeValue::Symlink(id)) Merge::normal(TreeValue::Symlink(id))
} }