Sync with Tramp 2.5.3.2. Don't merge with master

* doc/misc/tramp.texi (Android shell setup): Rework.
(Frequently Asked Questions): Improve recommendations for speeding up.

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.4-pre".

* lisp/net/tramp-adb.el (tramp-methods): Use "%d".
(tramp-adb-handle-directory-files-and-attributes): Fix "." and
".." in listing.
(tramp-adb-handle-file-attributes)
(tramp-adb-handle-directory-files-and-attributes)
(tramp-adb-handle-file-name-all-completions): Pipe "ls" output
through "cat", in order to avoid quoting special characters.
(tramp-adb-maybe-open-connection): Compute args from `tramp-login-args'.

* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
New defalias.

* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
Adapt check for proper remote command.

* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-handle-make-process): Check for adb device if indicated.
(tramp-get-remote-tmpdir): Cache result in temporary connection
property.

* test/lisp/net/tramp-tests.el  (tramp-test17-insert-directory)
(tramp-test22-file-times, tramp--test-utf8): Adapt tests.
(tramp--test-shell-file-name): Do not depend on `tramp--test-adb-p'.
(tramp-test46-unload): Ignore autoload functions in
`tramp-file-name' structure tests, since `tramp-file-name-handler'
is also autoloaded in Emacs 29.

5 files changed, 59 insertions, 24 deletions

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 1fe10a560b1..53796503bcd 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -95,7 +95,7 @@ It is used for TCP/IP devices."
  (add-to-list 'tramp-methods
               `(,tramp-adb-method
                 (tramp-login-program ,tramp-adb-program)
-                (tramp-login-args    (("shell")))
+                (tramp-login-args    (("-s" "%d") ("shell")))
                 (tramp-direct-async  t)
                 (tramp-tmpdir        "/data/local/tmp")
                 (tramp-default-port  5555)))
@@ -256,7 +256,7 @@ arguments to pass to the OPERATION."
           v localname (format "file-attributes-%s" id-format)
         (and
          (tramp-adb-send-command-and-check
-          v (format "%s -d -l %s"
+          v (format "%s -d -l %s | cat"
                     (tramp-adb-get-ls-command v)
                     (tramp-shell-quote-argument localname)))
          (with-current-buffer (tramp-get-buffer v)
@@ -315,20 +315,25 @@ arguments to pass to the OPERATION."
                                full match id-format nosort count)
          (with-current-buffer (tramp-get-buffer v)
            (when (tramp-adb-send-command-and-check
-                  v (format "%s -a -l %s"
+                  v (format "%s -a -l %s | cat"
                             (tramp-adb-get-ls-command v)
                             (tramp-shell-quote-argument localname)))
-             ;; We insert also filename/. and filename/.., because "ls" doesn't.
-             ;; Looks like it does include them in toybox, since Android 6.
+             ;; We insert also filename/. and filename/.., because
+             ;; "ls" doesn't on some file systems, like "sdcard".
              (unless (re-search-backward "\\.$" nil t)
                (narrow-to-region (point-max) (point-max))
                (tramp-adb-send-command
-                v (format "%s -d -a -l %s %s"
+                v (format "%s -d -a -l %s %s | cat"
                           (tramp-adb-get-ls-command v)
                           (tramp-shell-quote-argument
                            (tramp-compat-file-name-concat localname "."))
                           (tramp-shell-quote-argument
                            (tramp-compat-file-name-concat localname ".."))))
+               (tramp-compat-replace-regexp-in-region
+                (regexp-quote
+                 (tramp-compat-file-name-unquote
+                  (file-name-as-directory localname)))
+                "" (point-min))
                (widen)))
            (tramp-adb-sh-fix-ls-output)
            (let ((result (tramp-do-parse-file-attributes-with-ls
@@ -474,7 +479,7 @@ Emacs dired can't find files."
    (with-parsed-tramp-file-name (expand-file-name directory) nil
      (with-tramp-file-property v localname "file-name-all-completions"
        (tramp-adb-send-command
-        v (format "%s -a %s"
+        v (format "%s -a %s | cat"
                   (tramp-adb-get-ls-command v)
                   (tramp-shell-quote-argument localname)))
        (mapcar
@@ -485,9 +490,8 @@ Emacs dired can't find files."
         (with-current-buffer (tramp-get-buffer v)
           (delete-dups
            (append
-            ;; In older Android versions, "." and ".." are not
-            ;; included.  In newer versions (toybox, since Android 6)
-            ;; they are.  We fix this by `delete-dups'.
+            ;; On some file systems like "sdcard", "." and ".." are
+            ;; not included.  We fix this by `delete-dups'.
             '("." "..")
             (delq
              nil
@@ -1270,9 +1274,8 @@ connection if a previous connection has died for some reason."
         (with-tramp-progress-reporter vec 3 "Opening adb shell connection"
           (let* ((coding-system-for-read 'utf-8-dos) ; Is this correct?
                  (process-connection-type tramp-process-connection-type)
-                 (args (if (> (length host) 0)
-                           (list "-s" device "shell")
-                         (list "shell")))
+                 (args (tramp-expand-args
+                        vec 'tramp-login-args ?d (or device "")))
                  (p (let ((default-directory
                             tramp-compat-temporary-file-directory))
                       (apply #'start-process (tramp-get-connection-name vec) buf
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index aead1dedd24..91c450eee4e 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -398,6 +398,29 @@ CONDITION can also be a list of error conditions."
                          (car components))
                  (cdr components)))))))
 
+;; Function `replace-regexp-in-region' is new in Emacs 28.1.
+(defalias 'tramp-compat-replace-regexp-in-region
+  (if (fboundp 'replace-regexp-in-region)
+      #'replace-regexp-in-region
+    (lambda (regexp replacement &optional start end)
+      (if start
+          (when (< start (point-min))
+            (error "Start before start of buffer"))
+        (setq start (point)))
+      (if end
+          (when (> end (point-max))
+            (error "End after end of buffer"))
+        (setq end (point-max)))
+      (save-excursion
+        (let ((matches 0)
+              (case-fold-search nil))
+          (goto-char start)
+          (while (re-search-forward regexp end t)
+            (replace-match replacement t)
+            (setq matches (1+ matches)))
+          (and (not (zerop matches))
+               matches))))))
+
 (dolist (elt (all-completions "tramp-compat-" obarray 'functionp))
   (put (intern elt) 'tramp-suppress-trace t))
 
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index e0b786f015a..207e588f347 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1053,12 +1053,14 @@ file names."
                        ;; 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)))))
+                           (and
+                            (tramp-gvfs-send-command
+                             v "gvfs-info"
+                             (tramp-gvfs-url-file-name newname))
+                            (or (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
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 95d674911f3..f7243625c7c 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -257,6 +257,7 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
       argument if it is supported.
     - \"%y\" is replaced by the `tramp-scp-force-scp-protocol'
       argument if it is supported.
+    - \"%d\" is replaced by the device detected by `tramp-adb-get-device'.
 
     The existence of `tramp-login-args', combined with the
     absence of `tramp-copy-args', is an indication that the
@@ -4244,6 +4245,8 @@ substitution.  SPEC-LIST is a list of char/value pairs used for
           ;; is different between tramp-sh.el, and tramp-adb.el or
           ;; tramp-sshfs.el.
           (let* ((sh-file-name-handler-p (tramp-sh-file-name-handler-p v))
+                 (adb-file-name-handler-p
+                  (tramp-adb-file-name-p (tramp-make-tramp-file-name v)))
                  (login-program
                   (tramp-get-method-parameter v 'tramp-login-program))
                  ;; We don't create the temporary file.  In fact, it
@@ -4263,6 +4266,10 @@ substitution.  SPEC-LIST is a list of char/value pairs used for
                   (when sh-file-name-handler-p
                     (tramp-compat-funcall
                      'tramp-ssh-controlmaster-options v)))
+                 (device
+                  (when adb-file-name-handler-p
+                    (tramp-compat-funcall
+                     'tramp-adb-get-device v)))
                  login-args p)
 
             ;; Replace `login-args' place holders.  Split
@@ -4279,7 +4286,7 @@ substitution.  SPEC-LIST is a list of char/value pairs used for
                  v 'tramp-login-args
                  ?h (or host "") ?u (or user "") ?p (or port "")
                  ?c (format-spec (or options "") (format-spec-make ?t tmpfile))
-                 ?l ""))))
+                 ?d (or device "") ?l ""))))
              p (make-process
                 :name name :buffer buffer
                 :command (append `(,login-program) login-args command)
@@ -5451,7 +5458,7 @@ This handles also chrooted environments, which are not regarded as local."
 
 (defun tramp-get-remote-tmpdir (vec)
   "Return directory for temporary files on the remote host identified by VEC."
-  (with-tramp-connection-property vec "tmpdir"
+  (with-tramp-connection-property (tramp-get-process vec) "remote-tmpdir"
     (let ((dir
            (tramp-make-tramp-file-name
             vec (or (tramp-get-method-parameter vec 'tramp-tmpdir) "/tmp"))))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index e14c26d8999..80a533cb992 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.5.3.28.2
+;; Version: 2.5.4-pre
 ;; Package-Requires: ((emacs "25.1"))
 ;; Package-Type: multi
 ;; URL: https://www.gnu.org/software/tramp/
@@ -40,7 +40,7 @@
 ;; ./configure" to change them.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.5.3.28.2"
+(defconst tramp-version "2.5.4-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -78,7 +78,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-lessp emacs-version "25.1"))
       "ok"
-    (format "Tramp 2.5.3.28.2 is not fit for %s"
+    (format "Tramp 2.5.4-pre is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))