uu/mv: change error msg to be the same as GNU coreutils 9.8-2

Author: asder8215

src/uu/mv/locales/en-US.ftl

@@ -31,9 +31,9 @@ mv-error-extra-operand = mv: extra operand {$operand}
 mv-error-backup-might-destroy-source = backing up {$target} might destroy source;  {$source} not moved
 mv-error-will-not-overwrite-just-created = will not overwrite just-created '{$target}' with '{$source}'
 mv-error-not-replacing = not replacing {$target}
-mv-error-cannot-overwrite = cannot overwrite
+mv-error-cannot-overwrite = cannot overwrite {$target}
 mv-error-cannot-move = cannot move {$source} to {$target}
-mv-error-directory-not-empty = A non-empty directory: {$target} exists at destination
+mv-error-directory-not-empty = Directory not empty
 mv-error-dangling-symlink = can't determine symlink type, since it is dangling
 mv-error-no-symlink-support = your operating system does not support symlinks
 mv-error-permission-denied = Permission denied

src/uu/mv/locales/fr-FR.ftl

@@ -31,9 +31,9 @@ mv-error-extra-operand = mv : opérande supplémentaire {$operand}
 mv-error-backup-might-destroy-source = sauvegarder {$target} pourrait détruire la source ; {$source} non déplacé
 mv-error-will-not-overwrite-just-created = ne va pas écraser le fichier qui vient d'être créé '{$target}' avec '{$source}'
 mv-error-not-replacing = ne remplace pas {$target}
-mv-error-cannot-overwrite = impossible d'écraser
+mv-error-cannot-overwrite = impossible d'écraser ${target}
 mv-error-cannot-move = impossible de déplacer {$source} vers {$target}
-mv-error-directory-not-empty = Un répertoire non vide : ${target} existe à destination
+mv-error-directory-not-empty = Répertoire non vide
 mv-error-dangling-symlink = impossible de déterminer le type de lien symbolique, car il est suspendu
 mv-error-no-symlink-support = votre système d'exploitation ne prend pas en charge les liens symboliques
 mv-error-permission-denied = Permission refusée

src/uu/mv/src/mv.rs

@@ -675,7 +675,9 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, options: &Options)
         ) {
             Err(e) if e.to_string().is_empty() => set_exit_code(1),
             Err(e) => {
-                let e = e.map_err_context(|| translate!("mv-error-cannot-overwrite"));
+                let e = e.map_err_context(
+                    || translate!("mv-error-cannot-overwrite", "target" => targetpath.quote()),
+                );
                 match display_manager {
                     Some(ref pb) => pb.suspend(|| show!(e)),
                     None => show!(e),
@@ -754,9 +756,7 @@ fn rename(
             if is_empty_dir(to) {
                 fs::remove_dir(to)?;
             } else {
-                return Err(io::Error::other(
-                    translate!("mv-error-directory-not-empty", "target" => to.quote()),
-                ));
+                return Err(io::Error::other(translate!("mv-error-directory-not-empty")));
             }
         }
     }

tests/by-util/test_mv.rs

@@ -1463,7 +1463,7 @@ fn test_mv_overwrite_nonempty_dir_error() {
     // GNU:     "mv: cannot overwrite 'b': Directory not empty"
 
     ucmd.arg(dummy_dir_a).arg(dir_b).fails().stderr_is(format!(
-        "mv: cannot overwrite: A non-empty directory: '{dummy_dir_b}' exists at destination\n"
+        "mv: cannot overwrite '{dummy_dir_b}': Directory not empty\n"
     ));
 }