mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Still fixes for Tramp directory-files-*

Browse source 
* lisp/net/tramp.el (tramp-handle-directory-files):
* lisp/net/tramp-adb.el
(tramp-adb-handle-directory-files-and-attributes): Fix COUNT.

* lisp/net/tramp-crypt.el (tramp-crypt-handle-directory-files):
Implement COUNT.

* lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-byte-array-to-string):
* lisp/net/tramp-integration.el (tramp-eshell-directory-change):
Use `nbutlast'.

* lisp/net/tramp-rclone.el (tramp-rclone-handle-delete-directory)
(tramp-rclone-handle-delete-file): Reorder cache flushing.
(tramp-rclone-handle-directory-files):
Use `tramp-compat-directory-files'.

* lisp/net/tramp-sh.el (tramp-sh-handle-directory-files-and-attributes):
Fix NOSORT and COUNT.

* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Fix NOSORT.

* test/lisp/net/tramp-tests.el (tramp--test-share-p): New defun.
(tramp-test05-expand-file-name-relative): Use it.
(tramp-test16-directory-files)
(tramp-test19-directory-files-and-attributes): Strengthen test.
(tramp-test20-file-modes): Simplify check.
This commit is contained in:
Michael Albinus 2020-11-05 17:36:04 +01:00
parent ef5211d0aa
commit 334e2ab440
9 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/net/tramp-adb.el
View file

@ -350,8 +350,8 @@ ARGUMENTS to pass to the OPERATION."
match (car x)))
x))
result)))
(when (natnump count)
(setq result (last result count)))
(when (and (natnump count) (> count 0))
(setq result (nbutlast result (- (length result) count))))
result)))))))
(defun tramp-adb-get-ls-command (vec)

9
lisp/net/tramp-crypt.el
View file

@ -668,7 +668,8 @@ absolute file names."
(let (tramp-crypt-enabled)
(delete-file (tramp-crypt-encrypt-file-name filename)))))
(defun tramp-crypt-handle-directory-files (directory &optional full match nosort)
(defun tramp-crypt-handle-directory-files
(directory &optional full match nosort count)
"Like `directory-files' for Tramp files."
(unless (file-exists-p directory)
(tramp-error
@ -697,7 +698,11 @@ absolute file names."
(replace-regexp-in-string
(concat "^" (regexp-quote directory)) "" x))
result)))
(if nosort result (sort result #'string<)))))
(unless nosort
(setq result (sort result #'string<)))
(when (and (natnump count) (> count 0))
(setq result (nbutlast result (- (length result) count))))
result)))
(defun tramp-crypt-handle-file-attributes (filename &optional id-format)
"Like `file-attributes' for Tramp files."

2
lisp/net/tramp-gvfs.el
View file

@ -876,7 +876,7 @@ Return nil for null BYTE-ARRAY."
byte-array (car byte-array))))
(dbus-byte-array-to-string
(if (and (consp byte-array) (zerop (car (last byte-array))))
(butlast byte-array) byte-array))))
(nbutlast byte-array) byte-array))))
(defun tramp-gvfs-stringify-dbus-message (message)
"Convert a D-Bus MESSAGE into readable UTF8 strings, used for traces."

2
lisp/net/tramp-integration.el
View file

@ -132,7 +132,7 @@ been set up by `rfn-eshadow-setup-minibuffer'."
;; Use `path-separator' as it does eshell.
(setq eshell-path-env
(mapconcat
#'identity (butlast (tramp-compat-exec-path)) path-separator)))
#'identity (nbutlast (tramp-compat-exec-path)) path-separator)))
(with-eval-after-load 'esh-util
(add-hook 'eshell-mode-hook

12
lisp/net/tramp-rclone.el
View file

@ -289,16 +289,16 @@ file names."
(directory &optional recursive trash)
"Like `delete-directory' for Tramp files."
(with-parsed-tramp-file-name (expand-file-name directory) nil
(delete-directory (tramp-rclone-local-file-name directory) recursive trash)
(tramp-flush-directory-properties v localname)
(tramp-rclone-flush-directory-cache v)))
(tramp-rclone-flush-directory-cache v)
(delete-directory (tramp-rclone-local-file-name directory) recursive trash)))
(defun tramp-rclone-handle-delete-file (filename &optional trash)
"Like `delete-file' for Tramp files."
(with-parsed-tramp-file-name (expand-file-name filename) nil
(tramp-rclone-flush-directory-cache v)
(delete-file (tramp-rclone-local-file-name filename) trash)
(tramp-flush-file-properties v localname)
(tramp-rclone-flush-directory-cache v)))
(tramp-flush-file-properties v localname)))
(defun tramp-rclone-handle-directory-files
(directory &optional full match nosort count)
@ -311,8 +311,8 @@ file names."
(setq directory (file-name-as-directory (expand-file-name directory)))
(with-parsed-tramp-file-name directory nil
(let ((result
(directory-files
(tramp-rclone-local-file-name directory) full match count)))
(tramp-compat-directory-files
(tramp-rclone-local-file-name directory) full match nosort count)))
;; Massage the result.
(when full
(let ((local (concat "^" (regexp-quote (tramp-rclone-mount-point v))))

11
lisp/net/tramp-sh.el
View file

@ -1738,12 +1738,13 @@ ID-FORMAT valid values are `string' and `integer'."
(setcar item (expand-file-name (car item) directory)))
(push item result)))
(when (natnump count)
(setq result (last result count)))
(unless nosort
(setq result (sort result (lambda (x y) (string< (car x) (car y))))))
(or (if nosort
result
(sort result (lambda (x y) (string< (car x) (car y)))))
(when (and (natnump count) (> count 0))
(setq result (nbutlast result (- (length result) count))))
(or result
;; The scripts could fail, for example with huge file size.
(tramp-handle-directory-files-and-attributes
directory full match nosort id-format count)))))

7
lisp/net/tramp-smb.el
View file

@ -704,6 +704,10 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(mapcar (lambda (x) (when (string-match-p match x) x))
result))))
;; Sort them if necessary.
(unless nosort
(setq result (sort result #'string-lessp)))
;; Return count number of results.
(when (and (natnump count) (> count 0))
(setq result (nbutlast result (- (length result) count))))
@ -714,8 +718,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(mapcar
(lambda (x) (format "%s/%s" (directory-file-name directory) x))
result)))
;; Sort them if necessary.
(unless nosort (setq result (sort result #'string-lessp)))
result))
(defun tramp-smb-handle-expand-file-name (name &optional dir)

4
lisp/net/tramp.el
View file

@ -3134,8 +3134,8 @@ User is always nil."
result)))
(unless nosort
(setq result (sort result #'string<)))
(when (natnump count)
(setq result (last result count)))
(when (and (natnump count) (> count 0))
(setq result (nbutlast result (- (length result) count))))
result)))
(defun tramp-handle-directory-files-and-attributes

27
test/lisp/net/tramp-tests.el
View file

@ -2169,6 +2169,8 @@ is greater than 10.
(skip-unless (tramp--test-enabled))
;; The bugs are fixed in Emacs 28.1.
(skip-unless (tramp--test-emacs28-p))
;; Methods with a share do not expand "/path/..".
(skip-unless (not (tramp--test-share-p)))
(should
(string-equal
@ -2931,10 +2933,10 @@ This tests also `file-directory-p' and `file-accessible-directory-p'."
(when (tramp--test-emacs28-p)
(with-no-warnings
(should
(= 1 (length
(directory-files
tmp-name1 nil directory-files-no-dot-files-regexp
nil 1)))))))
(equal
(directory-files
tmp-name1 nil directory-files-no-dot-files-regexp nil 1)
'("bla"))))))
;; Cleanup.
(ignore-errors (delete-directory tmp-name1 'recursive))))))
@ -3457,8 +3459,9 @@ They might differ only in time attributes or directory size."
;; Check the COUNT arg. It exists since Emacs 28.
(when (tramp--test-emacs28-p)
(with-no-warnings
(should (= 1 (length (directory-files-and-attributes
tmp-name2 nil "\\`b" nil nil 1)))))))
(setq attr (directory-files-and-attributes
tmp-name2 nil "\\`b" nil nil 1))
(should (equal (mapcar #'car attr) '("bar"))))))
;; Cleanup.
(ignore-errors (delete-directory tmp-name1 'recursive))))))
@ -3470,10 +3473,7 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
(skip-unless
(or (tramp--test-sh-p) (tramp--test-sudoedit-p)
;; Not all tramp-gvfs.el methods support changing the file mode.
(and
(tramp--test-gvfs-p)
(string-match-p
"ftp" (file-remote-p tramp-test-temporary-file-directory 'method)))))
(tramp--test-gvfs-p "afp") (tramp--test-gvfs-p "ftp")))
(dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
@ -5705,6 +5705,13 @@ This does not support special file names."
(tramp-sh-file-name-handler-p
(tramp-dissect-file-name tramp-test-temporary-file-directory)))
(defun tramp--test-share-p ()
"Check, whether the method needs a share."
(and (tramp--test-gvfs-p)
(string-match-p
"^\\(afp\\|davs?\\|smb\\)$"
(file-remote-p tramp-test-temporary-file-directory 'method))))
(defun tramp--test-sudoedit-p ()
"Check, whether the sudoedit method is used."
(tramp-sudoedit-file-name-p tramp-test-temporary-file-directory))