bug#31941: 26.1; Moving directory on remote host via tramp scp always performs copy

bug#31941: 26.1; Moving directory on remote host via tramp scp always performs copy

[Stephen Nutt]

In Emacs 26, when moving a directory within a remote host over Tramp
using the scp method (e.g. with dired-do-rename or mv in eshell), a copy
and delete are always performed, even when a much simpler mv would
suffice. The behavior is the same when running emacs with -q or with
emacs built from master. This is a regression from the behavior in 25.3.

I think I've isolated the change to the commit b500e0 where the
following was added at the beginning of `tramp-do-copy-or-rename-file'
in tramp-sh.el to explicitly call `copy-directory'.

  (if (file-directory-p filename)
      (progn
	(copy-directory filename newname keep-date t)
	(when (eq op 'rename) (delete-directory filename 'recursive)))

I think the conditional should also check if op is a rename and if the
remote of filename and newname are the same, in which case the normal
behavior of the function should proceed which should result in a mv
command.

bug#31941: 26.1; Moving directory on remote host via tramp scp always performs copy

[Michael Albinus]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

Stephen Nutt <stnutt@gmail.com> writes:

Hi Stephen,

> In Emacs 26, when moving a directory within a remote host over Tramp
> using the scp method (e.g. with dired-do-rename or mv in eshell), a copy
> and delete are always performed, even when a much simpler mv would
> suffice. The behavior is the same when running emacs with -q or with
> emacs built from master. This is a regression from the behavior in 25.3.
>
> I think I've isolated the change to the commit b500e0 where the
> following was added at the beginning of `tramp-do-copy-or-rename-file'
> in tramp-sh.el to explicitly call `copy-directory'.
>
>   (if (file-directory-p filename)
>       (progn
> 	(copy-directory filename newname keep-date t)
> 	(when (eq op 'rename) (delete-directory filename 'recursive)))
>
> I think the conditional should also check if op is a rename and if the
> remote of filename and newname are the same, in which case the normal
> behavior of the function should proceed which should result in a mv
> command.

Thanks for the bug report. I've fixed this in the emacs-26 branch of the
repository, will appear with Emacs 26.2.

The patch will be also part of Tramp 2.3.4, which is scheduled for
release next week.

The patch is appended, pls check whether it works for you.

Best regards, Michael.


[-- Attachment #2: Type: text/plain, Size: 1065 bytes --]

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 02fb8648d8..3e99ab567f 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2038,7 +2038,9 @@ tramp-do-copy-or-rename-file
   (unless (memq op '(copy rename))
     (error "Unknown operation `%s', must be `copy' or `rename'" op))
 
-  (if (file-directory-p filename)
+  (if (and
+       (file-directory-p filename)
+       (not (tramp-equal-remote filename newname)))
       (progn
 	(copy-directory filename newname keep-date t)
 	(when (eq op 'rename) (delete-directory filename 'recursive)))
@@ -2187,8 +2189,8 @@ tramp-do-copy-or-rename-file-directly
 		     (file-attributes filename)))
 	(file-modes (tramp-default-file-modes filename)))
     (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
-			((eq op 'copy) "cp -f")
+      (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -r -p")
+			((eq op 'copy) "cp -f -r")
 			((eq op 'rename) "mv -f")
 			(t (tramp-error
 			    v 'file-error

bug#31941: 26.1; Moving directory on remote host via tramp scp always performs copy

[Stephen Nutt]

Michael Albinus <michael.albinus@gmx.de> writes:

> Thanks for the bug report. I've fixed this in the emacs-26 branch of the
> repository, will appear with Emacs 26.2.
>
> The patch will be also part of Tramp 2.3.4, which is scheduled for
> release next week.
>
> The patch is appended, pls check whether it works for you.
>
> Best regards, Michael.

The patch fixes it. Thanks.

bug#31941: 26.1; Moving directory on remote host via tramp scp always performs copy

[Michael Albinus]

Version: 26.2

Stephen Nutt <stnutt@gmail.com> writes:

>> The patch is appended, pls check whether it works for you.
>
> The patch fixes it. Thanks.

Thanks for the feedback, I'm closing the bug.

Best regards, Michael.