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: pass Metadata into file_state()

Browse source 
This is a refactoring to prepare for getting the metadata from an
already open file when possible.
This commit is contained in:
Martin von Zweigbergk 2022-05-23 22:44:28 -07:00 committed by Martin von Zweigbergk
parent d451242746
commit e7aaf2f95f
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/src/working_copy.rs
View file

@ -17,7 +17,7 @@ use std::collections::{BTreeMap, HashSet};
use std::convert::TryInto; use std::convert::TryInto;
use std::ffi::OsString; use std::ffi::OsString;
use std::fs; use std::fs;
use std::fs::{File, OpenOptions}; use std::fs::{File, Metadata, OpenOptions};
use std::io::Read; use std::io::Read;
use std::ops::Bound; use std::ops::Bound;
#[cfg(unix)] #[cfg(unix)]
@ -154,15 +154,14 @@ fn create_parent_dirs(disk_path: &Path) {
.unwrap_or_else(|_| panic!("failed to create parent directories for {:?}", &disk_path)); .unwrap_or_else(|_| panic!("failed to create parent directories for {:?}", &disk_path));
} }
fn file_state(path: &Path) -> Option<FileState> { fn file_state(metadata: &Metadata) -> FileState {
let metadata = path.symlink_metadata().ok()?;
let time = metadata.modified().unwrap(); let time = metadata.modified().unwrap();
let since_epoch = time.duration_since(UNIX_EPOCH).unwrap(); let since_epoch = time.duration_since(UNIX_EPOCH).unwrap();
let mtime = MillisSinceEpoch(since_epoch.as_millis().try_into().unwrap()); let mtime = MillisSinceEpoch(since_epoch.as_millis().try_into().unwrap());
let size = metadata.len(); let size = metadata.len();
let metadata_file_type = metadata.file_type(); let metadata_file_type = metadata.file_type();
let file_type = if metadata_file_type.is_dir() { let file_type = if metadata_file_type.is_dir() {
panic!("expected file, not directory: {:?}", path); panic!("expected file, not directory");
} else if metadata_file_type.is_symlink() { } else if metadata_file_type.is_symlink() {
FileType::Symlink FileType::Symlink
} else { } else {
@ -176,11 +175,11 @@ fn file_state(path: &Path) -> Option<FileState> {
FileType::Normal { executable: false } FileType::Normal { executable: false }
} }
}; };
Some(FileState { FileState {
file_type, file_type,
mtime, mtime,
size, size,
}) }
} }
#[derive(Debug, PartialEq, Eq, Clone)] #[derive(Debug, PartialEq, Eq, Clone)]
@ -454,8 +453,9 @@ impl TreeState {
// ignore it. // ignore it.
return Ok(()); return Ok(());
} }
let metadata = disk_path.symlink_metadata().unwrap();
#[cfg_attr(unix, allow(unused_mut))] #[cfg_attr(unix, allow(unused_mut))]
let mut new_file_state = file_state(&disk_path).unwrap(); let mut new_file_state = file_state(&metadata);
match maybe_current_file_state { match maybe_current_file_state {
None => { None => {
// untracked // untracked
@ -574,7 +574,8 @@ impl TreeState {
// the file exists, and the stat information is most likely accurate, // the file exists, and the stat information is most likely accurate,
// except for other processes modifying the file concurrently (The mtime is set // except for other processes modifying the file concurrently (The mtime is set
// at write time and won't change when we close the file.) // at write time and won't change when we close the file.)
let mut file_state = file_state(disk_path).unwrap(); let metadata = disk_path.symlink_metadata().unwrap();
let mut file_state = file_state(&metadata);
// Make sure the state we record is what we tried to set above. This is mostly // Make sure the state we record is what we tried to set above. This is mostly
// for Windows, since the executable bit is not reflected in the file system // for Windows, since the executable bit is not reflected in the file system
// there. // there.
@ -600,7 +601,8 @@ impl TreeState {
let target = PathBuf::from(&target); let target = PathBuf::from(&target);
symlink(target, disk_path).unwrap(); symlink(target, disk_path).unwrap();
} }
Ok(file_state(disk_path).unwrap()) let metadata = disk_path.symlink_metadata().unwrap();
Ok(file_state(&metadata))
} }
fn write_conflict( fn write_conflict(
@ -622,7 +624,8 @@ impl TreeState {
materialize_conflict(self.store.as_ref(), path, &conflict, &mut file).unwrap(); materialize_conflict(self.store.as_ref(), path, &conflict, &mut file).unwrap();
// TODO: Set the executable bit correctly (when possible) and preserve that on // TODO: Set the executable bit correctly (when possible) and preserve that on
// Windows like we do with the executable bit for regular files. // Windows like we do with the executable bit for regular files.
let mut result = file_state(disk_path).unwrap(); let metadata = disk_path.symlink_metadata().unwrap();
let mut result = file_state(&metadata);
result.file_type = FileType::Conflict { id: id.clone() }; result.file_type = FileType::Conflict { id: id.clone() };
Ok(result) Ok(result)
} }