mv: Change error message

src/uu/mv/src/mv.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) sourcepath targetpath nushell canonicalized
+// spell-checker:ignore (ToDO) sourcepath targetpath nushell canonicalized ENOTEMPTY  EEXIST  EISDIR  ENOSPC  EMLINK  ETXTBSY
 
 mod error;
 
@@ -29,6 +29,7 @@
 };
 #[cfg(all(unix, not(any(target_os = "macos", target_os = "redox"))))]
 use uucore::fsxattr;
+use uucore::libc;
 use uucore::update_control;
 
 // These are exposed for projects (e.g. nushell) that want to create an `Options` value, which
@@ -497,17 +498,38 @@
         match rename(sourcepath, &targetpath, options, multi_progress.as_ref()) {
             Err(e) if e.to_string().is_empty() => set_exit_code(1),
             Err(e) => {
-                let e = e.map_err_context(|| {
-                    format!(
-                        "cannot move {} to {}",
-                        sourcepath.quote(),
-                        targetpath.quote()
-                    )
-                });
-                match multi_progress {
-                    Some(ref pb) => pb.suspend(|| show!(e)),
-                    None => show!(e),
-                };
+                match e.raw_os_error() {
+                    Some(
+                        libc::ENOTEMPTY
+                        | libc::EEXIST
+                        | libc::EISDIR
+                        | libc::ENOSPC
+                        | libc::EMLINK
+                        | libc::ETXTBSY,
+                    ) => {
+                        // The error message was changed to match GNU's decision
+                        // when an issue was filed. These will match when merged upstream.
+                        let e = e
+                            .map_err_context(|| format!("cannot overwrite {}", targetpath.quote()));
+                        match multi_progress {
+                            Some(ref pb) => pb.suspend(|| show!(e)),
+                            None => show!(e),
+                        };
+                    }
+                    _ => {
+                        let e = e.map_err_context(|| {
+                            format!(
+                                "cannot move {} to {}",
+                                sourcepath.quote(),
+                                targetpath.quote()
+                            )
+                        });
+                        match multi_progress {
+                            Some(ref pb) => pb.suspend(|| show!(e)),
+                            None => show!(e),
+                        };
+                    }
+                }
             }
             Ok(()) => (),
         }
@@ -581,7 +603,9 @@
             if is_empty_dir(to) {
                 fs::remove_dir(to)?;
             } else {
-                return Err(io::Error::new(io::ErrorKind::Other, "Directory not empty"));
+                // TODO: change when 'io::Error::DirectoryNotEmpty' is stabilized.
+                // https://github.com/rust-lang/rust/issues/86442
+                return Err(io::Error::from_raw_os_error(libc::ENOTEMPTY));
             }
         }
     }

tests/by-util/test_mv.rs

@@ -1224,6 +1224,35 @@ fn test_mv_overwrite_nonempty_dir() {
     assert!(at.dir_exists(dir_b));
 }
 
+#[test]
+fn test_mv_nonempty_directory_exists() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let test_dir = "test_dir";
+    let dir_a = "test_mv_nonempty_directory_exists";
+    let dir_b = "test_dir/test_mv_nonempty_directory_exists";
+    let dummy = "test_mv_nonempty_directory_exists/file";
+    let dummy2 = "test_dir/test_mv_nonempty_directory_exists/file";
+    at.mkdir(test_dir);
+    at.mkdir(dir_a);
+    at.mkdir(dir_b);
+    at.touch(dummy);
+    at.touch(dummy2);
+
+    // Not same error as GNU; the error message is custom.
+    // GNU: "mv: Couldn't move (Directory not empty; from=a; to=b)
+    // Current: "mv: cannot overwrite {}: Directory not empty""
+
+    ucmd.arg(dir_a)
+        .arg(test_dir)
+        .fails()
+        .stderr_contains("cannot overwrite");
+
+    assert!(at.dir_exists(dir_a));
+    assert!(at.dir_exists(dir_b));
+    assert!(at.file_exists(dummy));
+    assert!(at.file_exists(dummy2));
+}
+
 #[test]
 fn test_mv_backup_dir() {
     let (at, mut ucmd) = at_and_ucmd!();

util/build-gnu.sh

@@ -230,6 +230,9 @@ sed -i -e "s|rm: cannot remove 'a/b/file'|rm: cannot remove 'a'|g" tests/rm/cycl
 
 sed -i -e "s|rm: cannot remove directory 'b/a/p'|rm: cannot remove 'b'|g" tests/rm/rm1.sh
 
+# TODO: when GNU's output is changed to match this error, this can be removed.
+sed -i -e "s|mv: cannot move 'b/t' to 'a/t'|mv: cannot overwrite 'b/t'|g" tests/mv/dir2dir.sh
+
 sed -i -e "s|rm: cannot remove 'a/1'|rm: cannot remove 'a'|g" tests/rm/rm2.sh
 
 sed -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh