mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 16:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

working_copy: pass in PathBuf and Metadata to get_updated_file_state()

Browse source 
This will let us call the function even if we don't have a `DirEntry`.
This commit is contained in:
Martin von Zweigbergk 2023-07-25 21:53:54 -07:00 committed by Martin von Zweigbergk
parent 37d9aae894
commit 5cc2c91453
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/src/working_copy.rs
View file

@ -18,7 +18,7 @@ use std::collections::{BTreeMap, HashSet};
use std::error::Error; use std::error::Error;
use std::ffi::OsString; use std::ffi::OsString;
use std::fs; use std::fs;
use std::fs::{DirEntry, File, Metadata, OpenOptions}; use std::fs::{File, Metadata, OpenOptions};
use std::io::{Read, Write}; use std::io::{Read, Write};
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::fs::symlink; use std::os::unix::fs::symlink;
@ -709,12 +709,22 @@ impl TreeState {
if maybe_current_file_state.is_none() if maybe_current_file_state.is_none()
&& git_ignore.matches_file(&sub_path.to_internal_file_string()) && git_ignore.matches_file(&sub_path.to_internal_file_string())
{ {
// If it wasn't already tracked and it matches the ignored paths, then // If it wasn't already tracked and it matches
// the ignored paths, then
// ignore it. // ignore it.
} else { } else {
let metadata =
entry.metadata().map_err(|err| SnapshotError::IoError {
message: format!(
"Failed to stat file {}",
entry.path().display()
),
err,
})?;
let update = self.get_updated_file_state( let update = self.get_updated_file_state(
&sub_path, &sub_path,
&entry, entry.path(),
metadata,
maybe_current_file_state, maybe_current_file_state,
&current_tree, &current_tree,
)?; )?;
@ -805,15 +815,11 @@ impl TreeState {
fn get_updated_file_state( fn get_updated_file_state(
&self, &self,
repo_path: &RepoPath, repo_path: &RepoPath,
dir_entry: &DirEntry, disk_path: PathBuf,
metadata: Metadata,
maybe_current_file_state: Option<&FileState>, maybe_current_file_state: Option<&FileState>,
current_tree: &Tree, current_tree: &Tree,
) -> Result<UpdatedFileState, SnapshotError> { ) -> Result<UpdatedFileState, SnapshotError> {
let disk_path = dir_entry.path();
let metadata = dir_entry.metadata().map_err(|err| SnapshotError::IoError {
message: format!("Failed to stat file {}", disk_path.display()),
err,
})?;
let maybe_new_file_state = file_state(&metadata); let maybe_new_file_state = file_state(&metadata);
let (current_file_state, new_file_state) = let (current_file_state, new_file_state) =
match (maybe_current_file_state, maybe_new_file_state) { match (maybe_current_file_state, maybe_new_file_state) {