From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 1 Mar 2023 16:07:59 +0000 (+0100)
Subject: Make Tramp file name completion more quiet
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b99015e15a23bd5cbec021d53ef9fcca25b2441;p=emacs.git

Make Tramp file name completion more quiet

* lisp/net/tramp-sh.el (tramp-perl-file-name-all-completions):
Don't print status message.
(tramp-sh-handle-file-name-all-completions): Return nil when check
fails.  (Bug#61890)

* test/lisp/net/tramp-tests.el
(tramp-test26-file-name-completion-with-perl):
(tramp-test26-file-name-completion-with-ls): New tests.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index b3d837f9514..ce443b558a3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -631,7 +631,6 @@ foreach $f (@files) {
   print \"$f\\n\";
  }
 }
-print \"ok\\n\"
 ' \"$1\" %n"
   "Perl script to produce output suitable for use with
 `file-name-all-completions' on the remote file system.
@@ -1768,57 +1767,34 @@ ID-FORMAT valid values are `string' and `integer'."
 	   ;; Get a list of directories and files, including reliably
 	   ;; tagging the directories with a trailing "/".  Because I
 	   ;; rock.  --daniel@danann.net
-	   (tramp-send-command
-	    v
-	    (if (tramp-get-remote-perl v)
-		(progn
-		  (tramp-maybe-send-script
-		   v tramp-perl-file-name-all-completions
-		   "tramp_perl_file_name_all_completions")
-		  (format "tramp_perl_file_name_all_completions %s"
-			  (tramp-shell-quote-argument localname)))
-
-	      (format (concat
-		       "(cd %s 2>&1 && %s -a 2>%s"
-		       " | while IFS= read f; do"
-		       " if %s -d \"$f\" 2>%s;"
-		       " then \\echo \"$f/\"; else \\echo \"$f\"; fi; done"
-		       " && \\echo ok) || \\echo fail")
-		      (tramp-shell-quote-argument localname)
-		      (tramp-get-ls-command v)
-                      (tramp-get-remote-null-device v)
-		      (tramp-get-test-command v)
-                      (tramp-get-remote-null-device v))))
-
-	   ;; Now grab the output.
-	   (with-current-buffer (tramp-get-buffer v)
-	     (goto-char (point-max))
-
-	     ;; Check result code, found in last line of output.
-	     (forward-line -1)
-	     (if (looking-at-p (rx bol "fail" eol))
-		 (progn
-		   ;; Grab error message from line before last line
-		   ;; (it was put there by `cd 2>&1').
-		   (forward-line -1)
-		   (tramp-error
-		    v 'file-error
-		    "tramp-sh-handle-file-name-all-completions: %s"
-		    (buffer-substring (point) (line-end-position))))
-	       ;; For peace of mind, if buffer doesn't end in `fail'
-	       ;; then it should end in `ok'.  If neither are in the
-	       ;; buffer something went seriously wrong on the remote
-	       ;; side.
-	       (unless (looking-at-p (rx bol "ok" eol))
-		 (tramp-error
-		  v 'file-error
-		  (concat "tramp-sh-handle-file-name-all-completions: "
-			  "internal error accessing `%s': `%s'")
-		  (tramp-shell-quote-argument localname) (buffer-string))))
-
-	     (while (zerop (forward-line -1))
-	       (push (buffer-substring (point) (line-end-position)) result)))
-	   result))))))
+	   (when (tramp-send-command-and-check
+		  v
+		  (if (tramp-get-remote-perl v)
+		      (progn
+			(tramp-maybe-send-script
+			 v tramp-perl-file-name-all-completions
+			 "tramp_perl_file_name_all_completions")
+			(format "tramp_perl_file_name_all_completions %s"
+				(tramp-shell-quote-argument localname)))
+
+		    (format (concat
+			     "cd %s 2>&1 && %s -a 2>%s"
+			     " | while IFS= read f; do"
+			     " if %s -d \"$f\" 2>%s;"
+			     " then \\echo \"$f/\"; else \\echo \"$f\"; fi;"
+			     " done")
+			    (tramp-shell-quote-argument localname)
+			    (tramp-get-ls-command v)
+			    (tramp-get-remote-null-device v)
+			    (tramp-get-test-command v)
+			    (tramp-get-remote-null-device v))))
+
+	     ;; Now grab the output.
+	     (with-current-buffer (tramp-get-buffer v)
+	       (goto-char (point-max))
+	       (while (zerop (forward-line -1))
+		 (push (buffer-substring (point) (line-end-position)) result)))
+	     result)))))))
 
 ;; cp, mv and ln
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 69004bdbdf3..948bf0ab9e2 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2530,7 +2530,7 @@ This checks also `file-name-as-directory', `file-name-directory',
 			(rx bos))
 		      tramp--test-messages))))))
 
-	    ;; We do not test lockname here.  See
+	    ;; We do not test the lock file here.  See
 	    ;; `tramp-test39-make-lock-file-name'.
 
 	    ;; Do not overwrite if excluded.
@@ -4635,6 +4635,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 	  ;; Cleanup.
 	  (ignore-errors (delete-directory tmp-name 'recursive)))))))
 
+(tramp--test-deftest-with-perl tramp-test26-file-name-completion)
+
+(tramp--test-deftest-with-ls tramp-test26-file-name-completion)
+
 ;; This test is inspired by Bug#51386, Bug#52758, Bug#53513, Bug#54042
 ;; and Bug#60505.
 (ert-deftest tramp-test26-interactive-file-name-completion ()
@@ -6561,7 +6565,7 @@ INPUT, if non-nil, is a string sent to the process."
                          (lambda (&rest _args) "yes")))
                 (kill-buffer)))
 	    ;; A new connection changes process id, and also the
-	    ;; lockname contents.  But the lock file still exists.
+	    ;; lock file contents.  But it still exists.
 	    (tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
 	    (should (stringp (with-no-warnings (file-locked-p tmp-name1))))