Refactor Tramp

* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Use `tramp-adb-handle-get-remote-gid' and
`tramp-adb-handle-get-remote-uid'.
(tramp-adb-handle-file-attributes): Use `tramp-convert-file-attributes'.
(tramp-do-parse-file-attributes-with-ls): Remove ID-FORMAT.
(tramp-adb-handle-directory-files-and-attributes):
Use `tramp-skeleton-directory-files-and-attributes'.
(tramp-adb-handle-file-local-copy): Use `tramp-skeleton-file-local-copy'.
(tramp-adb-handle-copy-file, tramp-adb-handle-rename-file):
Use `tramp-barf-if-file-missing'.
(tramp-adb-handle-get-remote-uid)
(tramp-adb-handle-get-remote-gid): New defuns.

* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Use `tramp-archive-handle-directory-files'.
(tramp-archive-handle-directory-files): New defun.

* lisp/net/tramp-cache.el (tramp-file-property-p): New defun.

* lisp/net/tramp-compat.el (tramp-compat-take): New defalias.

* lisp/net/tramp-crypt.el (tramp-crypt-do-copy-or-rename-file):
Use `tramp-barf-if-file-missing'.
(tramp-crypt-handle-directory-files):
Use `tramp-skeleton-directory-files'.

* lisp/net/tramp-fuse.el (tramp-fuse-handle-directory-files):
Use `tramp-skeleton-directory-files'.

* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
Use `tramp-barf-if-file-missing'.

* lisp/net/tramp-rclone.el (tramp-rclone-do-copy-or-rename-file):
Use `tramp-barf-if-file-missing'.

* lisp/net/tramp-sh.el (tramp-readlink-file-truename)
(tramp-stat-file-attributes)
(tramp-stat-directory-files-and-attributes): New defconsts.
(tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes): Adapt.
(tramp-sh-handle-make-symbolic-link): Flush TARGET file properties.
(tramp-sh-handle-file-truename): Use `tramp-readlink-file-truename'
(tramp-sh-handle-file-exists-p)
(tramp-sh-handle-file-executable-p)
(tramp-sh-handle-file-readable-p)
(tramp-sh-handle-file-directory-p)
(tramp-sh-handle-file-writable-p): Adapt check of file properties.
(tramp-sh-handle-file-attributes): Simplify.
(tramp-do-file-attributes-with-ls): Remove ID-FORMAT.  Combine two
remote commands.  Compute both versions of uid and gid together.
(tramp-do-file-attributes-with-perl)
(tramp-do-directory-files-and-attributes-with-perl):
Remove ID-FORMAT.
(tramp-do-file-attributes-with-stat): Remove ID-FORMAT.  Use
`tramp-stat-file-attributes'.
(tramp-sh-handle-directory-files-and-attributes):
Use `tramp-skeleton-directory-files-and-attributes'.
(tramp-do-directory-files-and-attributes-with-stat):
Remove ID-FORMAT.  Use `tramp-stat-directory-files-and-attributes'.
(tramp-sh-handle-copy-directory): Use `tramp-skeleton-copy-directory'.
(tramp-do-copy-or-rename-file): Use `tramp-barf-if-file-missing'.
(tramp-sh-handle-file-local-copy): Use `tramp-skeleton-file-local-copy'.
(tramp-sh-handle-write-region): Combine two remote commands.
(tramp-sh-gio-monitor-process-filter): Simplify `cond' call.
(tramp-expand-script): Extend for ls, readling and stat.
(tramp-open-connection-setup-interactive-shell): Do not set
`tramp-end-of-output'.
(tramp-open-connection-setup-interactive-shell): Do not send
prompt formatting command, it's superfluous.
(tramp-send-command-and-check): Rearrange in order to accept also
heredoc scripts.
(tramp-convert-file-attributes): Move function to tramp.el.
(tramp-get-remote-id): Set connection property.
(tramp-get-remote-uid-with-id): Use it.
(tramp-get-remote-python): Don't check for python2 anymore.

* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Use `tramp-handle-directory-files'.
(tramp-smb-handle-copy-directory): Use `tramp-skeleton-copy-directory'.
(tramp-smb-handle-directory-files): Remove.
(tramp-smb-handle-file-attributes): Use `tramp-convert-file-attributes'.
(tramp-smb-do-file-attributes-with-stat): Remove ID-FORMAT.
(tramp-smb-handle-file-local-copy): Use `tramp-skeleton-file-local-copy'.

* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Use `tramp-barf-if-file-missing'.
(tramp-sudoedit-file-attributes): New defconst.
(tramp-sudoedit-handle-file-attributes): Simplify code.

* lisp/net/tramp.el (tramp-setup-debug-buffer): Set debug buffer
as not modified.
(tramp-barf-if-file-missing, tramp-skeleton-copy-directory)
(tramp-skeleton-directory-files)
(tramp-skeleton-directory-files-and-attributes)
(tramp-skeleton-file-local-copy): New macros.
(tramp-handle-copy-directory): Use `tramp-skeleton-copy-directory'.
(tramp-handle-directory-files): Use `tramp-skeleton-directory-files'.
(tramp-handle-file-local-copy): Use `tramp-skeleton-file-local-copy'.
(tramp-handle-insert-file-contents): Use `tramp-barf-if-file-missing'.
(tramp-get-process-attributes, tramp-action-out-of-band):
Simplify `cond' call.
(tramp-check-cached-permissions): Simplify.
(tramp-make-tramp-temp-file): Reimplement.

* test/lisp/net/tramp-archive-tests.el (tramp-copy-size-limit):
Don't set.

* test/lisp/net/tramp-tests.el (tramp--test-enabled):
Remove superfluous test files.
(tramp-test21-file-links): Protect file name deletion.

1 files changed, 81 insertions, 79 deletions

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 03a6a46e80d..d9afcf93c19 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1002,84 +1002,83 @@ file names."
 	  (msg-operation (if (eq op 'copy) "Copying" "Renaming")))
 
       (with-parsed-tramp-file-name (if t1 filename newname) nil
-	(unless (file-exists-p filename)
-	  (tramp-error v 'file-missing filename))
-	(when (and (not ok-if-already-exists) (file-exists-p newname))
-	  (tramp-error v 'file-already-exists newname))
-	(when (and (file-directory-p newname)
-		   (not (directory-name-p newname)))
-	  (tramp-error v 'file-error "File is a directory %s" newname))
-
-	(cond
-	 ;; We cannot rename volatile files, as used by Google-drive.
-	 ((and (not equal-remote) volatile)
-	  (prog1 (copy-file
-		  filename newname ok-if-already-exists keep-date
-		  preserve-uid-gid preserve-extended-attributes)
-	    (delete-file filename)))
-
-	 ;; We cannot copy or rename directly.
-	 ((or (and equal-remote
-		   (tramp-get-connection-property v "direct-copy-failed"))
-	      (and t1 (not (tramp-gvfs-file-name-p filename)))
-	      (and t2 (not (tramp-gvfs-file-name-p newname))))
-	  (let ((tmpfile (tramp-compat-make-temp-file filename)))
-	    (if (eq op 'copy)
-		(copy-file
-		 filename tmpfile t keep-date preserve-uid-gid
-		 preserve-extended-attributes)
-	      (rename-file filename tmpfile t))
-	    (rename-file tmpfile newname ok-if-already-exists)))
-
-	 ;; Direct action.
-	 (t (with-tramp-progress-reporter
-		v 0 (format "%s %s to %s" msg-operation filename newname)
-	      (unless
-		  (and (apply
-			#'tramp-gvfs-send-command v gvfs-operation
-			(append
-			 (and (eq op 'copy) (or keep-date preserve-uid-gid)
-			      '("--preserve"))
-			 (list
-			  (tramp-gvfs-url-file-name filename)
-			  (tramp-gvfs-url-file-name newname))))
-		       ;; Some backends do not return a proper error
-		       ;; code in case of direct copy/move.  Apply
-		       ;; sanity checks.
-		       (or (not equal-remote)
-			   (tramp-gvfs-send-command
-			    v "gvfs-info" (tramp-gvfs-url-file-name newname))
-			   (eq op 'copy)
-			   (not (tramp-gvfs-send-command
-				 v "gvfs-info"
-				 (tramp-gvfs-url-file-name filename)))))
-
-		(if (or (not equal-remote)
-			(and equal-remote
-			     (tramp-get-connection-property
-			      v "direct-copy-failed")))
-		    ;; Propagate the error.
-		    (with-current-buffer (tramp-get-connection-buffer v)
-		      (goto-char (point-min))
-		      (tramp-error-with-buffer
-		       nil v 'file-error
-		       "%s failed, see buffer `%s' for details."
-		       msg-operation (buffer-name)))
-
-		  ;; Some WebDAV server, like the one from QNAP, do
-		  ;; not support direct copy/move.  Try a fallback.
-		  (tramp-set-connection-property v "direct-copy-failed" t)
-		  (tramp-gvfs-do-copy-or-rename-file
-		   op filename newname ok-if-already-exists keep-date
-		   preserve-uid-gid preserve-extended-attributes))))
-
-	    (when (and t1 (eq op 'rename))
-	      (with-parsed-tramp-file-name filename nil
-		(tramp-flush-file-properties v localname)))
-
-	    (when t2
-	      (with-parsed-tramp-file-name newname nil
-		(tramp-flush-file-properties v localname)))))))))
+	(tramp-barf-if-file-missing v filename
+	  (when (and (not ok-if-already-exists) (file-exists-p newname))
+	    (tramp-error v 'file-already-exists newname))
+	  (when (and (file-directory-p newname)
+		     (not (directory-name-p newname)))
+	    (tramp-error v 'file-error "File is a directory %s" newname))
+
+	  (cond
+	   ;; We cannot rename volatile files, as used by Google-drive.
+	   ((and (not equal-remote) volatile)
+	    (prog1 (copy-file
+		    filename newname ok-if-already-exists keep-date
+		    preserve-uid-gid preserve-extended-attributes)
+	      (delete-file filename)))
+
+	   ;; We cannot copy or rename directly.
+	   ((or (and equal-remote
+		     (tramp-get-connection-property v "direct-copy-failed"))
+		(and t1 (not (tramp-gvfs-file-name-p filename)))
+		(and t2 (not (tramp-gvfs-file-name-p newname))))
+	    (let ((tmpfile (tramp-compat-make-temp-file filename)))
+	      (if (eq op 'copy)
+		  (copy-file
+		   filename tmpfile t keep-date preserve-uid-gid
+		   preserve-extended-attributes)
+		(rename-file filename tmpfile t))
+	      (rename-file tmpfile newname ok-if-already-exists)))
+
+	   ;; Direct action.
+	   (t (with-tramp-progress-reporter
+		  v 0 (format "%s %s to %s" msg-operation filename newname)
+		(unless
+		    (and (apply
+			  #'tramp-gvfs-send-command v gvfs-operation
+			  (append
+			   (and (eq op 'copy) (or keep-date preserve-uid-gid)
+				'("--preserve"))
+			   (list
+			    (tramp-gvfs-url-file-name filename)
+			    (tramp-gvfs-url-file-name newname))))
+			 ;; Some backends do not return a proper error
+			 ;; code in case of direct copy/move.  Apply
+			 ;; sanity checks.
+			 (or (not equal-remote)
+			     (tramp-gvfs-send-command
+			      v "gvfs-info" (tramp-gvfs-url-file-name newname))
+			     (eq op 'copy)
+			     (not (tramp-gvfs-send-command
+				   v "gvfs-info"
+				   (tramp-gvfs-url-file-name filename)))))
+
+		  (if (or (not equal-remote)
+			  (and equal-remote
+			       (tramp-get-connection-property
+				v "direct-copy-failed")))
+		      ;; Propagate the error.
+		      (with-current-buffer (tramp-get-connection-buffer v)
+			(goto-char (point-min))
+			(tramp-error-with-buffer
+			 nil v 'file-error
+			 "%s failed, see buffer `%s' for details."
+			 msg-operation (buffer-name)))
+
+		    ;; Some WebDAV server, like the one from QNAP, do
+		    ;; not support direct copy/move.  Try a fallback.
+		    (tramp-set-connection-property v "direct-copy-failed" t)
+		    (tramp-gvfs-do-copy-or-rename-file
+		     op filename newname ok-if-already-exists keep-date
+		     preserve-uid-gid preserve-extended-attributes))))
+
+	      (when (and t1 (eq op 'rename))
+		(with-parsed-tramp-file-name filename nil
+		  (tramp-flush-file-properties v localname)))
+
+	      (when t2
+		(with-parsed-tramp-file-name newname nil
+		  (tramp-flush-file-properties v localname))))))))))
 
 (defun tramp-gvfs-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
@@ -1626,6 +1625,7 @@ VEC or USER, or if there is no home directory, return nil."
 (defun tramp-gvfs-handle-get-remote-uid (vec id-format)
   "The uid of the remote connection VEC, in ID-FORMAT.
 ID-FORMAT valid values are `string' and `integer'."
+  ;; The result is cached in `tramp-get-remote-uid'.
   (if (equal id-format 'string)
       (tramp-file-name-user vec)
     (when-let ((localname
@@ -1636,6 +1636,7 @@ ID-FORMAT valid values are `string' and `integer'."
 (defun tramp-gvfs-handle-get-remote-gid (vec id-format)
   "The gid of the remote connection VEC, in ID-FORMAT.
 ID-FORMAT valid values are `string' and `integer'."
+  ;; The result is cached in `tramp-get-remote-gid'.
   (when-let ((localname
 	      (tramp-get-connection-property (tramp-get-process vec) "share")))
     (file-attribute-group-id
@@ -1795,7 +1796,8 @@ a downcased host name only."
 			 (progn
 			   (message "%s" message)
 			   0)
-		       (with-tramp-connection-property (tramp-get-process v) message
+		       (with-tramp-connection-property
+			   (tramp-get-process v) message
 			 ;; In theory, there can be several choices.
 			 ;; Until now, there is only the question
 			 ;; whether to accept an unknown host