extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-08 10:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix cp -u/mv -u when the dst doesn't exist (#9662)

Browse Source 
Fixes #9655
This commit is contained in:
mengsuenyan
2023-07-13 00:12:59 +08:00
committed by GitHub
parent 7c9edbd9ee
commit 026335fff0
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-command/src/filesystem/cp.rs
View File

@ -184,7 +184,7 @@ impl Command for Cp {
canonicalize_with(dst.as_path(), &current_dir_path).unwrap_or(dst);
// ignore when source file is not newer than target file
if update_mode && super::util::is_older(&src, &dst) {
if update_mode && super::util::is_older(&src, &dst).unwrap_or(false) {
continue;
}

2
crates/nu-command/src/filesystem/mv.rs
View File

@ -313,7 +313,7 @@ fn move_file(
}
}
if update_mode && super::util::is_older(&from, &to) {
if update_mode && super::util::is_older(&from, &to).unwrap_or(false) {
Ok(false)
} else {
match move_item(&from, from_span, &to) {

12
crates/nu-command/src/filesystem/util.rs
View File

@ -133,9 +133,11 @@ fn get_interactive_confirmation(prompt: String) -> Result<bool, Box<dyn Error>>
}
}
pub fn is_older(src: &Path, dst: &Path) -> bool {
if !dst.exists() {
return true;
/// Return `Some(true)` if the last change time of the `src` old than the `dst`,
/// otherwisie return `Some(false)`. Return `None` if the `src` or `dst` doesn't exist.
pub fn is_older(src: &Path, dst: &Path) -> Option<bool> {
if !dst.exists() || !src.exists() {
return None;
}
#[cfg(unix)]
{
@ -146,7 +148,7 @@ pub fn is_older(src: &Path, dst: &Path) -> bool {
let dst_ctime = std::fs::metadata(dst)
.map(|m| m.ctime())
.unwrap_or(i64::MAX);
src_ctime <= dst_ctime
Some(src_ctime <= dst_ctime)
}
#[cfg(windows)]
{
@ -157,7 +159,7 @@ pub fn is_older(src: &Path, dst: &Path) -> bool {
let dst_ctime = std::fs::metadata(dst)
.map(|m| m.last_write_time())
.unwrap_or(u64::MAX);
src_ctime <= dst_ctime
Some(src_ctime <= dst_ctime)
}
}