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

working_copy: avoid std::os::unix on Windows

Browse source 
std::os::unix::fs::PermissionsExt::mode() does not exist on Windows.
Treat files on Windows as regular files.
This commit is contained in:
Jun Wu 2021-03-10 22:13:52 -08:00
parent 5631e85502
commit 4cd29a2130
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/src/working_copy.rs
View file

@ -254,7 +254,10 @@ impl TreeState {
} else if metadata_file_type.is_symlink() { } else if metadata_file_type.is_symlink() {
FileType::Symlink FileType::Symlink
} else { } else {
#[cfg(unix)]
let mode = metadata.permissions().mode(); let mode = metadata.permissions().mode();
#[cfg(windows)]
let mode = 0;
if mode & 0o111 != 0 { if mode & 0o111 != 0 {
FileType::Executable FileType::Executable
} else { } else {

2
lib/tests/test_working_copy.rs
View file

@ -195,6 +195,7 @@ fn test_checkout_file_transitions(use_git: bool) {
assert_eq!(maybe_metadata.is_ok(), true, "{:?} should exist", path); assert_eq!(maybe_metadata.is_ok(), true, "{:?} should exist", path);
let metadata = maybe_metadata.unwrap(); let metadata = maybe_metadata.unwrap();
assert_eq!(metadata.is_file(), true, "{:?} should be a file", path); assert_eq!(metadata.is_file(), true, "{:?} should be a file", path);
#[cfg(unix)]
assert_eq!( assert_eq!(
metadata.permissions().mode() & 0o111, metadata.permissions().mode() & 0o111,
0, 0,
@ -206,6 +207,7 @@ fn test_checkout_file_transitions(use_git: bool) {
assert_eq!(maybe_metadata.is_ok(), true, "{:?} should exist", path); assert_eq!(maybe_metadata.is_ok(), true, "{:?} should exist", path);
let metadata = maybe_metadata.unwrap(); let metadata = maybe_metadata.unwrap();
assert_eq!(metadata.is_file(), true, "{:?} should be a file", path); assert_eq!(metadata.is_file(), true, "{:?} should be a file", path);
#[cfg(unix)]
assert_ne!( assert_ne!(
metadata.permissions().mode() & 0o111, metadata.permissions().mode() & 0o111,
0, 0,