2017-03-23 14:58:04 +01:00
|
|
|
|
;;; tramp-tests.el --- Tests of remote file access -*- lexical-binding:t -*-
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2023-01-01 05:31:12 -05:00
|
|
|
|
;; Copyright (C) 2013-2023 Free Software Foundation, Inc.
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
;; Author: Michael Albinus <michael.albinus@gmx.de>
|
|
|
|
|
|
|
2020-10-28 03:41:55 +01:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; modify it under the terms of the GNU General Public License as
|
|
|
|
|
|
;; published by the Free Software Foundation, either version 3 of the
|
|
|
|
|
|
;; License, or (at your option) any later version.
|
|
|
|
|
|
;;
|
2020-10-28 03:41:55 +01:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful, but
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
;; General Public License for more details.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2020-10-28 03:41:55 +01:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
2014-04-24 10:21:58 +02:00
|
|
|
|
;; Some of the tests require access to a remote host files. Since
|
|
|
|
|
|
;; this could be problematic, a mock-up connection method "mock" is
|
|
|
|
|
|
;; used. Emulating a remote connection, it simply calls "sh -i".
|
2014-04-25 12:35:01 +02:00
|
|
|
|
;; Tramp's file name handlers still run, so this test is sufficient
|
2014-04-24 10:21:58 +02:00
|
|
|
|
;; except for connection establishing.
|
|
|
|
|
|
|
|
|
|
|
|
;; If you want to test a real Tramp connection, set
|
|
|
|
|
|
;; $REMOTE_TEMPORARY_FILE_DIRECTORY to a suitable value in order to
|
|
|
|
|
|
;; overwrite the default value. If you want to skip tests accessing a
|
|
|
|
|
|
;; remote host, set this environment variable to "/dev/null" or
|
|
|
|
|
|
;; whatever is appropriate on your system.
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; For slow remote connections, `tramp-test45-asynchronous-requests'
|
2017-12-16 10:47:06 +01:00
|
|
|
|
;; might be too heavy. Setting $REMOTE_PARALLEL_PROCESSES to a proper
|
|
|
|
|
|
;; value less than 10 could help.
|
|
|
|
|
|
|
2013-11-08 10:31:15 +01:00
|
|
|
|
;; A whole test run can be performed calling the command `tramp-test-all'.
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
2019-05-09 14:23:07 +02:00
|
|
|
|
(require 'cl-lib)
|
2017-03-23 14:58:04 +01:00
|
|
|
|
(require 'dired)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(require 'dired-aux)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(require 'tramp)
|
2018-01-04 12:48:07 +01:00
|
|
|
|
(require 'ert-x)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(require 'seq) ; For `seq-random-elt', autoloaded since Emacs 28.1
|
2022-05-05 09:54:31 +02:00
|
|
|
|
(require 'tar-mode)
|
2020-06-23 21:18:08 +02:00
|
|
|
|
(require 'trace)
|
2014-02-11 09:31:39 +01:00
|
|
|
|
(require 'vc)
|
|
|
|
|
|
(require 'vc-bzr)
|
|
|
|
|
|
(require 'vc-git)
|
|
|
|
|
|
(require 'vc-hg)
|
|
|
|
|
|
|
2021-09-26 10:32:15 +02:00
|
|
|
|
(declare-function tramp-check-remote-uname "tramp-sh")
|
2014-02-11 09:31:39 +01:00
|
|
|
|
(declare-function tramp-find-executable "tramp-sh")
|
2020-02-26 18:43:11 +01:00
|
|
|
|
(declare-function tramp-get-remote-chmod-h "tramp-sh")
|
2014-02-11 09:31:39 +01:00
|
|
|
|
(declare-function tramp-get-remote-path "tramp-sh")
|
2015-03-04 11:46:06 +01:00
|
|
|
|
(declare-function tramp-get-remote-perl "tramp-sh")
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(declare-function tramp-get-remote-stat "tramp-sh")
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(declare-function tramp-list-tramp-buffers "tramp-cmds")
|
2021-04-14 13:25:36 +02:00
|
|
|
|
(declare-function tramp-method-out-of-band-p "tramp-sh")
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(declare-function tramp-smb-get-localname "tramp-smb")
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(defvar ange-ftp-make-backup-files)
|
Reduce autoloaded objects in Tramp
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
Remove autoload cookie.
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name): Remove autoload cookie.
* lisp/net/tramp-ftp.el (tramp-ftp-enable-ange-ftp):
Use `tramp-autoload' cookie.
* lisp/net/tramp-gvfs.el (tramp-gvfs-zeroconf-domain):
Remove autoload cookie.
* lisp/net/tramp-rclone.el (tramp-rclone-program): Remove autoload
cookie.
(tramp-set-completion-function): Use `tramp--with-startup'.
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-histfile-override)
(tramp-use-ssh-controlmaster-options, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Remove autoload cookie.
(tramp-stat-marker, tramp-stat-quoted-marker): Move to tramp.el.
* lisp/net/tramp-smb.el (tramp-smb-program)
(tramp-smb-acl-program, tramp-smb-conf)
(tramp-smb-winexe-program, tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch): Remove autoload cookie.
* lisp/net/tramp-sudoedit.el (server, tramp-sh): Do not require.
* lisp/net/tramp.el (tramp--startup-hook): Define.
(tramp-stat-marker, tramp-stat-quoted-marker): New defconsts,
taken from tramp-sh.el.
* test/lisp/net/tramp-archive-tests.el (tramp-copy-size-limit)
(tramp-persistency-file-name): Declare.
* test/lisp/net/tramp-tests.el (tramp-connection-properties)
(tramp-display-escape-sequence-regexp)
(tramp-inline-compress-start-size, tramp-remote-path): Declare.
2018-12-17 11:50:06 +01:00
|
|
|
|
(defvar tramp-connection-properties)
|
2014-03-07 15:11:37 +01:00
|
|
|
|
(defvar tramp-copy-size-limit)
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(defvar tramp-fuse-remove-hidden-files)
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(defvar tramp-fuse-unmount-on-cleanup)
|
Reduce autoloaded objects in Tramp
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
Remove autoload cookie.
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name): Remove autoload cookie.
* lisp/net/tramp-ftp.el (tramp-ftp-enable-ange-ftp):
Use `tramp-autoload' cookie.
* lisp/net/tramp-gvfs.el (tramp-gvfs-zeroconf-domain):
Remove autoload cookie.
* lisp/net/tramp-rclone.el (tramp-rclone-program): Remove autoload
cookie.
(tramp-set-completion-function): Use `tramp--with-startup'.
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-histfile-override)
(tramp-use-ssh-controlmaster-options, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Remove autoload cookie.
(tramp-stat-marker, tramp-stat-quoted-marker): Move to tramp.el.
* lisp/net/tramp-smb.el (tramp-smb-program)
(tramp-smb-acl-program, tramp-smb-conf)
(tramp-smb-winexe-program, tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch): Remove autoload cookie.
* lisp/net/tramp-sudoedit.el (server, tramp-sh): Do not require.
* lisp/net/tramp.el (tramp--startup-hook): Define.
(tramp-stat-marker, tramp-stat-quoted-marker): New defconsts,
taken from tramp-sh.el.
* test/lisp/net/tramp-archive-tests.el (tramp-copy-size-limit)
(tramp-persistency-file-name): Declare.
* test/lisp/net/tramp-tests.el (tramp-connection-properties)
(tramp-display-escape-sequence-regexp)
(tramp-inline-compress-start-size, tramp-remote-path): Declare.
2018-12-17 11:50:06 +01:00
|
|
|
|
(defvar tramp-inline-compress-start-size)
|
2015-07-23 21:49:40 +02:00
|
|
|
|
(defvar tramp-persistency-file-name)
|
Reduce autoloaded objects in Tramp
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
Remove autoload cookie.
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name): Remove autoload cookie.
* lisp/net/tramp-ftp.el (tramp-ftp-enable-ange-ftp):
Use `tramp-autoload' cookie.
* lisp/net/tramp-gvfs.el (tramp-gvfs-zeroconf-domain):
Remove autoload cookie.
* lisp/net/tramp-rclone.el (tramp-rclone-program): Remove autoload
cookie.
(tramp-set-completion-function): Use `tramp--with-startup'.
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-histfile-override)
(tramp-use-ssh-controlmaster-options, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Remove autoload cookie.
(tramp-stat-marker, tramp-stat-quoted-marker): Move to tramp.el.
* lisp/net/tramp-smb.el (tramp-smb-program)
(tramp-smb-acl-program, tramp-smb-conf)
(tramp-smb-winexe-program, tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch): Remove autoload cookie.
* lisp/net/tramp-sudoedit.el (server, tramp-sh): Do not require.
* lisp/net/tramp.el (tramp--startup-hook): Define.
(tramp-stat-marker, tramp-stat-quoted-marker): New defconsts,
taken from tramp-sh.el.
* test/lisp/net/tramp-archive-tests.el (tramp-copy-size-limit)
(tramp-persistency-file-name): Declare.
* test/lisp/net/tramp-tests.el (tramp-connection-properties)
(tramp-display-escape-sequence-regexp)
(tramp-inline-compress-start-size, tramp-remote-path): Declare.
2018-12-17 11:50:06 +01:00
|
|
|
|
(defvar tramp-remote-path)
|
2014-06-02 11:53:43 +02:00
|
|
|
|
(defvar tramp-remote-process-environment)
|
2023-05-16 17:19:20 +02:00
|
|
|
|
(defvar tramp-use-connection-share)
|
Add new Tramp connection method "owncloud"
* doc/misc/tramp.texi (all): Use @acronym{GNOME} thoroughly.
(Using GNOME Online Accounts based methods): Rename from
"Using Google Drive". Add `owncloud'.
(GVFS based methods): Add `owncloud'.
* etc/NEWS: Add Tramp connection method "owncloud".
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods): Add "owncloud".
Remove goa methods if not supported.
(tramp-goa-methods, tramp-goa-service, tramp-goa-path)
(tramp-goa-path-accounts, tramp-goa-interface-documents)
(tramp-goa-interface-printers, tramp-goa-interface-files)
(tramp-goa-interface-contacts, tramp-goa-interface-calendar)
(tramp-goa-interface-oauth2based)
(tramp-goa-interface-account, tramp-goa-identity-regexp)
(tramp-goa-interface-mail, tramp-goa-interface-chat)
(tramp-goa-interface-photos, tramp-goa-path-manager)
(tramp-goa-interface-documents)
(tramp-gvfs-owncloud-default-prefix)
(tramp-gvfs-owncloud-default-prefix-regexp): New defconst.
(tramp-goa-name): New defstruct.
(tramp-gvfs-stringify-dbus-message): Handle all consp messages.
(tramp-dbus-function, tramp-gvfs-get-remote-prefix)
(tramp-get-goa-accounts): New defun.
(with-tramp-dbus-call-method): Use it.
(with-tramp-dbus-get-all-properties): New defmacro.
(tramp-gvfs-url-file-name)
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec):
Map between "owncloud" and "davs".
(tramp-gvfs-maybe-open-connection): Set "vector" connection property.
* test/lisp/net/tramp-tests.el (tramp-gvfs-handler-askquestion):
Suppress run in tests.
(tramp--test-owncloud-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file): Use it.
2018-01-05 21:04:39 +01:00
|
|
|
|
|
2020-02-01 14:29:45 +01:00
|
|
|
|
;; Needed for Emacs 27.
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(defvar lock-file-name-transforms)
|
2020-05-16 14:04:07 +02:00
|
|
|
|
(defvar process-file-return-signal-string)
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(defvar remote-file-name-inhibit-locks)
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(defvar dired-copy-dereference)
|
2019-12-22 13:48:36 +01:00
|
|
|
|
|
2023-01-08 19:24:17 +01:00
|
|
|
|
;; Declared in Emacs 30.
|
2023-07-03 18:24:11 +02:00
|
|
|
|
(defvar remote-file-name-access-timeout)
|
2023-01-08 19:24:17 +01:00
|
|
|
|
(defvar remote-file-name-inhibit-delete-by-moving-to-trash)
|
|
|
|
|
|
|
2022-05-09 20:10:10 +02:00
|
|
|
|
;; `ert-resource-file' was introduced in Emacs 28.1.
|
|
|
|
|
|
(unless (macrop 'ert-resource-file)
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
|
|
(defvar ert-resource-directory-format "%s-resources/"
|
|
|
|
|
|
"Format for `ert-resource-directory'.")
|
|
|
|
|
|
(defvar ert-resource-directory-trim-left-regexp ""
|
|
|
|
|
|
"Regexp for `string-trim' (left) used by `ert-resource-directory'.")
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(defvar ert-resource-directory-trim-right-regexp
|
|
|
|
|
|
(rx (? "-test" (? "s")) ".el")
|
2022-05-09 20:10:10 +02:00
|
|
|
|
"Regexp for `string-trim' (right) used by `ert-resource-directory'.")
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro ert-resource-directory ()
|
|
|
|
|
|
"Return absolute file name of the resource directory for this file.
|
|
|
|
|
|
|
|
|
|
|
|
The path to the resource directory is the \"resources\" directory
|
|
|
|
|
|
in the same directory as the test file.
|
|
|
|
|
|
|
|
|
|
|
|
If that directory doesn't exist, use the directory named like the
|
|
|
|
|
|
test file but formatted by `ert-resource-directory-format' and trimmed
|
|
|
|
|
|
using `string-trim' with arguments
|
|
|
|
|
|
`ert-resource-directory-trim-left-regexp' and
|
|
|
|
|
|
`ert-resource-directory-trim-right-regexp'. The default values mean
|
|
|
|
|
|
that if called from a test file named \"foo-tests.el\", return
|
|
|
|
|
|
the absolute file name for \"foo-resources\"."
|
|
|
|
|
|
`(let* ((testfile ,(or (bound-and-true-p byte-compile-current-file)
|
|
|
|
|
|
(and load-in-progress load-file-name)
|
|
|
|
|
|
buffer-file-name))
|
|
|
|
|
|
(default-directory (file-name-directory testfile)))
|
|
|
|
|
|
(file-truename
|
|
|
|
|
|
(if (file-accessible-directory-p "resources/")
|
|
|
|
|
|
(expand-file-name "resources/")
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
ert-resource-directory-format
|
|
|
|
|
|
(string-trim testfile
|
|
|
|
|
|
ert-resource-directory-trim-left-regexp
|
|
|
|
|
|
ert-resource-directory-trim-right-regexp)))))))
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro ert-resource-file (file)
|
|
|
|
|
|
"Return file name of resource file named FILE.
|
|
|
|
|
|
A resource file is in the resource directory as per
|
|
|
|
|
|
`ert-resource-directory'."
|
|
|
|
|
|
`(expand-file-name ,file (ert-resource-directory)))))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
;; `ert-remote-temporary-file-directory' was introduced in Emacs 29.1.
|
2022-07-10 18:13:50 +02:00
|
|
|
|
;; Adapting `tramp-remote-path' happens also there.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(unless (boundp 'ert-remote-temporary-file-directory)
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
|
|
;; There is no default value on w32 systems, which could work out
|
|
|
|
|
|
;; of the box.
|
|
|
|
|
|
(defconst ert-remote-temporary-file-directory
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
|
|
|
|
|
|
((eq system-type 'windows-nt) null-device)
|
|
|
|
|
|
(t (add-to-list
|
|
|
|
|
|
'tramp-methods
|
2022-11-21 14:49:54 +01:00
|
|
|
|
`("mock"
|
|
|
|
|
|
(tramp-login-program ,tramp-default-remote-shell)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-login-args (("-i")))
|
2022-11-21 14:49:54 +01:00
|
|
|
|
(tramp-direct-async ("-c"))
|
|
|
|
|
|
(tramp-remote-shell ,tramp-default-remote-shell)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-remote-shell-args ("-c"))
|
|
|
|
|
|
(tramp-connection-timeout 10)))
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-host-alist
|
|
|
|
|
|
`("\\`mock\\'" nil ,(system-name)))
|
|
|
|
|
|
;; Emacs's Makefile sets $HOME to a nonexistent value.
|
|
|
|
|
|
;; Needed in batch mode only, therefore.
|
|
|
|
|
|
(unless (and (null noninteractive) (file-directory-p "~/"))
|
|
|
|
|
|
(setenv "HOME" temporary-file-directory))
|
|
|
|
|
|
(format "/mock::%s" temporary-file-directory)))
|
2022-07-10 18:13:50 +02:00
|
|
|
|
"Temporary directory for remote file tests.")
|
|
|
|
|
|
|
|
|
|
|
|
;; This should happen on hydra only.
|
|
|
|
|
|
(when (getenv "EMACS_HYDRA_CI")
|
|
|
|
|
|
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
|
Add new Tramp connection method "owncloud"
* doc/misc/tramp.texi (all): Use @acronym{GNOME} thoroughly.
(Using GNOME Online Accounts based methods): Rename from
"Using Google Drive". Add `owncloud'.
(GVFS based methods): Add `owncloud'.
* etc/NEWS: Add Tramp connection method "owncloud".
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods): Add "owncloud".
Remove goa methods if not supported.
(tramp-goa-methods, tramp-goa-service, tramp-goa-path)
(tramp-goa-path-accounts, tramp-goa-interface-documents)
(tramp-goa-interface-printers, tramp-goa-interface-files)
(tramp-goa-interface-contacts, tramp-goa-interface-calendar)
(tramp-goa-interface-oauth2based)
(tramp-goa-interface-account, tramp-goa-identity-regexp)
(tramp-goa-interface-mail, tramp-goa-interface-chat)
(tramp-goa-interface-photos, tramp-goa-path-manager)
(tramp-goa-interface-documents)
(tramp-gvfs-owncloud-default-prefix)
(tramp-gvfs-owncloud-default-prefix-regexp): New defconst.
(tramp-goa-name): New defstruct.
(tramp-gvfs-stringify-dbus-message): Handle all consp messages.
(tramp-dbus-function, tramp-gvfs-get-remote-prefix)
(tramp-get-goa-accounts): New defun.
(with-tramp-dbus-call-method): Use it.
(with-tramp-dbus-get-all-properties): New defmacro.
(tramp-gvfs-url-file-name)
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec):
Map between "owncloud" and "davs".
(tramp-gvfs-maybe-open-connection): Set "vector" connection property.
* test/lisp/net/tramp-tests.el (tramp-gvfs-handler-askquestion):
Suppress run in tests.
(tramp--test-owncloud-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file): Use it.
2018-01-05 21:04:39 +01:00
|
|
|
|
;; Beautify batch mode.
|
|
|
|
|
|
(when noninteractive
|
|
|
|
|
|
;; Suppress nasty messages.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(fset #'shell-command-sentinel #'ignore)
|
Add new Tramp connection method "owncloud"
* doc/misc/tramp.texi (all): Use @acronym{GNOME} thoroughly.
(Using GNOME Online Accounts based methods): Rename from
"Using Google Drive". Add `owncloud'.
(GVFS based methods): Add `owncloud'.
* etc/NEWS: Add Tramp connection method "owncloud".
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods): Add "owncloud".
Remove goa methods if not supported.
(tramp-goa-methods, tramp-goa-service, tramp-goa-path)
(tramp-goa-path-accounts, tramp-goa-interface-documents)
(tramp-goa-interface-printers, tramp-goa-interface-files)
(tramp-goa-interface-contacts, tramp-goa-interface-calendar)
(tramp-goa-interface-oauth2based)
(tramp-goa-interface-account, tramp-goa-identity-regexp)
(tramp-goa-interface-mail, tramp-goa-interface-chat)
(tramp-goa-interface-photos, tramp-goa-path-manager)
(tramp-goa-interface-documents)
(tramp-gvfs-owncloud-default-prefix)
(tramp-gvfs-owncloud-default-prefix-regexp): New defconst.
(tramp-goa-name): New defstruct.
(tramp-gvfs-stringify-dbus-message): Handle all consp messages.
(tramp-dbus-function, tramp-gvfs-get-remote-prefix)
(tramp-get-goa-accounts): New defun.
(with-tramp-dbus-call-method): Use it.
(with-tramp-dbus-get-all-properties): New defmacro.
(tramp-gvfs-url-file-name)
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec):
Map between "owncloud" and "davs".
(tramp-gvfs-maybe-open-connection): Set "vector" connection property.
* test/lisp/net/tramp-tests.el (tramp-gvfs-handler-askquestion):
Suppress run in tests.
(tramp--test-owncloud-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file): Use it.
2018-01-05 21:04:39 +01:00
|
|
|
|
;; We do not want to be interrupted.
|
2023-01-23 11:02:56 +01:00
|
|
|
|
(fset #'tramp-action-yesno
|
|
|
|
|
|
(lambda (_proc vec)
|
|
|
|
|
|
(tramp-send-string vec (concat "yes" tramp-local-end-of-line)) t))
|
Add new Tramp connection method "owncloud"
* doc/misc/tramp.texi (all): Use @acronym{GNOME} thoroughly.
(Using GNOME Online Accounts based methods): Rename from
"Using Google Drive". Add `owncloud'.
(GVFS based methods): Add `owncloud'.
* etc/NEWS: Add Tramp connection method "owncloud".
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods): Add "owncloud".
Remove goa methods if not supported.
(tramp-goa-methods, tramp-goa-service, tramp-goa-path)
(tramp-goa-path-accounts, tramp-goa-interface-documents)
(tramp-goa-interface-printers, tramp-goa-interface-files)
(tramp-goa-interface-contacts, tramp-goa-interface-calendar)
(tramp-goa-interface-oauth2based)
(tramp-goa-interface-account, tramp-goa-identity-regexp)
(tramp-goa-interface-mail, tramp-goa-interface-chat)
(tramp-goa-interface-photos, tramp-goa-path-manager)
(tramp-goa-interface-documents)
(tramp-gvfs-owncloud-default-prefix)
(tramp-gvfs-owncloud-default-prefix-regexp): New defconst.
(tramp-goa-name): New defstruct.
(tramp-gvfs-stringify-dbus-message): Handle all consp messages.
(tramp-dbus-function, tramp-gvfs-get-remote-prefix)
(tramp-get-goa-accounts): New defun.
(with-tramp-dbus-call-method): Use it.
(with-tramp-dbus-get-all-properties): New defmacro.
(tramp-gvfs-url-file-name)
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec):
Map between "owncloud" and "davs".
(tramp-gvfs-maybe-open-connection): Set "vector" connection property.
* test/lisp/net/tramp-tests.el (tramp-gvfs-handler-askquestion):
Suppress run in tests.
(tramp--test-owncloud-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file): Use it.
2018-01-05 21:04:39 +01:00
|
|
|
|
(eval-after-load 'tramp-gvfs
|
|
|
|
|
|
'(fset 'tramp-gvfs-handler-askquestion
|
|
|
|
|
|
(lambda (_message _choices) '(t nil 0)))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(defconst tramp-test-vec
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(and (file-remote-p ert-remote-temporary-file-directory)
|
|
|
|
|
|
(tramp-dissect-file-name ert-remote-temporary-file-directory))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
"The used `tramp-file-name' structure.")
|
|
|
|
|
|
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(setq auth-source-save-behavior nil
|
|
|
|
|
|
password-cache-expiry nil
|
2019-10-18 19:45:07 +02:00
|
|
|
|
remote-file-name-inhibit-cache nil
|
2021-07-14 18:36:14 +02:00
|
|
|
|
tramp-allow-unsafe-temporary-files t
|
2017-06-14 14:17:22 +02:00
|
|
|
|
tramp-cache-read-persistent-data t ;; For auth-sources.
|
2014-04-18 20:58:13 +02:00
|
|
|
|
tramp-copy-size-limit nil
|
2022-04-25 12:57:01 +02:00
|
|
|
|
tramp-error-show-message-timeout nil
|
2019-10-18 19:45:07 +02:00
|
|
|
|
tramp-persistency-file-name nil
|
|
|
|
|
|
tramp-verbose 0)
|
2013-11-11 16:22:57 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(defvar tramp--test-enabled-checked nil
|
|
|
|
|
|
"Cached result of `tramp--test-enabled'.
|
|
|
|
|
|
If the function did run, the value is a cons cell, the `cdr'
|
|
|
|
|
|
being the result.")
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp--test-enabled ()
|
|
|
|
|
|
"Whether remote file access is enabled."
|
|
|
|
|
|
(unless (consp tramp--test-enabled-checked)
|
|
|
|
|
|
(setq
|
|
|
|
|
|
tramp--test-enabled-checked
|
|
|
|
|
|
(cons
|
|
|
|
|
|
t (ignore-errors
|
|
|
|
|
|
(and
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory)
|
|
|
|
|
|
(file-directory-p ert-remote-temporary-file-directory)
|
|
|
|
|
|
(file-writable-p ert-remote-temporary-file-directory))))))
|
2014-02-27 13:07:10 +01:00
|
|
|
|
|
2014-02-28 09:47:43 +01:00
|
|
|
|
(when (cdr tramp--test-enabled-checked)
|
2022-07-24 16:02:10 +02:00
|
|
|
|
;; Remove old test files.
|
|
|
|
|
|
(dolist (dir `(,temporary-file-directory
|
|
|
|
|
|
,ert-remote-temporary-file-directory))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(dolist (file (directory-files dir 'full (rx bos (? ".#") "tramp-test")))
|
2022-07-24 16:02:10 +02:00
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(if (file-directory-p file)
|
|
|
|
|
|
(delete-directory file 'recursive)
|
|
|
|
|
|
(delete-file file)))))
|
2014-03-07 15:11:37 +01:00
|
|
|
|
;; Cleanup connection.
|
2014-06-15 17:56:58 +02:00
|
|
|
|
(ignore-errors
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-cleanup-connection tramp-test-vec nil 'keep-password)))
|
2014-02-27 13:07:10 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; Return result.
|
|
|
|
|
|
(cdr tramp--test-enabled-checked))
|
|
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(defun tramp--test-make-temp-name (&optional local quoted)
|
2017-07-31 14:32:24 +02:00
|
|
|
|
"Return a temporary file name for test.
|
|
|
|
|
|
If LOCAL is non-nil, a local file name is returned.
|
|
|
|
|
|
If QUOTED is non-nil, the local part of the file name is quoted.
|
|
|
|
|
|
The temporary file is not created."
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(make-temp-name "tramp-test")
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(if local temporary-file-directory ert-remote-temporary-file-directory))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2021-08-23 15:47:19 +02:00
|
|
|
|
;; Method "smb" supports `make-symbolic-link' only if the remote host
|
|
|
|
|
|
;; has CIFS capabilities. tramp-adb.el, tramp-gvfs.el, tramp-rclone.el
|
|
|
|
|
|
;; and tramp-sshfs.el do not support symbolic links at all.
|
|
|
|
|
|
(defmacro tramp--test-ignore-make-symbolic-link-error (&rest body)
|
|
|
|
|
|
"Run BODY, ignoring \"make-symbolic-link not supported\" file error."
|
|
|
|
|
|
(declare (indent defun) (debug (body)))
|
|
|
|
|
|
`(condition-case err
|
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
|
(file-error
|
|
|
|
|
|
(unless (string-equal (error-message-string err)
|
|
|
|
|
|
"make-symbolic-link not supported")
|
|
|
|
|
|
(signal (car err) (cdr err))))))
|
|
|
|
|
|
|
2017-07-17 14:12:20 +02:00
|
|
|
|
;; Don't print messages in nested `tramp--test-instrument-test-case' calls.
|
|
|
|
|
|
(defvar tramp--test-instrument-test-case-p nil
|
|
|
|
|
|
"Whether `tramp--test-instrument-test-case' run.
|
2017-06-29 18:22:38 +02:00
|
|
|
|
This shall used dynamically bound only.")
|
|
|
|
|
|
|
2021-05-13 16:46:17 +02:00
|
|
|
|
;; When `tramp-verbose' is greater than 10, and you want to trace
|
|
|
|
|
|
;; other functions as well, do something like
|
|
|
|
|
|
;; (let ((tramp-trace-functions '(file-name-non-special)))
|
|
|
|
|
|
;; (tramp--test-instrument-test-case 11
|
|
|
|
|
|
;; ...))
|
2017-07-17 14:12:20 +02:00
|
|
|
|
(defmacro tramp--test-instrument-test-case (verbose &rest body)
|
2014-02-20 15:08:00 +01:00
|
|
|
|
"Run BODY with `tramp-verbose' equal VERBOSE.
|
2019-01-23 15:23:57 +01:00
|
|
|
|
Print the content of the Tramp connection and debug buffers, if
|
2020-06-23 21:18:08 +02:00
|
|
|
|
`tramp-verbose' is greater than 3. Print traces if `tramp-verbose'
|
|
|
|
|
|
is greater than 10.
|
|
|
|
|
|
`should-error' is not handled properly. BODY shall not contain a timeout."
|
2014-02-27 13:07:10 +01:00
|
|
|
|
(declare (indent 1) (debug (natnump body)))
|
2020-06-23 21:18:08 +02:00
|
|
|
|
`(let* ((tramp-verbose (max (or ,verbose 0) (or tramp-verbose 0)))
|
|
|
|
|
|
(debug-ignored-errors
|
|
|
|
|
|
(append
|
|
|
|
|
|
'("^make-symbolic-link not supported$"
|
|
|
|
|
|
"^error with add-name-to-file")
|
|
|
|
|
|
debug-ignored-errors))
|
|
|
|
|
|
inhibit-message)
|
2014-06-29 20:32:35 +02:00
|
|
|
|
(unwind-protect
|
2017-07-17 14:12:20 +02:00
|
|
|
|
(let ((tramp--test-instrument-test-case-p t)) ,@body)
|
2017-06-29 18:22:38 +02:00
|
|
|
|
;; Unwind forms.
|
2017-07-17 14:12:20 +02:00
|
|
|
|
(when (and (null tramp--test-instrument-test-case-p) (> tramp-verbose 3))
|
2021-05-13 16:46:17 +02:00
|
|
|
|
(untrace-all)
|
|
|
|
|
|
(dolist (buf (tramp-list-tramp-buffers))
|
2021-12-06 19:36:15 +01:00
|
|
|
|
(message ";; %s\n%s" buf (tramp-get-buffer-string buf))
|
Tune Tramp traces
* doc/misc/tramp.texi (Traces and Profiles): Describe call traces.
* lisp/net/tramp-compat.el: Add `tramp-suppress-trace' property for all
functions.
* lisp/net/tramp.el (tramp-verbose): Adapt docstring.
(tramp-file-name-method, tramp-file-name-user)
(tramp-file-name-domain, tramp-file-name-host)
(tramp-file-name-port, tramp-file-name-localname)
(tramp-file-name-hop, tramp-file-name-user-domain)
(tramp-file-name-host-port, tramp-file-name-port-or-default)
(tramp-tramp-file-p, tramp-find-method, tramp-find-user)
(tramp-find-host, tramp-dissect-file-name)
(tramp-dissect-hop-name, tramp-debug-buffer-name)
(tramp-debug-outline-level, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-read-passwd)
(tramp-clear-passwd): Add `tramp-suppress-trace' property.
(tramp-debug-message): Activate call traces.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case): Simplify.
2021-05-07 13:04:28 +02:00
|
|
|
|
(kill-buffer buf))))))
|
2014-02-20 15:08:00 +01:00
|
|
|
|
|
2017-06-29 18:22:38 +02:00
|
|
|
|
(defsubst tramp--test-message (fmt-string &rest arguments)
|
|
|
|
|
|
"Emit a message into ERT *Messages*."
|
2017-07-17 14:12:20 +02:00
|
|
|
|
(tramp--test-instrument-test-case 0
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(apply #'tramp-message tramp-test-vec 0 fmt-string arguments)))
|
2017-06-29 18:22:38 +02:00
|
|
|
|
|
|
|
|
|
|
(defsubst tramp--test-backtrace ()
|
|
|
|
|
|
"Dump a backtrace into ERT *Messages*."
|
2017-07-17 14:12:20 +02:00
|
|
|
|
(tramp--test-instrument-test-case 10
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-backtrace tramp-test-vec)))
|
2017-06-29 18:22:38 +02:00
|
|
|
|
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(defmacro tramp--test-print-duration (message &rest body)
|
|
|
|
|
|
"Run BODY and print a message with duration, prompted by MESSAGE."
|
|
|
|
|
|
(declare (indent 1) (debug (stringp body)))
|
|
|
|
|
|
`(let ((start (current-time)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
|
(tramp--test-message
|
2021-12-09 20:11:40 +01:00
|
|
|
|
"%s %f sec" ,message (float-time (time-subtract nil start))))))
|
2018-03-17 15:10:46 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test00-availability ()
|
|
|
|
|
|
"Test availability of Tramp functions."
|
|
|
|
|
|
:expected-result (if (tramp--test-enabled) :passed :failed)
|
2017-06-29 18:22:38 +02:00
|
|
|
|
(tramp--test-message
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"Remote directory: `%s'" ert-remote-temporary-file-directory)
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(should (ignore-errors
|
|
|
|
|
|
(and
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory)
|
|
|
|
|
|
(file-directory-p ert-remote-temporary-file-directory)
|
|
|
|
|
|
(file-writable-p ert-remote-temporary-file-directory)))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test01-file-name-syntax ()
|
|
|
|
|
|
"Check remote file name syntax."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(let ((syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'default)
|
|
|
|
|
|
;; Simple cases.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:host:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@host:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@email@host:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using a port.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:host#1234:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@host#1234:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv4 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:1.2.3.4:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@1.2.3.4:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv6 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:[::1]:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@[::1]:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv4 mapped IPv6 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:[::ffff:1.2.3.4]:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:user@[::ffff:1.2.3.4]:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Local file name part.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method:::"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::/:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::/:/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method::/:file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/method1:|method2::"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(tramp-tramp-file-p "/method1:host1|method2:host2:"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(tramp-tramp-file-p "/method1:user1@host1|method2:user2@host2:"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(tramp-tramp-file-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2|method3:user3@host3:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; No strings.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p nil))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p 'symbol))
|
|
|
|
|
|
;; No newline or linefeed.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/method::file\nname"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/method::file\rname"))
|
|
|
|
|
|
;; Ange-FTP syntax.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/host:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/user@host:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/1.2.3.4:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/[]:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/[::1]:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/[::ffff:1.2.3.4]:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/host:/:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/host1|host2:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/user1@host1|user2@host2:"))
|
|
|
|
|
|
;; Quote with "/:" suppresses file name handlers.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/::"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/:@:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/:[]:"))
|
|
|
|
|
|
;; When `tramp-mode' is nil, Tramp is not activated.
|
|
|
|
|
|
(let (tramp-mode)
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/method:user@host:")))
|
|
|
|
|
|
;; `tramp-ignored-file-name-regexp' suppresses Tramp.
|
|
|
|
|
|
(let ((tramp-ignored-file-name-regexp "^/method:user@host:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/method:user@host:")))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
;; Methods shall be at least two characters, except the
|
|
|
|
|
|
;; default method.
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(let ((system-type 'windows-nt))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/c:/path/to/file"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/c::/path/to/file"))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should (tramp-tramp-file-p "/-::/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/mm::/path/to/file")))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(let ((system-type 'gnu/linux))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should-not (tramp-tramp-file-p "/m::/path/to/file"))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(should (tramp-tramp-file-p "/-:h:/path/to/file"))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should (tramp-tramp-file-p "/mm::/path/to/file"))))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(ert-deftest tramp-test01-file-name-syntax-simplified ()
|
|
|
|
|
|
"Check simplified file name syntax."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(let ((syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'simplified)
|
|
|
|
|
|
;; Simple cases.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@host:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@email@host:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using a port.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host#1234:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@host#1234:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv4 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/1.2.3.4:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@1.2.3.4:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv6 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[::1]:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@[::1]:"))
|
|
|
|
|
|
|
2019-03-05 09:36:33 +01:00
|
|
|
|
;; Using an IPv4 mapped IPv6 address.
|
2019-03-06 12:06:09 +01:00
|
|
|
|
(should (tramp-tramp-file-p "/[::ffff:1.2.3.4]:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user@[::ffff:1.2.3.4]:"))
|
2019-03-05 09:36:33 +01:00
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Local file name part.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host::"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:/:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:/:/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host:/:file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/host1|host2:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user1@host1|user2@host2:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/user1@host1|user2@host2|user3@host3:"))
|
|
|
|
|
|
|
|
|
|
|
|
;; No strings.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p nil))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p 'symbol))
|
|
|
|
|
|
;; Quote with "/:" suppresses file name handlers.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/::"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/:@:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/:[]:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test01-file-name-syntax-separate ()
|
|
|
|
|
|
"Check separate file name syntax."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(let ((syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'separate)
|
|
|
|
|
|
;; Simple cases.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/host]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@host]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@email@host]"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using a port.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/host#1234]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@host#1234]"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv4 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/1.2.3.4]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@1.2.3.4]"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Using an IPv6 address.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/::1]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@::1]"))
|
|
|
|
|
|
|
2019-03-05 09:36:33 +01:00
|
|
|
|
;; Using an IPv4 mapped IPv6 address.
|
2019-03-06 12:06:09 +01:00
|
|
|
|
(should (tramp-tramp-file-p "/[method/::ffff:1.2.3.4]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/user@::ffff:1.2.3.4]"))
|
2019-03-05 09:36:33 +01:00
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Local file name part.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]/:"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]/:/path/to/file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]file"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method/]/:file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method1/|method2/]"))
|
|
|
|
|
|
(should (tramp-tramp-file-p "/[method1/host1|method2/host2]"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(tramp-tramp-file-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(tramp-tramp-file-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2|method3/user3@host3]"))
|
|
|
|
|
|
|
|
|
|
|
|
;; No strings.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p nil))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p 'symbol))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP syntax.
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should-not (tramp-tramp-file-p "/host:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/user@host:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/1.2.3.4:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/host:/:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/host1|host2:"))
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/user1@host1|user2@host2:"))
|
|
|
|
|
|
;; Quote with "/:" suppresses file name handlers.
|
|
|
|
|
|
(should-not (tramp-tramp-file-p "/:[]")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test02-file-name-dissect ()
|
|
|
|
|
|
"Check remote file name components."
|
|
|
|
|
|
(let ((tramp-default-method "default-method")
|
|
|
|
|
|
(tramp-default-user "default-user")
|
2018-01-21 00:14:33 +01:00
|
|
|
|
(tramp-default-host "default-host")
|
|
|
|
|
|
tramp-default-method-alist
|
|
|
|
|
|
tramp-default-user-alist
|
2018-12-06 15:25:22 +01:00
|
|
|
|
tramp-default-host-alist
|
2023-06-21 18:25:32 +02:00
|
|
|
|
tramp-default-proxies-alist
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
(non-essential t)
|
2018-12-06 15:25:22 +01:00
|
|
|
|
;; Suppress check for multihops.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(tramp-cache-data (make-hash-table :test #'equal))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(tramp-connection-properties '((nil "login-program" t)))
|
|
|
|
|
|
(syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'default)
|
|
|
|
|
|
;; An unknown method shall raise an error.
|
|
|
|
|
|
(let (non-essential)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(expand-file-name "/method:user@host:")
|
|
|
|
|
|
:type 'user-error))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2019-12-22 13:48:36 +01:00
|
|
|
|
;; Expand `tramp-default-user' and `tramp-default-host'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/method::")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "default-user" "default-host")))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method::" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method::" 'user) "default-user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method::" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method::" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method::" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:host:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "default-user" "host")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:host:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:host:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-host'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "user" "default-host")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@:" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@host:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@host:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@host:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:host:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "default-user" "host")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:host:" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:host:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-host'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user" "default-host")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@:" 'method) "method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:user@:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@:" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:user@:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:user@:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host:" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@host:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@host:" 'host) "host"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:user@host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user@email" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:" 'user) "user@email"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@email@host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:host#1234:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:host#1234:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:host#1234:" 'user) "default-user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host#1234:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@host#1234:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "user" "host#1234")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@host#1234:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@host#1234:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@host#1234:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:host#1234:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:host#1234:" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:host#1234:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:host#1234:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@host#1234:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:1.2.3.4:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:1.2.3.4:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:1.2.3.4:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@1.2.3.4:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@1.2.3.4:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@1.2.3.4:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:user@1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:1.2.3.4:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:1.2.3.4:" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:1.2.3.4:" 'user) "default-user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@1.2.3.4:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@1.2.3.4:" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@1.2.3.4:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method', `tramp-default-user' and
|
|
|
|
|
|
;; `tramp-default-host'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:[]:")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/%s:%s@%s:" "default-method" "default-user" "default-host")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:[]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(let ((tramp-default-host "::1"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:[]:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "default-user" "[::1]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:[]:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:[]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[]:" 'hop) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/-:[::1]:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "default-user" "[::1]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:[::1]:" 'method) "default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/-:[::1]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@[::1]:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "default-method" "user" "[::1]")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/-:user@[::1]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@[::1]:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:user@[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:[::1]:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "default-user" "[::1]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:[::1]:" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:[::1]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@[::1]:")
|
|
|
|
|
|
(format "/%s:%s@%s:" "method" "user" "[::1]")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@[::1]:" 'method) "method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@[::1]:" 'user) "user"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method:user@[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method:user@[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:user@[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Local file name part.
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:host:/:" 'localname) "/:"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:::" 'localname) ":"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/method:: " 'localname) " "))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p "/method::file" 'localname) "file"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/method::/path/to/file" 'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
2023-06-21 18:25:32 +02:00
|
|
|
|
(dolist (tramp-show-ad-hoc-proxies '(nil t))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
|
2023-06-21 18:25:32 +02:00
|
|
|
|
;; Explicit settings in `tramp-default-proxies-alist'
|
|
|
|
|
|
;; shouldn't show hops.
|
|
|
|
|
|
(setq tramp-default-proxies-alist
|
|
|
|
|
|
'(("^host2$" "^user2$" "/method1:user1@host1:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/method2:user2@host2:/path/to/file")
|
|
|
|
|
|
"/method2:user2@host2:"))
|
|
|
|
|
|
(setq tramp-default-proxies-alist nil)
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc settings.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file")
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:"
|
|
|
|
|
|
"/method2:user2@host2:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file" 'method)
|
|
|
|
|
|
"method2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file" 'user)
|
|
|
|
|
|
"user2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file" 'host)
|
|
|
|
|
|
"host2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file"
|
|
|
|
|
|
'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/method1:user1@host1|method2:user2@host2:/path/to/file" 'hop)
|
|
|
|
|
|
(format "%s:%s@%s|"
|
|
|
|
|
|
"method1" "user1" "host1")))
|
|
|
|
|
|
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:")
|
|
|
|
|
|
"/method3:user3@host3:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file")
|
|
|
|
|
|
'method)
|
|
|
|
|
|
"method3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file")
|
|
|
|
|
|
'user)
|
|
|
|
|
|
"user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file")
|
|
|
|
|
|
'host)
|
|
|
|
|
|
"host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file")
|
|
|
|
|
|
'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:/path/to/file")
|
|
|
|
|
|
'hop)
|
|
|
|
|
|
(format "%s:%s@%s|%s:%s@%s|"
|
|
|
|
|
|
"method1" "user1" "host1" "method2" "user2" "host2")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method-alist'.
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host1" "user1" "method1"))
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host2" "user2" "method2"))
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host3" "user3" "method3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/-:user1@host1"
|
|
|
|
|
|
"|-:user2@host2"
|
|
|
|
|
|
"|-:user3@host3:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:")
|
|
|
|
|
|
"/method3:user3@host3:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method1" "host1" "user1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method2" "host2" "user2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method3" "host3" "user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:host1"
|
|
|
|
|
|
"|method2:host2"
|
|
|
|
|
|
"|method3:host3:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:")
|
|
|
|
|
|
"/method3:user3@host3:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-host-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method1" "user1" "host1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method2" "user2" "host2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method3" "user3" "host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@"
|
|
|
|
|
|
"|method2:user2@"
|
|
|
|
|
|
"|method3:user3@:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user3@host3:")
|
|
|
|
|
|
"/method3:user3@host3:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc user name and host name expansion.
|
|
|
|
|
|
(setq tramp-default-method-alist nil
|
|
|
|
|
|
tramp-default-user-alist nil
|
|
|
|
|
|
tramp-default-host-alist nil)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@"
|
|
|
|
|
|
"|method3:user3@:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user1@host1"
|
|
|
|
|
|
"|method2:user2@host1"
|
|
|
|
|
|
"|method3:user3@host1:")
|
|
|
|
|
|
"/method3:user3@host1:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:%u@%h"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:%u@%h"
|
|
|
|
|
|
"|method4:user4%domain4@host4#1234:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/method1:user2@host2"
|
|
|
|
|
|
"|method2:user2@host2"
|
|
|
|
|
|
"|method3:user4@host4"
|
|
|
|
|
|
"|method4:user4%domain4@host4#1234:")
|
|
|
|
|
|
"/method4:user4%domain4@host4#1234:")))))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(ert-deftest tramp-test02-file-name-dissect-simplified ()
|
|
|
|
|
|
"Check simplified file name components."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(let ((tramp-default-method "default-method")
|
|
|
|
|
|
(tramp-default-user "default-user")
|
|
|
|
|
|
(tramp-default-host "default-host")
|
2018-01-21 00:14:33 +01:00
|
|
|
|
tramp-default-user-alist
|
|
|
|
|
|
tramp-default-host-alist
|
2023-06-21 18:25:32 +02:00
|
|
|
|
tramp-default-proxies-alist
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
(non-essential t)
|
2018-12-06 15:25:22 +01:00
|
|
|
|
;; Suppress check for multihops.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(tramp-cache-data (make-hash-table :test #'equal))
|
2018-12-06 15:25:22 +01:00
|
|
|
|
(tramp-connection-properties '((nil "login-program" t)))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'simplified)
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; An unknown default method shall raise an error.
|
|
|
|
|
|
(let (non-essential)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(expand-file-name "/user@host:")
|
|
|
|
|
|
:type 'user-error))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host:")
|
|
|
|
|
|
(format "/%s@%s:" "default-user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@:")
|
|
|
|
|
|
(format "/%s@%s:" "user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@:" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host:")
|
|
|
|
|
|
(format "/%s@%s:" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@host:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@email@host:")
|
|
|
|
|
|
(format "/%s@%s:" "user@email" "host")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/user@email@host:" 'method) "default-method"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@email@host:" 'user) "user@email"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@email@host:" 'host) "host"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@email@host:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@email@host:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host#1234:")
|
|
|
|
|
|
(format "/%s@%s:" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host#1234:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host#1234:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host#1234:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host#1234:")
|
|
|
|
|
|
(format "/%s@%s:" "user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host#1234:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host#1234:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host#1234:" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@host#1234:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@host#1234:" 'hop) nil))
|
|
|
|
|
|
|
2017-04-16 16:51:24 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/1.2.3.4:")
|
|
|
|
|
|
(format "/%s@%s:" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/1.2.3.4:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/1.2.3.4:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@1.2.3.4:")
|
|
|
|
|
|
(format "/%s@%s:" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@1.2.3.4:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@1.2.3.4:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@1.2.3.4:" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@1.2.3.4:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@1.2.3.4:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method', `tramp-default-user' and
|
|
|
|
|
|
;; `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[]:")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/%s@%s:" "default-user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(let ((tramp-default-host "::1"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[]:")
|
|
|
|
|
|
(format "/%s@%s:" "default-user" "[::1]")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[]:" 'hop) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[::1]:")
|
|
|
|
|
|
(format "/%s@%s:" "default-user" "[::1]")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[::1]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[::1]:" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@[::1]:")
|
|
|
|
|
|
(format "/%s@%s:" "user" "[::1]")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/user@[::1]:" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@[::1]:" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@[::1]:" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@[::1]:" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/user@[::1]:" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Local file name part.
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:/:" 'localname) "/:"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host::" 'localname) ":"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host: " 'localname) " "))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/host:file" 'localname) "file"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/host:/path/to/file" 'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
2023-06-21 18:25:32 +02:00
|
|
|
|
(dolist (tramp-show-ad-hoc-proxies '(nil t))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
|
2023-06-21 18:25:32 +02:00
|
|
|
|
;; Explicit settings in `tramp-default-proxies-alist'
|
|
|
|
|
|
;; shouldn't show hops.
|
|
|
|
|
|
(setq tramp-default-proxies-alist
|
|
|
|
|
|
'(("^host2$" "^user2$" "/user1@host1:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/user2@host2:/path/to/file")
|
|
|
|
|
|
"/user2@host2:"))
|
|
|
|
|
|
(setq tramp-default-proxies-alist nil)
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc settings.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/user1@host1|user2@host2:/path/to/file")
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
"/user1@host1|user2@host2:"
|
|
|
|
|
|
"/user2@host2:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/user1@host1|user2@host2:/path/to/file" 'method)
|
|
|
|
|
|
"default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/user1@host1|user2@host2:/path/to/file" 'user)
|
|
|
|
|
|
"user2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/user1@host1|user2@host2:/path/to/file" 'host)
|
|
|
|
|
|
"host2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/user1@host1|user2@host2:/path/to/file" 'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/user1@host1|user2@host2:/path/to/file" 'hop)
|
|
|
|
|
|
(format "%s@%s|" "user1" "host1")))
|
|
|
|
|
|
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:")
|
|
|
|
|
|
"/user3@host3:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file")
|
|
|
|
|
|
'method)
|
|
|
|
|
|
"default-method"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file")
|
|
|
|
|
|
'user)
|
|
|
|
|
|
"user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file")
|
|
|
|
|
|
'host)
|
|
|
|
|
|
"host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file")
|
|
|
|
|
|
'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:/path/to/file")
|
|
|
|
|
|
'hop)
|
|
|
|
|
|
(format "%s@%s|%s@%s|"
|
|
|
|
|
|
"user1" "host1" "user2" "host2")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '(nil "host1" "user1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '(nil "host2" "user2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '(nil "host3" "user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/host1"
|
|
|
|
|
|
"|host2"
|
|
|
|
|
|
"|host3:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:")
|
|
|
|
|
|
"/user3@host3:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-host-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '(nil "user1" "host1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '(nil "user2" "host2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '(nil "user3" "host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@"
|
|
|
|
|
|
"|user2@"
|
|
|
|
|
|
"|user3@:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user3@host3:")
|
|
|
|
|
|
"/user3@host3:")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc user name and host name expansion.
|
|
|
|
|
|
(setq tramp-default-user-alist nil
|
|
|
|
|
|
tramp-default-host-alist nil)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@"
|
|
|
|
|
|
"|user3@:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user1@host1"
|
|
|
|
|
|
"|user2@host1"
|
|
|
|
|
|
"|user3@host1:")
|
|
|
|
|
|
"/user3@host1:")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/%u@%h"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|%u@%h"
|
|
|
|
|
|
"|user4%domain4@host4#1234:/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/user2@host2"
|
|
|
|
|
|
"|user2@host2"
|
|
|
|
|
|
"|user4@host4"
|
|
|
|
|
|
"|user4%domain4@host4#1234:")
|
|
|
|
|
|
"/user4%domain4@host4#1234:")))))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test02-file-name-dissect-separate ()
|
|
|
|
|
|
"Check separate file name components."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(let ((tramp-default-method "default-method")
|
|
|
|
|
|
(tramp-default-user "default-user")
|
|
|
|
|
|
(tramp-default-host "default-host")
|
2018-01-21 00:14:33 +01:00
|
|
|
|
tramp-default-method-alist
|
|
|
|
|
|
tramp-default-user-alist
|
|
|
|
|
|
tramp-default-host-alist
|
2023-06-21 18:25:32 +02:00
|
|
|
|
tramp-default-proxies-alist
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
(non-essential t)
|
2018-12-06 15:25:22 +01:00
|
|
|
|
;; Suppress check for multihops.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(tramp-cache-data (make-hash-table :test #'equal))
|
2018-12-06 15:25:22 +01:00
|
|
|
|
(tramp-connection-properties '((nil "login-program" t)))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(syntax tramp-syntax))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp-change-syntax 'separate)
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; An unknown method shall raise an error.
|
|
|
|
|
|
(let (non-essential)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(expand-file-name "/[method/user@host]")
|
|
|
|
|
|
:type 'user-error))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-user' and `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "method" "default-user" "default-host")))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-16 16:51:24 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/host]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@host]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@host]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@host]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@host]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/host]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@host]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@host]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@host]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@host]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "default-user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/host]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/user@]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/user@]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user" "host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@email@host]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user@email" "host")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[method/user@email@host]" 'method) "method"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[method/user@email@host]" 'user)
|
|
|
|
|
|
"user@email"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@email@host]" 'host) "host"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@email@host]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@email@host]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-16 16:51:24 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host#1234]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host#1234]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host#1234]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/host#1234]" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/host#1234]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@host#1234]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[/user@host#1234]" 'method)
|
|
|
|
|
|
"default-method"))
|
2017-04-16 16:51:24 +02:00
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[/user@host#1234]" 'user) "user"))
|
2017-04-16 16:51:24 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@host#1234]" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@host#1234]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host#1234]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host#1234]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host#1234]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/host#1234]" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/host#1234]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@host#1234]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[-/user@host#1234]" 'method)
|
|
|
|
|
|
"default-method"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[-/user@host#1234]" 'user) "user"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@host#1234]" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@host#1234]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host#1234]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "default-user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host#1234]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host#1234]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host#1234]" 'host) "host#1234"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/host#1234]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host#1234]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user" "host#1234")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host#1234]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host#1234]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[method/user@host#1234]" 'host) "host#1234"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host#1234]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@host#1234]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-16 16:51:24 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/1.2.3.4]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/1.2.3.4]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/1.2.3.4]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@1.2.3.4]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[/user@1.2.3.4]" 'method) "default-method"))
|
2017-04-16 16:51:24 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@1.2.3.4]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/1.2.3.4]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/1.2.3.4]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/1.2.3.4]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@1.2.3.4]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(file-remote-p "/[-/user@1.2.3.4]" 'method) "default-method"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@1.2.3.4]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/1.2.3.4]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "default-user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/1.2.3.4]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/1.2.3.4]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user" "1.2.3.4")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]" 'host) "1.2.3.4"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@1.2.3.4]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-16 16:51:24 +02:00
|
|
|
|
;; Expand `tramp-default-method', `tramp-default-user' and
|
|
|
|
|
|
;; `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]"
|
|
|
|
|
|
"default-method" "default-user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(let ((tramp-default-host "::1"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]"
|
|
|
|
|
|
"default-method" "default-user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/]" 'hop) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/::1]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/::1]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/::1]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/::1]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@::1]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[/user@::1]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@::1]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[/user@::1]" 'hop) nil))
|
|
|
|
|
|
|
2017-04-10 17:22:13 +02:00
|
|
|
|
;; Expand `tramp-default-method', `tramp-default-user' and
|
|
|
|
|
|
;; `tramp-default-host'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]"
|
|
|
|
|
|
"default-method" "default-user" "default-host")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'host) "default-host"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(let ((tramp-default-host "::1"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]"
|
|
|
|
|
|
"default-method" "default-user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/]" 'hop) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method' and `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/::1]")
|
|
|
|
|
|
(format
|
|
|
|
|
|
"/[%s/%s@%s]" "default-method" "default-user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/::1]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/::1]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/::1]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@::1]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "default-method" "user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[-/user@::1]" 'method) "default-method"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@::1]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[-/user@::1]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user'.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/::1]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "default-user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/::1]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/::1]" 'user) "default-user"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/::1]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; No expansion.
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@::1]")
|
|
|
|
|
|
(format "/[%s/%s@%s]" "method" "user" "::1")))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@::1]" 'method) "method"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@::1]" 'user) "user"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@::1]" 'host) "::1"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/user@::1]" 'localname) ""))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/user@::1]" 'hop) nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Local file name part.
|
2017-04-16 16:51:24 +02:00
|
|
|
|
(should (string-equal (file-remote-p "/[/host]/:" 'localname) "/:"))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
(should (string-equal (file-remote-p "/[-/host]/:" 'localname) "/:"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/]:" 'localname) ":"))
|
|
|
|
|
|
(should (string-equal (file-remote-p "/[method/] " 'localname) " "))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/]file" 'localname) "file"))
|
|
|
|
|
|
(should (string-equal
|
|
|
|
|
|
(file-remote-p "/[method/]/path/to/file" 'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Multihop.
|
2023-06-21 18:25:32 +02:00
|
|
|
|
(dolist (tramp-show-ad-hoc-proxies '(nil t))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
|
2023-06-21 18:25:32 +02:00
|
|
|
|
;; Explicit settings in `tramp-default-proxies-alist'
|
|
|
|
|
|
;; shouldn't show hops.
|
|
|
|
|
|
(setq tramp-default-proxies-alist
|
|
|
|
|
|
'(("^host2$" "^user2$" "/[method1/user1@host1]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p "/[method2/user2@host2]/path/to/file")
|
|
|
|
|
|
"/[method2/user2@host2]"))
|
|
|
|
|
|
(setq tramp-default-proxies-alist nil)
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc settings.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file")
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]"
|
|
|
|
|
|
"/[method2/user2@host2]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file" 'method)
|
|
|
|
|
|
"method2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file" 'user)
|
|
|
|
|
|
"user2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file" 'host)
|
|
|
|
|
|
"host2"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file"
|
|
|
|
|
|
'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
"/[method1/user1@host1|method2/user2@host2]/path/to/file" 'hop)
|
|
|
|
|
|
(format "%s/%s@%s|"
|
|
|
|
|
|
"method1" "user1" "host1")))
|
|
|
|
|
|
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]")
|
|
|
|
|
|
"/[method3/user3@host3]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file")
|
|
|
|
|
|
'method)
|
|
|
|
|
|
"method3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file")
|
|
|
|
|
|
'user)
|
|
|
|
|
|
"user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file")
|
|
|
|
|
|
'host)
|
|
|
|
|
|
"host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file")
|
|
|
|
|
|
'localname)
|
|
|
|
|
|
"/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]/path/to/file")
|
|
|
|
|
|
'hop)
|
|
|
|
|
|
(format "%s/%s@%s|%s/%s@%s|"
|
|
|
|
|
|
"method1" "user1" "host1" "method2" "user2" "host2")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-method-alist'.
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host1" "user1" "method1"))
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host2" "user2" "method2"))
|
|
|
|
|
|
(add-to-list
|
|
|
|
|
|
'tramp-default-method-alist '("host3" "user3" "method3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[/user1@host1"
|
|
|
|
|
|
"|/user2@host2"
|
|
|
|
|
|
"|/user3@host3]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]")
|
|
|
|
|
|
"/[method3/user3@host3]")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-user-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method1" "host1" "user1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method2" "host2" "user2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-user-alist '("method3" "host3" "user3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/host1"
|
|
|
|
|
|
"|method2/host2"
|
|
|
|
|
|
"|method3/host3]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]")
|
|
|
|
|
|
"/[method3/user3@host3]")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Expand `tramp-default-host-alist'.
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method1" "user1" "host1"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method2" "user2" "host2"))
|
|
|
|
|
|
(add-to-list 'tramp-default-host-alist '("method3" "user3" "host3"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@"
|
|
|
|
|
|
"|method2/user2@"
|
|
|
|
|
|
"|method3/user3@]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user3@host3]")
|
|
|
|
|
|
"/[method3/user3@host3]")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Ad-hoc user name and host name expansion.
|
|
|
|
|
|
(setq tramp-default-method-alist nil
|
|
|
|
|
|
tramp-default-user-alist nil
|
|
|
|
|
|
tramp-default-host-alist nil)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@"
|
|
|
|
|
|
"|method3/user3@]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user1@host1"
|
|
|
|
|
|
"|method2/user2@host1"
|
|
|
|
|
|
"|method3/user3@host1]")
|
|
|
|
|
|
"/[method3/user3@host1]")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/%u@%h"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/%u@%h"
|
|
|
|
|
|
"|method4/user4%domain4@host4#1234]/path/to/file"))
|
|
|
|
|
|
(if tramp-show-ad-hoc-proxies
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"/[method1/user2@host2"
|
|
|
|
|
|
"|method2/user2@host2"
|
|
|
|
|
|
"|method3/user4@host4"
|
|
|
|
|
|
"|method4/user4%domain4@host4#1234]")
|
|
|
|
|
|
"/[method4/user4%domain4@host4#1234]")))))
|
2017-04-10 17:22:13 +02:00
|
|
|
|
|
|
|
|
|
|
;; Exit.
|
|
|
|
|
|
(tramp-change-syntax syntax))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test03-file-name-defaults ()
|
|
|
|
|
|
"Check default values for some methods."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; Default values in tramp-adb.el.
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(when (assoc "adb" tramp-methods)
|
|
|
|
|
|
(should (string-equal (file-remote-p "/adb::" 'host) "")))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; Default values in tramp-ftp.el.
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(when (assoc "ftp" tramp-methods)
|
|
|
|
|
|
(should (string-equal (file-remote-p "/-:ftp.host:" 'method) "ftp"))
|
|
|
|
|
|
(dolist (u '("ftp" "anonymous"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p (format "/-:%s@:" u) 'method) "ftp"))))
|
2019-01-28 16:33:47 +01:00
|
|
|
|
;; Default values in tramp-sh.el and tramp-sudoedit.el.
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(when (assoc "su" tramp-methods)
|
|
|
|
|
|
(dolist (h `("127.0.0.1" "[::1]" "localhost" "localhost6" ,(system-name)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p (format "/-:root@%s:" h) 'method) "su")))
|
|
|
|
|
|
(dolist (m '("su" "sudo" "ksu" "doas" "sudoedit"))
|
|
|
|
|
|
(should (string-equal (file-remote-p (format "/%s::" m) 'user) "root"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-remote-p (format "/%s::" m) 'host) (system-name))))
|
|
|
|
|
|
(dolist (m '("rcp" "remcp" "rsh" "telnet" "krlogin" "fcp" "nc"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p (format "/%s::" m) 'user) (user-login-name)))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; Default values in tramp-smb.el.
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(when (assoc "smb" tramp-methods)
|
|
|
|
|
|
(should (string-equal (file-remote-p "/smb::" 'user) nil))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2018-03-29 15:59:11 +02:00
|
|
|
|
;; The following test is inspired by Bug#30946.
|
|
|
|
|
|
(ert-deftest tramp-test03-file-name-host-rules ()
|
|
|
|
|
|
"Check host name rules for host-less methods."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
2018-03-29 15:59:11 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
|
|
|
|
|
|
|
|
|
|
|
;; Host names must match rules in case the command template of a
|
|
|
|
|
|
;; method doesn't use them.
|
|
|
|
|
|
(dolist (m '("su" "sg" "sudo" "doas" "ksu"))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(let (tramp-connection-properties tramp-default-proxies-alist)
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec nil 'keep-password))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
;; Single hop. The host name must match `tramp-local-host-regexp'.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(find-file (format "/%s:foo:" m))
|
|
|
|
|
|
:type 'user-error)
|
|
|
|
|
|
;; Multi hop. The host name must match the previous hop.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(find-file
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s|%s:foo:"
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(substring (file-remote-p ert-remote-temporary-file-directory) 0 -1)
|
2018-05-02 12:31:51 +02:00
|
|
|
|
m))
|
2018-12-09 17:09:53 +01:00
|
|
|
|
:type 'user-error))))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test03-file-name-method-rules ()
|
|
|
|
|
|
"Check file name rules for some methods."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2018-12-06 15:25:22 +01:00
|
|
|
|
|
|
|
|
|
|
;; Multi hops are allowed for inline methods only.
|
2020-08-04 14:19:51 +02:00
|
|
|
|
(let (non-essential)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(expand-file-name "/ssh:user1@host1|method:user2@host2:/path/to/file")
|
|
|
|
|
|
:type 'user-error)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(expand-file-name "/method:user1@host1|ssh:user2@host2:/path/to/file")
|
2022-06-16 19:29:55 +02:00
|
|
|
|
:type 'user-error)))
|
2018-03-29 15:59:11 +02:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test04-substitute-in-file-name ()
|
|
|
|
|
|
"Check `substitute-in-file-name'."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
|
|
|
|
|
|
2020-08-28 19:54:50 +02:00
|
|
|
|
;; Suppress method name check. We cannot use the string "foo" as
|
|
|
|
|
|
;; user name, because (substitute-in-string "/~foo") returns
|
|
|
|
|
|
;; different values depending on the existence of user "foo" (see
|
|
|
|
|
|
;; Bug#43052).
|
|
|
|
|
|
(let ((tramp-methods (cons '("method") tramp-methods))
|
|
|
|
|
|
(foo (downcase (md5 (current-time-string)))))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (substitute-in-file-name "/method:host:///foo") "/foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host://foo") "/method:host:/foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (substitute-in-file-name "/method:host:/path///foo") "/foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/path//foo") "/method:host:/foo"))
|
|
|
|
|
|
;; Quoting local part.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:///foo")
|
|
|
|
|
|
"/method:host:/:///foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/://foo") "/method:host:/://foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:/path///foo")
|
|
|
|
|
|
"/method:host:/:/path///foo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:/path//foo")
|
|
|
|
|
|
"/method:host:/:/path//foo"))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host://~" foo))
|
|
|
|
|
|
(concat "/~" foo)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/~" foo))
|
|
|
|
|
|
(concat "/method:host:/~" foo)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/path//~" foo))
|
|
|
|
|
|
(concat "/~" foo)))
|
|
|
|
|
|
;; (substitute-in-file-name "/path/~foo") expands only for a local
|
|
|
|
|
|
;; user "foo" to "/~foo"". Otherwise, it doesn't expand.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/path/~" foo))
|
|
|
|
|
|
(concat "/method:host:/path/~" foo)))
|
|
|
|
|
|
;; Quoting local part.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/://~" foo))
|
|
|
|
|
|
(concat "/method:host:/://~" foo)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/:/~" foo))
|
|
|
|
|
|
(concat "/method:host:/:/~" foo)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/:/path//~" foo))
|
|
|
|
|
|
(concat "/method:host:/:/path//~" foo)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name (concat "/method:host:/:/path/~" foo))
|
|
|
|
|
|
(concat "/method:host:/:/path/~" foo)))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
|
|
|
|
|
|
(let (process-environment)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/path/$FOO")
|
|
|
|
|
|
"/method:host:/path/$FOO"))
|
|
|
|
|
|
(setenv "FOO" "bla")
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/path/$FOO")
|
|
|
|
|
|
"/method:host:/path/bla"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/path/$$FOO")
|
|
|
|
|
|
"/method:host:/path/$FOO"))
|
|
|
|
|
|
;; Quoting local part.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:/path/$FOO")
|
|
|
|
|
|
"/method:host:/:/path/$FOO"))
|
|
|
|
|
|
(setenv "FOO" "bla")
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:/path/$FOO")
|
|
|
|
|
|
"/method:host:/:/path/$FOO"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(substitute-in-file-name "/method:host:/:/path/$$FOO")
|
|
|
|
|
|
"/method:host:/:/path/$$FOO")))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test05-expand-file-name ()
|
|
|
|
|
|
"Check `expand-file-name'."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
|
|
|
|
|
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
(let ((tramp-methods (cons '("method") tramp-methods)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/path/./file") "/method:host:/path/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/path/../file") "/method:host:/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2020-09-03 20:16:33 +03:00
|
|
|
|
(expand-file-name "/method:host:/path/.") "/method:host:/path"))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/path/..") "/method:host:/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2020-09-03 20:16:33 +03:00
|
|
|
|
(expand-file-name "." "/method:host:/path/") "/method:host:/path"))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2020-09-03 20:16:33 +03:00
|
|
|
|
(expand-file-name "" "/method:host:/path/") "/method:host:/path"))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Quoting local part.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/:/path/./file")
|
|
|
|
|
|
"/method:host:/:/path/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/:/path/../file") "/method:host:/:/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name "/method:host:/:/~/path/./file")
|
|
|
|
|
|
"/method:host:/:/~/path/file"))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2019-03-29 17:22:25 +01:00
|
|
|
|
;; The following test is inspired by Bug#26911 and Bug#34834. They
|
2020-08-26 13:25:35 -07:00
|
|
|
|
;; were bugs in `expand-file-name'.
|
2017-05-16 14:49:51 +02:00
|
|
|
|
(ert-deftest tramp-test05-expand-file-name-relative ()
|
|
|
|
|
|
"Check `expand-file-name'."
|
2017-05-19 13:57:36 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2020-11-05 17:36:04 +01:00
|
|
|
|
;; Methods with a share do not expand "/path/..".
|
|
|
|
|
|
(skip-unless (not (tramp--test-share-p)))
|
2022-03-07 13:42:30 +01:00
|
|
|
|
;; The bugs are fixed in Emacs 28.1.
|
|
|
|
|
|
(skip-unless (tramp--test-emacs28-p))
|
2017-05-19 13:57:36 +02:00
|
|
|
|
|
2017-05-16 14:49:51 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(let ((default-directory
|
|
|
|
|
|
(concat
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory) "/path")))
|
2017-05-16 14:49:51 +02:00
|
|
|
|
(expand-file-name ".." "./"))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(concat (file-remote-p ert-remote-temporary-file-directory) "/"))))
|
2017-05-16 14:49:51 +02:00
|
|
|
|
|
2021-02-17 18:04:35 +01:00
|
|
|
|
(ert-deftest tramp-test05-expand-file-name-top ()
|
|
|
|
|
|
"Check `expand-file-name'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((dir (concat (file-remote-p ert-remote-temporary-file-directory) "/")))
|
2021-02-17 18:04:35 +01:00
|
|
|
|
(dolist (local '("." ".."))
|
|
|
|
|
|
(should (string-equal (expand-file-name local dir) dir))
|
|
|
|
|
|
(should (string-equal (expand-file-name (concat dir local)) dir)))))
|
|
|
|
|
|
|
2023-10-13 16:09:51 +02:00
|
|
|
|
;; The following test is inspired by Bug#65685.
|
|
|
|
|
|
(ert-deftest tramp-test05-expand-file-name-tilde ()
|
|
|
|
|
|
"Check `expand-file-name'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((dir (file-remote-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
(tramp-tolerate-tilde t))
|
|
|
|
|
|
(should (string-equal (expand-file-name (concat dir "~"))
|
|
|
|
|
|
(expand-file-name (concat dir "/:~"))))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test06-directory-file-name ()
|
|
|
|
|
|
"Check `directory-file-name'.
|
2015-03-04 11:46:06 +01:00
|
|
|
|
This checks also `file-name-as-directory', `file-name-directory',
|
|
|
|
|
|
`file-name-nondirectory' and `unhandled-file-name-directory'."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
|
|
|
|
|
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
(let ((tramp-methods (cons '("method") tramp-methods)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(directory-file-name "/method:host:/path/to/file")
|
|
|
|
|
|
"/method:host:/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(directory-file-name "/method:host:/path/to/file/")
|
|
|
|
|
|
"/method:host:/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(directory-file-name "/method:host:/path/to/file//")
|
|
|
|
|
|
"/method:host:/path/to/file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-as-directory "/method:host:/path/to/file")
|
|
|
|
|
|
"/method:host:/path/to/file/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-as-directory "/method:host:/path/to/file/")
|
|
|
|
|
|
"/method:host:/path/to/file/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-directory "/method:host:/path/to/file")
|
|
|
|
|
|
"/method:host:/path/to/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-directory "/method:host:/path/to/file/")
|
|
|
|
|
|
"/method:host:/path/to/file/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-name-directory "/method:host:file") "/method:host:"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-directory "/method:host:path/") "/method:host:path/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-directory "/method:host:path/to") "/method:host:path/"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-nondirectory "/method:host:/path/to/file") "file"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-name-nondirectory "/method:host:/path/to/file/") ""))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(unhandled-file-name-directory "/method:host:/path/to/file")))
|
2016-05-02 09:02:27 +02:00
|
|
|
|
|
|
|
|
|
|
;; Bug#10085.
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(when (tramp--test-enabled) ;; Packages like tramp-gvfs.el might be disabled.
|
2020-02-13 16:34:07 +01:00
|
|
|
|
(dolist (non-essential '(nil t))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
;; We must clear `tramp-default-method'. On hydra, it is "ftp",
|
|
|
|
|
|
;; which ruins the tests.
|
2020-02-13 16:34:07 +01:00
|
|
|
|
(let ((tramp-default-method
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'method))
|
|
|
|
|
|
(host (file-remote-p ert-remote-temporary-file-directory 'host)))
|
2017-03-13 18:05:59 +01:00
|
|
|
|
(dolist
|
|
|
|
|
|
(file
|
2019-12-22 13:48:36 +01:00
|
|
|
|
`(,(format "/%s::" tramp-default-method)
|
2017-03-13 18:05:59 +01:00
|
|
|
|
,(format
|
2019-12-22 13:48:36 +01:00
|
|
|
|
"/-:%s:"
|
|
|
|
|
|
(if (string-match-p tramp-ipv6-regexp host)
|
|
|
|
|
|
(concat
|
|
|
|
|
|
tramp-prefix-ipv6-format host tramp-postfix-ipv6-format)
|
|
|
|
|
|
host))))
|
2017-03-13 18:05:59 +01:00
|
|
|
|
(should (string-equal (directory-file-name file) file))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-name-as-directory file)
|
Sync with Tramp 2.5.0-pre
* doc/misc/tramp.texi: Protext Tramp x.y and Emacs x.y by @w{}.
(GVFS-based methods): Move "GNOME Online Accounts" index.
(Customizing Methods, Android shell setup, File name completion)
(Frequently Asked Questions): Fix typos.
* doc/misc/trampver.texi: Change version to "2.5.0-pre".
* lisp/net/trampver.el: Change version to "2.5.0-pre".
(inhibit-message): Don't declare.
* lisp/net/tramp.el: Bump version to 2.5.0-pre. Require Emacs 25.1.
(tramp-debug-message): Simplify.
(tramp-message): Don't use `tramp-message-show-message'.
(tramp-with-demoted-errors, with-parsed-tramp-file-name)
(with-tramp-file-property, with-tramp-connection-property):
Adapt `declare' form.
(with-tramp-progress-reporter): Suppress progress reporter when
noninteractive.
(tramp-completion-mode, tramp-completion-mode-p): Remove.
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(format-message): Remove compatibility code.
(tramp-compat-directory-name-p)
(tramp-compat-tramp-file-name-slots): Remove.
* lisp/net/tramp.el (tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-with-buffer)
(tramp-user-error, tramp-with-demoted-errors)
(tramp-signal-hook-function):
* lisp/net/tramp-compat.el (tramp-compat-funcall)
* lisp/net/tramp-gvfs.el (tramp-dbus-function):
Add `tramp-suppress-trace' property.
* lisp/net/tramp.el (tramp-get-method-parameter)
(tramp-dissect-file-name, tramp-error, tramp-error-with-buffer)
(tramp-user-error, with-parsed-tramp-file-name)
(with-tramp-progress-reporter, tramp-file-name-handler)
(tramp-completion-file-name-handler, tramp-autoload-file-name-handler)
(tramp-register-file-name-handlers, tramp-connectable-p)
(tramp-handle-file-modes, tramp-handle-file-regular-p)
(tramp-handle-file-truename, tramp-handle-insert-directory)
(tramp-handle-load, tramp-set-file-uid-gid):
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler)
(tramp-adb-handle-file-truename, tramp-adb-handle-copy-file)
(tramp-adb-handle-rename-file):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-cache.el (tramp-get-file-property, tramp-cache-print):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(tramp-compat-exec-path):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
(tramp-gvfs-dbus-byte-array-to-string)
(tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler)
(tramp-rclone-do-copy-or-rename-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file)
(tramp-sh-handle-insert-directory, tramp-sh-file-name-handler)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler)
(tramp-smb-handle-copy-file, tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-insert-directory)
(tramp-smb-handle-rename-file, tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler)
(tramp-sudoedit-do-copy-or-rename-file)
(tramp-sudoedit-handle-file-truename):
Use `if-let', `when-let', `directory-name-p', `inhibit-message',
`non-essential and `cl-struct-slot-info'. Don't use `seconds-to-time'.
* test/lisp/net/tramp-archive-tests.el (tramp-message-show-message):
Don't set.
* test/lisp/net/tramp-tests.el (inhibit-message): Don't declare.
(tramp-message-show-message): Don't set.
(tramp-test06-directory-file-name): Use `non-essential'.
(tramp-test10-write-region): Use `inhibit-message'.
(tramp-test36-vc-registered): No special handling for old Emacsen.
(tramp--test-emacs25-p): Remove.
(tramp-test45-unload): Special case of `tramp-completion-mode'.
2020-01-19 14:11:07 +01:00
|
|
|
|
(if non-essential
|
2019-11-07 12:03:19 +01:00
|
|
|
|
file (concat file (if (tramp--test-ange-ftp-p) "/" "./")))))
|
2017-03-13 18:05:59 +01:00
|
|
|
|
(should (string-equal (file-name-directory file) file))
|
|
|
|
|
|
(should (string-equal (file-name-nondirectory file) "")))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2021-11-15 13:33:07 +01:00
|
|
|
|
(ert-deftest tramp-test07-abbreviate-file-name ()
|
|
|
|
|
|
"Check that Tramp abbreviates file names correctly."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-12-09 20:11:40 +01:00
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
2022-03-07 13:42:30 +01:00
|
|
|
|
;; `abbreviate-file-name' is supported since Emacs 29.1.
|
|
|
|
|
|
(skip-unless (tramp--test-emacs29-p))
|
2021-11-15 13:33:07 +01:00
|
|
|
|
|
2022-03-07 13:42:30 +01:00
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
|
|
|
|
|
(let* ((remote-host (file-remote-p ert-remote-temporary-file-directory))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(remote-host-nohop
|
|
|
|
|
|
(tramp-make-tramp-file-name (tramp-dissect-file-name remote-host)))
|
2021-11-18 15:06:26 +01:00
|
|
|
|
;; Not all methods can expand "~".
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(home-dir (ignore-errors (expand-file-name (concat remote-host "~"))))
|
|
|
|
|
|
home-dir-nohop)
|
2021-11-18 15:06:26 +01:00
|
|
|
|
(skip-unless home-dir)
|
|
|
|
|
|
|
2021-11-15 13:33:07 +01:00
|
|
|
|
;; Check home-dir abbreviation.
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(unless (string-suffix-p "~" home-dir)
|
|
|
|
|
|
(should (equal (abbreviate-file-name (concat home-dir "/foo/bar"))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(concat remote-host-nohop "~/foo/bar")))
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(should (equal (abbreviate-file-name
|
|
|
|
|
|
(concat remote-host "/nowhere/special"))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(concat remote-host-nohop "/nowhere/special"))))
|
2021-11-15 17:50:15 +01:00
|
|
|
|
|
2021-11-15 13:33:07 +01:00
|
|
|
|
;; Check `directory-abbrev-alist' abbreviation.
|
|
|
|
|
|
(let ((directory-abbrev-alist
|
2023-01-06 13:34:33 +01:00
|
|
|
|
`((,(rx bos (literal home-dir) "/foo") . ,(concat home-dir "/f"))
|
|
|
|
|
|
(,(rx bos (literal remote-host) "/nowhere")
|
|
|
|
|
|
. ,(concat remote-host "/nw")))))
|
2021-11-15 13:33:07 +01:00
|
|
|
|
(should (equal (abbreviate-file-name (concat home-dir "/foo/bar"))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(concat remote-host-nohop "~/f/bar")))
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(should (equal (abbreviate-file-name
|
|
|
|
|
|
(concat remote-host "/nowhere/special"))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(concat remote-host-nohop "/nw/special"))))
|
2021-11-16 15:04:27 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check that home-dir abbreviation doesn't occur when home-dir is just "/".
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(setq home-dir (concat remote-host "/")
|
|
|
|
|
|
home-dir-nohop
|
|
|
|
|
|
(tramp-make-tramp-file-name (tramp-dissect-file-name home-dir)))
|
2022-03-07 13:42:30 +01:00
|
|
|
|
;; The remote home directory is kept in the connection property "~".
|
|
|
|
|
|
;; We fake this setting.
|
|
|
|
|
|
(tramp-set-connection-property tramp-test-vec "~" (file-local-name home-dir))
|
2022-01-18 11:27:15 +01:00
|
|
|
|
(should (equal (abbreviate-file-name (concat home-dir "foo/bar"))
|
|
|
|
|
|
(concat home-dir-nohop "foo/bar")))
|
2022-03-07 13:42:30 +01:00
|
|
|
|
(tramp-flush-connection-property tramp-test-vec "~")))
|
2021-11-15 13:33:07 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test07-file-exists-p ()
|
2013-11-06 09:33:02 +01:00
|
|
|
|
"Check `file-exist-p', `write-region' and `delete-file'."
|
2013-11-08 10:31:15 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(delete-file tmp-name)
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
|
2021-12-22 18:13:18 +01:00
|
|
|
|
;; Trashing files doesn't work when `system-move-file-to-trash'
|
2022-07-19 13:57:20 +02:00
|
|
|
|
;; is defined (on MS-Windows and macOS), and for encrypted
|
|
|
|
|
|
;; remote files.
|
2021-12-22 18:13:18 +01:00
|
|
|
|
(unless (or (fboundp 'system-move-file-to-trash) (tramp--test-crypt-p))
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
|
|
|
|
|
|
(delete-by-moving-to-trash t))
|
|
|
|
|
|
(make-directory trash-directory)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(delete-file tmp-name 'trash)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(should
|
2020-11-13 16:55:08 +01:00
|
|
|
|
(or (file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name) trash-directory))
|
|
|
|
|
|
;; Gdrive.
|
|
|
|
|
|
(file-symlink-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name) trash-directory))))
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(delete-directory trash-directory 'recursive)
|
2023-01-08 19:24:17 +01:00
|
|
|
|
(should-not (file-exists-p trash-directory))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Setting `remote-file-name-inhibit-delete-by-moving-to-trash'
|
|
|
|
|
|
;; prevents trashing remote files.
|
|
|
|
|
|
(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
|
|
|
|
|
|
(delete-by-moving-to-trash t)
|
|
|
|
|
|
(remote-file-name-inhibit-delete-by-moving-to-trash t))
|
|
|
|
|
|
(make-directory trash-directory)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(delete-file tmp-name 'trash)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory tmp-name) trash-directory)))
|
|
|
|
|
|
(delete-directory trash-directory 'recursive)
|
|
|
|
|
|
(should-not (file-exists-p trash-directory))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test08-file-local-copy ()
|
|
|
|
|
|
"Check `file-local-copy'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
tmp-name2)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (setq tmp-name2 (file-local-copy tmp-name1)))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name2)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
|
|
|
|
|
;; Check also that a file transfer with compression works.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tramp-copy-size-limit 4)
|
|
|
|
|
|
(tramp-inline-compress-start-size 2))
|
|
|
|
|
|
(delete-file tmp-name2)
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(should (setq tmp-name2 (file-local-copy tmp-name1))))
|
|
|
|
|
|
;; Error case.
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(delete-file tmp-name2)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(setq tmp-name2 (file-local-copy tmp-name1))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(delete-file tmp-name2))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test09-insert-file-contents ()
|
|
|
|
|
|
"Check `insert-file-contents'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(unwind-protect
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(with-temp-buffer
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(write-region "foo" nil tmp-name)
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(let ((point (point)))
|
2023-04-09 18:51:21 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 3)))
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(should (string-equal (buffer-string) "foo"))
|
|
|
|
|
|
(should (= point (point))))
|
|
|
|
|
|
(goto-char (1+ (point)))
|
|
|
|
|
|
(let ((point (point)))
|
2023-04-09 18:51:21 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 3)))
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(should (string-equal (buffer-string) "ffoooo"))
|
|
|
|
|
|
(should (= point (point))))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
;; Insert partly.
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(let ((point (point)))
|
2023-04-09 18:51:21 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name nil 1 3)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 2)))
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(should (string-equal (buffer-string) "foofoooo"))
|
|
|
|
|
|
(should (= point (point))))
|
2023-04-09 18:51:21 +02:00
|
|
|
|
(let ((point (point)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name nil 2 5)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 1)))
|
|
|
|
|
|
(should (string-equal (buffer-string) "fooofoooo"))
|
|
|
|
|
|
(should (= point (point))))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
;; Replace.
|
2020-06-10 19:36:53 +02:00
|
|
|
|
(let ((point (point)))
|
2023-04-09 18:51:21 +02:00
|
|
|
|
;; 0 characters replaced, because "foo" is already there.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name nil nil nil 'replace)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 0)))
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo"))
|
|
|
|
|
|
(should (= point (point))))
|
2023-05-04 20:42:24 +02:00
|
|
|
|
;; Insert another string.
|
|
|
|
|
|
;; `replace-string-in-region' was introduced in Emacs 28.1.
|
|
|
|
|
|
(when (tramp--test-emacs28-p)
|
|
|
|
|
|
(let ((point (point)))
|
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(replace-string-in-region "foo" "bar" (point-min) (point-max)))
|
|
|
|
|
|
(goto-char point)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(insert-file-contents tmp-name nil nil nil 'replace)
|
|
|
|
|
|
`(,(expand-file-name tmp-name) 3)))
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo"))
|
|
|
|
|
|
(should (= point (point)))))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
;; Error case.
|
|
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test10-write-region ()
|
|
|
|
|
|
"Check `write-region'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2019-12-01 12:25:15 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(inhibit-message t))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
2017-05-08 22:17:53 -04:00
|
|
|
|
(progn
|
2017-05-16 14:49:51 +02:00
|
|
|
|
;; Write buffer. Use absolute and relative file name.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(write-region nil nil tmp-name))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
2017-05-16 14:49:51 +02:00
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(should-not (file-exists-p tmp-name))
|
|
|
|
|
|
(let ((default-directory (file-name-directory tmp-name)))
|
|
|
|
|
|
(should-not (file-exists-p (file-name-nondirectory tmp-name)))
|
|
|
|
|
|
(write-region nil nil (file-name-nondirectory tmp-name))
|
|
|
|
|
|
(should (file-exists-p (file-name-nondirectory tmp-name))))
|
|
|
|
|
|
(should (file-exists-p tmp-name)))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
2017-05-09 14:35:56 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Append.
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "bla")
|
|
|
|
|
|
(write-region nil nil tmp-name 'append))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foobla")))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "baz")
|
|
|
|
|
|
(write-region nil nil tmp-name 3))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
2020-03-21 10:30:26 +01:00
|
|
|
|
(should (string-equal (buffer-string) "foobaz")))
|
|
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(write-region nil nil tmp-name 'append))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo"))))
|
2017-05-09 14:35:56 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Write string.
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
2017-05-09 14:35:56 +02:00
|
|
|
|
|
2022-08-08 14:08:47 +02:00
|
|
|
|
;; Write empty string. Used for creation of temporary files.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(make-empty-file tmp-name)
|
|
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
(make-empty-file tmp-name)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (string-equal (buffer-string) "")))
|
Reorganize Tramp
* lisp/net/tramp-adb.el (tramp-adb-handle-write-region): Handle special
case that START is "".
(tramp-adb-handle-set-file-modes)
(tramp-adb-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-adb-handle-make-process):
Use `with-tramp-saved-connection-properties'.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Use `tramp-archive-handle-file-exists-p'.
(tramp-archive-handle-file-exists-p): New defun.
(tramp-archive-file-name-handler): Add ;;;###tramp-autoload cookie.
* lisp/net/tramp-cache.el (tramp-compat, tramp-loaddefs)
(time-stamp): Require.
(tramp-get-file-property, tramp-set-file-property)
(tramp-flush-file-property, tramp-flush-file-upper-properties)
(tramp-flush-file-properties): Use `tramp-file-name-unify'. Adapt
message.
(tramp-flush-directory-properties): Simplify.
(tramp-flush-file-function): Add ;;;###tramp-autoload cookie.
Don't use `with-parsed-tramp-file-name', it isn't exposed.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Macros moved from tramp.el.
(with-tramp-saved-file-property)
(with-tramp-saved-file-properties)
(with-tramp-saved-connection-properties): New defmacros.
* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Flush "/".
* lisp/net/tramp-crypt.el (tramp-crypt-handle-set-file-modes)
(tramp-crypt-handle-set-file-times)
(tramp-crypt-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-ftp.el (tramp-archive-file-name-handler):
Don't declare.
* lisp/net/tramp-gvfs.el (tramp-gvfs-info): New defun.
(tramp-gvfs-do-copy-or-rename-file)
(tramp-gvfs-handle-delete-directory)
(tramp-gvfs-handle-delete-file, tramp-gvfs-get-root-attributes)
(tramp-gvfs-handle-make-directory): Use it.
(tramp-gvfs-handle-set-file-modes)
(tramp-gvfs-handle-set-file-times)
(tramp-gvfs-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link):
Expand TARGET when flushing file properties.
(tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times)
(tramp-sh-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-sh-handle-file-name-all-completions): Protect, when
connection is not established yet.
(tramp-do-copy-or-rename-file-directly): Flush file properties of
NEWNAME when constructing a new remote file name.
(tramp-do-copy-or-rename-file-out-of-band, tramp-sh-handle-make-process):
Use `with-tramp-saved-connection-properties'.
(tramp-sh-handle-delete-file): Flush file properties only after
deleting, otherwise we get a false alarm.
(tramp-sh-handle-process-file): Flush "/".
(tramp-sh-handle-write-region): Handle special case that START is "".
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-process-file)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-start-file-process):
Use `with-tramp-saved-connection-properties'.
(tramp-smb-remote-acl-p): New defun.
(tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl): Use it.
(tramp-smb-handle-set-file-modes):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-smb-handle-process-file, tramp-smb-maybe-open-connection):
Flush "/".
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file): Flush "/".
(tramp-sshfs-handle-set-file-modes)
(tramp-sshfs-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-set-file-modes)
(tramp-sudoedit-handle-set-file-times)
(tramp-sudoedit-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp.el (tramp-archive-file-name-handler): Don't declare.
(tramp-verbose, tramp-file-name-unify, tramp-tramp-file-p)
(tramp-file-local-name, tramp-dissect-file-name)
(tramp-make-tramp-file-name, tramp-get-connection-buffer)
(tramp-get-buffer-string, tramp-debug-message)
(tramp-inhibit-progress-reporter, tramp-message):
Add ;;;###tramp-autoload cookie.
(tramp-file-name): Expose defstruct to tramp-loaddefs.el
(tramp-file-name-unify): New optional arg FILE.
(tramp-get-default-directory, tramp-get-buffer-string)
(tramp-message, tramp-backtrace, tramp-error-with-buffer)
(tramp-with-demoted-errors, tramp-barf-if-file-missing)
(tramp-skeleton-copy-directory, tramp-skeleton-delete-directory)
(tramp-skeleton-directory-files)
(tramp-skeleton-directory-files-and-attributes)
(tramp-skeleton-file-local-copy, tramp-skeleton-write-region):
Remove `tramp-suppress-trace' property, it isn't needed for
defmacros and defsubsts.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Move macros to tramp-cache.el.
(tramp-skeleton-directory-files-and-attributes): Fix implementation.
(tramp-skeleton-file-local-copy): Fix docstring.
(tramp-skeleton-set-file-modes-times-uid-gid): New defmacro.
(tramp-skeleton-write-region): Set "file-exists-p" cache property.
(tramp-handle-file-exists-p): Use cached value.
(tramp-process-sentinel): Flush "/".
(tramp-make-tramp-temp-file): Suppress also `tramp-smb-remote-acl-p'.
(tramp-get-connection-buffer):
* test/lisp/net/tramp-tests.el (tramp-test10-write-region)
(tramp-test20-file-modes, tramp-test22-file-times): Extend tests.
2022-08-03 17:30:09 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Write partly.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert "123456789")
|
|
|
|
|
|
(write-region 3 5 tmp-name))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
2017-08-12 12:30:39 +02:00
|
|
|
|
(should (string-equal (buffer-string) "34")))
|
|
|
|
|
|
|
2018-01-04 12:48:07 +01:00
|
|
|
|
;; Check message.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(let (inhibit-message)
|
|
|
|
|
|
(dolist (noninteractive (unless (tramp--test-ange-ftp-p) '(nil t)))
|
|
|
|
|
|
(dolist (visit '(nil t "string" no-message))
|
|
|
|
|
|
(ert-with-message-capture tramp--test-messages
|
|
|
|
|
|
(write-region "foo" nil tmp-name nil visit)
|
|
|
|
|
|
;; We must check the last line. There could be
|
|
|
|
|
|
;; other messages from the progress reporter.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-match-p
|
|
|
|
|
|
(if (and (null noninteractive)
|
|
|
|
|
|
(or (eq visit t) (null visit) (stringp visit)))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx bol "Wrote " (literal tmp-name) "\n" eos)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx bos))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
tramp--test-messages))))))
|
2018-01-04 12:48:07 +01:00
|
|
|
|
|
2023-03-01 17:07:59 +01:00
|
|
|
|
;; We do not test the lock file here. See
|
2021-07-18 16:58:52 +02:00
|
|
|
|
;; `tramp-test39-make-lock-file-name'.
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
2017-08-12 12:30:39 +02:00
|
|
|
|
;; Do not overwrite if excluded.
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'y-or-n-p) #'tramp-compat-always)
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP.
|
2023-06-11 20:33:34 +02:00
|
|
|
|
((symbol-function #'yes-or-no-p) #'tramp-compat-always))
|
2017-08-12 12:30:39 +02:00
|
|
|
|
(write-region "foo" nil tmp-name nil nil nil 'mustbenew))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(cl-letf (((symbol-function #'y-or-n-p) #'ignore)
|
|
|
|
|
|
;; Ange-FTP.
|
|
|
|
|
|
((symbol-function #'yes-or-no-p) #'ignore))
|
|
|
|
|
|
(write-region "foo" nil tmp-name nil nil nil 'mustbenew))
|
|
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(write-region "foo" nil tmp-name nil nil nil 'excl)
|
2023-08-06 14:30:57 +02:00
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
|
|
|
|
|
|
;; Check `buffer-file-coding-system'. Bug#65022.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name)
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(set-buffer-file-coding-system 'cp1251)
|
|
|
|
|
|
(let ((bfcs buffer-file-coding-system))
|
|
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(should (null (save-buffer)))
|
2023-08-06 15:46:58 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(eq (coding-system-get buffer-file-coding-system :mime-charset)
|
2023-08-06 16:24:19 +02:00
|
|
|
|
(coding-system-get bfcs :mime-charset))))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2019-05-08 09:44:22 +02:00
|
|
|
|
;; The following test is inspired by Bug#35497.
|
2019-05-08 09:13:58 +02:00
|
|
|
|
(ert-deftest tramp-test10-write-region-file-precious-flag ()
|
|
|
|
|
|
"Check that `file-precious-flag' is respected with Tramp in use."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
|
|
|
|
|
|
|
|
|
|
|
(let* ((tmp-name (tramp--test-make-temp-name))
|
2019-12-01 12:25:15 +01:00
|
|
|
|
(inhibit-message t)
|
2019-05-08 09:13:58 +02:00
|
|
|
|
written-files
|
|
|
|
|
|
(advice (lambda (_start _end filename &rest _r)
|
|
|
|
|
|
(push filename written-files))))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name)
|
|
|
|
|
|
;; Write initial contents. Adapt `visited-file-modtime'
|
|
|
|
|
|
;; in order to suppress confirmation.
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(write-region nil nil tmp-name)
|
|
|
|
|
|
(set-visited-file-modtime)
|
|
|
|
|
|
;; Run the test.
|
|
|
|
|
|
(advice-add 'write-region :before advice)
|
|
|
|
|
|
(setq-local file-precious-flag t)
|
2019-06-13 20:24:41 -04:00
|
|
|
|
(setq-local backup-inhibited t)
|
2019-05-08 09:13:58 +02:00
|
|
|
|
(insert "bar")
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (buffer-modified-p))
|
2019-05-08 09:13:58 +02:00
|
|
|
|
(should (null (save-buffer)))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (not (buffer-modified-p)))
|
2019-05-08 09:13:58 +02:00
|
|
|
|
(should-not (cl-member tmp-name written-files :test #'string=)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (advice-remove 'write-region advice))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name)))))
|
|
|
|
|
|
|
2022-05-05 09:54:31 +02:00
|
|
|
|
;; The following test is inspired by Bug#55166.
|
|
|
|
|
|
(ert-deftest tramp-test10-write-region-other-file-name-handler ()
|
|
|
|
|
|
"Check that another file name handler in VISIT is acknowledged."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
(skip-unless (executable-find "gzip"))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
;; The function was introduced in Emacs 28.1.
|
|
|
|
|
|
(skip-unless (boundp 'tar-goto-file))
|
2022-05-05 09:54:31 +02:00
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((default-directory ert-remote-temporary-file-directory)
|
2022-05-05 09:54:31 +02:00
|
|
|
|
(archive (ert-resource-file "foo.tar.gz"))
|
|
|
|
|
|
(tmp-file (expand-file-name (file-name-nondirectory archive)))
|
|
|
|
|
|
(require-final-newline t)
|
|
|
|
|
|
(inhibit-message t)
|
|
|
|
|
|
(backup-inhibited t)
|
|
|
|
|
|
create-lockfiles buffer1 buffer2)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(copy-file archive tmp-file 'ok)
|
|
|
|
|
|
;; Read archive. Check contents of foo.txt, and modify it. Save.
|
|
|
|
|
|
(with-current-buffer (setq buffer1 (find-file-noselect tmp-file))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
;; The function was introduced in Emacs 28.1.
|
|
|
|
|
|
(with-no-warnings (should (tar-goto-file "foo.txt")))
|
2022-05-05 09:54:31 +02:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
|
(setq buffer2 (tar-extract))
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo\n"))
|
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
|
(insert "bar")
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(should (null (save-buffer)))
|
|
|
|
|
|
(should-not (buffer-modified-p)))
|
|
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(should (null (save-buffer)))
|
|
|
|
|
|
(should-not (buffer-modified-p)))
|
2022-05-05 09:54:31 +02:00
|
|
|
|
|
|
|
|
|
|
(kill-buffer buffer1)
|
|
|
|
|
|
(kill-buffer buffer2)
|
|
|
|
|
|
;; Read archive. Check contents of modified foo.txt.
|
|
|
|
|
|
(with-current-buffer (setq buffer1 (find-file-noselect tmp-file))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
;; The function was introduced in Emacs 28.1.
|
|
|
|
|
|
(with-no-warnings (should (tar-goto-file "foo.txt")))
|
2022-05-05 09:54:31 +02:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
|
(setq buffer2 (tar-extract))
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo\nbar\n")))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-buffer buffer1))
|
|
|
|
|
|
(ignore-errors (kill-buffer buffer2))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-file)))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test11-copy-file ()
|
|
|
|
|
|
"Check `copy-file'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name 'local quoted)))
|
|
|
|
|
|
(dolist (source-target
|
|
|
|
|
|
`(;; Copy on remote side.
|
|
|
|
|
|
(,tmp-name1 . ,tmp-name2)
|
|
|
|
|
|
;; Copy from remote side to local side.
|
|
|
|
|
|
(,tmp-name1 . ,tmp-name3)
|
|
|
|
|
|
;; Copy from local side to remote side.
|
|
|
|
|
|
(,tmp-name3 . ,tmp-name1)))
|
|
|
|
|
|
(let ((source (car source-target))
|
|
|
|
|
|
(target (cdr source-target)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy simple file.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-file source target)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(write-region "foo" nil source)
|
|
|
|
|
|
(should (file-exists-p source))
|
|
|
|
|
|
(copy-file source target)
|
|
|
|
|
|
(should (file-exists-p target))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents target)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2019-01-23 15:23:57 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-file source target)
|
|
|
|
|
|
:type 'file-already-exists))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(copy-file source target 'ok))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file source))
|
|
|
|
|
|
(ignore-errors (delete-file target)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy file to directory.
|
|
|
|
|
|
(unwind-protect
|
2020-11-30 13:54:29 +01:00
|
|
|
|
;; This doesn't work on FTP.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(write-region "foo" nil source)
|
|
|
|
|
|
(should (file-exists-p source))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2019-01-23 15:23:57 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-file source target)
|
2019-07-12 15:10:57 +02:00
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-file source target 'ok)
|
|
|
|
|
|
:type 'file-error))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(copy-file source (file-name-as-directory target))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory source) target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file source))
|
|
|
|
|
|
(ignore-errors (delete-directory target 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy directory to existing directory.
|
|
|
|
|
|
(unwind-protect
|
2020-11-30 13:54:29 +01:00
|
|
|
|
;; This doesn't work on FTP.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(make-directory source)
|
|
|
|
|
|
(should (file-directory-p source))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" source))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo" source)))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
|
|
|
|
|
;; Directory `target' exists already, so we must use
|
|
|
|
|
|
;; `file-name-as-directory'.
|
|
|
|
|
|
(copy-file source (file-name-as-directory target))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(concat (file-name-nondirectory source) "/foo") target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory source 'recursive))
|
|
|
|
|
|
(ignore-errors (delete-directory target 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy directory/file to non-existing directory.
|
|
|
|
|
|
(unwind-protect
|
2020-11-30 13:54:29 +01:00
|
|
|
|
;; This doesn't work on FTP.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(make-directory source)
|
|
|
|
|
|
(should (file-directory-p source))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" source))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo" source)))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
|
|
|
|
|
(copy-file
|
|
|
|
|
|
source
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory source) target))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(concat (file-name-nondirectory source) "/foo") target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory source 'recursive))
|
2019-01-23 15:23:57 +01:00
|
|
|
|
(ignore-errors (delete-directory target 'recursive))))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test12-rename-file ()
|
|
|
|
|
|
"Check `rename-file'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name 'local quoted)))
|
|
|
|
|
|
(dolist (source-target
|
|
|
|
|
|
`(;; Rename on remote side.
|
|
|
|
|
|
(,tmp-name1 . ,tmp-name2)
|
|
|
|
|
|
;; Rename from remote side to local side.
|
|
|
|
|
|
(,tmp-name1 . ,tmp-name3)
|
|
|
|
|
|
;; Rename from local side to remote side.
|
|
|
|
|
|
(,tmp-name3 . ,tmp-name1)))
|
|
|
|
|
|
(let ((source (car source-target))
|
|
|
|
|
|
(target (cdr source-target)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Rename simple file.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(rename-file source target)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(write-region "foo" nil source)
|
|
|
|
|
|
(should (file-exists-p source))
|
|
|
|
|
|
(rename-file source target)
|
|
|
|
|
|
(should-not (file-exists-p source))
|
|
|
|
|
|
(should (file-exists-p target))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents target)
|
|
|
|
|
|
(should (string-equal (buffer-string) "foo")))
|
|
|
|
|
|
(write-region "foo" nil source)
|
|
|
|
|
|
(should (file-exists-p source))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(rename-file source target)
|
|
|
|
|
|
:type 'file-already-exists))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(rename-file source target 'ok)
|
|
|
|
|
|
(should-not (file-exists-p source)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file source))
|
|
|
|
|
|
(ignore-errors (delete-file target)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Rename file to directory.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(write-region "foo" nil source)
|
|
|
|
|
|
(should (file-exists-p source))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(should-error
|
|
|
|
|
|
(rename-file source target)
|
2019-07-12 15:10:57 +02:00
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(rename-file source target 'ok)
|
|
|
|
|
|
:type 'file-error))
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(rename-file source (file-name-as-directory target))
|
|
|
|
|
|
(should-not (file-exists-p source))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory source) target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file source))
|
|
|
|
|
|
(ignore-errors (delete-directory target 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Rename directory to existing directory.
|
|
|
|
|
|
(unwind-protect
|
2020-11-30 13:54:29 +01:00
|
|
|
|
;; This doesn't work on FTP.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(make-directory source)
|
|
|
|
|
|
(should (file-directory-p source))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" source))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo" source)))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
|
|
|
|
|
;; Directory `target' exists already, so we must use
|
|
|
|
|
|
;; `file-name-as-directory'.
|
|
|
|
|
|
(rename-file source (file-name-as-directory target))
|
|
|
|
|
|
(should-not (file-exists-p source))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(concat (file-name-nondirectory source) "/foo") target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory source 'recursive))
|
|
|
|
|
|
(ignore-errors (delete-directory target 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Rename directory/file to non-existing directory.
|
|
|
|
|
|
(unwind-protect
|
2020-11-30 13:54:29 +01:00
|
|
|
|
;; This doesn't work on FTP.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
2017-10-20 12:46:54 +02:00
|
|
|
|
(make-directory source)
|
|
|
|
|
|
(should (file-directory-p source))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" source))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo" source)))
|
|
|
|
|
|
(make-directory target)
|
|
|
|
|
|
(should (file-directory-p target))
|
|
|
|
|
|
(rename-file
|
|
|
|
|
|
source
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory source) target))
|
|
|
|
|
|
(should-not (file-exists-p source))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(concat (file-name-nondirectory source) "/foo") target))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory source 'recursive))
|
|
|
|
|
|
(ignore-errors (delete-directory target 'recursive))))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2021-09-11 15:35:51 +02:00
|
|
|
|
(ert-deftest tramp-test13-make-directory ()
|
|
|
|
|
|
"Check `make-directory'.
|
|
|
|
|
|
This tests also `file-directory-p' and `file-accessible-directory-p'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2022-12-22 19:39:59 +01:00
|
|
|
|
;; Since Emacs 29.1, `make-directory' has defined return values.
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
2021-09-10 06:30:06 -07:00
|
|
|
|
(tmp-name2 (expand-file-name "foo/bar" tmp-name1))
|
|
|
|
|
|
(unusual-file-mode-1 #o740)
|
|
|
|
|
|
(unusual-file-mode-2 #o710))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2021-09-10 06:30:06 -07:00
|
|
|
|
(with-file-modes unusual-file-mode-1
|
2022-12-22 19:39:59 +01:00
|
|
|
|
(if (tramp--test-emacs29-p)
|
|
|
|
|
|
(should-not (make-directory tmp-name1))
|
|
|
|
|
|
(make-directory tmp-name1)))
|
2019-11-06 16:49:35 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
:type 'file-already-exists)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-accessible-directory-p tmp-name1))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(when (tramp--test-supports-set-file-modes-p)
|
2021-09-11 15:35:51 +02:00
|
|
|
|
(should (equal (format "%#o" unusual-file-mode-1)
|
|
|
|
|
|
(format "%#o" (file-modes tmp-name1)))))
|
2019-11-06 16:49:35 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
:type 'file-error)
|
2021-09-10 06:30:06 -07:00
|
|
|
|
(with-file-modes unusual-file-mode-2
|
2022-12-22 19:39:59 +01:00
|
|
|
|
(if (tramp--test-emacs29-p)
|
|
|
|
|
|
(should-not (make-directory tmp-name2 'parents))
|
|
|
|
|
|
(make-directory tmp-name2 'parents)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-directory-p tmp-name2))
|
2017-10-08 13:55:20 +02:00
|
|
|
|
(should (file-accessible-directory-p tmp-name2))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(when (tramp--test-supports-set-file-modes-p)
|
2021-09-11 15:35:51 +02:00
|
|
|
|
(should (equal (format "%#o" unusual-file-mode-2)
|
|
|
|
|
|
(format "%#o" (file-modes tmp-name2)))))
|
2017-10-08 13:55:20 +02:00
|
|
|
|
;; If PARENTS is non-nil, `make-directory' shall not
|
2022-12-22 19:39:59 +01:00
|
|
|
|
;; signal an error when DIR exists already. It returns t.
|
|
|
|
|
|
(if (tramp--test-emacs29-p)
|
|
|
|
|
|
(should (make-directory tmp-name2 'parents))
|
|
|
|
|
|
(make-directory tmp-name2 'parents)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test14-delete-directory ()
|
|
|
|
|
|
"Check `delete-directory'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Delete empty directory.
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(delete-directory tmp-name1)
|
|
|
|
|
|
(should-not (file-directory-p tmp-name1))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Delete non-empty directory.
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "bla" tmp-name1))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "bla" tmp-name1)))
|
|
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "bla" tmp-name2))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "bla" tmp-name2)))
|
2019-11-06 16:49:35 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(delete-directory tmp-name1)
|
|
|
|
|
|
:type 'file-error)
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(delete-directory tmp-name1 'recursive)
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(should-not (file-directory-p tmp-name1))
|
|
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
;; Trashing directories doesn't work when
|
|
|
|
|
|
;; `system-move-file-to-trash' is defined (on MS Windows and
|
|
|
|
|
|
;; macOS), for encrypted remote directories and for ange-ftp.
|
2021-12-22 18:13:18 +01:00
|
|
|
|
(when (and (not (fboundp 'system-move-file-to-trash))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(not (tramp--test-crypt-p)) (not (tramp--test-ftp-p)))
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
|
|
|
|
|
|
(delete-by-moving-to-trash t))
|
|
|
|
|
|
(make-directory trash-directory)
|
|
|
|
|
|
;; Delete empty directory.
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(delete-directory tmp-name1 nil 'trash)
|
|
|
|
|
|
(should-not (file-directory-p tmp-name1))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name1) trash-directory)))
|
|
|
|
|
|
(delete-directory trash-directory 'recursive)
|
|
|
|
|
|
(should-not (file-exists-p trash-directory))
|
|
|
|
|
|
;; Delete non-empty directory.
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "bla" tmp-name1))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "bla" tmp-name1)))
|
|
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "bla" tmp-name2))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "bla" tmp-name2)))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(delete-directory tmp-name1 nil 'trash)
|
2021-03-08 12:05:29 +01:00
|
|
|
|
;; tramp-rclone.el and tramp-sshfs.el call the local
|
|
|
|
|
|
;; `delete-directory'. This raises another error.
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
:type (if (tramp--test-fuse-p) 'error 'file-error))
|
2020-11-01 12:42:29 +01:00
|
|
|
|
(delete-directory tmp-name1 'recursive 'trash)
|
|
|
|
|
|
(should-not (file-directory-p tmp-name1))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s/%s/bla" trash-directory (file-name-nondirectory tmp-name1))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s/%s/%s/bla" trash-directory (file-name-nondirectory tmp-name1)
|
|
|
|
|
|
(file-name-nondirectory tmp-name2))))
|
|
|
|
|
|
(delete-directory trash-directory 'recursive)
|
2023-01-08 19:24:17 +01:00
|
|
|
|
(should-not (file-exists-p trash-directory))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Setting `remote-file-name-inhibit-delete-by-moving-to-trash'
|
|
|
|
|
|
;; prevents trashing remote files.
|
|
|
|
|
|
(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
|
|
|
|
|
|
(delete-by-moving-to-trash t)
|
|
|
|
|
|
(remote-file-name-inhibit-delete-by-moving-to-trash t))
|
|
|
|
|
|
(make-directory trash-directory)
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(delete-directory tmp-name1 nil 'trash)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name1))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(file-exists-p
|
|
|
|
|
|
(expand-file-name (file-name-nondirectory tmp-name1) trash-directory)))
|
|
|
|
|
|
(delete-directory trash-directory 'recursive)
|
|
|
|
|
|
(should-not (file-exists-p trash-directory))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test15-copy-directory ()
|
|
|
|
|
|
"Check `copy-directory'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(skip-unless (not (tramp--test-rclone-p)))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name3 (expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name1) tmp-name2))
|
|
|
|
|
|
(tmp-name4 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(tmp-name5 (expand-file-name "foo" tmp-name2))
|
2021-08-22 20:44:54 +02:00
|
|
|
|
(tmp-name6 (expand-file-name "foo" tmp-name3))
|
|
|
|
|
|
(tmp-name7 (tramp--test-make-temp-name nil quoted)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Copy complete directory.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-directory tmp-name1 tmp-name2)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Copy empty directory.
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name4)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
(copy-directory tmp-name1 tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name5))
|
|
|
|
|
|
;; Target directory does exist already.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(copy-directory tmp-name1 tmp-name2)
|
|
|
|
|
|
:type 'file-already-exists)
|
2017-09-10 23:04:10 -07:00
|
|
|
|
(copy-directory tmp-name1 (file-name-as-directory tmp-name2))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-directory-p tmp-name3))
|
|
|
|
|
|
(should (file-exists-p tmp-name6)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-directory tmp-name1 'recursive)
|
|
|
|
|
|
(delete-directory tmp-name2 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy directory contents.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Copy empty directory.
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name4)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
(copy-directory tmp-name1 tmp-name2 nil 'parents 'contents)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name5))
|
|
|
|
|
|
;; Target directory does exist already.
|
|
|
|
|
|
(delete-file tmp-name5)
|
|
|
|
|
|
(should-not (file-exists-p tmp-name5))
|
2017-09-12 11:20:49 +02:00
|
|
|
|
(copy-directory
|
|
|
|
|
|
tmp-name1 (file-name-as-directory tmp-name2)
|
|
|
|
|
|
nil 'parents 'contents)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name5))
|
|
|
|
|
|
(should-not (file-directory-p tmp-name3))
|
|
|
|
|
|
(should-not (file-exists-p tmp-name6)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-directory tmp-name1 'recursive)
|
2021-08-22 20:44:54 +02:00
|
|
|
|
(delete-directory tmp-name2 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy symlink to directory. Implemented since Emacs 28.1.
|
2021-08-23 15:47:19 +02:00
|
|
|
|
(when (boundp 'copy-directory-create-symlink)
|
2021-08-22 20:44:54 +02:00
|
|
|
|
(dolist (copy-directory-create-symlink '(nil t))
|
|
|
|
|
|
(unwind-protect
|
2021-08-23 15:47:19 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
|
|
|
|
|
;; Copy to file name.
|
2021-08-22 20:44:54 +02:00
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name4)
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name7)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
(should (file-symlink-p tmp-name7))
|
|
|
|
|
|
(copy-directory tmp-name7 tmp-name2)
|
|
|
|
|
|
(if copy-directory-create-symlink
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-symlink-p tmp-name2) (file-symlink-p tmp-name7)))
|
2021-08-23 15:47:19 +02:00
|
|
|
|
(should (file-directory-p tmp-name2)))
|
|
|
|
|
|
;; Copy to directory name.
|
|
|
|
|
|
(delete-directory tmp-name2 'recursive)
|
|
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(copy-directory tmp-name7 (file-name-as-directory tmp-name2))
|
|
|
|
|
|
(if copy-directory-create-symlink
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-symlink-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name7) tmp-name2))
|
|
|
|
|
|
(file-symlink-p tmp-name7)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-directory-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name7) tmp-name2)))))
|
2021-08-22 20:44:54 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-directory tmp-name1 'recursive)
|
|
|
|
|
|
(delete-directory tmp-name2 'recursive)
|
|
|
|
|
|
(delete-directory tmp-name7 'recursive))))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test16-directory-files ()
|
|
|
|
|
|
"Check `directory-files'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(let* ((tramp-fuse-remove-hidden-files t)
|
|
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name2 (expand-file-name "bla" tmp-name1))
|
|
|
|
|
|
(tmp-name3 (expand-file-name "foo" tmp-name1)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(directory-files tmp-name1)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(write-region "bla" nil tmp-name3)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name3))
|
|
|
|
|
|
(should (equal (directory-files tmp-name1) '("." ".." "bla" "foo")))
|
|
|
|
|
|
(should (equal (directory-files tmp-name1 'full)
|
|
|
|
|
|
`(,(concat tmp-name1 "/.")
|
|
|
|
|
|
,(concat tmp-name1 "/..")
|
|
|
|
|
|
,tmp-name2 ,tmp-name3)))
|
|
|
|
|
|
(should (equal (directory-files
|
|
|
|
|
|
tmp-name1 nil directory-files-no-dot-files-regexp)
|
|
|
|
|
|
'("bla" "foo")))
|
|
|
|
|
|
(should (equal (directory-files
|
|
|
|
|
|
tmp-name1 'full directory-files-no-dot-files-regexp)
|
2020-11-03 18:47:32 +01:00
|
|
|
|
`(,tmp-name2 ,tmp-name3)))
|
|
|
|
|
|
;; Check the COUNT arg. It exists since Emacs 28.
|
|
|
|
|
|
(when (tramp--test-emacs28-p)
|
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(should
|
2020-11-05 17:36:04 +01:00
|
|
|
|
(equal
|
|
|
|
|
|
(directory-files
|
|
|
|
|
|
tmp-name1 nil directory-files-no-dot-files-regexp nil 1)
|
|
|
|
|
|
'("bla"))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2017-08-22 16:22:33 +02:00
|
|
|
|
;; This is not a file name handler test. But Tramp needed to apply an
|
|
|
|
|
|
;; advice for older Emacs versions, so we check that this has been fixed.
|
|
|
|
|
|
(ert-deftest tramp-test16-file-expand-wildcards ()
|
|
|
|
|
|
"Check `file-expand-wildcards'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(let* ((tramp-fuse-remove-hidden-files t)
|
|
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
2017-08-22 16:22:33 +02:00
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(tmp-name3 (expand-file-name "bar" tmp-name1))
|
|
|
|
|
|
(tmp-name4 (expand-file-name "baz" tmp-name1))
|
|
|
|
|
|
(default-directory tmp-name1))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(write-region "bar" nil tmp-name3)
|
|
|
|
|
|
(write-region "baz" nil tmp-name4)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name3))
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
|
2017-09-13 20:10:40 +02:00
|
|
|
|
;; `sort' works destructive.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-expand-wildcards "*")
|
|
|
|
|
|
(sort (copy-sequence '("foo" "bar" "baz")) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-expand-wildcards "ba?")
|
|
|
|
|
|
(sort (copy-sequence '("bar" "baz")) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-expand-wildcards "ba[rz]")
|
|
|
|
|
|
(sort (copy-sequence '("bar" "baz")) 'string<)))
|
|
|
|
|
|
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards "*" 'full)
|
|
|
|
|
|
(sort
|
|
|
|
|
|
(copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards "ba?" 'full)
|
|
|
|
|
|
(sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards "ba[rz]" 'full)
|
|
|
|
|
|
(sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
|
|
|
|
|
|
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards (concat tmp-name1 "/" "*"))
|
|
|
|
|
|
(sort
|
|
|
|
|
|
(copy-sequence `(,tmp-name2 ,tmp-name3 ,tmp-name4)) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards (concat tmp-name1 "/" "ba?"))
|
|
|
|
|
|
(sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-expand-wildcards (concat tmp-name1 "/" "ba[rz]"))
|
|
|
|
|
|
(sort (copy-sequence `(,tmp-name3 ,tmp-name4)) 'string<))))
|
2017-08-22 16:22:33 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2019-12-29 13:53:06 +01:00
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2017-08-22 16:22:33 +02:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test17-insert-directory ()
|
|
|
|
|
|
"Check `insert-directory'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP is very special. It does not include the header line
|
|
|
|
|
|
;; (this is performed by `dired'). If FULL is nil, it shows just
|
|
|
|
|
|
;; one file. So we refrain from testing.
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2017-03-13 18:05:59 +01:00
|
|
|
|
(let* ((tmp-name1
|
|
|
|
|
|
(expand-file-name (tramp--test-make-temp-name nil quoted)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
;; We test for the summary line. Keyword "total" could be localized.
|
|
|
|
|
|
(process-environment
|
|
|
|
|
|
(append '("LANG=C" "LANGUAGE=C" "LC_ALL=C") process-environment)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-directory tmp-name1 nil)
|
|
|
|
|
|
(goto-char (point-min))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (looking-at-p (rx (literal tmp-name1)))))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-directory (file-name-as-directory tmp-name1) nil)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(looking-at-p (rx (literal (file-name-as-directory tmp-name1))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-directory tmp-name1 "-al")
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(looking-at-p (rx bol (+ nonl) blank (literal tmp-name1) eol))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-directory (file-name-as-directory tmp-name1) "-al")
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(looking-at-p
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx bol (+ nonl) blank (literal tmp-name1) "/" eol))))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-directory
|
|
|
|
|
|
(file-name-as-directory tmp-name1) "-al" nil 'full-directory-p)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(looking-at-p
|
|
|
|
|
|
(rx-to-string
|
|
|
|
|
|
`(:
|
2022-08-06 18:09:35 +02:00
|
|
|
|
;; There might be a summary line.
|
2023-10-01 11:28:20 +02:00
|
|
|
|
(? (* blank) "total" (+ nonl) (+ digit) (? blank)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(? (any "EGKMPTYZk")) (? "i") (? "B") "\n")
|
2022-08-06 18:09:35 +02:00
|
|
|
|
;; We don't know in which order ".", ".." and "foo" appear.
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(= ,(length (directory-files tmp-name1))
|
2022-09-06 12:33:19 +02:00
|
|
|
|
(+ nonl) blank
|
2023-10-01 11:28:20 +02:00
|
|
|
|
(| . ,(directory-files tmp-name1))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(? " ->" (+ nonl)) "\n"))))))
|
2019-02-19 14:00:17 +01:00
|
|
|
|
|
2021-10-18 19:54:13 +02:00
|
|
|
|
;; Check error cases.
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(when (and (tramp--test-supports-set-file-modes-p)
|
2021-10-18 19:54:13 +02:00
|
|
|
|
;; With "sshfs", directories with zero file
|
|
|
|
|
|
;; modes are still "accessible".
|
|
|
|
|
|
(not (tramp--test-sshfs-p))
|
|
|
|
|
|
;; A directory is always accessible for user "root".
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(not (zerop (file-attribute-user-id
|
2021-10-18 19:54:13 +02:00
|
|
|
|
(file-attributes tmp-name1)))))
|
|
|
|
|
|
(set-file-modes tmp-name1 0)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(insert-directory tmp-name1 nil)
|
|
|
|
|
|
:type 'file-error))
|
|
|
|
|
|
(set-file-modes tmp-name1 #o777))
|
2019-02-19 14:00:17 +01:00
|
|
|
|
(delete-directory tmp-name1 'recursive)
|
|
|
|
|
|
(with-temp-buffer
|
2019-05-18 16:04:58 +02:00
|
|
|
|
(should-error
|
|
|
|
|
|
(insert-directory tmp-name1 nil)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(ert-deftest tramp-test17-dired-with-wildcards ()
|
|
|
|
|
|
"Check `dired' with wildcards."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
;; `separate' syntax and IPv6 host name syntax do not work.
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(skip-unless
|
|
|
|
|
|
(not (string-match-p (rx "[") ert-remote-temporary-file-directory)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2017-07-31 14:32:24 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2017-10-19 13:37:23 +02:00
|
|
|
|
(skip-unless (not (tramp--test-rsync-p)))
|
2020-06-14 15:31:17 +02:00
|
|
|
|
;; Wildcards are not supported in tramp-crypt.el.
|
|
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(let* ((tmp-name1
|
|
|
|
|
|
(expand-file-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(tmp-name2
|
|
|
|
|
|
(expand-file-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(tmp-name3 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(tmp-name4 (expand-file-name "bar" tmp-name2))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(ert-remote-temporary-file-directory
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
buffer)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name3)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name3))
|
|
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
(write-region "foo" nil tmp-name4)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check for expanded directory names.
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(setq buffer
|
|
|
|
|
|
(dired-noselect
|
|
|
|
|
|
(expand-file-name
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"tramp-test*" ert-remote-temporary-file-directory)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name1 ert-remote-temporary-file-directory)))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name2 ert-remote-temporary-file-directory))))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
|
|
|
|
|
|
|
;; Check for expanded directory and file names.
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(setq buffer
|
|
|
|
|
|
(dired-noselect
|
|
|
|
|
|
(expand-file-name
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"tramp-test*/*" ert-remote-temporary-file-directory)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name3 ert-remote-temporary-file-directory)))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name4
|
|
|
|
|
|
ert-remote-temporary-file-directory))))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
|
|
|
|
|
|
|
;; Check for special characters.
|
|
|
|
|
|
(setq tmp-name3 (expand-file-name "*?" tmp-name1))
|
|
|
|
|
|
(setq tmp-name4 (expand-file-name "[a-z0-9]" tmp-name2))
|
|
|
|
|
|
(write-region "foo" nil tmp-name3)
|
|
|
|
|
|
(should (file-exists-p tmp-name3))
|
|
|
|
|
|
(write-region "foo" nil tmp-name4)
|
|
|
|
|
|
(should (file-exists-p tmp-name4))
|
|
|
|
|
|
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(setq buffer
|
|
|
|
|
|
(dired-noselect
|
|
|
|
|
|
(expand-file-name
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"tramp-test*/*" ert-remote-temporary-file-directory)))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name3 ert-remote-temporary-file-directory)))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
(literal
|
|
|
|
|
|
(file-relative-name
|
|
|
|
|
|
tmp-name4
|
|
|
|
|
|
ert-remote-temporary-file-directory))))))
|
2017-07-30 13:08:36 +02:00
|
|
|
|
(kill-buffer buffer))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-buffer buffer))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive))))))
|
|
|
|
|
|
|
2021-01-10 13:26:29 +01:00
|
|
|
|
;; The following test is inspired by Bug#45691.
|
|
|
|
|
|
(ert-deftest tramp-test17-insert-directory-one-file ()
|
|
|
|
|
|
"Check `insert-directory' inside directory listing."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-01-27 16:30:49 +01:00
|
|
|
|
;; Relative file names in dired are not supported in tramp-crypt.el.
|
|
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2021-01-10 13:26:29 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2021-01-10 13:26:29 +01:00
|
|
|
|
(let* ((tmp-name1
|
|
|
|
|
|
(expand-file-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(tmp-name3 (expand-file-name "bar" tmp-name1))
|
|
|
|
|
|
(dired-copy-preserve-time t)
|
|
|
|
|
|
(dired-recursive-copies 'top)
|
|
|
|
|
|
dired-copy-dereference
|
|
|
|
|
|
buffer)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check, that `insert-directory' works properly.
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(setq buffer (dired-noselect tmp-name1 "--dired -al"))
|
|
|
|
|
|
(read-only-mode -1)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(while (not (or (eobp)
|
|
|
|
|
|
(string-equal
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(dired-get-filename 'no-dir 'no-error)
|
2021-01-10 13:26:29 +01:00
|
|
|
|
(file-name-nondirectory tmp-name2))))
|
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
|
(should-not (eobp))
|
|
|
|
|
|
(copy-file tmp-name2 tmp-name3)
|
|
|
|
|
|
(insert-directory
|
|
|
|
|
|
(file-name-nondirectory tmp-name3) "--dired -al -d")
|
|
|
|
|
|
;; Point shall still be the recent file.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(dired-get-filename 'no-dir 'no-error)
|
2021-01-10 13:26:29 +01:00
|
|
|
|
(file-name-nondirectory tmp-name2)))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should-not (search-forward "dired" nil t))
|
2021-01-10 13:26:29 +01:00
|
|
|
|
;; The copied file has been inserted the line before.
|
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(dired-get-filename 'no-dir 'no-error)
|
2021-01-10 13:26:29 +01:00
|
|
|
|
(file-name-nondirectory tmp-name3))))
|
|
|
|
|
|
(kill-buffer buffer))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-buffer buffer))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test18-file-attributes ()
|
|
|
|
|
|
"Check `file-attributes'.
|
2019-02-19 14:00:17 +01:00
|
|
|
|
This tests also `access-file', `file-readable-p',
|
|
|
|
|
|
`file-regular-p' and `file-ownership-preserved-p'."
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; We must use `file-truename' for the temporary directory,
|
|
|
|
|
|
;; because it could be located on a symlinked directory. This
|
|
|
|
|
|
;; would let the test fail.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((ert-remote-temporary-file-directory
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
;; File name with "//".
|
|
|
|
|
|
(tmp-name3
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s%s"
|
|
|
|
|
|
(file-remote-p tmp-name1)
|
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
|
"/" "//" (file-remote-p tmp-name1 'localname))))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
;; `file-ownership-preserved-p' is implemented only in tramp-sh.el.
|
|
|
|
|
|
(test-file-ownership-preserved-p (tramp--test-sh-p))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
attr)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2023-07-03 18:24:11 +02:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
;; `access-file' returns nil in case of success.
|
|
|
|
|
|
(should-not (access-file tmp-name1 "error"))
|
|
|
|
|
|
;; `access-file' could use a timeout.
|
|
|
|
|
|
(let ((remote-file-name-access-timeout 1))
|
|
|
|
|
|
(cl-letf (((symbol-function #'file-exists-p)
|
|
|
|
|
|
(lambda (_filename) (sleep-for 5))))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(access-file tmp-name1 "error")
|
|
|
|
|
|
:type 'file-error)))
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
|
2020-02-12 20:26:47 +01:00
|
|
|
|
;; A sticky bit could damage the `file-ownership-preserved-p' test.
|
|
|
|
|
|
(when
|
|
|
|
|
|
(and test-file-ownership-preserved-p
|
|
|
|
|
|
(zerop (logand
|
|
|
|
|
|
#o1000
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-modes ert-remote-temporary-file-directory))))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(setq test-file-ownership-preserved-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(= (file-attribute-group-id (file-attributes tmp-name1))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-get-remote-gid tramp-test-vec 'integer)))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(delete-file tmp-name1))
|
|
|
|
|
|
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(when (tramp--test-supports-set-file-modes-p)
|
2021-10-18 19:54:13 +02:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
2021-10-29 14:06:47 +02:00
|
|
|
|
;; A file is always accessible for user "root".
|
2021-12-27 19:51:58 +01:00
|
|
|
|
(unless
|
|
|
|
|
|
(zerop (file-attribute-user-id (file-attributes tmp-name1)))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(set-file-modes tmp-name1 0)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(access-file tmp-name1 "error")
|
2021-12-27 19:51:58 +01:00
|
|
|
|
:type tramp-permission-denied)
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(set-file-modes tmp-name1 #o777))
|
2021-10-18 19:54:13 +02:00
|
|
|
|
(delete-file tmp-name1))
|
2019-02-19 14:00:17 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(access-file tmp-name1 "error")
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
2021-10-18 19:54:13 +02:00
|
|
|
|
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-exists-p tmp-name1))
|
|
|
|
|
|
(should-not (file-readable-p tmp-name1))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name1))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; `file-ownership-preserved-p' should return t for
|
2020-02-12 20:26:47 +01:00
|
|
|
|
;; non-existing files.
|
|
|
|
|
|
(when test-file-ownership-preserved-p
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name1 'group)))
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-readable-p tmp-name1))
|
|
|
|
|
|
(should (file-regular-p tmp-name1))
|
2019-02-19 14:00:17 +01:00
|
|
|
|
(should-not (access-file tmp-name1 "error"))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(when test-file-ownership-preserved-p
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name1 'group)))
|
|
|
|
|
|
|
|
|
|
|
|
;; We do not test inodes and device numbers.
|
|
|
|
|
|
(setq attr (file-attributes tmp-name1))
|
|
|
|
|
|
(should (consp attr))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should (null (file-attribute-type attr)))
|
|
|
|
|
|
(should (numberp (file-attribute-link-number attr)))
|
|
|
|
|
|
(should (numberp (file-attribute-user-id attr)))
|
|
|
|
|
|
(should (numberp (file-attribute-group-id attr)))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(should
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(stringp (current-time-string (file-attribute-access-time attr))))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(stringp
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(current-time-string (file-attribute-modification-time attr))))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(stringp
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(current-time-string (file-attribute-status-change-time attr))))
|
|
|
|
|
|
(should (numberp (file-attribute-size attr)))
|
|
|
|
|
|
(should (stringp (file-attribute-modes attr)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
(setq attr (file-attributes tmp-name1 'string))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should (stringp (file-attribute-user-id attr)))
|
|
|
|
|
|
(should (stringp (file-attribute-group-id attr)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(access-file tmp-name2 "error")
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(when test-file-ownership-preserved-p
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name2 'group)))
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should (file-symlink-p tmp-name2))
|
2019-02-19 14:00:17 +01:00
|
|
|
|
(should-not (access-file tmp-name2 "error"))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(when test-file-ownership-preserved-p
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name2 'group)))
|
|
|
|
|
|
(setq attr (file-attributes tmp-name2))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-type attr))
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(file-remote-p (file-truename tmp-name1) 'localname)))
|
|
|
|
|
|
(delete-file tmp-name2))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check, that "//" in symlinks are handled properly.
|
|
|
|
|
|
(with-temp-buffer
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(shell-command
|
|
|
|
|
|
(format
|
|
|
|
|
|
"ln -s %s %s"
|
|
|
|
|
|
(tramp-file-name-localname
|
|
|
|
|
|
(tramp-dissect-file-name tmp-name3))
|
|
|
|
|
|
(tramp-file-name-localname
|
|
|
|
|
|
(tramp-dissect-file-name tmp-name2)))
|
|
|
|
|
|
t)))
|
|
|
|
|
|
(when (file-symlink-p tmp-name2)
|
|
|
|
|
|
(setq attr (file-attributes tmp-name2))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-type attr)
|
2022-02-24 16:11:01 +01:00
|
|
|
|
(funcall
|
|
|
|
|
|
(if (tramp--test-sshfs-p) #'file-name-nondirectory #'identity)
|
|
|
|
|
|
(tramp-file-name-localname
|
|
|
|
|
|
(tramp-dissect-file-name tmp-name3)))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(delete-file tmp-name2))
|
|
|
|
|
|
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(when test-file-ownership-preserved-p
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name1 'group)))
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-readable-p tmp-name1))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name1))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (access-file tmp-name1 "error"))
|
2020-02-12 20:26:47 +01:00
|
|
|
|
(when test-file-ownership-preserved-p
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-ownership-preserved-p tmp-name1 'group)))
|
|
|
|
|
|
(setq attr (file-attributes tmp-name1))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should (eq (file-attribute-type attr) t)))
|
2015-08-24 14:26:57 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
2023-12-12 17:39:51 +01:00
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name2))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(defmacro tramp--test-deftest-with-stat (test)
|
|
|
|
|
|
"Define ert `TEST-with-stat'."
|
|
|
|
|
|
(declare (indent 1))
|
|
|
|
|
|
`(ert-deftest ,(intern (concat (symbol-name test) "-with-stat")) ()
|
|
|
|
|
|
;; This is the docstring. However, it must be expanded to a
|
|
|
|
|
|
;; string inside the macro. No idea.
|
2022-07-16 14:05:06 +02:00
|
|
|
|
;; (concat (ert-test-documentation (get ',test 'ert--test))
|
|
|
|
|
|
;; "\nUse the \"stat\" command.")
|
2022-07-15 19:52:10 +02:00
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2022-07-18 15:48:14 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2022-07-16 14:05:06 +02:00
|
|
|
|
(skip-unless (tramp-get-remote-stat tramp-test-vec))
|
2022-08-25 11:08:48 +02:00
|
|
|
|
(if-let ((default-directory ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ert-test (ert-get-test ',test))
|
|
|
|
|
|
(result (ert-test-most-recent-result ert-test))
|
|
|
|
|
|
(tramp-connection-properties
|
|
|
|
|
|
(cons '(nil "perl" nil)
|
|
|
|
|
|
tramp-connection-properties)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(skip-unless (< (ert-test-result-duration result) 300))
|
|
|
|
|
|
(funcall (ert-test-body ert-test)))
|
|
|
|
|
|
(ert-skip (format "Test `%s' must run before" ',test)))))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
|
|
|
|
|
|
(defmacro tramp--test-deftest-with-perl (test)
|
|
|
|
|
|
"Define ert `TEST-with-perl'."
|
|
|
|
|
|
(declare (indent 1))
|
|
|
|
|
|
`(ert-deftest ,(intern (concat (symbol-name test) "-with-perl")) ()
|
|
|
|
|
|
;; This is the docstring. However, it must be expanded to a
|
|
|
|
|
|
;; string inside the macro. No idea.
|
2022-07-16 14:05:06 +02:00
|
|
|
|
;; (concat (ert-test-documentation (get ',test 'ert--test))
|
|
|
|
|
|
;; "\nUse the \"perl\" command.")
|
2022-07-15 19:52:10 +02:00
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2022-07-18 15:48:14 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2022-07-16 14:05:06 +02:00
|
|
|
|
(skip-unless (tramp-get-remote-perl tramp-test-vec))
|
2022-08-25 11:08:48 +02:00
|
|
|
|
(if-let ((default-directory ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ert-test (ert-get-test ',test))
|
|
|
|
|
|
(result (ert-test-most-recent-result ert-test))
|
|
|
|
|
|
(tramp-connection-properties
|
|
|
|
|
|
(append
|
|
|
|
|
|
'((nil "stat" nil)
|
|
|
|
|
|
;; See `tramp-sh-handle-file-truename'.
|
2022-09-08 10:36:08 +02:00
|
|
|
|
(nil "readlink" nil)
|
|
|
|
|
|
;; See `tramp-sh-handle-get-remote-*'.
|
|
|
|
|
|
(nil "id" nil))
|
2022-08-25 11:08:48 +02:00
|
|
|
|
tramp-connection-properties)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(skip-unless (< (ert-test-result-duration result) 300))
|
|
|
|
|
|
(funcall (ert-test-body ert-test)))
|
|
|
|
|
|
(ert-skip (format "Test `%s' must run before" ',test)))))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
|
|
|
|
|
|
(defmacro tramp--test-deftest-with-ls (test)
|
|
|
|
|
|
"Define ert `TEST-with-ls'."
|
|
|
|
|
|
(declare (indent 1))
|
|
|
|
|
|
`(ert-deftest ,(intern (concat (symbol-name test) "-with-ls")) ()
|
|
|
|
|
|
;; This is the docstring. However, it must be expanded to a
|
|
|
|
|
|
;; string inside the macro. No idea.
|
2022-07-16 14:05:06 +02:00
|
|
|
|
;; (concat (ert-test-documentation (get ',test 'ert--test))
|
|
|
|
|
|
;; "\nUse the \"ls\" command.")
|
2022-07-15 19:52:10 +02:00
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2022-07-18 15:48:14 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2022-08-25 11:08:48 +02:00
|
|
|
|
(if-let ((default-directory ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ert-test (ert-get-test ',test))
|
|
|
|
|
|
(result (ert-test-most-recent-result ert-test))
|
|
|
|
|
|
(tramp-connection-properties
|
|
|
|
|
|
(append
|
|
|
|
|
|
'((nil "perl" nil)
|
|
|
|
|
|
(nil "stat" nil)
|
|
|
|
|
|
;; See `tramp-sh-handle-file-truename'.
|
|
|
|
|
|
(nil "readlink" nil))
|
|
|
|
|
|
tramp-connection-properties)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(skip-unless (< (ert-test-result-duration result) 300))
|
|
|
|
|
|
(funcall (ert-test-body ert-test)))
|
|
|
|
|
|
(ert-skip (format "Test `%s' must run before" ',test)))))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-stat tramp-test18-file-attributes)
|
|
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-perl tramp-test18-file-attributes)
|
|
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-ls tramp-test18-file-attributes)
|
|
|
|
|
|
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(defvar tramp--test-start-time nil
|
|
|
|
|
|
"Keep the start time of the current test, a float number.")
|
|
|
|
|
|
|
2019-01-22 15:22:52 +01:00
|
|
|
|
(defsubst tramp--test-file-attributes-equal-p (attr1 attr2)
|
|
|
|
|
|
"Check, whether file attributes ATTR1 and ATTR2 are equal.
|
2019-08-07 16:36:00 +02:00
|
|
|
|
They might differ only in time attributes or directory size."
|
|
|
|
|
|
(let ((attr1 (copy-sequence attr1))
|
|
|
|
|
|
(attr2 (copy-sequence attr2))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(start-time (- tramp--test-start-time 10)))
|
2019-08-26 16:14:16 +02:00
|
|
|
|
;; Link number. For directories, it includes the number of
|
|
|
|
|
|
;; subdirectories. Set it to 1.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (eq (file-attribute-type attr1) t)
|
2019-08-26 16:14:16 +02:00
|
|
|
|
(setcar (nthcdr 1 attr1) 1))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (eq (file-attribute-type attr2) t)
|
2019-08-26 16:14:16 +02:00
|
|
|
|
(setcar (nthcdr 1 attr2) 1))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
;; Access time.
|
|
|
|
|
|
(setcar (nthcdr 4 attr1) tramp-time-dont-know)
|
|
|
|
|
|
(setcar (nthcdr 4 attr2) tramp-time-dont-know)
|
|
|
|
|
|
;; Modification time. If any of the time values is "don't know",
|
|
|
|
|
|
;; we cannot compare, and we normalize the time stamps. If the
|
|
|
|
|
|
;; time value is newer than the test start time, normalize it,
|
|
|
|
|
|
;; because due to caching the time stamps could differ slightly (a
|
2019-08-11 12:06:57 +02:00
|
|
|
|
;; few seconds). We use a test start time minus 10 seconds, in
|
|
|
|
|
|
;; order to compensate a possible timestamp resolution higher than
|
|
|
|
|
|
;; a second on the remote machine.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(when (or (time-equal-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-modification-time attr1) tramp-time-dont-know)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(time-equal-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-modification-time attr2) tramp-time-dont-know))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 5 attr1) tramp-time-dont-know)
|
|
|
|
|
|
(setcar (nthcdr 5 attr2) tramp-time-dont-know))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(when (< start-time
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(float-time (file-attribute-modification-time attr1)))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 5 attr1) tramp-time-dont-know))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(when (< start-time
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(float-time (file-attribute-modification-time attr2)))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 5 attr2) tramp-time-dont-know))
|
2019-12-09 18:44:35 -08:00
|
|
|
|
;; Status change time. Ditto.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(when (or (time-equal-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-status-change-time attr1) tramp-time-dont-know)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(time-equal-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-status-change-time attr2) tramp-time-dont-know))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 6 attr1) tramp-time-dont-know)
|
|
|
|
|
|
(setcar (nthcdr 6 attr2) tramp-time-dont-know))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (< start-time (float-time (file-attribute-status-change-time attr1)))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 6 attr1) tramp-time-dont-know))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (< start-time (float-time (file-attribute-status-change-time attr2)))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(setcar (nthcdr 6 attr2) tramp-time-dont-know))
|
|
|
|
|
|
;; Size. Set it to 0 for directories, because it might have
|
|
|
|
|
|
;; changed. For example the upper directory "../".
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (eq (file-attribute-type attr1) t)
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(setcar (nthcdr 7 attr1) 0))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (eq (file-attribute-type attr2) t)
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(setcar (nthcdr 7 attr2) 0))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
;; The check.
|
2019-08-08 15:42:45 +02:00
|
|
|
|
(unless (equal attr1 attr2) (tramp--test-message "%S\n%S" attr1 attr2))
|
2019-08-07 16:36:00 +02:00
|
|
|
|
(equal attr1 attr2)))
|
2019-01-22 15:22:52 +01:00
|
|
|
|
|
2019-04-17 21:27:15 +02:00
|
|
|
|
;; This isn't 100% correct, but better than no explainer at all.
|
|
|
|
|
|
(put #'tramp--test-file-attributes-equal-p 'ert-explainer #'ert--explain-equal)
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test19-directory-files-and-attributes ()
|
|
|
|
|
|
"Check `directory-files-and-attributes'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; `directory-files-and-attributes' contains also values for
|
|
|
|
|
|
;; "../". Ensure that this doesn't change during tests, for
|
|
|
|
|
|
;; example due to handling temporary files.
|
|
|
|
|
|
(let* ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (expand-file-name "bla" tmp-name1))
|
|
|
|
|
|
attr)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2019-11-04 17:34:31 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(directory-files-and-attributes tmp-name1)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(setq tramp--test-start-time
|
|
|
|
|
|
(float-time
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-modification-time
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(file-attributes tmp-name1))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(make-directory tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name2))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" tmp-name2))
|
|
|
|
|
|
(write-region "bar" nil (expand-file-name "bar" tmp-name2))
|
|
|
|
|
|
(write-region "boz" nil (expand-file-name "boz" tmp-name2))
|
2019-08-06 21:47:57 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(setq attr (directory-files-and-attributes tmp-name2))
|
|
|
|
|
|
(should (consp attr))
|
|
|
|
|
|
(dolist (elt attr)
|
2019-08-06 21:47:57 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(tramp--test-file-attributes-equal-p
|
|
|
|
|
|
(file-attributes (expand-file-name (car elt) tmp-name2))
|
|
|
|
|
|
(cdr elt))))
|
|
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(setq attr (directory-files-and-attributes tmp-name2 'full))
|
2019-08-06 21:47:57 +02:00
|
|
|
|
(should (consp attr))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(dolist (elt attr)
|
2019-08-06 21:47:57 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(tramp--test-file-attributes-equal-p
|
|
|
|
|
|
(file-attributes (car elt)) (cdr elt))))
|
|
|
|
|
|
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(setq attr (directory-files-and-attributes
|
|
|
|
|
|
tmp-name2 nil (rx bos "b")))
|
2020-11-03 18:47:32 +01:00
|
|
|
|
(should (equal (mapcar #'car attr) '("bar" "boz")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check the COUNT arg. It exists since Emacs 28.
|
|
|
|
|
|
(when (tramp--test-emacs28-p)
|
|
|
|
|
|
(with-no-warnings
|
2020-11-05 17:36:04 +01:00
|
|
|
|
(setq attr (directory-files-and-attributes
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
tmp-name2 nil (rx bos "b") nil nil 1))
|
2020-11-05 17:36:04 +01:00
|
|
|
|
(should (equal (mapcar #'car attr) '("bar"))))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-stat tramp-test19-directory-files-and-attributes)
|
|
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-perl tramp-test19-directory-files-and-attributes)
|
|
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-ls tramp-test19-directory-files-and-attributes)
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test20-file-modes ()
|
|
|
|
|
|
"Check `file-modes'.
|
|
|
|
|
|
This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-set-file-modes-p))
|
|
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(set-file-modes tmp-name1 #o777)
|
|
|
|
|
|
(should (= (file-modes tmp-name1) #o777))
|
|
|
|
|
|
(should (file-executable-p tmp-name1))
|
|
|
|
|
|
(should (file-writable-p tmp-name1))
|
|
|
|
|
|
(set-file-modes tmp-name1 #o444)
|
|
|
|
|
|
(should (= (file-modes tmp-name1) #o444))
|
|
|
|
|
|
(should-not (file-executable-p tmp-name1))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; A file is always writable for user "root".
|
2022-02-24 16:11:01 +01:00
|
|
|
|
(unless
|
|
|
|
|
|
(or (zerop (file-attribute-user-id (file-attributes tmp-name1)))
|
|
|
|
|
|
(tramp--test-sshfs-p))
|
2020-02-26 18:43:11 +01:00
|
|
|
|
(should-not (file-writable-p tmp-name1)))
|
|
|
|
|
|
;; Check the NOFOLLOW arg. It exists since Emacs 28. For
|
|
|
|
|
|
;; regular files, there shouldn't be a difference.
|
|
|
|
|
|
(when (tramp--test-emacs28-p)
|
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(set-file-modes tmp-name1 #o222 'nofollow)
|
Reorganize Tramp
* lisp/net/tramp-adb.el (tramp-adb-handle-write-region): Handle special
case that START is "".
(tramp-adb-handle-set-file-modes)
(tramp-adb-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-adb-handle-make-process):
Use `with-tramp-saved-connection-properties'.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Use `tramp-archive-handle-file-exists-p'.
(tramp-archive-handle-file-exists-p): New defun.
(tramp-archive-file-name-handler): Add ;;;###tramp-autoload cookie.
* lisp/net/tramp-cache.el (tramp-compat, tramp-loaddefs)
(time-stamp): Require.
(tramp-get-file-property, tramp-set-file-property)
(tramp-flush-file-property, tramp-flush-file-upper-properties)
(tramp-flush-file-properties): Use `tramp-file-name-unify'. Adapt
message.
(tramp-flush-directory-properties): Simplify.
(tramp-flush-file-function): Add ;;;###tramp-autoload cookie.
Don't use `with-parsed-tramp-file-name', it isn't exposed.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Macros moved from tramp.el.
(with-tramp-saved-file-property)
(with-tramp-saved-file-properties)
(with-tramp-saved-connection-properties): New defmacros.
* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Flush "/".
* lisp/net/tramp-crypt.el (tramp-crypt-handle-set-file-modes)
(tramp-crypt-handle-set-file-times)
(tramp-crypt-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-ftp.el (tramp-archive-file-name-handler):
Don't declare.
* lisp/net/tramp-gvfs.el (tramp-gvfs-info): New defun.
(tramp-gvfs-do-copy-or-rename-file)
(tramp-gvfs-handle-delete-directory)
(tramp-gvfs-handle-delete-file, tramp-gvfs-get-root-attributes)
(tramp-gvfs-handle-make-directory): Use it.
(tramp-gvfs-handle-set-file-modes)
(tramp-gvfs-handle-set-file-times)
(tramp-gvfs-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link):
Expand TARGET when flushing file properties.
(tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times)
(tramp-sh-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-sh-handle-file-name-all-completions): Protect, when
connection is not established yet.
(tramp-do-copy-or-rename-file-directly): Flush file properties of
NEWNAME when constructing a new remote file name.
(tramp-do-copy-or-rename-file-out-of-band, tramp-sh-handle-make-process):
Use `with-tramp-saved-connection-properties'.
(tramp-sh-handle-delete-file): Flush file properties only after
deleting, otherwise we get a false alarm.
(tramp-sh-handle-process-file): Flush "/".
(tramp-sh-handle-write-region): Handle special case that START is "".
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-process-file)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-start-file-process):
Use `with-tramp-saved-connection-properties'.
(tramp-smb-remote-acl-p): New defun.
(tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl): Use it.
(tramp-smb-handle-set-file-modes):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-smb-handle-process-file, tramp-smb-maybe-open-connection):
Flush "/".
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file): Flush "/".
(tramp-sshfs-handle-set-file-modes)
(tramp-sshfs-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-set-file-modes)
(tramp-sudoedit-handle-set-file-times)
(tramp-sudoedit-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp.el (tramp-archive-file-name-handler): Don't declare.
(tramp-verbose, tramp-file-name-unify, tramp-tramp-file-p)
(tramp-file-local-name, tramp-dissect-file-name)
(tramp-make-tramp-file-name, tramp-get-connection-buffer)
(tramp-get-buffer-string, tramp-debug-message)
(tramp-inhibit-progress-reporter, tramp-message):
Add ;;;###tramp-autoload cookie.
(tramp-file-name): Expose defstruct to tramp-loaddefs.el
(tramp-file-name-unify): New optional arg FILE.
(tramp-get-default-directory, tramp-get-buffer-string)
(tramp-message, tramp-backtrace, tramp-error-with-buffer)
(tramp-with-demoted-errors, tramp-barf-if-file-missing)
(tramp-skeleton-copy-directory, tramp-skeleton-delete-directory)
(tramp-skeleton-directory-files)
(tramp-skeleton-directory-files-and-attributes)
(tramp-skeleton-file-local-copy, tramp-skeleton-write-region):
Remove `tramp-suppress-trace' property, it isn't needed for
defmacros and defsubsts.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Move macros to tramp-cache.el.
(tramp-skeleton-directory-files-and-attributes): Fix implementation.
(tramp-skeleton-file-local-copy): Fix docstring.
(tramp-skeleton-set-file-modes-times-uid-gid): New defmacro.
(tramp-skeleton-write-region): Set "file-exists-p" cache property.
(tramp-handle-file-exists-p): Use cached value.
(tramp-process-sentinel): Flush "/".
(tramp-make-tramp-temp-file): Suppress also `tramp-smb-remote-acl-p'.
(tramp-get-connection-buffer):
* test/lisp/net/tramp-tests.el (tramp-test10-write-region)
(tramp-test20-file-modes, tramp-test22-file-times): Extend tests.
2022-08-03 17:30:09 +02:00
|
|
|
|
(should (= (file-modes tmp-name1 'nofollow) #o222))))
|
|
|
|
|
|
;; Setting the mode for not existing files shall fail.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(set-file-modes tmp-name2 #o777)
|
|
|
|
|
|
:type 'file-missing))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(ignore-errors (delete-file tmp-name1)))
|
|
|
|
|
|
|
2020-02-26 18:43:11 +01:00
|
|
|
|
;; Check the NOFOLLOW arg. It exists since Emacs 28. It is
|
|
|
|
|
|
;; implemented for tramp-gvfs.el and tramp-sh.el. However,
|
|
|
|
|
|
;; tramp-gvfs,el does not support creating symbolic links. And
|
|
|
|
|
|
;; in tramp-sh.el, we must ensure that the remote chmod command
|
|
|
|
|
|
;; supports the "-h" argument.
|
|
|
|
|
|
(when (and (tramp--test-emacs28-p) (tramp--test-sh-p)
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-get-remote-chmod-h tramp-test-vec))
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(unwind-protect
|
2020-02-26 18:43:11 +01:00
|
|
|
|
(with-no-warnings
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
(file-symlink-p tmp-name2)))
|
|
|
|
|
|
;; Both report the modes of `tmp-name1'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(= (file-modes tmp-name1) (file-modes tmp-name2)))
|
|
|
|
|
|
;; `tmp-name1' is a regular file. NOFOLLOW doesn't matter.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(= (file-modes tmp-name1) (file-modes tmp-name1 'nofollow)))
|
|
|
|
|
|
;; `tmp-name2' is a symbolic link. It has different permissions.
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(= (file-modes tmp-name2) (file-modes tmp-name2 'nofollow)))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(= (file-modes tmp-name1 'nofollow)
|
|
|
|
|
|
(file-modes tmp-name2 'nofollow)))
|
|
|
|
|
|
;; Change permissions.
|
|
|
|
|
|
(set-file-modes tmp-name1 #o200)
|
|
|
|
|
|
(set-file-modes tmp-name2 #o200)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(= (file-modes tmp-name1) (file-modes tmp-name2) #o200))
|
|
|
|
|
|
;; Change permissions with NOFOLLOW.
|
|
|
|
|
|
(set-file-modes tmp-name1 #o300 'nofollow)
|
|
|
|
|
|
(set-file-modes tmp-name2 #o300 'nofollow)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(= (file-modes tmp-name1 'nofollow)
|
|
|
|
|
|
(file-modes tmp-name2 'nofollow)))
|
|
|
|
|
|
(should-not (= (file-modes tmp-name1) (file-modes tmp-name2))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name2)))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2018-05-02 12:31:51 +02:00
|
|
|
|
;; Method "smb" could run into "NT_STATUS_REVISION_MISMATCH" error.
|
|
|
|
|
|
(defmacro tramp--test-ignore-add-name-to-file-error (&rest body)
|
|
|
|
|
|
"Run BODY, ignoring \"error with add-name-to-file\" file error."
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(declare (indent defun) (debug (body)))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
`(condition-case err
|
|
|
|
|
|
(progn ,@body)
|
2019-06-30 11:23:06 +02:00
|
|
|
|
(file-error
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(unless (string-prefix-p "error with add-name-to-file"
|
|
|
|
|
|
(error-message-string err))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(signal (car err) (cdr err))))))
|
|
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(ert-deftest tramp-test21-file-links ()
|
|
|
|
|
|
"Check `file-symlink-p'.
|
|
|
|
|
|
This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; We must use `file-truename' for the temporary directory,
|
|
|
|
|
|
;; because it could be located on a symlinked directory. This
|
|
|
|
|
|
;; would let the test fail.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((ert-remote-temporary-file-directory
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
2017-09-12 11:20:49 +02:00
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name 'local quoted))
|
2017-09-25 17:52:24 +02:00
|
|
|
|
(tmp-name4 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name5
|
2019-10-12 12:20:55 +02:00
|
|
|
|
(expand-file-name (file-name-nondirectory tmp-name1) tmp-name4))
|
|
|
|
|
|
(tmp-name6 (tramp--test-make-temp-name nil quoted)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Check `make-symbolic-link'.
|
|
|
|
|
|
(unwind-protect
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-regular-p tmp-name1))
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should (file-regular-p tmp-name2))
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
(file-symlink-p tmp-name2)))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(should-error
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
:type 'file-already-exists))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
;; A number means interactive case.
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'ignore))
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2 0)
|
|
|
|
|
|
:type 'file-already-exists)))
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'tramp-compat-always))
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2 0)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
(file-symlink-p tmp-name2))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2 'ok-if-already-exists)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
(file-symlink-p tmp-name2)))
|
|
|
|
|
|
;; If we use the local part of `tmp-name1', it shall still work.
|
|
|
|
|
|
(make-symbolic-link
|
|
|
|
|
|
(file-remote-p tmp-name1 'localname)
|
|
|
|
|
|
tmp-name2 'ok-if-already-exists)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
(file-symlink-p tmp-name2)))
|
|
|
|
|
|
;; `tmp-name3' is a local file name. Therefore, the link
|
|
|
|
|
|
;; target remains unchanged, even if quoted.
|
2018-01-07 18:50:06 +01:00
|
|
|
|
;; `make-symbolic-link' might not be permitted on w32 systems.
|
2020-08-24 12:11:48 +02:00
|
|
|
|
(unless (tramp--test-windows-nt-p)
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name3)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal tmp-name1 (file-symlink-p tmp-name3))))
|
2017-09-12 11:20:49 +02:00
|
|
|
|
;; Check directory as newname.
|
|
|
|
|
|
(make-directory tmp-name4)
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-directory-p tmp-name4))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name4))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name4)
|
|
|
|
|
|
:type 'file-already-exists))
|
2017-09-12 11:20:49 +02:00
|
|
|
|
(make-symbolic-link tmp-name1 (file-name-as-directory tmp-name4))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-unquote #'identity)
|
2017-09-12 11:20:49 +02:00
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
2017-09-25 17:52:24 +02:00
|
|
|
|
(file-symlink-p tmp-name5)))
|
2019-10-12 12:20:55 +02:00
|
|
|
|
;; Check, that files in symlinked directories still work.
|
|
|
|
|
|
(make-symbolic-link tmp-name4 tmp-name6)
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-symlink-p tmp-name6))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name6))
|
2019-10-12 12:20:55 +02:00
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" tmp-name6))
|
|
|
|
|
|
(delete-file (expand-file-name "foo" tmp-name6))
|
|
|
|
|
|
(should-not (file-exists-p (expand-file-name "foo" tmp-name4)))
|
|
|
|
|
|
(should-not (file-exists-p (expand-file-name "foo" tmp-name6))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2019-10-12 12:20:55 +02:00
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name2))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name3))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name5))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name6))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name4 'recursive)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check `add-name-to-file'.
|
|
|
|
|
|
(unwind-protect
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(tramp--test-ignore-add-name-to-file-error
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(add-name-to-file tmp-name1 tmp-name2)
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(should (file-regular-p tmp-name2))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(add-name-to-file tmp-name1 tmp-name2)
|
|
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
;; A number means interactive case.
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'ignore))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(should-error
|
|
|
|
|
|
(add-name-to-file tmp-name1 tmp-name2 0)
|
|
|
|
|
|
:type 'file-already-exists))
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'tramp-compat-always))
|
2017-08-27 19:16:58 +02:00
|
|
|
|
(add-name-to-file tmp-name1 tmp-name2 0)
|
|
|
|
|
|
(should (file-regular-p tmp-name2)))
|
2018-05-02 12:31:51 +02:00
|
|
|
|
(add-name-to-file tmp-name1 tmp-name2 'ok-if-already-exists)
|
|
|
|
|
|
(should-not (file-symlink-p tmp-name2))
|
|
|
|
|
|
(should (file-regular-p tmp-name2))
|
|
|
|
|
|
;; `tmp-name3' is a local file name.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(add-name-to-file tmp-name1 tmp-name3)
|
|
|
|
|
|
:type 'file-error)
|
|
|
|
|
|
;; Check directory as newname.
|
|
|
|
|
|
(make-directory tmp-name4)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(add-name-to-file tmp-name1 tmp-name4)
|
|
|
|
|
|
:type 'file-already-exists)
|
|
|
|
|
|
(add-name-to-file tmp-name1 (file-name-as-directory tmp-name4))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(file-regular-p
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(file-name-nondirectory tmp-name1) tmp-name4)))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-file tmp-name1)
|
2017-09-12 11:20:49 +02:00
|
|
|
|
(delete-file tmp-name2)
|
|
|
|
|
|
(delete-directory tmp-name4 'recursive)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check `file-truename'.
|
|
|
|
|
|
(unwind-protect
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-regular-p tmp-name1))
|
2017-09-04 13:10:52 +02:00
|
|
|
|
(should (string-equal tmp-name1 (file-truename tmp-name1)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
|
|
|
|
|
(should (file-symlink-p tmp-name2))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-regular-p tmp-name2))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should-not (string-equal tmp-name2 (file-truename tmp-name2)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-truename tmp-name1) (file-truename tmp-name2)))
|
2017-08-26 15:09:55 +02:00
|
|
|
|
(should (file-equal-p tmp-name1 tmp-name2))
|
2017-11-18 14:24:03 +01:00
|
|
|
|
;; Check relative symlink file name.
|
|
|
|
|
|
(delete-file tmp-name2)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory))
|
2017-11-18 14:24:03 +01:00
|
|
|
|
(make-symbolic-link (file-name-nondirectory tmp-name1) tmp-name2))
|
|
|
|
|
|
(should (file-symlink-p tmp-name2))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should (file-regular-p tmp-name2))
|
2017-11-18 14:24:03 +01:00
|
|
|
|
(should-not (string-equal tmp-name2 (file-truename tmp-name2)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (file-truename tmp-name1) (file-truename tmp-name2)))
|
|
|
|
|
|
(should (file-equal-p tmp-name1 tmp-name2))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
;; Symbolic links could look like a remote file name.
|
|
|
|
|
|
;; They must be quoted then.
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(let ((penguin
|
|
|
|
|
|
(if (eq tramp-syntax 'separate)
|
|
|
|
|
|
"/[penguin/motd]" "/penguin:motd:")))
|
|
|
|
|
|
(delete-file tmp-name2)
|
|
|
|
|
|
(make-symbolic-link
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(funcall (if quoted #'file-name-unquote #'identity) penguin)
|
2019-12-22 13:48:36 +01:00
|
|
|
|
tmp-name2)
|
|
|
|
|
|
(should (file-symlink-p tmp-name2))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name2))
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-truename tmp-name2)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(file-name-quote (concat (file-remote-p tmp-name2) penguin)))))
|
2017-08-26 15:09:55 +02:00
|
|
|
|
;; `tmp-name3' is a local file name.
|
2018-01-07 18:50:06 +01:00
|
|
|
|
;; `make-symbolic-link' might not be permitted on w32 systems.
|
2020-08-24 12:11:48 +02:00
|
|
|
|
(unless (tramp--test-windows-nt-p)
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name3)
|
|
|
|
|
|
(should (file-symlink-p tmp-name3))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name3))
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(should-not (string-equal tmp-name3 (file-truename tmp-name3)))
|
|
|
|
|
|
;; `file-truename' returns a quoted file name for `tmp-name3'.
|
|
|
|
|
|
;; We must unquote it.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2018-06-03 14:30:41 +02:00
|
|
|
|
(file-truename tmp-name1)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(file-name-unquote (file-truename tmp-name3))))))
|
2017-08-26 15:09:55 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-file tmp-name1)
|
2017-08-26 15:09:55 +02:00
|
|
|
|
(delete-file tmp-name2)
|
|
|
|
|
|
(delete-file tmp-name3)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2017-08-30 12:00:26 +02:00
|
|
|
|
;; Symbolic links could be nested.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((ert-remote-temporary-file-directory
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(file-truename tmp-name1))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name3 tmp-name2)
|
2017-09-04 13:10:52 +02:00
|
|
|
|
(number-nesting 15))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(dotimes (_ number-nesting)
|
|
|
|
|
|
(make-symbolic-link
|
|
|
|
|
|
tmp-name3
|
|
|
|
|
|
(setq tmp-name3 (tramp--test-make-temp-name nil quoted))))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name2))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name3))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-truename tmp-name2)
|
|
|
|
|
|
(file-truename tmp-name3)))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(with-temp-buffer (insert-file-contents tmp-name2))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(with-temp-buffer (insert-file-contents tmp-name3))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
:type 'file-missing))
|
2017-09-04 13:10:52 +02:00
|
|
|
|
;; `directory-files' does not show symlinks to
|
|
|
|
|
|
;; non-existing targets in the "smb" case. So we remove
|
|
|
|
|
|
;; the symlinks manually.
|
|
|
|
|
|
(while (stringp (setq tmp-name2 (file-symlink-p tmp-name3)))
|
|
|
|
|
|
(delete-file tmp-name3)
|
|
|
|
|
|
(setq tmp-name3 (concat (file-remote-p tmp-name3) tmp-name2)))))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2022-07-24 16:02:10 +02:00
|
|
|
|
(ignore-errors (delete-file tmp-name2))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name3))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive)))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
;; Detect cyclic symbolic links.
|
|
|
|
|
|
(unwind-protect
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
|
|
|
|
|
(make-symbolic-link tmp-name2 tmp-name1)
|
|
|
|
|
|
(should (file-symlink-p tmp-name1))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name1))
|
|
|
|
|
|
(should-not (file-regular-p tmp-name2))
|
2023-01-23 11:02:56 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-truename tmp-name1)
|
|
|
|
|
|
(file-truename tmp-name2)))
|
2020-06-23 21:18:08 +02:00
|
|
|
|
(if (tramp--test-smb-p)
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; The symlink command of "smbclient" detects the
|
2018-03-17 15:10:46 +01:00
|
|
|
|
;; cycle already.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
|
|
|
|
|
:type 'file-error)
|
|
|
|
|
|
(make-symbolic-link tmp-name1 tmp-name2)
|
2023-01-23 11:02:56 +01:00
|
|
|
|
(should (file-symlink-p tmp-name1))
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(should (file-symlink-p tmp-name2))
|
2023-01-23 11:02:56 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name1))
|
2023-01-21 12:04:50 +01:00
|
|
|
|
(should-not (file-regular-p tmp-name2))
|
2019-11-06 16:49:35 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(file-truename tmp-name1)
|
2023-01-23 11:02:56 +01:00
|
|
|
|
:type 'file-error)
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(file-truename tmp-name2)
|
2019-11-06 16:49:35 +01:00
|
|
|
|
:type 'file-error))))
|
2017-08-30 12:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(delete-file tmp-name2)))
|
|
|
|
|
|
|
2018-03-26 14:33:24 +02:00
|
|
|
|
;; `file-truename' shall preserve trailing slash of directories.
|
|
|
|
|
|
(let* ((dir1
|
|
|
|
|
|
(directory-file-name
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory)))
|
2018-03-26 14:33:24 +02:00
|
|
|
|
(dir2 (file-name-as-directory dir1)))
|
|
|
|
|
|
(should (string-equal (file-truename dir1) (expand-file-name dir1)))
|
|
|
|
|
|
(should (string-equal (file-truename dir2) (expand-file-name dir2)))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test22-file-times ()
|
|
|
|
|
|
"Check `set-file-times' and `file-newer-than-file-p'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2018-12-16 15:49:07 +01:00
|
|
|
|
(skip-unless
|
2019-08-04 12:47:43 +02:00
|
|
|
|
(or (tramp--test-adb-p) (tramp--test-gvfs-p)
|
|
|
|
|
|
(tramp--test-sh-p) (tramp--test-sudoedit-p)))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should (consp (file-attribute-modification-time
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(file-attributes tmp-name1))))
|
2018-09-29 15:33:48 +02:00
|
|
|
|
;; Skip the test, if the remote handler is not able to set
|
|
|
|
|
|
;; the correct time.
|
2022-08-09 18:12:27 +02:00
|
|
|
|
;; Some remote machines cannot resolve seconds. So we use a minute.
|
|
|
|
|
|
(skip-unless (set-file-times tmp-name1 (seconds-to-time 60)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Dumb remote shells without perl(1) or stat(1) are not
|
|
|
|
|
|
;; able to return the date correctly. They say "don't know".
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(unless (time-equal-p
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-modification-time
|
2019-08-11 12:06:57 +02:00
|
|
|
|
(file-attributes tmp-name1))
|
|
|
|
|
|
tramp-time-dont-know)
|
2018-08-29 10:05:34 +02:00
|
|
|
|
(should
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(time-equal-p
|
2022-08-09 18:12:27 +02:00
|
|
|
|
(file-attribute-modification-time (file-attributes tmp-name1))
|
|
|
|
|
|
(seconds-to-time 60)))
|
Reorganize Tramp
* lisp/net/tramp-adb.el (tramp-adb-handle-write-region): Handle special
case that START is "".
(tramp-adb-handle-set-file-modes)
(tramp-adb-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-adb-handle-make-process):
Use `with-tramp-saved-connection-properties'.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Use `tramp-archive-handle-file-exists-p'.
(tramp-archive-handle-file-exists-p): New defun.
(tramp-archive-file-name-handler): Add ;;;###tramp-autoload cookie.
* lisp/net/tramp-cache.el (tramp-compat, tramp-loaddefs)
(time-stamp): Require.
(tramp-get-file-property, tramp-set-file-property)
(tramp-flush-file-property, tramp-flush-file-upper-properties)
(tramp-flush-file-properties): Use `tramp-file-name-unify'. Adapt
message.
(tramp-flush-directory-properties): Simplify.
(tramp-flush-file-function): Add ;;;###tramp-autoload cookie.
Don't use `with-parsed-tramp-file-name', it isn't exposed.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Macros moved from tramp.el.
(with-tramp-saved-file-property)
(with-tramp-saved-file-properties)
(with-tramp-saved-connection-properties): New defmacros.
* lisp/net/tramp-cmds.el (tramp-cleanup-connection): Flush "/".
* lisp/net/tramp-crypt.el (tramp-crypt-handle-set-file-modes)
(tramp-crypt-handle-set-file-times)
(tramp-crypt-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-ftp.el (tramp-archive-file-name-handler):
Don't declare.
* lisp/net/tramp-gvfs.el (tramp-gvfs-info): New defun.
(tramp-gvfs-do-copy-or-rename-file)
(tramp-gvfs-handle-delete-directory)
(tramp-gvfs-handle-delete-file, tramp-gvfs-get-root-attributes)
(tramp-gvfs-handle-make-directory): Use it.
(tramp-gvfs-handle-set-file-modes)
(tramp-gvfs-handle-set-file-times)
(tramp-gvfs-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link):
Expand TARGET when flushing file properties.
(tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times)
(tramp-sh-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-sh-handle-file-name-all-completions): Protect, when
connection is not established yet.
(tramp-do-copy-or-rename-file-directly): Flush file properties of
NEWNAME when constructing a new remote file name.
(tramp-do-copy-or-rename-file-out-of-band, tramp-sh-handle-make-process):
Use `with-tramp-saved-connection-properties'.
(tramp-sh-handle-delete-file): Flush file properties only after
deleting, otherwise we get a false alarm.
(tramp-sh-handle-process-file): Flush "/".
(tramp-sh-handle-write-region): Handle special case that START is "".
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-process-file)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-start-file-process):
Use `with-tramp-saved-connection-properties'.
(tramp-smb-remote-acl-p): New defun.
(tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl): Use it.
(tramp-smb-handle-set-file-modes):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
(tramp-smb-handle-process-file, tramp-smb-maybe-open-connection):
Flush "/".
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file): Flush "/".
(tramp-sshfs-handle-set-file-modes)
(tramp-sshfs-handle-set-file-times):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-set-file-modes)
(tramp-sudoedit-handle-set-file-times)
(tramp-sudoedit-handle-set-file-uid-gid):
Use `tramp-skeleton-set-file-modes-times-uid-gid'.
* lisp/net/tramp.el (tramp-archive-file-name-handler): Don't declare.
(tramp-verbose, tramp-file-name-unify, tramp-tramp-file-p)
(tramp-file-local-name, tramp-dissect-file-name)
(tramp-make-tramp-file-name, tramp-get-connection-buffer)
(tramp-get-buffer-string, tramp-debug-message)
(tramp-inhibit-progress-reporter, tramp-message):
Add ;;;###tramp-autoload cookie.
(tramp-file-name): Expose defstruct to tramp-loaddefs.el
(tramp-file-name-unify): New optional arg FILE.
(tramp-get-default-directory, tramp-get-buffer-string)
(tramp-message, tramp-backtrace, tramp-error-with-buffer)
(tramp-with-demoted-errors, tramp-barf-if-file-missing)
(tramp-skeleton-copy-directory, tramp-skeleton-delete-directory)
(tramp-skeleton-directory-files)
(tramp-skeleton-directory-files-and-attributes)
(tramp-skeleton-file-local-copy, tramp-skeleton-write-region):
Remove `tramp-suppress-trace' property, it isn't needed for
defmacros and defsubsts.
(with-tramp-file-property, with-tramp-connection-property)
(with-tramp-saved-connection-property): Move macros to tramp-cache.el.
(tramp-skeleton-directory-files-and-attributes): Fix implementation.
(tramp-skeleton-file-local-copy): Fix docstring.
(tramp-skeleton-set-file-modes-times-uid-gid): New defmacro.
(tramp-skeleton-write-region): Set "file-exists-p" cache property.
(tramp-handle-file-exists-p): Use cached value.
(tramp-process-sentinel): Flush "/".
(tramp-make-tramp-temp-file): Suppress also `tramp-smb-remote-acl-p'.
(tramp-get-connection-buffer):
* test/lisp/net/tramp-tests.el (tramp-test10-write-region)
(tramp-test20-file-modes, tramp-test22-file-times): Extend tests.
2022-08-03 17:30:09 +02:00
|
|
|
|
;; Setting the time for not existing files shall fail.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(set-file-times tmp-name2)
|
|
|
|
|
|
:type 'file-missing)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(write-region "bla" nil tmp-name2)
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should (file-newer-than-file-p tmp-name2 tmp-name1))
|
|
|
|
|
|
;; `tmp-name3' does not exist.
|
|
|
|
|
|
(should (file-newer-than-file-p tmp-name2 tmp-name3))
|
2020-03-09 16:05:21 +01:00
|
|
|
|
(should-not (file-newer-than-file-p tmp-name3 tmp-name1))
|
|
|
|
|
|
;; Check the NOFOLLOW arg. It exists since Emacs 28. For
|
|
|
|
|
|
;; regular files, there shouldn't be a difference.
|
|
|
|
|
|
(when (tramp--test-emacs28-p)
|
|
|
|
|
|
(with-no-warnings
|
2022-08-09 18:12:27 +02:00
|
|
|
|
(set-file-times tmp-name1 (seconds-to-time 60) 'nofollow)
|
2020-03-09 16:05:21 +01:00
|
|
|
|
(should
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(time-equal-p
|
2022-08-09 18:12:27 +02:00
|
|
|
|
(file-attribute-modification-time
|
|
|
|
|
|
(file-attributes tmp-name1))
|
|
|
|
|
|
(seconds-to-time 60)))))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(delete-file tmp-name2))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test23-visited-file-modtime ()
|
|
|
|
|
|
"Check `set-visited-file-modtime' and `verify-visited-file-modtime'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should (verify-visited-file-modtime))
|
2018-09-24 19:13:34 -07:00
|
|
|
|
(set-visited-file-modtime (seconds-to-time 1))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (verify-visited-file-modtime))
|
2018-09-29 15:33:48 +02:00
|
|
|
|
(should (= 1 (float-time (visited-file-modtime))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Checks with deleted file.
|
|
|
|
|
|
(delete-file tmp-name)
|
|
|
|
|
|
(dired-uncache tmp-name)
|
|
|
|
|
|
(should (verify-visited-file-modtime))
|
|
|
|
|
|
(set-visited-file-modtime (seconds-to-time 1))
|
|
|
|
|
|
(should (verify-visited-file-modtime))
|
2018-09-24 19:13:34 -07:00
|
|
|
|
(should (= 1 (float-time (visited-file-modtime))))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; This test is inspired by Bug#29149.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(ert-deftest tramp-test24-file-acl ()
|
|
|
|
|
|
"Check that `file-acl' and `set-file-acl' work proper."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; The following test checks also whether `set-file-modes' will work.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(skip-unless (file-acl ert-remote-temporary-file-directory))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name 'local quoted)))
|
|
|
|
|
|
;; Both files are remote.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Two files with same ACLs.
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-acl tmp-name1))
|
2017-11-14 10:38:41 +01:00
|
|
|
|
(copy-file tmp-name1 tmp-name2 nil nil nil 'preserve-permissions)
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should (file-acl tmp-name2))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name2)))
|
|
|
|
|
|
;; Different permissions mean different ACLs.
|
2021-12-27 19:51:58 +01:00
|
|
|
|
(unless (tramp--test-windows-nt-or-smb-p)
|
2017-12-06 20:49:30 +01:00
|
|
|
|
(set-file-modes tmp-name1 #o777)
|
|
|
|
|
|
(set-file-modes tmp-name2 #o444)
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(string-equal (file-acl tmp-name1) (file-acl tmp-name2))))
|
|
|
|
|
|
;; Copy ACL. Not all remote handlers support it, so we test.
|
|
|
|
|
|
(when (set-file-acl tmp-name2 (file-acl tmp-name1))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name2))))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
;; An invalid ACL does not harm.
|
|
|
|
|
|
(should-not (set-file-acl tmp-name2 "foo")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name2)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Remote and local file.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(when (and (file-acl temporary-file-directory)
|
|
|
|
|
|
(not (tramp--test-windows-nt-or-smb-p)))
|
|
|
|
|
|
;; Two files with same ACLs.
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-acl tmp-name1))
|
2017-11-14 10:38:41 +01:00
|
|
|
|
(copy-file tmp-name1 tmp-name3 nil nil nil 'preserve-permissions)
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should (file-acl tmp-name3))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
|
|
|
|
|
|
;; Different permissions mean different ACLs.
|
|
|
|
|
|
(set-file-modes tmp-name1 #o777)
|
|
|
|
|
|
(set-file-modes tmp-name3 #o444)
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
|
2017-11-19 12:11:18 +01:00
|
|
|
|
;; Copy ACL. Since we don't know whether Emacs is built
|
|
|
|
|
|
;; with local ACL support, we must check it.
|
|
|
|
|
|
(when (set-file-acl tmp-name3 (file-acl tmp-name1))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
|
|
|
|
|
|
;; Two files with same ACLs.
|
|
|
|
|
|
(delete-file tmp-name1)
|
2017-11-14 10:38:41 +01:00
|
|
|
|
(copy-file tmp-name3 tmp-name1 nil nil nil 'preserve-permissions)
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should (file-acl tmp-name1))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
|
|
|
|
|
|
;; Different permissions mean different ACLs.
|
|
|
|
|
|
(set-file-modes tmp-name1 #o777)
|
|
|
|
|
|
(set-file-modes tmp-name3 #o444)
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
|
|
|
|
|
|
;; Copy ACL.
|
|
|
|
|
|
(set-file-acl tmp-name1 (file-acl tmp-name3))
|
|
|
|
|
|
(should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name3))))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test25-file-selinux ()
|
|
|
|
|
|
"Check `file-selinux-context' and `set-file-selinux-context'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(not (equal (file-selinux-context ert-remote-temporary-file-directory)
|
2017-11-12 13:05:44 +01:00
|
|
|
|
'(nil nil nil nil))))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name3 (tramp--test-make-temp-name 'local quoted)))
|
|
|
|
|
|
;; Both files are remote.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; Two files with same SELinux context.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-selinux-context tmp-name1))
|
2021-07-25 14:14:49 +02:00
|
|
|
|
(copy-file tmp-name1 tmp-name2 nil nil nil 'preserve-permissions)
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should (file-selinux-context tmp-name2))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name2)))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; Check different SELinux context. We cannot support
|
|
|
|
|
|
;; different ranges in this test; let's assume the most
|
|
|
|
|
|
;; likely one.
|
|
|
|
|
|
(let ((context (file-selinux-context tmp-name1)))
|
|
|
|
|
|
(when (and (string-equal (nth 3 context) "s0")
|
|
|
|
|
|
(setcar (nthcdr 3 context) "s0:c0")
|
|
|
|
|
|
(set-file-selinux-context tmp-name1 context))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name2)))))
|
|
|
|
|
|
;; Copy SELinux context.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(set-file-selinux-context
|
|
|
|
|
|
tmp-name2 (file-selinux-context tmp-name1)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name2)))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; An invalid SELinux context does not harm.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should-not (set-file-selinux-context tmp-name2 "foo")))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name2)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Remote and local file.
|
|
|
|
|
|
(unwind-protect
|
2017-11-14 10:21:55 +01:00
|
|
|
|
(when (and (not
|
|
|
|
|
|
(or (equal (file-selinux-context temporary-file-directory)
|
|
|
|
|
|
'(nil nil nil nil))
|
|
|
|
|
|
(tramp--test-windows-nt-or-smb-p)))
|
|
|
|
|
|
;; Both users shall use the same SELinux context.
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(let ((default-directory temporary-file-directory))
|
|
|
|
|
|
(shell-command-to-string "id -Z"))
|
|
|
|
|
|
(let ((default-directory
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
(shell-command-to-string "id -Z"))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Two files with same SELinux context.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
(should (file-exists-p tmp-name1))
|
|
|
|
|
|
(should (file-selinux-context tmp-name1))
|
|
|
|
|
|
(copy-file tmp-name1 tmp-name3)
|
|
|
|
|
|
(should (file-selinux-context tmp-name3))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; We cannot expect that copying over file system
|
|
|
|
|
|
;; boundaries keeps SELinux context. So we copy it
|
2017-11-16 00:00:31 -08:00
|
|
|
|
;; explicitly.
|
2017-11-14 10:21:55 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(set-file-selinux-context
|
|
|
|
|
|
tmp-name3 (file-selinux-context tmp-name1)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3)))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; Check different SELinux context. We cannot support
|
|
|
|
|
|
;; different ranges in this test; let's assume the most
|
|
|
|
|
|
;; likely one.
|
|
|
|
|
|
(let ((context (file-selinux-context tmp-name1)))
|
|
|
|
|
|
(when (and (string-equal (nth 3 context) "s0")
|
|
|
|
|
|
(setcar (nthcdr 3 context) "s0:c0")
|
|
|
|
|
|
(set-file-selinux-context tmp-name1 context))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3)))))
|
|
|
|
|
|
;; Copy SELinux context.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(set-file-selinux-context
|
|
|
|
|
|
tmp-name3 (file-selinux-context tmp-name1)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3)))
|
|
|
|
|
|
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; Two files with same SELinux context.
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(delete-file tmp-name1)
|
|
|
|
|
|
(copy-file tmp-name3 tmp-name1)
|
|
|
|
|
|
(should (file-selinux-context tmp-name1))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; We cannot expect that copying over file system
|
|
|
|
|
|
;; boundaries keeps SELinux context. So we copy it
|
2017-11-16 00:00:31 -08:00
|
|
|
|
;; explicitly.
|
2017-11-14 10:21:55 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(set-file-selinux-context
|
|
|
|
|
|
tmp-name1 (file-selinux-context tmp-name3)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3)))
|
2017-11-14 10:21:55 +01:00
|
|
|
|
;; Check different SELinux context. We cannot support
|
|
|
|
|
|
;; different ranges in this test; let's assume the most
|
|
|
|
|
|
;; likely one.
|
|
|
|
|
|
(let ((context (file-selinux-context tmp-name3)))
|
|
|
|
|
|
(when (and (string-equal (nth 3 context) "s0")
|
|
|
|
|
|
(setcar (nthcdr 3 context) "s0:c0")
|
|
|
|
|
|
(set-file-selinux-context tmp-name3 context))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3)))))
|
|
|
|
|
|
;; Copy SELinux context.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(set-file-selinux-context
|
|
|
|
|
|
tmp-name1 (file-selinux-context tmp-name3)))
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-selinux-context tmp-name1)
|
|
|
|
|
|
(file-selinux-context tmp-name3))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name3))))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test26-file-name-completion ()
|
2013-11-05 15:46:57 +01:00
|
|
|
|
"Check `file-name-completion' and `file-name-all-completions'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2017-05-02 16:30:55 +02:00
|
|
|
|
;; Method and host name in completion mode. This kind of completion
|
|
|
|
|
|
;; does not work on MS Windows.
|
2021-12-27 19:51:58 +01:00
|
|
|
|
(unless (memq system-type '(cygwin windows-nt))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(let ((tramp-fuse-remove-hidden-files t)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(method (file-remote-p ert-remote-temporary-file-directory 'method))
|
|
|
|
|
|
(host (file-remote-p ert-remote-temporary-file-directory 'host))
|
2023-02-07 19:28:15 +01:00
|
|
|
|
(orig-syntax tramp-syntax)
|
|
|
|
|
|
(minibuffer-completing-file-name t))
|
2017-06-11 23:16:13 +02:00
|
|
|
|
(when (and (stringp host) (string-match tramp-host-with-port-regexp host))
|
|
|
|
|
|
(setq host (match-string 1 host)))
|
2017-05-02 16:30:55 +02:00
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
2023-02-06 18:13:22 +01:00
|
|
|
|
(dolist (syntax (if (tramp--test-expensive-test-p)
|
|
|
|
|
|
(tramp-syntax-values) `(,orig-syntax)))
|
2017-05-02 16:30:55 +02:00
|
|
|
|
(tramp-change-syntax syntax)
|
2018-10-20 13:38:31 +02:00
|
|
|
|
;; This has cleaned up all connection data, which are used
|
|
|
|
|
|
;; for completion. We must refill the cache.
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-set-connection-property tramp-test-vec "property" nil)
|
2018-10-20 13:38:31 +02:00
|
|
|
|
|
2023-02-06 18:13:22 +01:00
|
|
|
|
(let (;; This is needed for the `separate' syntax.
|
|
|
|
|
|
(prefix-format (substring tramp-prefix-format 1))
|
|
|
|
|
|
;; This is needed for the IPv6 host name syntax.
|
|
|
|
|
|
(ipv6-prefix
|
|
|
|
|
|
(and (string-match-p tramp-ipv6-regexp host)
|
|
|
|
|
|
tramp-prefix-ipv6-format))
|
|
|
|
|
|
(ipv6-postfix
|
|
|
|
|
|
(and (string-match-p tramp-ipv6-regexp host)
|
|
|
|
|
|
tramp-postfix-ipv6-format)))
|
2017-05-02 16:30:55 +02:00
|
|
|
|
;; Complete method name.
|
Upgrade to length* functions in Tramp
* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
Move up.
(tramp-compat-length<, tramp-compat-length>)
(tramp-compat-length=): New defaliases.
(tramp-compat-file-name-unquote, tramp-compat-take)
(tramp-compat-ntake): Use them.
* lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst.
(tramp-find-host, tramp-buffer-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name, tramp-debug-buffer-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-handle-directory-file-name)
(tramp-handle-expand-file-name)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-direct-async-process-p, tramp-call-process)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-get-device)
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handle-get-home-directory)
(tramp-gvfs-handler-askpassword)
(tramp-gvfs-maybe-open-connection, tramp-get-media-devices):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-directory-p)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-make-process)
(tramp-sh-gio-monitor-process-filter, tramp-set-remote-path)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection, tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-expand-file-name, tramp-smb-handle-file-acl)
(tramp-smb-handle-insert-directory)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-get-home-directory)
(tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name)
(tramp-sudoedit-handle-file-name-all-completions): Use the new
functions.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test43-file-system-info):
* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
(tramp-test31-memory-info, tramp-test35-remote-path)
(tramp-test43-file-system-info): Use new compat functions.
2023-01-15 17:50:17 +01:00
|
|
|
|
(unless (or (tramp-string-empty-or-nil-p method)
|
|
|
|
|
|
(string-empty-p tramp-method-regexp))
|
2017-05-02 16:30:55 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(member
|
2017-09-11 17:12:32 +02:00
|
|
|
|
(concat prefix-format method tramp-postfix-method-format)
|
2017-05-02 16:30:55 +02:00
|
|
|
|
(file-name-all-completions
|
|
|
|
|
|
(concat prefix-format (substring method 0 1)) "/"))))
|
|
|
|
|
|
;; Complete host name.
|
Upgrade to length* functions in Tramp
* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
Move up.
(tramp-compat-length<, tramp-compat-length>)
(tramp-compat-length=): New defaliases.
(tramp-compat-file-name-unquote, tramp-compat-take)
(tramp-compat-ntake): Use them.
* lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst.
(tramp-find-host, tramp-buffer-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name, tramp-debug-buffer-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-handle-directory-file-name)
(tramp-handle-expand-file-name)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-direct-async-process-p, tramp-call-process)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-get-device)
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handle-get-home-directory)
(tramp-gvfs-handler-askpassword)
(tramp-gvfs-maybe-open-connection, tramp-get-media-devices):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-directory-p)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-make-process)
(tramp-sh-gio-monitor-process-filter, tramp-set-remote-path)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection, tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-expand-file-name, tramp-smb-handle-file-acl)
(tramp-smb-handle-insert-directory)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-get-home-directory)
(tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name)
(tramp-sudoedit-handle-file-name-all-completions): Use the new
functions.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test43-file-system-info):
* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
(tramp-test31-memory-info, tramp-test35-remote-path)
(tramp-test43-file-system-info): Use new compat functions.
2023-01-15 17:50:17 +01:00
|
|
|
|
(unless (or (tramp-string-empty-or-nil-p method)
|
|
|
|
|
|
(string-empty-p tramp-method-regexp)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
(tramp-string-empty-or-nil-p host))
|
2017-05-02 16:30:55 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(member
|
|
|
|
|
|
(concat
|
2017-09-11 17:12:32 +02:00
|
|
|
|
prefix-format method tramp-postfix-method-format
|
2019-12-22 13:48:36 +01:00
|
|
|
|
ipv6-prefix host ipv6-postfix tramp-postfix-host-format)
|
2017-05-02 16:30:55 +02:00
|
|
|
|
(file-name-all-completions
|
2017-09-11 17:12:32 +02:00
|
|
|
|
(concat prefix-format method tramp-postfix-method-format)
|
2017-05-02 16:30:55 +02:00
|
|
|
|
"/"))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(tramp-change-syntax orig-syntax))))
|
|
|
|
|
|
|
2020-02-13 16:34:07 +01:00
|
|
|
|
(dolist (non-essential '(nil t))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(let ((tramp-fuse-remove-hidden-files t)
|
|
|
|
|
|
(tmp-name (tramp--test-make-temp-name nil quoted)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Local files.
|
|
|
|
|
|
(make-directory tmp-name)
|
|
|
|
|
|
(should (file-directory-p tmp-name))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo" tmp-name))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo" tmp-name)))
|
|
|
|
|
|
(write-region "bar" nil (expand-file-name "bold" tmp-name))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "bold" tmp-name)))
|
|
|
|
|
|
(make-directory (expand-file-name "boz" tmp-name))
|
|
|
|
|
|
(should (file-directory-p (expand-file-name "boz" tmp-name)))
|
2016-05-30 15:00:14 +02:00
|
|
|
|
(should (equal (file-name-completion "fo" tmp-name) "foo"))
|
|
|
|
|
|
(should (equal (file-name-completion "foo" tmp-name) t))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (equal (file-name-completion "b" tmp-name) "bo"))
|
|
|
|
|
|
(should-not (file-name-completion "a" tmp-name))
|
2023-03-02 13:54:14 +01:00
|
|
|
|
;; `file-name-completion' should not err out if
|
|
|
|
|
|
;; directory does not exist. (Bug#61890)
|
2023-03-14 11:39:16 +01:00
|
|
|
|
;; Ange-FTP does not support this.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(file-name-completion
|
|
|
|
|
|
"a" (tramp-compat-file-name-concat tmp-name "fuzz"))))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP does not support predicates.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(file-name-completion "b" tmp-name #'file-directory-p)
|
|
|
|
|
|
"boz/")))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-name-all-completions "fo" tmp-name) '("foo")))
|
2016-05-30 15:00:14 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(sort (file-name-all-completions "b" tmp-name) #'string-lessp)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
'("bold" "boz/")))
|
|
|
|
|
|
(should-not (file-name-all-completions "a" tmp-name))
|
|
|
|
|
|
;; `completion-regexp-list' restricts the completion to
|
|
|
|
|
|
;; files which match all expressions in this list.
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP does not complete "".
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(let ((completion-regexp-list
|
|
|
|
|
|
`(,directory-files-no-dot-files-regexp "b")))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-name-completion "" tmp-name) "bo"))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(sort
|
|
|
|
|
|
(file-name-all-completions "" tmp-name) #'string-lessp)
|
|
|
|
|
|
'("bold" "boz/")))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; `file-name-completion' ignores file names that end in
|
|
|
|
|
|
;; any string in `completion-ignored-extensions'.
|
|
|
|
|
|
(let ((completion-ignored-extensions '(".ext")))
|
|
|
|
|
|
(write-region "foo" nil (expand-file-name "foo.ext" tmp-name))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name "foo.ext" tmp-name)))
|
|
|
|
|
|
(should (equal (file-name-completion "fo" tmp-name) "foo"))
|
|
|
|
|
|
(should (equal (file-name-completion "foo" tmp-name) t))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (file-name-completion "foo." tmp-name) "foo.ext"))
|
|
|
|
|
|
(should (equal (file-name-completion "foo.ext" tmp-name) t))
|
|
|
|
|
|
;; `file-name-all-completions' is not affected.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(sort (file-name-all-completions "" tmp-name) #'string-lessp)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
'("../" "./" "bold" "boz/" "foo" "foo.ext")))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name 'recursive)))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2023-03-01 17:07:59 +01:00
|
|
|
|
(tramp--test-deftest-with-perl tramp-test26-file-name-completion)
|
|
|
|
|
|
|
|
|
|
|
|
(tramp--test-deftest-with-ls tramp-test26-file-name-completion)
|
|
|
|
|
|
|
2023-02-06 18:13:22 +01:00
|
|
|
|
;; This test is inspired by Bug#51386, Bug#52758, Bug#53513, Bug#54042
|
|
|
|
|
|
;; and Bug#60505.
|
|
|
|
|
|
(ert-deftest tramp-test26-interactive-file-name-completion ()
|
|
|
|
|
|
"Check interactive completion with different `completion-styles'."
|
2023-02-19 18:35:46 +01:00
|
|
|
|
;; Method, user and host name in completion mode. This kind of
|
|
|
|
|
|
;; completion does not work on MS Windows.
|
2023-02-24 20:08:10 +01:00
|
|
|
|
(skip-unless (not (memq system-type '(cygwin windows-nt))))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec nil 'keep-password)
|
2023-02-06 18:13:22 +01:00
|
|
|
|
|
2023-02-24 20:08:10 +01:00
|
|
|
|
(let ((method (file-remote-p ert-remote-temporary-file-directory 'method))
|
|
|
|
|
|
(user (file-remote-p ert-remote-temporary-file-directory 'user))
|
|
|
|
|
|
(host (file-remote-p ert-remote-temporary-file-directory 'host))
|
|
|
|
|
|
(hop (file-remote-p ert-remote-temporary-file-directory 'hop))
|
|
|
|
|
|
(orig-syntax tramp-syntax)
|
|
|
|
|
|
(non-essential t)
|
|
|
|
|
|
(inhibit-message t))
|
|
|
|
|
|
(when (and (stringp host) (string-match tramp-host-with-port-regexp host))
|
|
|
|
|
|
(setq host (match-string 1 host)))
|
|
|
|
|
|
|
|
|
|
|
|
;; (trace-function #'tramp-completion-file-name-handler)
|
|
|
|
|
|
;; (trace-function #'completion-file-name-table)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(dolist (syntax (if (tramp--test-expensive-test-p)
|
|
|
|
|
|
(tramp-syntax-values) `(,orig-syntax)))
|
|
|
|
|
|
(tramp-change-syntax syntax)
|
|
|
|
|
|
;; This has cleaned up all connection data, which are used
|
|
|
|
|
|
;; for completion. We must refill the cache.
|
|
|
|
|
|
(tramp-set-connection-property tramp-test-vec "property" nil)
|
|
|
|
|
|
|
|
|
|
|
|
(dolist
|
|
|
|
|
|
(style
|
|
|
|
|
|
(if (tramp--test-expensive-test-p)
|
|
|
|
|
|
;; It doesn't work for `initials' and `shorthand'
|
|
|
|
|
|
;; completion styles. Should it?
|
2023-11-17 18:17:28 +01:00
|
|
|
|
;; `orderless' passes the tests, but it is an ELPA package.
|
2023-02-24 20:08:10 +01:00
|
|
|
|
'(emacs21 emacs22 basic partial-completion substring flex)
|
|
|
|
|
|
'(basic)))
|
|
|
|
|
|
|
|
|
|
|
|
(when (assoc style completion-styles-alist)
|
|
|
|
|
|
(let* (;; Force the real minibuffer in batch mode.
|
|
|
|
|
|
(executing-kbd-macro noninteractive)
|
|
|
|
|
|
(completion-styles `(,style))
|
|
|
|
|
|
completion-category-defaults
|
|
|
|
|
|
completion-category-overrides
|
|
|
|
|
|
;; This is needed for the `simplified' syntax,
|
|
|
|
|
|
(tramp-default-method method)
|
|
|
|
|
|
(method-string
|
|
|
|
|
|
(unless (string-empty-p tramp-method-regexp)
|
|
|
|
|
|
(concat method tramp-postfix-method-format)))
|
|
|
|
|
|
(user-string
|
|
|
|
|
|
(unless (tramp-string-empty-or-nil-p user)
|
|
|
|
|
|
(concat user tramp-postfix-user-format)))
|
|
|
|
|
|
;; This is needed for the IPv6 host name syntax.
|
|
|
|
|
|
(ipv6-prefix
|
|
|
|
|
|
(and (string-match-p tramp-ipv6-regexp host)
|
|
|
|
|
|
tramp-prefix-ipv6-format))
|
|
|
|
|
|
(ipv6-postfix
|
|
|
|
|
|
(and (string-match-p tramp-ipv6-regexp host)
|
|
|
|
|
|
tramp-postfix-ipv6-format))
|
|
|
|
|
|
(host-string
|
|
|
|
|
|
(unless (tramp-string-empty-or-nil-p host)
|
|
|
|
|
|
(concat
|
|
|
|
|
|
ipv6-prefix host
|
|
|
|
|
|
ipv6-postfix tramp-postfix-host-format)))
|
|
|
|
|
|
;; The hop string fits only the initial syntax.
|
|
|
|
|
|
(hop (and (eq tramp-syntax orig-syntax) hop))
|
|
|
|
|
|
test result completions)
|
|
|
|
|
|
|
|
|
|
|
|
(dolist
|
|
|
|
|
|
(test-and-result
|
|
|
|
|
|
;; These are triples of strings (TEST-STRING
|
|
|
|
|
|
;; RESULT-CHECK COMPLETION-CHECK). RESULT-CHECK
|
|
|
|
|
|
;; could be not unique, in this case it is a list
|
|
|
|
|
|
;; (RESULT1 RESULT2 ...).
|
|
|
|
|
|
(append
|
|
|
|
|
|
;; Complete method name.
|
|
|
|
|
|
(unless (string-empty-p tramp-method-regexp)
|
|
|
|
|
|
`((,(concat
|
|
|
|
|
|
tramp-prefix-format hop
|
|
|
|
|
|
(substring-no-properties
|
|
|
|
|
|
method 0 (min 2 (length method))))
|
2023-05-27 10:14:50 +02:00
|
|
|
|
,(concat tramp-prefix-format hop method-string)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
,method-string)))
|
|
|
|
|
|
;; Complete user name.
|
|
|
|
|
|
(unless (tramp-string-empty-or-nil-p user)
|
|
|
|
|
|
`((,(concat
|
|
|
|
|
|
tramp-prefix-format hop method-string
|
|
|
|
|
|
(substring-no-properties
|
|
|
|
|
|
user 0 (min 2 (length user))))
|
|
|
|
|
|
,(concat
|
2023-05-27 10:14:50 +02:00
|
|
|
|
tramp-prefix-format hop method-string user-string)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
,user-string)))
|
|
|
|
|
|
;; Complete host name.
|
|
|
|
|
|
(unless (tramp-string-empty-or-nil-p host)
|
|
|
|
|
|
`((,(concat
|
|
|
|
|
|
tramp-prefix-format hop method-string
|
|
|
|
|
|
ipv6-prefix
|
|
|
|
|
|
(substring-no-properties
|
|
|
|
|
|
host 0 (min 2 (length host))))
|
|
|
|
|
|
(,(concat
|
2023-05-27 10:14:50 +02:00
|
|
|
|
tramp-prefix-format hop method-string host-string)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
,(concat
|
2023-05-27 10:14:50 +02:00
|
|
|
|
tramp-prefix-format hop method-string
|
2023-02-24 20:08:10 +01:00
|
|
|
|
user-string host-string))
|
|
|
|
|
|
,host-string)))
|
|
|
|
|
|
;; Complete user and host name.
|
|
|
|
|
|
(unless (or (tramp-string-empty-or-nil-p user)
|
|
|
|
|
|
(tramp-string-empty-or-nil-p host))
|
|
|
|
|
|
`((,(concat
|
|
|
|
|
|
tramp-prefix-format hop method-string user-string
|
|
|
|
|
|
ipv6-prefix
|
|
|
|
|
|
(substring-no-properties
|
|
|
|
|
|
host 0 (min 2 (length host))))
|
|
|
|
|
|
,(concat
|
2023-05-27 10:14:50 +02:00
|
|
|
|
tramp-prefix-format hop method-string
|
2023-02-24 20:08:10 +01:00
|
|
|
|
user-string host-string)
|
|
|
|
|
|
,host-string)))))
|
|
|
|
|
|
|
|
|
|
|
|
(ignore-errors (kill-buffer "*Completions*"))
|
|
|
|
|
|
;; (and (bufferp trace-buffer) (kill-buffer trace-buffer))
|
|
|
|
|
|
(discard-input)
|
|
|
|
|
|
(setq test (car test-and-result)
|
|
|
|
|
|
unread-command-events
|
|
|
|
|
|
(mapcar #'identity (concat test "\t\t\n"))
|
|
|
|
|
|
completions nil
|
|
|
|
|
|
result (read-file-name "Prompt: "))
|
|
|
|
|
|
|
|
|
|
|
|
(if (or (not (get-buffer "*Completions*"))
|
|
|
|
|
|
(string-match-p
|
|
|
|
|
|
(if (string-empty-p tramp-method-regexp)
|
|
|
|
|
|
(rx
|
|
|
|
|
|
(| (regexp tramp-postfix-user-regexp)
|
|
|
|
|
|
(regexp tramp-postfix-host-regexp))
|
|
|
|
|
|
eos)
|
|
|
|
|
|
(rx
|
|
|
|
|
|
(| (regexp tramp-postfix-method-regexp)
|
|
|
|
|
|
(regexp tramp-postfix-user-regexp)
|
|
|
|
|
|
(regexp tramp-postfix-host-regexp))
|
|
|
|
|
|
eos))
|
|
|
|
|
|
result))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; (tramp--test-message
|
|
|
|
|
|
;; "syntax: %s style: %s test: %s result: %s"
|
|
|
|
|
|
;; syntax style test result)
|
|
|
|
|
|
(if (stringp (cadr test-and-result))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-prefix-p (cadr test-and-result) result))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(let (res)
|
|
|
|
|
|
(dolist (elem (cadr test-and-result) res)
|
|
|
|
|
|
(setq
|
|
|
|
|
|
res (or res (string-prefix-p elem result))))))))
|
|
|
|
|
|
|
|
|
|
|
|
(with-current-buffer "*Completions*"
|
|
|
|
|
|
;; We must remove leading `default-directory'.
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(let ((inhibit-read-only t))
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(while (search-forward-regexp "//" nil 'noerror)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
(delete-region (line-beginning-position) (point))))
|
|
|
|
|
|
(goto-char (point-min))
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(search-forward-regexp
|
2023-02-24 20:08:10 +01:00
|
|
|
|
(rx bol (0+ nonl)
|
|
|
|
|
|
(any "Pp") "ossible completions"
|
|
|
|
|
|
(0+ nonl) eol))
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(setq completions
|
|
|
|
|
|
(split-string
|
|
|
|
|
|
(buffer-substring-no-properties (point) (point-max))
|
|
|
|
|
|
(rx (any "\r\n\t ")) 'omit)))
|
|
|
|
|
|
|
|
|
|
|
|
;; (tramp--test-message
|
|
|
|
|
|
;; "syntax: %s style: %s test: %s result: %s completions: %S"
|
|
|
|
|
|
;; syntax style test result completions)
|
|
|
|
|
|
(should (member (caddr test-and-result) completions))))))))
|
2023-02-06 18:13:22 +01:00
|
|
|
|
|
2023-02-24 20:08:10 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
;; (tramp--test-message "%s" (tramp-get-buffer-string trace-buffer))
|
|
|
|
|
|
;; (untrace-function #'tramp-completion-file-name-handler)
|
|
|
|
|
|
;; (untrace-function #'completion-file-name-table)
|
|
|
|
|
|
(tramp-change-syntax orig-syntax))))
|
2023-02-06 18:13:22 +01:00
|
|
|
|
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(ert-deftest tramp-test27-load ()
|
2013-11-05 15:46:57 +01:00
|
|
|
|
"Check `load'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted)))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2022-05-11 18:02:13 +02:00
|
|
|
|
;; Ange-FTP does not tolerate a missing file, even with `noerror'.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(load tmp-name 'noerror 'nomessage))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should-not (featurep 'tramp-test-load))
|
|
|
|
|
|
(write-region "(provide 'tramp-test-load)" nil tmp-name)
|
2022-11-04 15:39:58 +01:00
|
|
|
|
;; `load' in lread.c passes `must-suffix' since Emacs 29.
|
|
|
|
|
|
;; In Ange-FTP, `must-suffix' is ignored.
|
|
|
|
|
|
(when (and (tramp--test-emacs29-p)
|
|
|
|
|
|
(not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(load tmp-name nil 'nomessage 'nosuffix 'must-suffix)
|
|
|
|
|
|
:type 'file-error))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(load tmp-name nil 'nomessage 'nosuffix)
|
|
|
|
|
|
(should (featurep 'tramp-test-load)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(and (featurep 'tramp-test-load) (unload-feature 'tramp-test-load))
|
|
|
|
|
|
(delete-file tmp-name))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(defun tramp--test-shell-file-name ()
|
2021-04-14 13:25:36 +02:00
|
|
|
|
"Return default remote shell."
|
2022-08-25 11:08:48 +02:00
|
|
|
|
(if (file-exists-p
|
|
|
|
|
|
(concat
|
|
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory) "/system/bin/sh"))
|
|
|
|
|
|
"/system/bin/sh" "/bin/sh"))
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(ert-deftest tramp-test28-process-file ()
|
2013-11-05 15:46:57 +01:00
|
|
|
|
"Check `process-file'."
|
2016-01-04 23:28:07 +01:00
|
|
|
|
:tags '(:expensive-test)
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
2019-06-26 10:24:59 -04:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let* ((tmp-name (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(fnnd (file-name-nondirectory tmp-name))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory)
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(buffer (get-buffer-create "*tramp-tests*"))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
kill-buffer-query-functions)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; We cannot use "/bin/true" and "/bin/false"; those paths
|
|
|
|
|
|
;; do not exist on hydra.
|
|
|
|
|
|
(should (zerop (process-file "true")))
|
|
|
|
|
|
(should-not (zerop (process-file "false")))
|
|
|
|
|
|
(should-not (zerop (process-file "binary-does-not-exist")))
|
2020-05-16 14:04:07 +02:00
|
|
|
|
;; Return exit code.
|
|
|
|
|
|
(should (= 42 (process-file
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(tramp--test-shell-file-name)
|
2020-05-16 14:04:07 +02:00
|
|
|
|
nil nil nil "-c" "exit 42")))
|
|
|
|
|
|
;; Return exit code in case the process is interrupted,
|
|
|
|
|
|
;; and there's no indication for a signal describing string.
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(unless (tramp--test-sshfs-p)
|
|
|
|
|
|
(let (process-file-return-signal-string)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(= (+ 128 2)
|
|
|
|
|
|
(process-file
|
|
|
|
|
|
(tramp--test-shell-file-name)
|
|
|
|
|
|
nil nil nil "-c" "kill -2 $$")))))
|
2020-05-16 14:04:07 +02:00
|
|
|
|
;; Return string in case the process is interrupted and
|
|
|
|
|
|
;; there's an indication for a signal describing string.
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(unless (tramp--test-sshfs-p)
|
|
|
|
|
|
(let ((process-file-return-signal-string t))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-match-p
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx (| "Interrupt" "Signal 2"))
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(process-file
|
|
|
|
|
|
(tramp--test-shell-file-name)
|
|
|
|
|
|
nil nil nil "-c" "kill -2 $$")))))
|
2020-05-13 14:11:18 +02:00
|
|
|
|
|
2022-02-13 20:50:51 +01:00
|
|
|
|
;; Check DESTINATION.
|
|
|
|
|
|
(dolist (destination `(nil t ,buffer))
|
|
|
|
|
|
(when (bufferp destination)
|
|
|
|
|
|
(with-current-buffer destination
|
|
|
|
|
|
(delete-region (point-min) (point-max))))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(should (zerop (process-file "ls" nil destination nil fnnd)))
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(if (bufferp destination) destination (current-buffer))
|
|
|
|
|
|
;; "ls" could produce colorized output.
|
|
|
|
|
|
(goto-char (point-min))
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(while (search-forward-regexp
|
|
|
|
|
|
ansi-color-control-seq-regexp nil t)
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(replace-match "" nil nil))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal (if destination (format "%s\n" fnnd) "")
|
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
|
(should-not (get-buffer-window (current-buffer) t))
|
|
|
|
|
|
(goto-char (point-max)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Second run. The output must be appended.
|
|
|
|
|
|
(should (zerop (process-file "ls" nil destination t fnnd)))
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(if (bufferp destination) destination (current-buffer))
|
|
|
|
|
|
;; "ls" could produce colorized output.
|
|
|
|
|
|
(goto-char (point-min))
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(while (search-forward-regexp
|
|
|
|
|
|
ansi-color-control-seq-regexp nil t)
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(replace-match "" nil nil))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(if destination (format "%s\n%s\n" fnnd fnnd) "")
|
|
|
|
|
|
(buffer-string))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(unless (eq destination t)
|
|
|
|
|
|
(should (string-empty-p (buffer-string))))
|
|
|
|
|
|
;; A non-nil DISPLAY must not raise the buffer.
|
|
|
|
|
|
(should-not (get-buffer-window (current-buffer) t))
|
|
|
|
|
|
(delete-file tmp-name)))
|
2022-01-17 10:46:58 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check remote and local INFILE.
|
|
|
|
|
|
(dolist (local '(nil t))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq tmp-name (tramp--test-make-temp-name local quoted))
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(should (zerop (process-file "cat" tmp-name t)))
|
|
|
|
|
|
(should (string-equal "foo" (buffer-string)))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(should-not (get-buffer-window (current-buffer) t))
|
|
|
|
|
|
(delete-file tmp-name)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check remote and local DESTNATION file. This isn't
|
|
|
|
|
|
;; implemented yet ina all file name handler backends.
|
|
|
|
|
|
;; (dolist (local '(nil t))
|
|
|
|
|
|
;; (setq tmp-name (tramp--test-make-temp-name local quoted))
|
|
|
|
|
|
;; (should
|
|
|
|
|
|
;; (zerop (process-file "echo" nil `(:file ,tmp-name) nil "foo")))
|
|
|
|
|
|
;; (with-temp-buffer
|
|
|
|
|
|
;; (insert-file-contents tmp-name)
|
|
|
|
|
|
;; (should (string-equal "foo" (buffer-string)))
|
|
|
|
|
|
;; (should-not (get-buffer-window (current-buffer) t))
|
|
|
|
|
|
;; (delete-file tmp-name)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check remote and local STDERR.
|
|
|
|
|
|
(dolist (local '(nil t))
|
|
|
|
|
|
(setq tmp-name (tramp--test-make-temp-name local quoted))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(zerop
|
|
|
|
|
|
(process-file "cat" nil `(t ,tmp-name) nil "/does-not-exist")))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-match-p
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx "cat:" (* nonl) " No such file or directory")
|
|
|
|
|
|
(buffer-string)))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(should-not (get-buffer-window (current-buffer) t))
|
|
|
|
|
|
(delete-file tmp-name))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(ignore-errors (kill-buffer buffer))
|
2020-08-24 12:11:48 +02:00
|
|
|
|
(ignore-errors (delete-file tmp-name))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; Must be a command, because used as `sigusr1' handler.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(defun tramp--test-timeout-handler (&rest _ignore)
|
|
|
|
|
|
"Timeout handler, reporting a failed test."
|
|
|
|
|
|
(interactive)
|
2023-11-17 18:17:28 +01:00
|
|
|
|
(tramp--test-message "proc: %s" (get-buffer-process (current-buffer)))
|
|
|
|
|
|
(when-let ((proc (get-buffer-process (current-buffer)))
|
|
|
|
|
|
((processp proc)))
|
|
|
|
|
|
(tramp--test-message "cmd: %s" (process-command proc)))
|
|
|
|
|
|
(tramp--test-message "buf: %s\n%s\n---" (current-buffer) (buffer-string))
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(ert-fail (format "`%s' timed out" (ert-test-name (ert-running-test)))))
|
|
|
|
|
|
|
2017-11-12 13:05:44 +01:00
|
|
|
|
(ert-deftest tramp-test29-start-file-process ()
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
"Check `start-file-process'."
|
2021-12-24 11:32:34 +01:00
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name (tramp--test-make-temp-name nil quoted))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
kill-buffer-query-functions command proc)
|
2019-04-03 21:36:40 +02:00
|
|
|
|
|
|
|
|
|
|
;; Simple process.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
|
|
|
|
|
(apply #'start-file-process "test1" (current-buffer) command))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2020-02-14 14:50:55 +01:00
|
|
|
|
(process-send-string proc "foo\n")
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(process-send-eof proc)
|
|
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(while (< (- (point-max) (point-min)) (length "foo"))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
|
|
|
|
|
|
2019-04-03 21:36:40 +02:00
|
|
|
|
;; Simple process using a file.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command `("cat" ,(file-name-nondirectory tmp-name))
|
|
|
|
|
|
proc
|
|
|
|
|
|
(apply #'start-file-process "test2" (current-buffer) command))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (processp proc))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(while (< (- (point-max) (point-min)) (length "foo"))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-process proc)
|
|
|
|
|
|
(delete-file tmp-name)))
|
|
|
|
|
|
|
2019-04-03 21:36:40 +02:00
|
|
|
|
;; Process filter.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
|
|
|
|
|
(apply #'start-file-process "test3" (current-buffer) command))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(set-process-filter
|
|
|
|
|
|
proc
|
|
|
|
|
|
(lambda (p s) (with-current-buffer (process-buffer p) (insert s))))
|
2020-02-14 14:50:55 +01:00
|
|
|
|
(process-send-string proc "foo\n")
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(process-send-eof proc)
|
|
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(while (< (- (point-max) (point-min)) (length "foo"))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2020-10-24 14:36:34 +02:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
|
|
|
|
|
|
2023-01-15 18:49:37 +01:00
|
|
|
|
;; Disabled process filter. It doesn't work reliable.
|
|
|
|
|
|
(unless t
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
|
|
|
|
|
(apply
|
|
|
|
|
|
#'start-file-process "test4" (current-buffer) command))
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(set-process-filter proc t)
|
|
|
|
|
|
(process-send-string proc "foo\n")
|
|
|
|
|
|
(process-send-eof proc)
|
2021-12-22 18:13:18 +01:00
|
|
|
|
;; Read output. There shouldn't be any.
|
|
|
|
|
|
(with-timeout (10)
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(while (process-live-p proc)
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
|
|
|
|
|
;; No output due to process filter.
|
|
|
|
|
|
(should (= (point-min) (point-max))))
|
2021-10-14 14:32:47 +02:00
|
|
|
|
|
2021-10-19 18:50:12 +02:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc))))
|
2021-10-14 14:32:47 +02:00
|
|
|
|
|
2021-08-24 21:42:42 +02:00
|
|
|
|
;; Process connection type.
|
|
|
|
|
|
(when (and (tramp--test-sh-p)
|
2021-09-05 09:23:30 +02:00
|
|
|
|
(not (tramp-direct-async-process-p))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(executable-find "hexdump" 'remote))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(dolist (process-connection-type '(nil pipe t pty))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("hexdump" "-v" "-e" "/1 \"%02X\n\"")
|
|
|
|
|
|
proc
|
|
|
|
|
|
(apply #'start-file-process
|
|
|
|
|
|
(format "test5-%s" process-connection-type)
|
|
|
|
|
|
(current-buffer) command))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2023-02-01 18:40:11 +01:00
|
|
|
|
;; Give the pipe process a chance to start.
|
|
|
|
|
|
(when (memq process-connection-type '(nil pipe))
|
|
|
|
|
|
(sit-for 0.1 'nodisp))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(process-send-string proc "foo\r\n")
|
|
|
|
|
|
(process-send-eof proc)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
;; Read output. On macOS, there is always newline
|
|
|
|
|
|
;; conversion. "telnet" converts \r to <CR><NUL> if
|
|
|
|
|
|
;; `crlf' flag is FALSE. See telnet(1) man page.
|
|
|
|
|
|
(let ((expected
|
|
|
|
|
|
(rx "66\n" "6F\n" "6F\n"
|
|
|
|
|
|
(| "0D\n" "0A\n") (? "00\n") "0A\n")))
|
|
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (not (string-match-p expected (buffer-string)))
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
|
|
|
|
|
(should (string-match-p expected (buffer-string)))))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))))
|
|
|
|
|
|
|
2020-10-24 14:36:34 +02:00
|
|
|
|
;; PTY.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
;; It works only for tramp-sh.el, and not direct async processes.
|
|
|
|
|
|
(if (or (not (tramp--test-sh-p)) (tramp-direct-async-process-p))
|
|
|
|
|
|
(should-error
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(start-file-process "test6" (current-buffer) nil)
|
2020-10-24 14:36:34 +02:00
|
|
|
|
:type 'wrong-type-argument)
|
2020-12-20 19:45:11 +01:00
|
|
|
|
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq proc (start-file-process "test6" (current-buffer) nil))
|
2020-10-24 14:36:34 +02:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should-not (process-get proc 'remote-command))
|
2020-11-25 09:41:11 +01:00
|
|
|
|
;; On MS Windows, `process-tty-name' returns nil.
|
2020-11-25 12:24:08 +01:00
|
|
|
|
(unless (tramp--test-windows-nt-p)
|
2020-11-25 09:41:11 +01:00
|
|
|
|
(should (stringp (process-tty-name proc))))))
|
2020-10-24 14:36:34 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
2019-01-24 14:36:38 +01:00
|
|
|
|
(ignore-errors (delete-process proc))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(defmacro tramp--test-deftest-direct-async-process (test &optional unstable)
|
2020-08-24 12:11:48 +02:00
|
|
|
|
"Define ert test `TEST-direct-async' for direct async processes.
|
2020-08-23 13:30:43 +02:00
|
|
|
|
If UNSTABLE is non-nil, the test is tagged as `:unstable'."
|
|
|
|
|
|
(declare (indent 1))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
`(ert-deftest ,(intern (concat (symbol-name test) "-direct-async")) ()
|
|
|
|
|
|
;; This is the docstring. However, it must be expanded to a
|
|
|
|
|
|
;; string inside the macro. No idea.
|
|
|
|
|
|
;; (concat (ert-test-documentation (get ',test 'ert--test))
|
|
|
|
|
|
;; "\nUse direct async process.")
|
|
|
|
|
|
:tags (append '(:expensive-test :tramp-asynchronous-processes)
|
|
|
|
|
|
(and ,unstable '(:unstable)))
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ert-test (ert-get-test ',test))
|
|
|
|
|
|
(tramp-connection-properties
|
|
|
|
|
|
(cons '(nil "direct-async-process" t)
|
|
|
|
|
|
tramp-connection-properties)))
|
|
|
|
|
|
(skip-unless (tramp-direct-async-process-p))
|
|
|
|
|
|
;; We do expect an established connection already,
|
|
|
|
|
|
;; `file-truename' does it by side-effect. Suppress
|
|
|
|
|
|
;; `tramp--test-enabled', in order to keep the connection.
|
|
|
|
|
|
;; Suppress "Process ... finished" messages.
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'tramp--test-enabled) #'tramp-compat-always)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
((symbol-function #'internal-default-process-sentinel)
|
|
|
|
|
|
#'ignore))
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
|
|
|
|
|
(funcall (ert-test-body ert-test))))))
|
2020-08-23 13:30:43 +02:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-direct-async-process tramp-test29-start-file-process)
|
2020-08-23 13:30:43 +02:00
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test30-make-process ()
|
|
|
|
|
|
"Check `make-process'."
|
2022-03-12 17:49:42 +01:00
|
|
|
|
:tags (append '(:expensive-test :tramp-asynchronous-processes)
|
|
|
|
|
|
(and (getenv "EMACS_EMBA_CI")
|
|
|
|
|
|
'(:unstable)))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(tmp-name (tramp--test-make-temp-name nil quoted))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
kill-buffer-query-functions command proc)
|
2023-08-19 10:08:35 +02:00
|
|
|
|
(should-not (apply #'make-process nil)) ; Use `apply' to avoid warnings.
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Simple process.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test1" :buffer (current-buffer) :command command
|
|
|
|
|
|
:file-handler t))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2020-02-14 14:50:55 +01:00
|
|
|
|
(process-send-string proc "foo\n")
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(process-send-eof proc)
|
|
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(while (< (- (point-max) (point-min)) (length "foo"))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Simple process using a file.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command `("cat" ,(file-name-nondirectory tmp-name))
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test2" :buffer (current-buffer) :command command
|
|
|
|
|
|
:file-handler t))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(should (processp proc))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(while (< (- (point-max) (point-min)) (length "foo"))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(delete-process proc)
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(delete-file tmp-name)))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Process filter.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test3" :buffer (current-buffer) :command command
|
|
|
|
|
|
:filter
|
|
|
|
|
|
(lambda (p s)
|
|
|
|
|
|
(with-current-buffer (process-buffer p) (insert s)))
|
|
|
|
|
|
:file-handler t))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2020-02-14 14:50:55 +01:00
|
|
|
|
(process-send-string proc "foo\n")
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(process-send-eof proc)
|
|
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(while (not (string-match-p "foo" (buffer-string)))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(should (string-match-p "foo" (buffer-string))))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
|
|
|
|
|
|
2023-01-15 18:49:37 +01:00
|
|
|
|
;; Disabled process filter. It doesn't work reliable.
|
|
|
|
|
|
(unless t
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test4" :buffer (current-buffer) :command command
|
|
|
|
|
|
:filter t :file-handler t))
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(process-send-string proc "foo\n")
|
|
|
|
|
|
(process-send-eof proc)
|
2021-12-22 18:13:18 +01:00
|
|
|
|
;; Read output. There shouldn't be any.
|
|
|
|
|
|
(with-timeout (10)
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(while (process-live-p proc)
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
|
|
|
|
|
;; No output due to process filter.
|
|
|
|
|
|
(should (= (point-min) (point-max))))
|
2021-10-14 14:32:47 +02:00
|
|
|
|
|
2021-10-19 18:50:12 +02:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc))))
|
2021-10-14 14:32:47 +02:00
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
;; Process sentinel.
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test5" :buffer (current-buffer) :command command
|
|
|
|
|
|
:sentinel
|
|
|
|
|
|
(lambda (p s)
|
|
|
|
|
|
(with-current-buffer (process-buffer p) (insert s)))
|
|
|
|
|
|
:file-handler t))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2020-02-14 14:50:55 +01:00
|
|
|
|
(process-send-string proc "foo\n")
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(process-send-eof proc)
|
|
|
|
|
|
(delete-process proc)
|
|
|
|
|
|
;; Read output.
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
2019-01-29 17:26:14 +01:00
|
|
|
|
(while (accept-process-output proc 0 nil t)))
|
2020-09-05 19:29:47 +02:00
|
|
|
|
;; On some MS Windows systems, it returns "unknown signal".
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-match-p
|
|
|
|
|
|
(rx (| "unknown signal" "killed")) (buffer-string))))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
|
|
|
|
|
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; Process with stderr buffer. "telnet" does not cooperate with
|
2021-09-16 16:50:24 +02:00
|
|
|
|
;; three processes.
|
|
|
|
|
|
(unless (or (tramp--test-telnet-p) (tramp-direct-async-process-p))
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(let ((stderr (generate-new-buffer "*stderr*")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat" "/does-not-exist")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test6" :buffer (current-buffer) :command command
|
|
|
|
|
|
:stderr stderr :file-handler t))
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(should (processp proc))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2021-05-16 12:08:09 +02:00
|
|
|
|
;; Read output.
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t)))
|
2021-05-16 12:08:09 +02:00
|
|
|
|
;; Read stderr.
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(with-current-buffer stderr
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (not (string-match-p
|
|
|
|
|
|
"No such file or directory" (buffer-string)))
|
|
|
|
|
|
(while (accept-process-output
|
|
|
|
|
|
(get-buffer-process stderr) 0 nil t))))
|
|
|
|
|
|
(delete-process proc)
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx "cat:" (* nonl) " No such file or directory")
|
|
|
|
|
|
(buffer-string)))))
|
2020-01-06 12:24:16 +01:00
|
|
|
|
|
2020-08-23 13:30:43 +02:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc))
|
|
|
|
|
|
(ignore-errors (kill-buffer stderr)))))
|
2020-01-06 12:24:16 +01:00
|
|
|
|
|
2020-01-07 13:13:03 +01:00
|
|
|
|
;; Process with stderr file.
|
2020-08-23 13:30:43 +02:00
|
|
|
|
(unless (tramp-direct-async-process-p)
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("cat" "/does-not-exist")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name "test7" :buffer (current-buffer) :command command
|
|
|
|
|
|
:stderr tmp-name :file-handler t))
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(should (processp proc))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2021-05-16 12:08:09 +02:00
|
|
|
|
;; Read stderr.
|
|
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (accept-process-output proc nil nil t)))
|
|
|
|
|
|
(delete-process proc)
|
2020-01-06 12:24:16 +01:00
|
|
|
|
(with-temp-buffer
|
2021-05-16 12:08:09 +02:00
|
|
|
|
(insert-file-contents tmp-name)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-match-p
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx "cat:" (* nonl) " No such file or directory")
|
|
|
|
|
|
(buffer-string)))))
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
2021-05-16 12:08:09 +02:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc))
|
2021-08-12 20:09:48 +02:00
|
|
|
|
(ignore-errors (delete-file tmp-name))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Process connection type.
|
|
|
|
|
|
(when (and (tramp--test-sh-p)
|
2021-09-05 09:23:30 +02:00
|
|
|
|
(not (tramp-direct-async-process-p))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(executable-find "hexdump" 'remote))
|
2021-08-12 20:09:48 +02:00
|
|
|
|
(dolist (connection-type '(nil pipe t pty))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
;; `process-connection-type' is taken when
|
|
|
|
|
|
;; `:connection-type' is nil.
|
|
|
|
|
|
(dolist (process-connection-type
|
2023-02-01 18:40:11 +01:00
|
|
|
|
(if connection-type '(nil pipe t pty) '(nil)))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command '("hexdump" "-v" "-e" "/1 \"%02X\n\"")
|
|
|
|
|
|
proc
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(make-process
|
|
|
|
|
|
:name
|
|
|
|
|
|
(format "test8-%s-%s"
|
|
|
|
|
|
connection-type process-connection-type)
|
|
|
|
|
|
:buffer (current-buffer)
|
|
|
|
|
|
:connection-type connection-type
|
|
|
|
|
|
:command command
|
|
|
|
|
|
:file-handler t))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command) command))
|
2023-02-01 18:40:11 +01:00
|
|
|
|
;; Give the pipe process a chance to start.
|
|
|
|
|
|
(when (or (eq connection-type 'pipe)
|
|
|
|
|
|
(memq process-connection-type '(nil pipe)))
|
|
|
|
|
|
(sit-for 0.1 'nodisp))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
(process-send-string proc "foo\r\n")
|
|
|
|
|
|
(process-send-eof proc)
|
2023-02-24 20:08:10 +01:00
|
|
|
|
;; Read output. On macOS, there is always newline
|
|
|
|
|
|
;; conversion. "telnet" converts \r to <CR><NUL> if
|
|
|
|
|
|
;; `crlf' flag is FALSE. See telnet(1) man page.
|
|
|
|
|
|
(let ((expected
|
|
|
|
|
|
(rx "66\n" "6F\n" "6F\n"
|
|
|
|
|
|
(| "0D\n" "0A\n") (? "00\n") "0A\n")))
|
|
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (not (string-match-p expected (buffer-string)))
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
|
|
|
|
|
(should (string-match-p expected (buffer-string)))))
|
2021-08-24 21:42:42 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))))))))
|
2020-08-23 13:30:43 +02:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-direct-async-process tramp-test30-make-process)
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test31-interrupt-process ()
|
2017-08-20 21:18:05 +02:00
|
|
|
|
"Check `interrupt-process'."
|
2022-05-05 09:54:31 +02:00
|
|
|
|
;; The final `process-live-p' check does not run sufficiently.
|
|
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes :unstable)
|
2017-08-20 21:18:05 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2022-05-29 13:31:32 +02:00
|
|
|
|
(skip-unless (not (tramp--test-windows-nt-p)))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2017-08-20 21:18:05 +02:00
|
|
|
|
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; We must use `file-truename' for the temporary directory, in
|
|
|
|
|
|
;; order to establish the connection prior running an asynchronous
|
|
|
|
|
|
;; process.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory (file-truename ert-remote-temporary-file-directory))
|
2020-01-27 10:11:32 +01:00
|
|
|
|
(delete-exited-processes t)
|
2022-03-29 19:36:28 +02:00
|
|
|
|
kill-buffer-query-functions command proc)
|
2017-08-20 21:18:05 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(setq command "trap 'echo boom; exit 1' 2; sleep 100"
|
|
|
|
|
|
proc (start-file-process-shell-command
|
|
|
|
|
|
"test" (current-buffer) command))
|
2017-08-20 21:18:05 +02:00
|
|
|
|
(should (processp proc))
|
2017-08-24 15:53:56 +02:00
|
|
|
|
(should (process-live-p proc))
|
2017-08-20 21:18:05 +02:00
|
|
|
|
(should (equal (process-status proc) 'run))
|
2017-09-17 19:16:59 +02:00
|
|
|
|
(should (numberp (process-get proc 'remote-pid)))
|
2022-03-29 19:36:28 +02:00
|
|
|
|
(should (equal (process-get proc 'remote-command)
|
|
|
|
|
|
(with-connection-local-variables
|
|
|
|
|
|
`(,shell-file-name ,shell-command-switch ,command))))
|
2017-08-24 15:53:56 +02:00
|
|
|
|
(should (interrupt-process proc))
|
|
|
|
|
|
;; Let the process accept the interrupt.
|
2019-06-15 11:33:16 +02:00
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(while (process-live-p proc)
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t))))
|
2017-08-24 15:53:56 +02:00
|
|
|
|
(should-not (process-live-p proc))
|
|
|
|
|
|
;; An interrupted process cannot be interrupted, again.
|
2019-11-06 16:49:35 +01:00
|
|
|
|
(should-error
|
|
|
|
|
|
(interrupt-process proc)
|
|
|
|
|
|
:type 'error))
|
2017-08-20 21:18:05 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))))
|
|
|
|
|
|
|
2022-03-30 13:16:54 +02:00
|
|
|
|
(ert-deftest tramp-test31-signal-process ()
|
|
|
|
|
|
"Check `signal-process'."
|
2022-05-05 09:54:31 +02:00
|
|
|
|
;; The final `process-live-p' check does not run sufficiently.
|
|
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes :unstable)
|
2022-03-30 13:16:54 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2022-06-03 19:55:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-windows-nt-p)))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
|
|
|
|
|
;; Since Emacs 29.1.
|
|
|
|
|
|
(skip-unless (boundp 'signal-process-functions))
|
|
|
|
|
|
|
|
|
|
|
|
;; We must use `file-truename' for the temporary directory, in
|
|
|
|
|
|
;; order to establish the connection prior running an asynchronous
|
|
|
|
|
|
;; process.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory (file-truename ert-remote-temporary-file-directory))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
(delete-exited-processes t)
|
|
|
|
|
|
kill-buffer-query-functions command proc)
|
|
|
|
|
|
|
2023-12-01 16:29:37 +01:00
|
|
|
|
;; If PROCESS is a string, it must be a process name or a process
|
|
|
|
|
|
;; number. Check error handling.
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(signal-process (md5 (current-time-string)) 0)
|
|
|
|
|
|
:type 'wrong-type-argument)
|
|
|
|
|
|
|
2023-11-30 15:02:37 +01:00
|
|
|
|
;; The PROCESS argument of `signal-process' can be a string. Test
|
|
|
|
|
|
;; this as well.
|
|
|
|
|
|
(dolist
|
|
|
|
|
|
(func '(identity
|
|
|
|
|
|
(lambda (x) (format "%s" (if (processp x) (process-name x) x)))))
|
|
|
|
|
|
(dolist (sigcode '(2 INT))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq command "trap 'echo boom; exit 1' 2; sleep 100"
|
|
|
|
|
|
proc (start-file-process-shell-command
|
|
|
|
|
|
(format "test1-%s" sigcode) (current-buffer) command))
|
|
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (process-live-p proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
|
|
|
|
|
(should (numberp (process-get proc 'remote-pid)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal (process-get proc 'remote-command)
|
|
|
|
|
|
(with-connection-local-variables
|
|
|
|
|
|
`(,shell-file-name ,shell-command-switch ,command))))
|
|
|
|
|
|
(should (zerop (signal-process (funcall func proc) sigcode)))
|
|
|
|
|
|
;; Let the process accept the signal.
|
|
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t)))
|
|
|
|
|
|
(should-not (process-live-p proc)))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
|
2023-11-30 15:02:37 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-process proc))
|
|
|
|
|
|
(ignore-errors (delete-process proc)))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
|
2023-11-30 15:02:37 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq command "trap 'echo boom; exit 1' 2; sleep 100"
|
|
|
|
|
|
proc (start-file-process-shell-command
|
|
|
|
|
|
(format "test2-%s" sigcode) (current-buffer) command))
|
|
|
|
|
|
(should (processp proc))
|
|
|
|
|
|
(should (process-live-p proc))
|
|
|
|
|
|
(should (equal (process-status proc) 'run))
|
|
|
|
|
|
(should (numberp (process-get proc 'remote-pid)))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should
|
2023-11-30 15:02:37 +01:00
|
|
|
|
(equal (process-get proc 'remote-command)
|
|
|
|
|
|
(with-connection-local-variables
|
|
|
|
|
|
`(,shell-file-name ,shell-command-switch ,command))))
|
|
|
|
|
|
;; `signal-process' has argument REMOTE since Emacs 29.
|
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(should
|
|
|
|
|
|
(zerop
|
|
|
|
|
|
(signal-process
|
|
|
|
|
|
(funcall func (process-get proc 'remote-pid))
|
|
|
|
|
|
sigcode default-directory))))
|
|
|
|
|
|
;; Let the process accept the signal.
|
|
|
|
|
|
(with-timeout (10 (tramp--test-timeout-handler))
|
|
|
|
|
|
(while (accept-process-output proc 0 nil t)))
|
|
|
|
|
|
(should-not (process-live-p proc)))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
|
2023-11-30 15:02:37 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-process proc))
|
|
|
|
|
|
(ignore-errors (delete-process proc)))))))
|
2022-03-30 13:16:54 +02:00
|
|
|
|
|
2022-04-12 09:41:11 +02:00
|
|
|
|
(ert-deftest tramp-test31-list-system-processes ()
|
|
|
|
|
|
"Check `list-system-processes'."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
|
|
|
|
|
;; `list-system-processes' is supported since Emacs 29.1.
|
|
|
|
|
|
(skip-unless (tramp--test-emacs29-p))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory))
|
2022-04-12 09:41:11 +02:00
|
|
|
|
(skip-unless (consp (list-system-processes)))
|
|
|
|
|
|
(should (not (equal (list-system-processes)
|
|
|
|
|
|
(let ((default-directory temporary-file-directory))
|
|
|
|
|
|
(list-system-processes)))))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test31-process-attributes ()
|
|
|
|
|
|
"Check `process-attributes'."
|
|
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
|
|
|
|
|
;; `process-attributes' is supported since Emacs 29.1.
|
|
|
|
|
|
(skip-unless (tramp--test-emacs29-p))
|
|
|
|
|
|
|
|
|
|
|
|
;; We must use `file-truename' for the temporary directory, in
|
|
|
|
|
|
;; order to establish the connection prior running an asynchronous
|
|
|
|
|
|
;; process.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory (file-truename ert-remote-temporary-file-directory))
|
2022-04-12 09:41:11 +02:00
|
|
|
|
(delete-exited-processes t)
|
|
|
|
|
|
kill-buffer-query-functions command proc)
|
|
|
|
|
|
(skip-unless (consp (list-system-processes)))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(setq command '("sleep" "100")
|
|
|
|
|
|
proc (apply #'start-file-process "test" nil command))
|
|
|
|
|
|
(while (accept-process-output proc 0))
|
|
|
|
|
|
(when-let ((pid (process-get proc 'remote-pid))
|
|
|
|
|
|
(attributes (process-attributes pid)))
|
|
|
|
|
|
;; (tramp--test-message "%s" attributes)
|
|
|
|
|
|
(should (equal (cdr (assq 'comm attributes)) (car command)))
|
|
|
|
|
|
(should (equal (cdr (assq 'args attributes))
|
2023-02-14 18:51:44 +01:00
|
|
|
|
(string-join command " ")))))
|
2022-04-12 09:41:11 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-process proc)))))
|
|
|
|
|
|
|
2022-11-27 16:57:03 +01:00
|
|
|
|
(ert-deftest tramp-test31-memory-info ()
|
|
|
|
|
|
"Check `memory-info'."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
|
|
|
|
|
;; `memory-info' is supported since Emacs 29.1.
|
|
|
|
|
|
(skip-unless (tramp--test-emacs29-p))
|
|
|
|
|
|
|
|
|
|
|
|
(when-let ((default-directory ert-remote-temporary-file-directory)
|
|
|
|
|
|
(mi (memory-info)))
|
|
|
|
|
|
(should (consp mi))
|
Upgrade to length* functions in Tramp
* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
Move up.
(tramp-compat-length<, tramp-compat-length>)
(tramp-compat-length=): New defaliases.
(tramp-compat-file-name-unquote, tramp-compat-take)
(tramp-compat-ntake): Use them.
* lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst.
(tramp-find-host, tramp-buffer-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name, tramp-debug-buffer-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-handle-directory-file-name)
(tramp-handle-expand-file-name)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-direct-async-process-p, tramp-call-process)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-get-device)
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handle-get-home-directory)
(tramp-gvfs-handler-askpassword)
(tramp-gvfs-maybe-open-connection, tramp-get-media-devices):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-directory-p)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-make-process)
(tramp-sh-gio-monitor-process-filter, tramp-set-remote-path)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection, tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-expand-file-name, tramp-smb-handle-file-acl)
(tramp-smb-handle-insert-directory)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-get-home-directory)
(tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name)
(tramp-sudoedit-handle-file-name-all-completions): Use the new
functions.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test43-file-system-info):
* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
(tramp-test31-memory-info, tramp-test35-remote-path)
(tramp-test43-file-system-info): Use new compat functions.
2023-01-15 17:50:17 +01:00
|
|
|
|
(should (tramp-compat-length= mi 4))
|
2022-11-27 16:57:03 +01:00
|
|
|
|
(dotimes (i (length mi))
|
|
|
|
|
|
(should (natnump (nth i mi))))))
|
|
|
|
|
|
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(defun tramp--test-async-shell-command
|
|
|
|
|
|
(command output-buffer &optional error-buffer input)
|
|
|
|
|
|
"Like `async-shell-command', reading the output.
|
|
|
|
|
|
INPUT, if non-nil, is a string sent to the process."
|
2020-12-29 15:36:38 +01:00
|
|
|
|
(let ((proc (async-shell-command command output-buffer error-buffer))
|
2020-01-27 10:11:32 +01:00
|
|
|
|
(delete-exited-processes t))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (equal (process-get proc 'remote-command)
|
|
|
|
|
|
(with-connection-local-variables
|
|
|
|
|
|
`(,shell-file-name ,shell-command-switch ,command))))
|
2020-12-20 19:45:11 +01:00
|
|
|
|
(cl-letf (((symbol-function #'shell-command-sentinel) #'ignore))
|
|
|
|
|
|
(when (stringp input)
|
|
|
|
|
|
(process-send-string proc input))
|
|
|
|
|
|
(with-timeout
|
|
|
|
|
|
((if (getenv "EMACS_EMBA_CI") 30 10) (tramp--test-timeout-handler))
|
|
|
|
|
|
(while
|
|
|
|
|
|
(or (accept-process-output proc nil nil t) (process-live-p proc))))
|
|
|
|
|
|
(accept-process-output proc nil nil t))))
|
2020-01-14 11:46:42 +01:00
|
|
|
|
|
2019-04-17 11:42:06 +02:00
|
|
|
|
(defun tramp--test-shell-command-to-string-asynchronously (command)
|
|
|
|
|
|
"Like `shell-command-to-string', but for asynchronous processes."
|
|
|
|
|
|
(with-temp-buffer
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(tramp--test-async-shell-command command (current-buffer))
|
2019-04-17 11:42:06 +02:00
|
|
|
|
(buffer-substring-no-properties (point-min) (point-max))))
|
|
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test32-shell-command ()
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
"Check `shell-command'."
|
2022-07-27 21:20:49 +02:00
|
|
|
|
:tags '(:expensive-test)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory)
|
2017-06-29 18:22:38 +02:00
|
|
|
|
;; Suppress nasty messages.
|
|
|
|
|
|
(inhibit-message t)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
kill-buffer-query-functions)
|
2019-04-17 11:42:06 +02:00
|
|
|
|
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(dolist (this-shell-command
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(append
|
|
|
|
|
|
;; Synchronously.
|
|
|
|
|
|
'(shell-command)
|
|
|
|
|
|
;; Asynchronously.
|
|
|
|
|
|
(and (tramp--test-asynchronous-processes-p)
|
|
|
|
|
|
'(tramp--test-async-shell-command))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2020-01-14 11:46:42 +01:00
|
|
|
|
;; Test ordinary `{async-}shell-command'.
|
2019-12-29 13:53:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
this-shell-command
|
|
|
|
|
|
(format "ls %s" (file-name-nondirectory tmp-name))
|
|
|
|
|
|
(current-buffer))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; "ls" could produce colorized output.
|
2020-01-27 10:11:32 +01:00
|
|
|
|
(goto-char (point-min))
|
Reorganize Tramp's messages
* doc/misc/tramp.texi (Traces and Profiles): Use proper buffer
names. Add tramp-debug-command-messages.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler):
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler):
Set `tramp-debug-message-fnh-function'.
* lisp/net/tramp.el (tramp-file-name-handler):
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
* lisp/net/tramp-crypt.el (tramp-crypt-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection):
Wrap code `with-tramp-debug-message'.
* lisp/net/tramp-message.el: New file.
* lisp/net/tramp.el (tramp-message): Require.
(tramp-verbose, tramp-debug-to-file, tramp-debug-buffer-name)
(tramp-debug-outline-regexp, tramp-debug-font-lock-keywords)
(tramp-debug-outline-level)
(tramp-debug-buffer-command-completion-p)
(tramp-setup-debug-buffer, tramp-get-debug-buffer)
(tramp-get-debug-file-name, tramp-trace-buffer-name)
(tramp-trace-functions, tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-show-message-timeout)
(tramp-error-with-buffer, tramp-user-error)
(tramp-with-demoted-errors): Move to tramp-message.el.
(tramp-current-connection, tramp-file-name-user-domain)
(tramp-file-name-host-port): Add ;;;###tramp-autoload cookie.
(tramp-inhibit-progress-reporter): Move down.
(tramp-post-process-creation): Write debug message only when there
is a command.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Add ;;;###tramp-autoload cookie.
* test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case):
Don't bind `trace-buffer'.
2023-07-29 13:11:01 +02:00
|
|
|
|
(while (search-forward-regexp ansi-color-control-seq-regexp nil t)
|
2020-01-27 10:11:32 +01:00
|
|
|
|
(replace-match "" nil nil))
|
2020-01-14 11:46:42 +01:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(format "%s\n" (file-name-nondirectory tmp-name))
|
|
|
|
|
|
(buffer-string))))
|
2019-12-29 13:53:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2020-01-27 10:11:32 +01:00
|
|
|
|
(ignore-errors (delete-file tmp-name)))
|
2013-11-16 12:46:37 +01:00
|
|
|
|
|
2020-01-27 10:11:32 +01:00
|
|
|
|
;; Test `{async-}shell-command' with error buffer.
|
2020-12-20 19:45:11 +01:00
|
|
|
|
(unless (tramp-direct-async-process-p)
|
|
|
|
|
|
(let ((stderr (generate-new-buffer "*stderr*")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
this-shell-command
|
|
|
|
|
|
"echo foo >&2; echo bar" (current-buffer) stderr)
|
|
|
|
|
|
(should (string-equal "bar\n" (buffer-string)))
|
|
|
|
|
|
;; Check stderr.
|
2021-12-06 19:36:15 +01:00
|
|
|
|
(should
|
2022-07-27 21:20:49 +02:00
|
|
|
|
(string-equal "foo\n" (tramp-get-buffer-string stderr))))
|
2020-01-06 12:24:16 +01:00
|
|
|
|
|
2020-12-20 19:45:11 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (kill-buffer stderr))))))
|
2020-01-06 12:24:16 +01:00
|
|
|
|
|
2019-04-17 11:42:06 +02:00
|
|
|
|
;; Test sending string to `async-shell-command'.
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-asynchronous-processes-p)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
|
|
|
|
|
(tramp--test-async-shell-command
|
|
|
|
|
|
"read line; ls $line" (current-buffer) nil
|
|
|
|
|
|
;; String to be sent.
|
|
|
|
|
|
(format "%s\n" (file-name-nondirectory tmp-name)))
|
|
|
|
|
|
(should
|
2022-12-30 09:26:56 +01:00
|
|
|
|
(string-match-p
|
2023-01-13 19:41:08 +01:00
|
|
|
|
;; Some shells echo, for example the "adb" or container methods.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-12-30 09:26:56 +01:00
|
|
|
|
bos (** 1 2 (literal (file-name-nondirectory tmp-name)) "\n")
|
|
|
|
|
|
eos)
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(buffer-string))))
|
2015-06-28 20:51:54 +02:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name))))))
|
2020-02-01 14:29:45 +01:00
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
;; Test `async-shell-command-width'.
|
|
|
|
|
|
(when (and (tramp--test-asynchronous-processes-p) (tramp--test-sh-p))
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(let* ((async-shell-command-width 1024)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory)
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(cols (ignore-errors
|
|
|
|
|
|
(read (tramp--test-shell-command-to-string-asynchronously
|
|
|
|
|
|
"tput cols")))))
|
|
|
|
|
|
(when (natnump cols)
|
2022-07-27 21:20:49 +02:00
|
|
|
|
(should (= cols async-shell-command-width))))))
|
2020-02-01 14:29:45 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-direct-async-process tramp-test32-shell-command 'unstable)
|
2020-12-20 19:45:11 +01:00
|
|
|
|
|
2020-02-02 11:26:09 +01:00
|
|
|
|
;; This test is inspired by Bug#39067.
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(ert-deftest tramp-test32-shell-command-dont-erase-buffer ()
|
2020-02-02 11:26:09 +01:00
|
|
|
|
"Check `shell-command-dont-erase-buffer'."
|
2020-10-08 11:28:50 +02:00
|
|
|
|
;; As long as Bug#40896 is not solved both in simple.el and Tramp,
|
|
|
|
|
|
;; this test cannot run properly.
|
|
|
|
|
|
:tags '(:expensive-test :unstable)
|
2020-02-01 14:29:45 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2020-12-14 19:30:01 +01:00
|
|
|
|
(skip-unless nil)
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
2020-02-01 14:29:45 +01:00
|
|
|
|
|
2020-10-08 11:28:50 +02:00
|
|
|
|
;; (message " s-c-d-e-b current-buffer buffer-string point")
|
|
|
|
|
|
;; (message "===============================================")
|
|
|
|
|
|
|
|
|
|
|
|
;; s-c-d-e-b current-buffer buffer-string point
|
|
|
|
|
|
;; ===============================================
|
|
|
|
|
|
;; nil t foobazzbar 4 x
|
|
|
|
|
|
;; nil nil bazz 5
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
;; erase t bazz 1 x
|
|
|
|
|
|
;; erase nil bazz 5
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
;; beg-last-out t foobazzbar 4 x
|
|
|
|
|
|
;; beg-last-out nil foobarbazz 7
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
;; end-last-out t foobazzbar 4
|
|
|
|
|
|
;; end-last-out nil foobazzbar 11
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
;; save-point t foobazzbar 4 x
|
|
|
|
|
|
;; save-point nil foobarbazz 4 x
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
;; random t foobazzbar 4
|
|
|
|
|
|
;; random nil foobazzbar 11
|
|
|
|
|
|
;; -----------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
(let (;; Suppress nasty messages.
|
|
|
|
|
|
(inhibit-message t)
|
|
|
|
|
|
buffer kill-buffer-query-functions)
|
|
|
|
|
|
;; We check both the local and remote case, in order to guarantee
|
|
|
|
|
|
;; that they behave similar.
|
|
|
|
|
|
(dolist (default-directory
|
2022-06-08 12:06:56 +02:00
|
|
|
|
`(,temporary-file-directory ,ert-remote-temporary-file-directory))
|
2020-10-08 11:28:50 +02:00
|
|
|
|
;; These are the possible values of `shell-command-dont-erase-buffer'.
|
|
|
|
|
|
;; `random' is taken as non-nil value without special meaning.
|
|
|
|
|
|
(dolist (shell-command-dont-erase-buffer
|
|
|
|
|
|
'(nil erase beg-last-out end-last-out save-point random))
|
|
|
|
|
|
;; `shell-command' might work over the current buffer, or not.
|
|
|
|
|
|
(dolist (current '(t nil))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
;; We insert the string "foobar" into an empty buffer.
|
|
|
|
|
|
;; Point is set between "foo" and "bar".
|
|
|
|
|
|
(setq buffer (current-buffer))
|
|
|
|
|
|
(insert "foobar")
|
|
|
|
|
|
(goto-char (- (point) 3))
|
|
|
|
|
|
(should (string-equal "foobar" (buffer-string)))
|
|
|
|
|
|
(should (string-equal "foo" (buffer-substring (point-min) (point))))
|
|
|
|
|
|
(should (string-equal "bar" (buffer-substring (point) (point-max))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Apply `shell-command'. It shall output the string
|
|
|
|
|
|
;; "bazz". Messages in the *Messages* buffer are
|
|
|
|
|
|
;; suppressed.
|
|
|
|
|
|
(let (message-log-max)
|
|
|
|
|
|
(if current
|
|
|
|
|
|
(shell-command "echo -n bazz" (current-buffer))
|
|
|
|
|
|
(with-temp-buffer (shell-command "echo -n bazz" buffer))))
|
|
|
|
|
|
|
|
|
|
|
|
;; (message
|
|
|
|
|
|
;; "%12s %14s %13s %5d"
|
|
|
|
|
|
;; shell-command-dont-erase-buffer current (buffer-string) (point))))
|
|
|
|
|
|
;; (message "-----------------------------------------------")))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check result.
|
|
|
|
|
|
(cond
|
|
|
|
|
|
(current
|
|
|
|
|
|
;; String is inserted at point, and point is preserved
|
|
|
|
|
|
;; unless dictated otherwise.
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null shell-command-dont-erase-buffer)
|
|
|
|
|
|
(should (string-equal "foobazzbar" (buffer-string)))
|
|
|
|
|
|
(should (= 4 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'erase)
|
|
|
|
|
|
(should (string-equal "bazz" (buffer-string)))
|
|
|
|
|
|
(should (= 1 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'beg-last-out)
|
|
|
|
|
|
(should (string-equal "foobazzbar" (buffer-string)))
|
|
|
|
|
|
(should (= 4 (point))))
|
|
|
|
|
|
;; Bug#40896
|
|
|
|
|
|
;; ((eq shell-command-dont-erase-buffer 'end-last-out)
|
|
|
|
|
|
;; (should (string-equal "foobazzbar" (buffer-string)))
|
|
|
|
|
|
;; (should (= 7 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'save-point)
|
|
|
|
|
|
(should (string-equal "foobazzbar" (buffer-string)))
|
|
|
|
|
|
(should (= 4 (point))))
|
|
|
|
|
|
;; Bug#40896
|
|
|
|
|
|
;; ((eq shell-command-dont-erase-buffer 'random)
|
|
|
|
|
|
;; (should (string-equal "foobazzbar" (buffer-string)))
|
|
|
|
|
|
;; (should (= 7 (point))))))
|
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
(t ;; not current buffer
|
|
|
|
|
|
;; String is appended, and point is at point-max unless
|
|
|
|
|
|
;; dictated otherwise.
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null shell-command-dont-erase-buffer)
|
|
|
|
|
|
(should (string-equal "bazz" (buffer-string)))
|
|
|
|
|
|
(should (= 5 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'erase)
|
|
|
|
|
|
(should (string-equal "bazz" (buffer-string)))
|
|
|
|
|
|
(should (= 5 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'beg-last-out)
|
|
|
|
|
|
(should (string-equal "foobarbazz" (buffer-string)))
|
|
|
|
|
|
(should (= 7 (point))))
|
|
|
|
|
|
;; ;; Bug#40896
|
|
|
|
|
|
;; ((eq shell-command-dont-erase-buffer 'end-last-out)
|
|
|
|
|
|
;; (should (string-equal "foobarbazz" (buffer-string)))
|
|
|
|
|
|
;; (should (= 11 (point))))
|
|
|
|
|
|
((eq shell-command-dont-erase-buffer 'save-point)
|
|
|
|
|
|
(should (string-equal "foobarbazz" (buffer-string)))
|
|
|
|
|
|
(should (= 4 (point))))
|
|
|
|
|
|
;; ;; Bug#40896
|
|
|
|
|
|
;; ((eq shell-command-dont-erase-buffer 'random)
|
|
|
|
|
|
;; (should (string-equal "foobarbazz" (buffer-string)))
|
|
|
|
|
|
;; (should (= 11 (point)))))))))))))
|
|
|
|
|
|
)))))))))
|
2016-07-14 10:10:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; This test is inspired by Bug#23952.
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test33-environment-variables ()
|
2016-07-14 10:10:53 +02:00
|
|
|
|
"Check that remote processes set / unset environment variables properly."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2016-07-14 10:10:53 +02:00
|
|
|
|
|
|
|
|
|
|
(dolist (this-shell-command-to-string
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(append
|
|
|
|
|
|
;; Synchronously.
|
|
|
|
|
|
'(shell-command-to-string)
|
|
|
|
|
|
;; Asynchronously.
|
|
|
|
|
|
(and (tramp--test-asynchronous-processes-p)
|
|
|
|
|
|
'(tramp--test-shell-command-to-string-asynchronously))))
|
2016-07-14 10:10:53 +02:00
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
2016-07-14 10:10:53 +02:00
|
|
|
|
(shell-file-name "/bin/sh")
|
|
|
|
|
|
(envvar (concat "VAR_" (upcase (md5 (current-time-string)))))
|
|
|
|
|
|
kill-buffer-query-functions)
|
|
|
|
|
|
|
2020-05-04 13:09:32 +02:00
|
|
|
|
;; Check INSIDE_EMACS.
|
2020-05-13 14:11:18 +02:00
|
|
|
|
(setenv "INSIDE_EMACS")
|
2020-05-04 13:09:32 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2020-08-02 13:26:00 +02:00
|
|
|
|
(format "%s,tramp:%s\n" emacs-version tramp-version)
|
2020-12-20 19:45:11 +01:00
|
|
|
|
(funcall this-shell-command-to-string "echo \"${INSIDE_EMACS:-bla}\"")))
|
2020-05-04 13:09:32 +02:00
|
|
|
|
(let ((process-environment
|
|
|
|
|
|
(cons (format "INSIDE_EMACS=%s,foo" emacs-version)
|
|
|
|
|
|
process-environment)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2020-08-02 13:26:00 +02:00
|
|
|
|
(format "%s,foo,tramp:%s\n" emacs-version tramp-version)
|
2020-05-04 13:09:32 +02:00
|
|
|
|
(funcall
|
2020-12-20 19:45:11 +01:00
|
|
|
|
this-shell-command-to-string "echo \"${INSIDE_EMACS:-bla}\""))))
|
2020-05-04 13:09:32 +02:00
|
|
|
|
|
|
|
|
|
|
;; Set a value.
|
|
|
|
|
|
(let ((process-environment
|
|
|
|
|
|
(cons (concat envvar "=foo") process-environment)))
|
|
|
|
|
|
;; Default value.
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2020-05-04 13:09:32 +02:00
|
|
|
|
"foo"
|
|
|
|
|
|
(funcall
|
2020-12-20 19:45:11 +01:00
|
|
|
|
this-shell-command-to-string
|
|
|
|
|
|
(format "echo \"${%s:-bla}\"" envvar)))))
|
2020-05-04 13:09:32 +02:00
|
|
|
|
|
|
|
|
|
|
;; Set the empty value.
|
|
|
|
|
|
(let ((process-environment
|
|
|
|
|
|
(cons (concat envvar "=") process-environment)))
|
|
|
|
|
|
;; Value is null.
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2020-05-04 13:09:32 +02:00
|
|
|
|
"bla"
|
|
|
|
|
|
(funcall
|
2020-12-20 19:45:11 +01:00
|
|
|
|
this-shell-command-to-string (format "echo \"${%s:-bla}\"" envvar))))
|
2020-05-04 13:09:32 +02:00
|
|
|
|
;; Variable is set.
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx (literal envvar)) (funcall this-shell-command-to-string "set"))))
|
2016-07-14 10:10:53 +02:00
|
|
|
|
|
2020-12-20 19:45:11 +01:00
|
|
|
|
(unless (tramp-direct-async-process-p)
|
|
|
|
|
|
;; We force a reconnect, in order to have a clean environment.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
;; Unset the variable.
|
|
|
|
|
|
(let ((tramp-remote-process-environment
|
|
|
|
|
|
(cons (concat envvar "=foo") tramp-remote-process-environment)))
|
2023-07-10 18:11:24 +02:00
|
|
|
|
;; Refill the cache; we don't want to run into timeouts.
|
|
|
|
|
|
(file-truename default-directory)
|
|
|
|
|
|
;; Check the initial value, we want to unset below.
|
2020-05-04 13:09:32 +02:00
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2020-12-20 19:45:11 +01:00
|
|
|
|
"foo"
|
2020-05-04 13:09:32 +02:00
|
|
|
|
(funcall
|
2020-12-20 19:45:11 +01:00
|
|
|
|
this-shell-command-to-string
|
|
|
|
|
|
(format "echo \"${%s:-bla}\"" envvar))))
|
|
|
|
|
|
(let ((process-environment (cons envvar process-environment)))
|
|
|
|
|
|
;; Variable is unset.
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2020-12-20 19:45:11 +01:00
|
|
|
|
"bla"
|
|
|
|
|
|
(funcall
|
|
|
|
|
|
this-shell-command-to-string
|
|
|
|
|
|
(format "echo \"${%s:-bla}\"" envvar))))
|
|
|
|
|
|
;; Variable is unset.
|
|
|
|
|
|
(should-not
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx (literal envvar))
|
2020-12-20 19:45:11 +01:00
|
|
|
|
;; We must remove PS1, the output is truncated otherwise.
|
2021-02-19 09:21:55 +01:00
|
|
|
|
;; We must suppress "_=VAR...".
|
2020-12-20 19:45:11 +01:00
|
|
|
|
(funcall
|
2021-02-19 09:21:55 +01:00
|
|
|
|
this-shell-command-to-string
|
|
|
|
|
|
"printenv | grep -v PS1 | grep -v _=")))))))))
|
2020-12-20 19:45:11 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-direct-async-process tramp-test33-environment-variables)
|
2016-07-14 10:10:53 +02:00
|
|
|
|
|
2017-05-23 09:25:03 +02:00
|
|
|
|
;; This test is inspired by Bug#27009.
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test33-environment-variables-and-port-numbers ()
|
2017-05-23 09:25:03 +02:00
|
|
|
|
"Check that two connections with separate ports are different."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
;; We test it only for the mock-up connection; otherwise there might
|
|
|
|
|
|
;; be problems with the used ports.
|
2019-12-22 13:48:36 +01:00
|
|
|
|
(skip-unless (and (eq tramp-syntax 'default) (tramp--test-mock-p)))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2017-05-23 09:25:03 +02:00
|
|
|
|
|
|
|
|
|
|
;; We force a reconnect, in order to have a clean environment.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(dolist (dir `(,ert-remote-temporary-file-directory
|
2017-05-24 16:17:59 +02:00
|
|
|
|
"/mock:localhost#11111:" "/mock:localhost#22222:"))
|
2017-05-23 09:25:03 +02:00
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
(tramp-dissect-file-name dir) 'keep-debug 'keep-password))
|
|
|
|
|
|
|
2017-05-24 16:17:59 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(dolist (port '(11111 22222))
|
|
|
|
|
|
(let* ((default-directory
|
|
|
|
|
|
(format "/mock:localhost#%d:%s" port temporary-file-directory))
|
|
|
|
|
|
(shell-file-name "/bin/sh")
|
|
|
|
|
|
(envvar (concat "VAR_" (upcase (md5 (current-time-string)))))
|
|
|
|
|
|
;; We cannot use `process-environment', because this
|
|
|
|
|
|
;; would be applied in `process-file'.
|
|
|
|
|
|
(tramp-remote-process-environment
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(format "%s=%d" envvar port)
|
|
|
|
|
|
tramp-remote-process-environment)))
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2017-05-24 16:17:59 +02:00
|
|
|
|
(number-to-string port)
|
2020-08-02 13:26:00 +02:00
|
|
|
|
(shell-command-to-string (format "echo $%s" envvar))))))
|
2017-05-24 16:17:59 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(dolist (dir '("/mock:localhost#11111:" "/mock:localhost#22222:"))
|
|
|
|
|
|
(tramp-cleanup-connection (tramp-dissect-file-name dir)))))
|
2017-05-23 09:25:03 +02:00
|
|
|
|
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(ert-deftest tramp-test34-connection-local-variables ()
|
|
|
|
|
|
"Check that connection-local variables are enabled."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((default-directory ert-remote-temporary-file-directory)
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name))
|
|
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(enable-local-variables :all)
|
|
|
|
|
|
(enable-remote-dir-locals t)
|
2019-12-01 12:25:15 +01:00
|
|
|
|
(inhibit-message t)
|
2019-03-09 16:44:24 +01:00
|
|
|
|
kill-buffer-query-functions
|
2023-03-13 18:02:36 +01:00
|
|
|
|
(clpa connection-local-profile-alist)
|
2023-06-28 16:53:01 +02:00
|
|
|
|
(clca connection-local-criteria-alist))
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
|
|
|
|
|
|
;; `local-variable' is buffer-local due to explicit setting.
|
2022-05-09 20:10:10 +02:00
|
|
|
|
;; We need `with-no-warnings', because `defvar-local' is not
|
|
|
|
|
|
;; called at toplevel.
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(with-no-warnings
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(defvar-local local-variable 'buffer))
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(should (eq local-variable 'buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
;; `local-variable' is connection-local due to Tramp.
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(connection-local-set-profile-variables
|
|
|
|
|
|
'local-variable-profile
|
|
|
|
|
|
'((local-variable . connect)))
|
|
|
|
|
|
(connection-local-set-profiles
|
|
|
|
|
|
`(:application tramp
|
|
|
|
|
|
:protocol ,(file-remote-p default-directory 'method)
|
|
|
|
|
|
:user ,(file-remote-p default-directory 'user)
|
|
|
|
|
|
:machine ,(file-remote-p default-directory 'host))
|
|
|
|
|
|
'local-variable-profile)
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name2)
|
|
|
|
|
|
(should (eq local-variable 'connect))
|
|
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
|
|
|
2023-03-25 18:28:55 +01:00
|
|
|
|
;; `local-variable' is still connection-local due to Tramp.
|
|
|
|
|
|
;; `find-file-hook' overrides dir-local settings.
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(write-region
|
|
|
|
|
|
"((nil . ((local-variable . dir))))" nil
|
|
|
|
|
|
(expand-file-name ".dir-locals.el" tmp-name1))
|
|
|
|
|
|
(should (file-exists-p (expand-file-name ".dir-locals.el" tmp-name1)))
|
2023-03-25 18:28:55 +01:00
|
|
|
|
(when (memq #'tramp-set-connection-local-variables-for-buffer
|
|
|
|
|
|
find-file-hook)
|
|
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name2)
|
|
|
|
|
|
(should (eq local-variable 'connect))
|
|
|
|
|
|
(kill-buffer (current-buffer))))
|
|
|
|
|
|
;; `local-variable' is dir-local due to existence of .dir-locals.el.
|
|
|
|
|
|
(let ((find-file-hook
|
|
|
|
|
|
(remq #'tramp-set-connection-local-variables-for-buffer
|
|
|
|
|
|
find-file-hook)))
|
|
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name2)
|
|
|
|
|
|
(should (eq local-variable 'dir))
|
|
|
|
|
|
(kill-buffer (current-buffer))))
|
|
|
|
|
|
|
|
|
|
|
|
;; `local-variable' is still connection-local due to Tramp.
|
|
|
|
|
|
;; `find-file-hook' overrides dir-local settings.
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(write-region
|
|
|
|
|
|
"-*- mode: comint; local-variable: file; -*-" nil tmp-name2)
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
2023-03-25 18:28:55 +01:00
|
|
|
|
(when (memq #'tramp-set-connection-local-variables-for-buffer
|
|
|
|
|
|
find-file-hook)
|
|
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name2)
|
|
|
|
|
|
(should (eq local-variable 'connect))
|
|
|
|
|
|
(kill-buffer (current-buffer))))
|
|
|
|
|
|
;; `local-variable' is file-local due to specifying as file variable.
|
|
|
|
|
|
(let ((find-file-hook
|
|
|
|
|
|
(remq #'tramp-set-connection-local-variables-for-buffer
|
|
|
|
|
|
find-file-hook)))
|
|
|
|
|
|
(with-current-buffer (find-file-noselect tmp-name2)
|
|
|
|
|
|
(should (eq local-variable 'file))
|
|
|
|
|
|
(kill-buffer (current-buffer)))))
|
2019-03-09 16:44:24 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2023-03-13 18:02:36 +01:00
|
|
|
|
(custom-set-variables
|
|
|
|
|
|
`(connection-local-profile-alist ',clpa now)
|
|
|
|
|
|
`(connection-local-criteria-alist ',clca now))
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive)))))
|
|
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test34-explicit-shell-file-name ()
|
2017-04-03 14:04:06 +02:00
|
|
|
|
"Check that connection-local `explicit-shell-file-name' is set."
|
2021-12-24 11:32:34 +01:00
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes)
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
2017-04-03 14:04:06 +02:00
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
2019-03-09 16:44:24 +01:00
|
|
|
|
explicit-shell-file-name kill-buffer-query-functions
|
2023-03-13 18:02:36 +01:00
|
|
|
|
(clpa connection-local-profile-alist)
|
2023-06-28 16:53:01 +02:00
|
|
|
|
(clca connection-local-criteria-alist))
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(connection-local-set-profile-variables
|
|
|
|
|
|
'remote-sh
|
|
|
|
|
|
`((explicit-shell-file-name . ,(tramp--test-shell-file-name))
|
|
|
|
|
|
(explicit-sh-args . ("-c" "echo foo"))))
|
|
|
|
|
|
(connection-local-set-profiles
|
|
|
|
|
|
`(:application tramp
|
|
|
|
|
|
:protocol ,(file-remote-p default-directory 'method)
|
|
|
|
|
|
:user ,(file-remote-p default-directory 'user)
|
|
|
|
|
|
:machine ,(file-remote-p default-directory 'host))
|
|
|
|
|
|
'remote-sh)
|
2019-03-09 16:44:24 +01:00
|
|
|
|
(put 'explicit-shell-file-name 'safe-local-variable #'identity)
|
|
|
|
|
|
(put 'explicit-sh-args 'safe-local-variable #'identity)
|
2017-04-03 14:04:06 +02:00
|
|
|
|
|
2019-04-03 21:36:40 +02:00
|
|
|
|
;; Run `shell' interactively. Since the default directory
|
|
|
|
|
|
;; is remote, `explicit-shell-file-name' shall be set in
|
|
|
|
|
|
;; order to avoid a question. `explicit-sh-args' echoes the
|
|
|
|
|
|
;; test data.
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(with-current-buffer (get-buffer-create "*shell*")
|
2021-01-22 17:39:52 +01:00
|
|
|
|
(ignore-errors (kill-process (get-buffer-process (current-buffer))))
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(should-not explicit-shell-file-name)
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(call-interactively #'shell)
|
2019-04-03 21:36:40 +02:00
|
|
|
|
(with-timeout (10)
|
|
|
|
|
|
(while (accept-process-output
|
|
|
|
|
|
(get-buffer-process (current-buffer)) nil nil t)))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(should (string-match-p (rx bol "foo" eol) (buffer-string)))))
|
2017-04-03 14:04:06 +02:00
|
|
|
|
|
2019-03-09 16:44:24 +01:00
|
|
|
|
;; Cleanup.
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(put 'explicit-shell-file-name 'permanent-local nil)
|
2023-03-13 18:02:36 +01:00
|
|
|
|
(custom-set-variables
|
|
|
|
|
|
`(connection-local-profile-alist ',clpa now)
|
|
|
|
|
|
`(connection-local-criteria-alist ',clca now))
|
2017-04-03 14:04:06 +02:00
|
|
|
|
(kill-buffer "*shell*"))))
|
|
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test35-exec-path ()
|
2018-06-20 12:13:56 +02:00
|
|
|
|
"Check `exec-path' and `executable-find'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-set-file-modes-p))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
|
|
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (consp (exec-path)))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
;; Last element is the `exec-directory'.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(car (last (exec-path)))
|
2018-06-22 16:17:17 +02:00
|
|
|
|
(file-remote-p default-directory 'localname)))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
;; The shell "sh" shall always exist.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (executable-find "sh" 'remote))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
;; Since the last element in `exec-path' is the current
|
|
|
|
|
|
;; directory, an executable file in that directory will be
|
|
|
|
|
|
;; found.
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(should (file-exists-p tmp-name))
|
2021-10-20 18:14:00 +02:00
|
|
|
|
|
2018-06-20 12:13:56 +02:00
|
|
|
|
(set-file-modes tmp-name #o777)
|
|
|
|
|
|
(should (file-executable-p tmp-name))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(executable-find (file-name-nondirectory tmp-name) 'remote)
|
2018-06-22 16:17:17 +02:00
|
|
|
|
(file-remote-p tmp-name 'localname)))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
(should-not
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(executable-find
|
|
|
|
|
|
(concat (file-name-nondirectory tmp-name) "foo") 'remote)))
|
2018-06-20 12:13:56 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name)))))
|
|
|
|
|
|
|
2018-12-20 11:07:15 +01:00
|
|
|
|
;; This test is inspired by Bug#33781.
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test35-remote-path ()
|
2018-12-20 11:07:15 +01:00
|
|
|
|
"Check loooong `tramp-remote-path'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
|
|
|
|
|
|
(let* ((tmp-name (tramp--test-make-temp-name))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(orig-exec-path (exec-path))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(tramp-remote-path tramp-remote-path)
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(orig-tramp-remote-path tramp-remote-path)
|
|
|
|
|
|
path)
|
2023-12-12 17:39:51 +01:00
|
|
|
|
;; The "flatpak" method modifies `tramp-remote-path'.
|
|
|
|
|
|
(skip-unless (not (tramp-compat-connection-local-p tramp-remote-path)))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Non existing directories are removed.
|
|
|
|
|
|
(setq tramp-remote-path
|
|
|
|
|
|
(cons (file-remote-p tmp-name 'localname) tramp-remote-path))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (equal (exec-path) orig-exec-path))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(setq tramp-remote-path orig-tramp-remote-path)
|
|
|
|
|
|
|
|
|
|
|
|
;; Double entries are removed.
|
|
|
|
|
|
(setq tramp-remote-path (append '("/" "/") tramp-remote-path))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (equal (exec-path) (cons "/" orig-exec-path)))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(setq tramp-remote-path orig-tramp-remote-path)
|
|
|
|
|
|
|
|
|
|
|
|
;; We make a super long `tramp-remote-path'.
|
|
|
|
|
|
(make-directory tmp-name)
|
|
|
|
|
|
(should (file-directory-p tmp-name))
|
2023-02-14 18:51:44 +01:00
|
|
|
|
(while (tramp-compat-length< (string-join orig-exec-path ":") 5000)
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(let ((dir (make-temp-file (file-name-as-directory tmp-name) 'dir)))
|
|
|
|
|
|
(should (file-directory-p dir))
|
|
|
|
|
|
(setq tramp-remote-path
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(append
|
|
|
|
|
|
tramp-remote-path `(,(file-remote-p dir 'localname)))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
orig-exec-path
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(append
|
|
|
|
|
|
(butlast orig-exec-path)
|
|
|
|
|
|
`(,(file-remote-p dir 'localname))
|
|
|
|
|
|
(last orig-exec-path)))))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (equal (exec-path) orig-exec-path))
|
2020-04-06 14:26:49 +02:00
|
|
|
|
;; Ignore trailing newline.
|
|
|
|
|
|
(setq path (substring (shell-command-to-string "echo $PATH") nil -1))
|
|
|
|
|
|
;; The shell doesn't handle such long strings.
|
Upgrade to length* functions in Tramp
* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
Move up.
(tramp-compat-length<, tramp-compat-length>)
(tramp-compat-length=): New defaliases.
(tramp-compat-file-name-unquote, tramp-compat-take)
(tramp-compat-ntake): Use them.
* lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst.
(tramp-find-host, tramp-buffer-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name, tramp-debug-buffer-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-handle-directory-file-name)
(tramp-handle-expand-file-name)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-direct-async-process-p, tramp-call-process)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-get-device)
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handle-get-home-directory)
(tramp-gvfs-handler-askpassword)
(tramp-gvfs-maybe-open-connection, tramp-get-media-devices):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-directory-p)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-make-process)
(tramp-sh-gio-monitor-process-filter, tramp-set-remote-path)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection, tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-expand-file-name, tramp-smb-handle-file-acl)
(tramp-smb-handle-insert-directory)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-get-home-directory)
(tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name)
(tramp-sudoedit-handle-file-name-all-completions): Use the new
functions.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test43-file-system-info):
* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
(tramp-test31-memory-info, tramp-test35-remote-path)
(tramp-test43-file-system-info): Use new compat functions.
2023-01-15 17:50:17 +01:00
|
|
|
|
(unless (tramp-compat-length>
|
|
|
|
|
|
path
|
|
|
|
|
|
(tramp-get-connection-property
|
|
|
|
|
|
tramp-test-vec "pipe-buf" 4096))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
;; The last element of `exec-path' is `exec-directory'.
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(should
|
2023-02-14 18:51:44 +01:00
|
|
|
|
(string-equal path (string-join (butlast orig-exec-path) ":"))))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
;; The shell "sh" shall always exist.
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(should (executable-find "sh" 'remote)))
|
2018-12-20 11:07:15 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
2018-12-20 11:07:15 +01:00
|
|
|
|
(setq tramp-remote-path orig-tramp-remote-path)
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name 'recursive)))))
|
|
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test36-vc-registered ()
|
2014-02-11 09:31:39 +01:00
|
|
|
|
"Check `vc-registered'."
|
2016-01-04 23:28:07 +01:00
|
|
|
|
:tags '(:expensive-test)
|
2014-02-11 09:31:39 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2014-02-11 09:31:39 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; We must use `file-truename' for the temporary directory, in
|
|
|
|
|
|
;; order to establish the connection prior running an asynchronous
|
|
|
|
|
|
;; process.
|
|
|
|
|
|
(let* ((default-directory
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-truename ert-remote-temporary-file-directory))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (expand-file-name "foo" tmp-name1))
|
|
|
|
|
|
(tramp-remote-process-environment tramp-remote-process-environment)
|
2019-12-01 12:25:15 +01:00
|
|
|
|
(inhibit-message t)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(vc-handled-backends
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(cond
|
|
|
|
|
|
((tramp-find-executable
|
|
|
|
|
|
tramp-test-vec vc-git-program
|
|
|
|
|
|
(tramp-get-remote-path tramp-test-vec))
|
|
|
|
|
|
'(Git))
|
|
|
|
|
|
((tramp-find-executable
|
|
|
|
|
|
tramp-test-vec vc-hg-program
|
|
|
|
|
|
(tramp-get-remote-path tramp-test-vec))
|
|
|
|
|
|
'(Hg))
|
|
|
|
|
|
((tramp-find-executable
|
|
|
|
|
|
tramp-test-vec vc-bzr-program
|
|
|
|
|
|
(tramp-get-remote-path tramp-test-vec))
|
|
|
|
|
|
(setq tramp-remote-process-environment
|
|
|
|
|
|
(cons (format "BZR_HOME=%s"
|
|
|
|
|
|
(file-remote-p tmp-name1 'localname))
|
|
|
|
|
|
tramp-remote-process-environment))
|
|
|
|
|
|
;; We must force a reconnect, in order to activate $BZR_HOME.
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
'(Bzr))
|
|
|
|
|
|
(t nil)))
|
2017-06-29 18:22:38 +02:00
|
|
|
|
;; Suppress nasty messages.
|
|
|
|
|
|
(inhibit-message t))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(skip-unless vc-handled-backends)
|
2017-06-29 18:22:38 +02:00
|
|
|
|
(unless quoted (tramp--test-message "%s" vc-handled-backends))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(write-region "foo" nil tmp-name2)
|
|
|
|
|
|
(should (file-directory-p tmp-name1))
|
|
|
|
|
|
(should (file-exists-p tmp-name2))
|
|
|
|
|
|
(should-not (vc-registered tmp-name1))
|
|
|
|
|
|
(should-not (vc-registered tmp-name2))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((default-directory tmp-name1))
|
|
|
|
|
|
;; Create empty repository, and register the file.
|
|
|
|
|
|
;; Sometimes, creation of repository fails (bzr!); we
|
|
|
|
|
|
;; skip the test then.
|
|
|
|
|
|
(condition-case nil
|
|
|
|
|
|
(vc-create-repo (car vc-handled-backends))
|
2019-04-13 10:58:17 +02:00
|
|
|
|
(error (ert-skip "`vc-create-repo' not supported")))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; The structure of VC-FILESET is not documented. Let's
|
|
|
|
|
|
;; hope it won't change.
|
Sync with Tramp 2.5.0-pre
* doc/misc/tramp.texi: Protext Tramp x.y and Emacs x.y by @w{}.
(GVFS-based methods): Move "GNOME Online Accounts" index.
(Customizing Methods, Android shell setup, File name completion)
(Frequently Asked Questions): Fix typos.
* doc/misc/trampver.texi: Change version to "2.5.0-pre".
* lisp/net/trampver.el: Change version to "2.5.0-pre".
(inhibit-message): Don't declare.
* lisp/net/tramp.el: Bump version to 2.5.0-pre. Require Emacs 25.1.
(tramp-debug-message): Simplify.
(tramp-message): Don't use `tramp-message-show-message'.
(tramp-with-demoted-errors, with-parsed-tramp-file-name)
(with-tramp-file-property, with-tramp-connection-property):
Adapt `declare' form.
(with-tramp-progress-reporter): Suppress progress reporter when
noninteractive.
(tramp-completion-mode, tramp-completion-mode-p): Remove.
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(format-message): Remove compatibility code.
(tramp-compat-directory-name-p)
(tramp-compat-tramp-file-name-slots): Remove.
* lisp/net/tramp.el (tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-with-buffer)
(tramp-user-error, tramp-with-demoted-errors)
(tramp-signal-hook-function):
* lisp/net/tramp-compat.el (tramp-compat-funcall)
* lisp/net/tramp-gvfs.el (tramp-dbus-function):
Add `tramp-suppress-trace' property.
* lisp/net/tramp.el (tramp-get-method-parameter)
(tramp-dissect-file-name, tramp-error, tramp-error-with-buffer)
(tramp-user-error, with-parsed-tramp-file-name)
(with-tramp-progress-reporter, tramp-file-name-handler)
(tramp-completion-file-name-handler, tramp-autoload-file-name-handler)
(tramp-register-file-name-handlers, tramp-connectable-p)
(tramp-handle-file-modes, tramp-handle-file-regular-p)
(tramp-handle-file-truename, tramp-handle-insert-directory)
(tramp-handle-load, tramp-set-file-uid-gid):
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler)
(tramp-adb-handle-file-truename, tramp-adb-handle-copy-file)
(tramp-adb-handle-rename-file):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-cache.el (tramp-get-file-property, tramp-cache-print):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(tramp-compat-exec-path):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
(tramp-gvfs-dbus-byte-array-to-string)
(tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler)
(tramp-rclone-do-copy-or-rename-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file)
(tramp-sh-handle-insert-directory, tramp-sh-file-name-handler)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler)
(tramp-smb-handle-copy-file, tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-insert-directory)
(tramp-smb-handle-rename-file, tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler)
(tramp-sudoedit-do-copy-or-rename-file)
(tramp-sudoedit-handle-file-truename):
Use `if-let', `when-let', `directory-name-p', `inhibit-message',
`non-essential and `cl-struct-slot-info'. Don't use `seconds-to-time'.
* test/lisp/net/tramp-archive-tests.el (tramp-message-show-message):
Don't set.
* test/lisp/net/tramp-tests.el (inhibit-message): Don't declare.
(tramp-message-show-message): Don't set.
(tramp-test06-directory-file-name): Use `non-essential'.
(tramp-test10-write-region): Use `inhibit-message'.
(tramp-test36-vc-registered): No special handling for old Emacsen.
(tramp--test-emacs25-p): Remove.
(tramp-test45-unload): Special case of `tramp-completion-mode'.
2020-01-19 14:11:07 +01:00
|
|
|
|
(vc-register
|
|
|
|
|
|
(list (car vc-handled-backends)
|
|
|
|
|
|
(list (file-name-nondirectory tmp-name2))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; vc-git uses an own process sentinel, Tramp's sentinel
|
|
|
|
|
|
;; for flushing the cache isn't used.
|
|
|
|
|
|
(dired-uncache (concat (file-remote-p default-directory) "/"))
|
|
|
|
|
|
(should (vc-registered (file-name-nondirectory tmp-name2)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))))))
|
2014-02-11 09:31:39 +01:00
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test37-make-auto-save-file-name ()
|
2015-05-27 15:48:13 +02:00
|
|
|
|
"Check `make-auto-save-file-name'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
tramp-allow-unsafe-temporary-files)
|
2015-05-27 15:48:13 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Use default `auto-save-file-name-transforms' mechanism.
|
2019-12-22 13:48:36 +01:00
|
|
|
|
;; It isn't prepared for `separate' syntax.
|
|
|
|
|
|
(unless (eq tramp-syntax 'separate)
|
|
|
|
|
|
(let (tramp-auto-save-directory)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name1)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(make-auto-save-file-name)
|
|
|
|
|
|
;; This is taken from original `make-auto-save-file-name'.
|
|
|
|
|
|
;; We call `convert-standard-filename', because on
|
|
|
|
|
|
;; MS Windows the (local) colons must be replaced by
|
|
|
|
|
|
;; exclamation marks.
|
|
|
|
|
|
(convert-standard-filename
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"#%s#"
|
|
|
|
|
|
(subst-char-in-string
|
|
|
|
|
|
?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1)))
|
|
|
|
|
|
temporary-file-directory)))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; No mapping.
|
|
|
|
|
|
(let (tramp-auto-save-directory auto-save-file-name-transforms)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name1)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(make-auto-save-file-name)
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format "#%s#" (file-name-nondirectory tmp-name1))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Use default `tramp-auto-save-directory' mechanism.
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP doesn't care.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(let ((tramp-auto-save-directory tmp-name2))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name1)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(make-auto-save-file-name)
|
|
|
|
|
|
;; This is taken from Tramp.
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"#%s#"
|
|
|
|
|
|
(tramp-subst-strs-in-string
|
|
|
|
|
|
'(("_" . "|")
|
|
|
|
|
|
("/" . "_a")
|
|
|
|
|
|
(":" . "_b")
|
|
|
|
|
|
("|" . "__")
|
|
|
|
|
|
("[" . "_l")
|
|
|
|
|
|
("]" . "_r"))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(file-name-unquote tmp-name1)))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
tmp-name2)))
|
|
|
|
|
|
(should (file-directory-p tmp-name2)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Relative file names shall work, too. Ange-FTP doesn't care.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(let ((tramp-auto-save-directory "."))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name1
|
|
|
|
|
|
default-directory tmp-name2)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(make-auto-save-file-name)
|
|
|
|
|
|
;; This is taken from Tramp.
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"#%s#"
|
|
|
|
|
|
(tramp-subst-strs-in-string
|
|
|
|
|
|
'(("_" . "|")
|
|
|
|
|
|
("/" . "_a")
|
|
|
|
|
|
(":" . "_b")
|
|
|
|
|
|
("|" . "__")
|
|
|
|
|
|
("[" . "_l")
|
|
|
|
|
|
("]" . "_r"))
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(file-name-unquote tmp-name1)))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
tmp-name2)))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(should (file-directory-p tmp-name2)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Create temporary file. This shall check for sensible
|
|
|
|
|
|
;; files, owned by root.
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(let ((tramp-auto-save-directory temporary-file-directory))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (zerop (or (file-attribute-user-id
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(file-attributes tmp-name1))
|
|
|
|
|
|
tramp-unknown-id-integer))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(setq buffer-file-name tmp-name1)
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(let ((tramp-allow-unsafe-temporary-files t))
|
|
|
|
|
|
(should (stringp (make-auto-save-file-name))))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'ignore))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(make-auto-save-file-name)
|
|
|
|
|
|
:type 'file-error))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p)
|
2023-04-26 18:06:39 +02:00
|
|
|
|
#'tramp-compat-always))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(should (stringp (make-auto-save-file-name))))))))
|
2015-05-27 15:48:13 +02:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)))))
|
2015-05-27 15:48:13 +02:00
|
|
|
|
|
Provide tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `tramp-sh-handle-make-process' and
`tramp-handle-start-file-process'.
(tramp-sh-handle-make-process): New defun, derived from
`tramp-sh-handle-start-file-process'. (Bug#28691)
* lisp/net/tramp.el (tramp-handle-start-file-process): New defun.
* test/lisp/net/tramp-tests.el (tramp-test30-make-process):
New test.
(tramp-test31-interrupt-process, tramp-test32-shell-command)
(tramp-test33-environment-variables)
(tramp-test33-environment-variables-and-port-numbers)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test35-remote-path, tramp-test36-vc-registered)
(tramp-test37-make-auto-save-file-name)
(tramp-test38-find-backup-file-name)
(tramp-test39-make-nearby-temp-file)
(tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls, tramp-test42-file-system-info)
(tramp-test43-asynchronous-requests, tramp-test44-auto-load)
(tramp-test44-delay-load, tramp-test44-recursive-load)
(tramp-test44-remote-load-path, tramp-test45-unload): Rename.
2018-12-24 14:28:31 +01:00
|
|
|
|
(ert-deftest tramp-test38-find-backup-file-name ()
|
2017-10-26 16:24:28 +02:00
|
|
|
|
"Check `find-backup-file-name'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2017-10-26 16:24:28 +02:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(ange-ftp-make-backup-files t)
|
2021-07-14 18:36:14 +02:00
|
|
|
|
tramp-allow-unsafe-temporary-files
|
2017-10-26 16:24:28 +02:00
|
|
|
|
;; These settings are not used by Tramp, so we ignore them.
|
|
|
|
|
|
version-control delete-old-versions
|
|
|
|
|
|
(kept-old-versions (default-toplevel-value 'kept-old-versions))
|
|
|
|
|
|
(kept-new-versions (default-toplevel-value 'kept-new-versions)))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
;; Use default `backup-directory-alist' mechanism.
|
|
|
|
|
|
(let (backup-directory-alist tramp-backup-directory-alist)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(find-backup-file-name tmp-name1)
|
|
|
|
|
|
(list
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2017-10-26 16:24:28 +02:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format "%s~" (file-name-nondirectory tmp-name1))
|
2023-04-03 13:18:55 +02:00
|
|
|
|
ert-remote-temporary-file-directory))))))
|
|
|
|
|
|
|
2023-04-03 16:00:11 +02:00
|
|
|
|
;; Cleanup. Nothing to do yet.
|
|
|
|
|
|
nil)
|
2017-10-26 16:24:28 +02:00
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
;; Map `backup-directory-alist'.
|
|
|
|
|
|
(let ((backup-directory-alist `(("." . ,tmp-name2)))
|
|
|
|
|
|
tramp-backup-directory-alist)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(find-backup-file-name tmp-name1)
|
|
|
|
|
|
(list
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2017-10-26 16:24:28 +02:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s~"
|
2018-01-07 18:50:06 +01:00
|
|
|
|
;; This is taken from `make-backup-file-name-1'. We
|
|
|
|
|
|
;; call `convert-standard-filename', because on MS
|
|
|
|
|
|
;; Windows the (local) colons must be replaced by
|
|
|
|
|
|
;; exclamation marks.
|
2017-10-26 16:24:28 +02:00
|
|
|
|
(subst-char-in-string
|
2018-01-07 18:50:06 +01:00
|
|
|
|
?/ ?!
|
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
|
"!" "!!" (convert-standard-filename tmp-name1))))
|
2017-10-26 16:24:28 +02:00
|
|
|
|
tmp-name2)))))
|
|
|
|
|
|
;; The backup directory is created.
|
|
|
|
|
|
(should (file-directory-p tmp-name2)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Map `tramp-backup-directory-alist'. Ange-FTP doesn't care.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(let ((tramp-backup-directory-alist `(("." . ,tmp-name2)))
|
|
|
|
|
|
backup-directory-alist)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(find-backup-file-name tmp-name1)
|
|
|
|
|
|
(list
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s~"
|
|
|
|
|
|
;; This is taken from `make-backup-file-name-1'.
|
|
|
|
|
|
;; We call `convert-standard-filename', because on
|
|
|
|
|
|
;; MS Windows the (local) colons must be replaced
|
|
|
|
|
|
;; by exclamation marks.
|
|
|
|
|
|
(subst-char-in-string
|
|
|
|
|
|
?/ ?!
|
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
|
"!" "!!" (convert-standard-filename tmp-name1))))
|
|
|
|
|
|
tmp-name2)))))
|
|
|
|
|
|
;; The backup directory is created.
|
|
|
|
|
|
(should (file-directory-p tmp-name2))))
|
2017-10-26 16:24:28 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
;; Map `tramp-backup-directory-alist' with local file name.
|
2019-11-07 12:03:19 +01:00
|
|
|
|
;; Ange-FTP doesn't care.
|
|
|
|
|
|
(unless (tramp--test-ange-ftp-p)
|
|
|
|
|
|
(let ((tramp-backup-directory-alist
|
|
|
|
|
|
`(("." . ,(file-remote-p tmp-name2 'localname))))
|
|
|
|
|
|
backup-directory-alist)
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(find-backup-file-name tmp-name1)
|
|
|
|
|
|
(list
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(expand-file-name
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s~"
|
|
|
|
|
|
;; This is taken from `make-backup-file-name-1'.
|
|
|
|
|
|
;; We call `convert-standard-filename', because on
|
|
|
|
|
|
;; MS Windows the (local) colons must be replaced
|
|
|
|
|
|
;; by exclamation marks.
|
|
|
|
|
|
(subst-char-in-string
|
|
|
|
|
|
?/ ?!
|
|
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
|
"!" "!!" (convert-standard-filename tmp-name1))))
|
|
|
|
|
|
tmp-name2)))))
|
|
|
|
|
|
;; The backup directory is created.
|
|
|
|
|
|
(should (file-directory-p tmp-name2))))
|
2017-10-26 16:24:28 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive)))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
;; Create temporary file. This shall check for sensible
|
|
|
|
|
|
;; files, owned by root.
|
|
|
|
|
|
(let ((backup-directory-alist `(("." . ,temporary-file-directory)))
|
|
|
|
|
|
tramp-backup-directory-alist)
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (zerop (or (file-attribute-user-id (file-attributes tmp-name1))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
tramp-unknown-id-integer))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(let ((tramp-allow-unsafe-temporary-files t))
|
|
|
|
|
|
(should (stringp (car (find-backup-file-name tmp-name1)))))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'ignore))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(find-backup-file-name tmp-name1)
|
|
|
|
|
|
:type 'file-error))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'tramp-compat-always))
|
2021-06-14 11:25:13 +02:00
|
|
|
|
(should (stringp (car (find-backup-file-name tmp-name1)))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)))))
|
2017-10-26 16:24:28 +02:00
|
|
|
|
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
;; The functions were introduced in Emacs 28.1.
|
2021-07-18 16:58:52 +02:00
|
|
|
|
(ert-deftest tramp-test39-make-lock-file-name ()
|
|
|
|
|
|
"Check `make-lock-file-name', `lock-file', `unlock-file' and `file-locked-p'."
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
;; Since Emacs 28.1.
|
|
|
|
|
|
(skip-unless (and (fboundp 'lock-file) (fboundp 'unlock-file)))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(skip-unless (and (fboundp 'file-locked-p) (fboundp 'make-lock-file-name)))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
2021-07-14 18:36:14 +02:00
|
|
|
|
;; `lock-file', `unlock-file', `file-locked-p' and
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; `make-lock-file-name' exist since Emacs 28.1. We don't want to
|
2021-07-14 18:36:14 +02:00
|
|
|
|
;; see compiler warnings for older Emacsen.
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
2021-07-13 19:50:05 +02:00
|
|
|
|
(let ((tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name nil quoted))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(remote-file-name-inhibit-cache t)
|
2021-07-13 19:50:05 +02:00
|
|
|
|
(remote-file-name-inhibit-locks nil)
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(create-lockfiles t)
|
2021-07-14 18:36:14 +02:00
|
|
|
|
tramp-allow-unsafe-temporary-files
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(inhibit-message t)
|
|
|
|
|
|
;; tramp-rclone.el and tramp-sshfs.el cache the mounted files.
|
2021-10-03 18:55:35 +02:00
|
|
|
|
(tramp-fuse-unmount-on-cleanup t)
|
2021-07-20 17:28:29 +02:00
|
|
|
|
auto-save-default
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
noninteractive)
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; A simple file lock.
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1)))
|
|
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; If it is locked already, nothing changes.
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
2021-07-18 16:58:52 +02:00
|
|
|
|
;; `save-buffer' removes the lock.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(set-visited-file-name tmp-name1)
|
|
|
|
|
|
(insert "foo")
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(save-buffer)
|
|
|
|
|
|
(should-not (buffer-modified-p)))
|
2021-07-18 16:58:52 +02:00
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1)))
|
2023-02-26 15:40:30 +01:00
|
|
|
|
|
|
|
|
|
|
;; `kill-buffer' removes the lock.
|
2021-07-18 16:58:52 +02:00
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
2023-02-26 15:40:30 +01:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(set-visited-file-name tmp-name1)
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(cl-letf (((symbol-function #'read-from-minibuffer)
|
|
|
|
|
|
(lambda (&rest _args) "yes")))
|
|
|
|
|
|
(kill-buffer)))
|
|
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1)))
|
2021-07-18 16:58:52 +02:00
|
|
|
|
|
2023-02-26 15:40:30 +01:00
|
|
|
|
;; `kill-buffer' should not remove the lock when the
|
|
|
|
|
|
;; connection is broken. See Bug#61663.
|
|
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(set-visited-file-name tmp-name1)
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'read-from-minibuffer)
|
|
|
|
|
|
(lambda (&rest _args) "yes")))
|
|
|
|
|
|
(kill-buffer)))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
;; A new connection changes process id, and also the
|
2023-03-01 17:07:59 +01:00
|
|
|
|
;; lock file contents. But it still exists.
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(should (stringp (with-no-warnings (file-locked-p tmp-name1))))
|
2021-07-13 19:50:05 +02:00
|
|
|
|
|
|
|
|
|
|
;; When `remote-file-name-inhibit-locks' is set, nothing happens.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(let ((remote-file-name-inhibit-locks t))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1))))
|
2021-07-13 19:50:05 +02:00
|
|
|
|
|
|
|
|
|
|
;; When `lock-file-name-transforms' is set, another lock
|
|
|
|
|
|
;; file is used.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(let ((lock-file-name-transforms `((,(rx (* nonl)) ,tmp-name2))))
|
2021-07-13 19:50:05 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (make-lock-file-name tmp-name1))
|
|
|
|
|
|
(with-no-warnings (make-lock-file-name tmp-name2))))
|
|
|
|
|
|
(with-no-warnings (lock-file tmp-name1))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
|
|
|
|
|
(with-no-warnings (unlock-file tmp-name1))
|
|
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1))))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; Steal the file lock.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'read-char) (lambda (&rest _args) ?s)))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (lock-file tmp-name1)))
|
|
|
|
|
|
(should (eq (with-no-warnings (file-locked-p tmp-name1)) t))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; Ignore the file lock.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'read-char) (lambda (&rest _args) ?p)))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (lock-file tmp-name1)))
|
|
|
|
|
|
(should (stringp (with-no-warnings (file-locked-p tmp-name1))))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; Quit the file lock machinery.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'read-char) (lambda (&rest _args) ?q)))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(lock-file tmp-name1)
|
|
|
|
|
|
:type 'file-locked))
|
2021-07-09 18:14:19 +02:00
|
|
|
|
;; The same for `write-region'.
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(should-error
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
:type 'file-locked)
|
2021-07-13 19:50:05 +02:00
|
|
|
|
(should-error
|
|
|
|
|
|
(write-region "foo" nil tmp-name1 nil nil tmp-name1)
|
2021-07-09 18:14:19 +02:00
|
|
|
|
:type 'file-locked)
|
|
|
|
|
|
;; The same for `set-visited-file-name'.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(should-error
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(set-visited-file-name tmp-name1)
|
|
|
|
|
|
:type 'file-locked)))
|
2021-07-18 16:58:52 +02:00
|
|
|
|
(should (stringp (with-no-warnings (file-locked-p tmp-name1)))))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2021-07-13 19:50:05 +02:00
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(with-no-warnings (unlock-file tmp-name1))
|
|
|
|
|
|
(with-no-warnings (unlock-file tmp-name2))
|
|
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name1)))
|
|
|
|
|
|
(should-not (with-no-warnings (file-locked-p tmp-name2))))
|
|
|
|
|
|
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
;; Create temporary file. This shall check for sensible
|
|
|
|
|
|
;; files, owned by root.
|
|
|
|
|
|
(let ((lock-file-name-transforms auto-save-file-name-transforms))
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(when (zerop (or (file-attribute-user-id (file-attributes tmp-name1))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
tramp-unknown-id-integer))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
|
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'ignore))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(write-region "foo" nil tmp-name1)
|
|
|
|
|
|
:type 'file-error))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)
|
2023-04-26 18:06:39 +02:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p) #'tramp-compat-always))
|
2021-07-14 18:36:14 +02:00
|
|
|
|
(write-region "foo" nil tmp-name1))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name1))
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug 'keep-password)))))
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
|
2022-02-04 19:24:43 +01:00
|
|
|
|
;; The functions were introduced in Emacs 28.1.
|
2022-02-03 14:21:23 +01:00
|
|
|
|
(ert-deftest tramp-test39-detect-external-change ()
|
|
|
|
|
|
"Check that an external file modification is reported."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
|
|
|
|
|
;; Since Emacs 28.1.
|
2022-02-04 19:24:43 +01:00
|
|
|
|
(skip-unless (and (fboundp 'lock-file) (fboundp 'file-locked-p)))
|
2022-02-03 14:21:23 +01:00
|
|
|
|
|
|
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
|
|
|
|
|
(dolist (create-lockfiles '(nil t))
|
|
|
|
|
|
(let ((tmp-name (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(remote-file-name-inhibit-cache t)
|
|
|
|
|
|
(remote-file-name-inhibit-locks nil)
|
|
|
|
|
|
tramp-allow-unsafe-temporary-files
|
|
|
|
|
|
(inhibit-message t)
|
|
|
|
|
|
;; tramp-rclone.el and tramp-sshfs.el cache the mounted files.
|
|
|
|
|
|
(tramp-fuse-unmount-on-cleanup t)
|
|
|
|
|
|
auto-save-default
|
|
|
|
|
|
(backup-inhibited t)
|
|
|
|
|
|
noninteractive)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(setq buffer-file-name tmp-name
|
|
|
|
|
|
buffer-file-truename tmp-name)
|
|
|
|
|
|
(insert "foo")
|
|
|
|
|
|
;; Bug#53207: with `create-lockfiles' nil, saving the
|
|
|
|
|
|
;; buffer results in a prompt.
|
2023-06-11 20:33:34 +02:00
|
|
|
|
(cl-letf (((symbol-function #'read-from-minibuffer)
|
|
|
|
|
|
(lambda (&rest _)
|
|
|
|
|
|
(ert-fail "Test failed unexpectedly"))))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(save-buffer)
|
|
|
|
|
|
(should-not (buffer-modified-p)))
|
2022-02-03 14:21:23 +01:00
|
|
|
|
(should-not (file-locked-p tmp-name))
|
|
|
|
|
|
|
|
|
|
|
|
;; For local files, just changing the file
|
|
|
|
|
|
;; modification on disk doesn't hurt, because file
|
|
|
|
|
|
;; contents in buffer and on disk are equal. For
|
|
|
|
|
|
;; remote files, file contents is not compared. We
|
|
|
|
|
|
;; mock an older modification time in buffer, because
|
|
|
|
|
|
;; Tramp regards modification times equal if they
|
|
|
|
|
|
;; differ for less than 2 seconds.
|
|
|
|
|
|
(set-visited-file-modtime (time-add (current-time) -60))
|
|
|
|
|
|
;; Some Tramp methods cannot check the file
|
|
|
|
|
|
;; modification time properly, for them it doesn't
|
|
|
|
|
|
;; make sense to test.
|
|
|
|
|
|
(when (not (verify-visited-file-modtime))
|
2023-06-11 20:33:34 +02:00
|
|
|
|
(cl-letf (((symbol-function #'read-char-choice)
|
2022-02-03 14:21:23 +01:00
|
|
|
|
(lambda (prompt &rest _) (message "%s" prompt) ?y)))
|
|
|
|
|
|
(ert-with-message-capture captured-messages
|
|
|
|
|
|
(insert "bar")
|
|
|
|
|
|
(when create-lockfiles
|
|
|
|
|
|
(should (string-match-p
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx-to-string
|
|
|
|
|
|
`(: bol
|
|
|
|
|
|
,(if (tramp--test-crypt-p)
|
|
|
|
|
|
'(+ nonl)
|
|
|
|
|
|
(file-name-nondirectory tmp-name))
|
|
|
|
|
|
" changed on disk; really edit the buffer?"))
|
2022-02-03 14:21:23 +01:00
|
|
|
|
captured-messages))
|
|
|
|
|
|
(should (file-locked-p tmp-name)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; `save-buffer' removes the file lock.
|
2023-06-11 20:33:34 +02:00
|
|
|
|
(cl-letf (((symbol-function #'yes-or-no-p)
|
2023-04-26 18:06:39 +02:00
|
|
|
|
#'tramp-compat-always)
|
2023-06-11 20:33:34 +02:00
|
|
|
|
((symbol-function #'read-char-choice)
|
2022-02-03 14:21:23 +01:00
|
|
|
|
(lambda (&rest _) ?y)))
|
2022-05-09 20:10:10 +02:00
|
|
|
|
(should (buffer-modified-p))
|
|
|
|
|
|
(save-buffer)
|
|
|
|
|
|
(should-not (buffer-modified-p)))
|
2022-02-03 14:21:23 +01:00
|
|
|
|
(should-not (file-locked-p tmp-name))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
|
(ignore-errors (delete-file tmp-name))
|
|
|
|
|
|
(tramp-cleanup-connection
|
|
|
|
|
|
tramp-test-vec 'keep-debug 'keep-password)))))))
|
|
|
|
|
|
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(ert-deftest tramp-test40-make-nearby-temp-file ()
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
"Check `make-nearby-temp-file' and `temporary-file-directory'."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(skip-unless (not (tramp--test-ange-ftp-p)))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
tmp-file)
|
2016-08-21 04:17:30 -07:00
|
|
|
|
;; The remote host shall know a temporary file directory.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(should (stringp (temporary-file-directory)))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p default-directory)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-remote-p (temporary-file-directory))))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
|
|
|
|
|
|
;; The temporary file shall be located on the remote host.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(setq tmp-file (make-nearby-temp-file "tramp-test"))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(should (file-exists-p tmp-file))
|
|
|
|
|
|
(should (file-regular-p tmp-file))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(file-remote-p default-directory)
|
|
|
|
|
|
(file-remote-p tmp-file)))
|
|
|
|
|
|
(delete-file tmp-file)
|
|
|
|
|
|
(should-not (file-exists-p tmp-file))
|
|
|
|
|
|
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(setq tmp-file (make-nearby-temp-file "tramp-test" 'dir))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(should (file-exists-p tmp-file))
|
|
|
|
|
|
(should (file-directory-p tmp-file))
|
|
|
|
|
|
(delete-directory tmp-file)
|
|
|
|
|
|
(should-not (file-exists-p tmp-file))))
|
|
|
|
|
|
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(defun tramp--test-emacs28-p ()
|
|
|
|
|
|
"Check for Emacs version >= 28.1.
|
2022-12-01 16:36:09 +01:00
|
|
|
|
Some semantics has been changed for there, without new functions
|
|
|
|
|
|
or variables, so we check the Emacs version directly."
|
2020-02-25 13:25:57 +01:00
|
|
|
|
(>= emacs-major-version 28))
|
|
|
|
|
|
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(defun tramp--test-emacs29-p ()
|
|
|
|
|
|
"Check for Emacs version >= 29.1.
|
2022-12-01 16:36:09 +01:00
|
|
|
|
Some semantics has been changed for there, without new functions
|
|
|
|
|
|
or variables, so we check the Emacs version directly."
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(>= emacs-major-version 29))
|
|
|
|
|
|
|
2015-03-04 11:46:06 +01:00
|
|
|
|
(defun tramp--test-adb-p ()
|
|
|
|
|
|
"Check, whether the remote host runs Android.
|
|
|
|
|
|
This requires restrictions of file name syntax."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-adb-file-name-p ert-remote-temporary-file-directory))
|
2015-07-21 14:59:18 +02:00
|
|
|
|
|
2019-11-07 12:03:19 +01:00
|
|
|
|
(defun tramp--test-ange-ftp-p ()
|
|
|
|
|
|
"Check, whether Ange-FTP is used."
|
|
|
|
|
|
(eq
|
2022-03-07 13:42:30 +01:00
|
|
|
|
(tramp-find-foreign-file-name-handler tramp-test-vec)
|
2019-11-07 12:03:19 +01:00
|
|
|
|
'tramp-ftp-file-name-handler))
|
|
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(defun tramp--test-asynchronous-processes-p ()
|
|
|
|
|
|
"Whether asynchronous processes tests are run.
|
2022-05-15 11:15:06 +02:00
|
|
|
|
This is used in tests which we don't want to tag
|
2021-12-24 11:32:34 +01:00
|
|
|
|
`:tramp-asynchronous-processes' completely."
|
2022-02-16 20:22:45 +01:00
|
|
|
|
(and
|
|
|
|
|
|
(ert-select-tests
|
|
|
|
|
|
(ert--stats-selector ert--current-run-stats)
|
|
|
|
|
|
(list (make-ert-test :name (ert-test-name (ert-running-test))
|
|
|
|
|
|
:body nil :tags '(:tramp-asynchronous-processes))))
|
2023-09-14 14:38:27 +02:00
|
|
|
|
;; tramp-adb.el cannot apply multibyte commands.
|
2022-02-16 20:22:45 +01:00
|
|
|
|
(not (and (tramp--test-adb-p)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(string-match-p (rx multibyte) default-directory)))))
|
2021-12-24 11:32:34 +01:00
|
|
|
|
|
2021-01-24 19:26:02 +01:00
|
|
|
|
(defun tramp--test-crypt-p ()
|
2022-07-19 13:57:20 +02:00
|
|
|
|
"Check, whether the remote directory is encrypted."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-crypt-file-name-p ert-remote-temporary-file-directory))
|
2021-01-24 19:26:02 +01:00
|
|
|
|
|
2023-01-13 19:41:08 +01:00
|
|
|
|
(defun tramp--test-container-p ()
|
|
|
|
|
|
"Check, whether a container method is used.
|
2016-12-12 11:12:34 +01:00
|
|
|
|
This does not support some special file names."
|
2023-01-13 19:41:08 +01:00
|
|
|
|
(string-match-p
|
|
|
|
|
|
(rx bol (| "docker" "podman") eol)
|
|
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'method)))
|
2016-12-12 11:12:34 +01:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(defun tramp--test-expensive-test-p ()
|
|
|
|
|
|
"Whether expensive tests are run.
|
2022-05-15 11:15:06 +02:00
|
|
|
|
This is used in tests which we don't want to tag `:expensive'
|
2021-12-24 11:32:34 +01:00
|
|
|
|
completely."
|
|
|
|
|
|
(ert-select-tests
|
|
|
|
|
|
(ert--stats-selector ert--current-run-stats)
|
|
|
|
|
|
(list (make-ert-test :name (ert-test-name (ert-running-test))
|
|
|
|
|
|
:body nil :tags '(:expensive-test)))))
|
|
|
|
|
|
|
2015-07-21 14:59:18 +02:00
|
|
|
|
(defun tramp--test-ftp-p ()
|
|
|
|
|
|
"Check, whether an FTP-like method is used.
|
|
|
|
|
|
This does not support globbing characters in file names (yet)."
|
|
|
|
|
|
;; Globbing characters are ??, ?* and ?\[.
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-suffix-p
|
|
|
|
|
|
"ftp" (file-remote-p ert-remote-temporary-file-directory 'method)))
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(defun tramp--test-fuse-p ()
|
|
|
|
|
|
"Check, whether an FUSE file system isused."
|
|
|
|
|
|
(or (tramp--test-rclone-p) (tramp--test-sshfs-p)))
|
|
|
|
|
|
|
2021-02-03 18:48:09 +01:00
|
|
|
|
(defun tramp--test-gdrive-p ()
|
|
|
|
|
|
"Check, whether the gdrive method is used."
|
|
|
|
|
|
(string-equal
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"gdrive" (file-remote-p ert-remote-temporary-file-directory 'method)))
|
2021-02-03 18:48:09 +01:00
|
|
|
|
|
2017-06-05 12:59:26 +02:00
|
|
|
|
(defun tramp--test-gvfs-p (&optional method)
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
"Check, whether the remote host runs a GVFS based method.
|
Adapt Tramp docstrings according to checkdoc
* lisp/net/tramp.el (tramp-backup-directory-alist)
(tramp-echoed-echo-mark-regexp, tramp-syntax-values)
(tramp-lookup-syntax, tramp-build-prefix-format)
(tramp-build-prefix-regexp, tramp-build-method-regexp)
(tramp-build-postfix-method-format)
(tramp-build-postfix-method-regexp)
(tramp-build-prefix-ipv6-format, tramp-build-prefix-ipv6-regexp)
(tramp-build-postfix-ipv6-format)
(tramp-build-postfix-ipv6-regexp)
(tramp-build-postfix-host-format)
(tramp-build-postfix-host-regexp, tramp-unknown-id-string)
(tramp-unknown-id-integer, tramp-build-file-name-regexp)
(tramp-build-completion-file-name-regexp, tramp-chunksize)
(tramp-find-method, tramp-find-user, tramp-find-host)
(tramp-dissect-file-name, tramp-get-buffer)
(tramp-get-connection-buffer, tramp-debug-message, tramp-error)
(with-tramp-connection-property, tramp-run-real-handler)
(tramp-file-name-for-operation, tramp-file-name-handler)
(tramp-completion-file-name-handler)
(tramp-completion-handle-file-name-completion)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-mode-string-to-int)
(tramp-file-mode-from-int):
* lisp/net/tramp-adb.el (tramp-adb-file-name-p):
* lisp/net/tramp-archive.el (tramp-archive-run-real-handler)
(tramp-archive-file-name-handler)
(tramp-archive-dissect-file-name)
(with-parsed-tramp-archive-file-name)
(tramp-archive-gvfs-file-name, tramp-archive-handle-access-file):
* lisp/net/tramp-cmds.el (tramp-list-remote-buffers):
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-compat-funcall, tramp-compat-tramp-file-name-slots):
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-p)
(tramp-gvfs-file-name-handler)
(tramp-gvfs-stringify-dbus-message)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handler-mounted-unmounted):
* lisp/net/tramp-integration.el
(tramp-rfn-eshadow-update-overlay-regexp):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-p)
(tramp-rclone-file-name-handler, tramp-rclone-send-command):
* lisp/net/tramp-sh.el (tramp-sh--quoting-style-options)
(tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter, tramp-find-executable)
(tramp-set-remote-path, tramp-open-shell, tramp-find-shell)
(tramp-send-command-and-check, tramp-shell-case-fold)
(tramp-get-remote-path):
* lisp/net/tramp-smb.el (tramp-smb-file-name-p)
(tramp-smb-file-name-handler)
(tramp-smb-do-file-attributes-with-stat)
(tramp-smb-handle-substitute-in-file-name)
(tramp-smb-get-stat-capability, tramp-smb-shell-quote-argument):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-p)
(tramp-sudoedit-file-name-handler)
(tramp-sudoedit-send-command-string):
* test/lisp/net/tramp-archive-tests.el (tramp-archive-test-all):
* test/lisp/net/tramp-tests.el (tramp--test-gvfs-p)
(tramp--test-with-proper-process-name-and-buffer)
(tramp-test-all): Adapt docstrings according to `checkdoc'.
2019-11-13 13:10:58 +01:00
|
|
|
|
This requires restrictions of file name syntax.
|
|
|
|
|
|
If optional METHOD is given, it is checked first."
|
2017-06-05 12:59:26 +02:00
|
|
|
|
(or (member method tramp-gvfs-methods)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-gvfs-file-name-p ert-remote-temporary-file-directory)))
|
2015-07-21 14:59:18 +02:00
|
|
|
|
|
2016-12-17 19:52:38 +01:00
|
|
|
|
(defun tramp--test-hpux-p ()
|
|
|
|
|
|
"Check, whether the remote host runs HP-UX.
|
|
|
|
|
|
Several special characters do not work properly there."
|
|
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(ignore-errors (tramp-check-remote-uname tramp-test-vec (rx bol "HP-UX"))))
|
2016-12-17 19:52:38 +01:00
|
|
|
|
|
2019-09-26 09:33:47 +02:00
|
|
|
|
(defun tramp--test-ksh-p ()
|
|
|
|
|
|
"Check, whether the remote shell is ksh.
|
|
|
|
|
|
ksh93 makes some strange conversions of non-latin characters into
|
|
|
|
|
|
a $'' syntax."
|
|
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-suffix-p
|
|
|
|
|
|
"ksh"
|
|
|
|
|
|
(tramp-get-connection-property tramp-test-vec "remote-shell" "")))
|
2019-09-26 09:33:47 +02:00
|
|
|
|
|
2021-09-26 10:32:15 +02:00
|
|
|
|
(defun tramp--test-macos-p ()
|
|
|
|
|
|
"Check, whether the remote host runs macOS."
|
|
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
2022-02-16 20:22:45 +01:00
|
|
|
|
(ignore-errors (tramp-check-remote-uname tramp-test-vec "Darwin")))
|
2021-09-26 10:32:15 +02:00
|
|
|
|
|
2017-11-27 13:31:53 +01:00
|
|
|
|
(defun tramp--test-mock-p ()
|
|
|
|
|
|
"Check, whether the mock method is used.
|
|
|
|
|
|
This does not support external Emacs calls."
|
|
|
|
|
|
(string-equal
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"mock" (file-remote-p ert-remote-temporary-file-directory 'method)))
|
2017-11-27 13:31:53 +01:00
|
|
|
|
|
2023-09-14 14:38:27 +02:00
|
|
|
|
(defun tramp--test-netbsd-p ()
|
|
|
|
|
|
"Check, whether the remote host runs NetBSD."
|
|
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ignore-errors (tramp-check-remote-uname tramp-test-vec "NetBSD")))
|
|
|
|
|
|
|
2023-08-06 11:43:48 +02:00
|
|
|
|
(defun tramp--test-openbsd-p ()
|
|
|
|
|
|
"Check, whether the remote host runs OpenBSD."
|
|
|
|
|
|
;; We must refill the cache. `file-truename' does it.
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory)
|
|
|
|
|
|
(ignore-errors (tramp-check-remote-uname tramp-test-vec "OpenBSD")))
|
|
|
|
|
|
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(defun tramp--test-out-of-band-p ()
|
|
|
|
|
|
"Check, whether an out-of-band method is used."
|
|
|
|
|
|
(tramp-method-out-of-band-p tramp-test-vec 1))
|
|
|
|
|
|
|
2023-05-16 17:19:20 +02:00
|
|
|
|
(defun tramp--test-putty-p ()
|
|
|
|
|
|
"Check, whether the method method usaes PuTTY.
|
|
|
|
|
|
This does not support connection share for more than two connections."
|
|
|
|
|
|
(member
|
|
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'method)
|
|
|
|
|
|
'("plink" "plinkx" "pscp" "psftp")))
|
|
|
|
|
|
|
2018-12-06 16:11:27 +01:00
|
|
|
|
(defun tramp--test-rclone-p ()
|
|
|
|
|
|
"Check, whether the remote host is offered by rclone.
|
|
|
|
|
|
This requires restrictions of file name syntax."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-rclone-file-name-p ert-remote-temporary-file-directory))
|
2018-12-06 16:11:27 +01:00
|
|
|
|
|
2016-06-26 12:30:21 +02:00
|
|
|
|
(defun tramp--test-rsync-p ()
|
|
|
|
|
|
"Check, whether the rsync method is used.
|
|
|
|
|
|
This does not support special file names."
|
|
|
|
|
|
(string-equal
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"rsync" (file-remote-p ert-remote-temporary-file-directory 'method)))
|
2016-06-26 12:30:21 +02:00
|
|
|
|
|
Add `make-nearby-temp-file' and `temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.
* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.
* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.
* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.
* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
|
|
|
|
(defun tramp--test-sh-p ()
|
|
|
|
|
|
"Check, whether the remote host runs a based method from tramp-sh.el."
|
2020-11-30 13:54:29 +01:00
|
|
|
|
(tramp-sh-file-name-handler-p tramp-test-vec))
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
2021-01-24 19:26:02 +01:00
|
|
|
|
(defun tramp--test-sh-no-ls--dired-p ()
|
|
|
|
|
|
"Check, whether the remote host runs a based method from tramp-sh.el.
|
|
|
|
|
|
Additionally, ls does not support \"--dired\"."
|
|
|
|
|
|
(and (tramp--test-sh-p)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
;; We must refill the cache. `insert-directory' does it.
|
2021-01-27 16:30:49 +01:00
|
|
|
|
;; This fails for tramp-crypt.el, so we ignore that.
|
|
|
|
|
|
(ignore-errors
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(insert-directory ert-remote-temporary-file-directory "-al"))
|
2022-07-03 18:23:55 +02:00
|
|
|
|
(not (tramp-get-connection-property tramp-test-vec "ls--dired")))))
|
2021-01-24 19:26:02 +01:00
|
|
|
|
|
2020-11-05 17:36:04 +01:00
|
|
|
|
(defun tramp--test-share-p ()
|
|
|
|
|
|
"Check, whether the method needs a share."
|
|
|
|
|
|
(and (tramp--test-gvfs-p)
|
|
|
|
|
|
(string-match-p
|
Fix rx forms in Tramp
* lisp/net/tramp.el (tramp-restricted-shell-hosts-alist)
(tramp-local-host-regexp, tramp-echoed-echo-mark-regexp)
(tramp-login-prompt-regexp, tramp-terminal-prompt-regexp)
(tramp-antispoof-regexp)
(tramp-build-completion-file-name-regexp)
(tramp-debug-outline-regexp)
(tramp-use-absolute-autoload-file-names)
(tramp-lock-file-info-regexp, tramp-shell-quote-argument):
* lisp/net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls)
* lisp/net/tramp-cache.el (tramp-flush-file-function):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name):
* lisp/net/tramp-integration.el (tramp-rfn-eshadow-update-overlay-regexp)
(info-lookup-maybe-add-help):
* lisp/net/tramp-sh.el (tramp-default-user-alist, tramp-sunos-unames)
(tramp-scp-direct-remote-copying, tramp-get-remote-locale):
* lisp/net/tramp-smb.el (tramp-smb-prompt, tramp-smb-wrong-passwd-regexp)
(tramp-smb-errors, tramp-smb-get-localname)
(tramp-smb-read-file-entry): Simplify rx forms.
* lisp/net/tramp.el (tramp-handle-find-backup-file-name)
(tramp-handle-lock-file, tramp-handle-make-auto-save-file-name):
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times)
(tramp-adb-maybe-open-connection):
* lisp/net/tramp-gvfs.el
(tramp-gvfs-file-attributes-with-gvfs-ls-regexp):
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell): Do not use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (tramp-rename-files, tramp-rename-these-files):
Use rx.
* lisp/net/tramp-gvfs.el (tramp-gvfs-password-tcrypt): New defonst.
(tramp-gvfs-handle-file-attributes): Use `number-to-string'.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test17-insert-directory):
* test/lisp/net/tramp-tests.el (tramp-test17-insert-directory)
(tramp--test-share-p): Simplify rx forms.
2022-09-04 13:44:30 +02:00
|
|
|
|
(rx bol (| "afp" (: "dav" (? "s")) "smb") eol)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'method))))
|
2020-11-05 17:36:04 +01:00
|
|
|
|
|
2021-03-08 12:05:29 +01:00
|
|
|
|
(defun tramp--test-sshfs-p ()
|
|
|
|
|
|
"Check, whether the remote host is offered by sshfs.
|
|
|
|
|
|
This requires restrictions of file name syntax."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-sshfs-file-name-p ert-remote-temporary-file-directory))
|
2021-03-08 12:05:29 +01:00
|
|
|
|
|
2018-12-16 15:49:07 +01:00
|
|
|
|
(defun tramp--test-sudoedit-p ()
|
|
|
|
|
|
"Check, whether the sudoedit method is used."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-sudoedit-file-name-p ert-remote-temporary-file-directory))
|
2018-12-16 15:49:07 +01:00
|
|
|
|
|
2021-09-16 16:50:24 +02:00
|
|
|
|
(defun tramp--test-telnet-p ()
|
|
|
|
|
|
"Check, whether the telnet method is used.
|
|
|
|
|
|
This does not support special file names."
|
|
|
|
|
|
(string-equal
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"telnet" (file-remote-p ert-remote-temporary-file-directory 'method)))
|
2021-09-16 16:50:24 +02:00
|
|
|
|
|
2020-08-24 12:11:48 +02:00
|
|
|
|
(defun tramp--test-windows-nt-p ()
|
2018-01-07 18:50:06 +01:00
|
|
|
|
"Check, whether the locale host runs MS Windows."
|
|
|
|
|
|
(eq system-type 'windows-nt))
|
|
|
|
|
|
|
2021-04-14 13:25:36 +02:00
|
|
|
|
(defun tramp--test-windows-nt-and-out-of-band-p ()
|
|
|
|
|
|
"Check, whether the locale host runs MS Windows and an out-of-band method.
|
|
|
|
|
|
This does not support utf8 based file transfer."
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(and (tramp--test-windows-nt-p)
|
|
|
|
|
|
(tramp--test-out-of-band-p)))
|
2016-12-17 19:52:38 +01:00
|
|
|
|
|
|
|
|
|
|
(defun tramp--test-windows-nt-or-smb-p ()
|
2014-12-30 12:45:48 +01:00
|
|
|
|
"Check, whether the locale or remote host runs MS Windows.
|
|
|
|
|
|
This requires restrictions of file name syntax."
|
2021-10-19 18:50:12 +02:00
|
|
|
|
(or (tramp--test-windows-nt-p)
|
2020-06-23 21:18:08 +02:00
|
|
|
|
(tramp--test-smb-p)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun tramp--test-smb-p ()
|
|
|
|
|
|
"Check, whether the locale or remote host runs MS Windows.
|
|
|
|
|
|
This requires restrictions of file name syntax."
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(tramp-smb-file-name-p ert-remote-temporary-file-directory))
|
2014-12-30 12:45:48 +01:00
|
|
|
|
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(defun tramp--test-supports-processes-p ()
|
|
|
|
|
|
"Return whether the method under test supports external processes."
|
|
|
|
|
|
(and (or (tramp--test-adb-p) (tramp--test-sh-p) (tramp--test-sshfs-p))
|
|
|
|
|
|
(not (tramp--test-crypt-p))))
|
|
|
|
|
|
|
2021-10-20 18:14:00 +02:00
|
|
|
|
(defun tramp--test-supports-set-file-modes-p ()
|
|
|
|
|
|
"Return whether the method under test supports setting file modes."
|
2021-09-10 06:30:06 -07:00
|
|
|
|
;; "smb" does not unless the SMB server supports "posix" extensions.
|
|
|
|
|
|
;; "adb" does not unless the Android device is rooted.
|
|
|
|
|
|
(or (tramp--test-sh-p) (tramp--test-sshfs-p) (tramp--test-sudoedit-p)
|
|
|
|
|
|
;; Not all tramp-gvfs.el methods support changing the file mode.
|
|
|
|
|
|
(and
|
|
|
|
|
|
(tramp--test-gvfs-p)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-suffix-p
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"ftp" (file-remote-p ert-remote-temporary-file-directory 'method)))))
|
2021-09-10 06:30:06 -07:00
|
|
|
|
|
2014-04-18 20:58:13 +02:00
|
|
|
|
(defun tramp--test-check-files (&rest files)
|
2015-03-04 11:46:06 +01:00
|
|
|
|
"Run a simple but comprehensive test over every file in FILES."
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; We must use `file-truename' for the temporary directory,
|
|
|
|
|
|
;; because it could be located on a symlinked directory. This
|
|
|
|
|
|
;; would let the test fail.
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let* ((ert-remote-temporary-file-directory
|
|
|
|
|
|
(file-truename ert-remote-temporary-file-directory))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(tramp-fuse-remove-hidden-files t)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(tmp-name1 (tramp--test-make-temp-name nil quoted))
|
|
|
|
|
|
(tmp-name2 (tramp--test-make-temp-name 'local quoted))
|
2021-07-05 10:24:31 +02:00
|
|
|
|
(files
|
|
|
|
|
|
(delq
|
|
|
|
|
|
nil (mapcar (lambda (x) (unless (string-empty-p x) x)) files)))
|
2019-08-30 13:54:42 +02:00
|
|
|
|
(process-environment process-environment)
|
2021-01-04 16:32:32 +01:00
|
|
|
|
(sorted-files (sort (copy-sequence files) #'string-lessp))
|
|
|
|
|
|
buffer)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name1)
|
|
|
|
|
|
(make-directory tmp-name2)
|
2016-12-17 19:52:38 +01:00
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(dolist (elt files)
|
2021-07-05 10:24:31 +02:00
|
|
|
|
;(tramp--test-message "'%s'" elt)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(let* ((file1 (expand-file-name elt tmp-name1))
|
|
|
|
|
|
(file2 (expand-file-name elt tmp-name2))
|
|
|
|
|
|
(file3 (expand-file-name (concat elt "foo") tmp-name1)))
|
|
|
|
|
|
(write-region elt nil file1)
|
|
|
|
|
|
(should (file-exists-p file1))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check file contents.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file1)
|
|
|
|
|
|
(should (string-equal (buffer-string) elt)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Copy file both directions.
|
2017-09-10 15:39:24 -07:00
|
|
|
|
(copy-file file1 (file-name-as-directory tmp-name2))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-exists-p file2))
|
|
|
|
|
|
(delete-file file1)
|
|
|
|
|
|
(should-not (file-exists-p file1))
|
2017-09-10 15:39:24 -07:00
|
|
|
|
(copy-file file2 (file-name-as-directory tmp-name1))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (file-exists-p file1))
|
|
|
|
|
|
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
|
|
|
|
|
(make-symbolic-link file1 file3)
|
|
|
|
|
|
(should (file-symlink-p file3))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(expand-file-name file1) (file-truename file3)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(file-attribute-type (file-attributes file3)))
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(file-remote-p (file-truename file1) 'localname)))
|
|
|
|
|
|
;; Check file contents.
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file3)
|
|
|
|
|
|
(should (string-equal (buffer-string) elt)))
|
|
|
|
|
|
(delete-file file3))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Check file names.
|
|
|
|
|
|
(should (equal (directory-files
|
|
|
|
|
|
tmp-name1 nil directory-files-no-dot-files-regexp)
|
2019-08-30 13:54:42 +02:00
|
|
|
|
sorted-files))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(should (equal (directory-files
|
|
|
|
|
|
tmp-name2 nil directory-files-no-dot-files-regexp)
|
2019-08-30 13:54:42 +02:00
|
|
|
|
sorted-files))
|
|
|
|
|
|
(should (equal (mapcar
|
|
|
|
|
|
#'car
|
|
|
|
|
|
(directory-files-and-attributes
|
|
|
|
|
|
tmp-name1 nil directory-files-no-dot-files-regexp))
|
|
|
|
|
|
sorted-files))
|
|
|
|
|
|
(should (equal (mapcar
|
|
|
|
|
|
#'car
|
|
|
|
|
|
(directory-files-and-attributes
|
|
|
|
|
|
tmp-name2 nil directory-files-no-dot-files-regexp))
|
|
|
|
|
|
sorted-files))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2021-01-04 16:32:32 +01:00
|
|
|
|
;; Check, that `insert-directory' works properly.
|
|
|
|
|
|
(with-current-buffer
|
|
|
|
|
|
(setq buffer (dired-noselect tmp-name1 "--dired -al"))
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(while (not (eobp))
|
2021-11-15 17:50:15 +01:00
|
|
|
|
(when-let ((name (dired-get-filename 'no-dir 'no-error)))
|
2021-01-04 16:32:32 +01:00
|
|
|
|
(unless
|
|
|
|
|
|
(string-match-p name directory-files-no-dot-files-regexp)
|
|
|
|
|
|
(should (member name files))))
|
|
|
|
|
|
(forward-line 1)))
|
|
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; `substitute-in-file-name' could return different
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; values. For "adb", there could be strange file
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; permissions preventing overwriting a file. We don't
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; care in this test case.
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(dolist (elt files)
|
|
|
|
|
|
(let ((file1
|
|
|
|
|
|
(substitute-in-file-name (expand-file-name elt tmp-name1)))
|
|
|
|
|
|
(file2
|
|
|
|
|
|
(substitute-in-file-name
|
|
|
|
|
|
(expand-file-name elt tmp-name2))))
|
|
|
|
|
|
(ignore-errors (write-region elt nil file1))
|
|
|
|
|
|
(should (file-exists-p file1))
|
|
|
|
|
|
(ignore-errors (write-region elt nil file2 nil 'nomessage))
|
|
|
|
|
|
(should (file-exists-p file2))))
|
|
|
|
|
|
|
|
|
|
|
|
(should (equal (directory-files
|
|
|
|
|
|
tmp-name1 nil directory-files-no-dot-files-regexp)
|
|
|
|
|
|
(directory-files
|
|
|
|
|
|
tmp-name2 nil directory-files-no-dot-files-regexp)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check directory creation. We use a subdirectory "foo"
|
|
|
|
|
|
;; in order to avoid conflicts with previous file name tests.
|
|
|
|
|
|
(dolist (elt files)
|
|
|
|
|
|
(let* ((elt1 (concat elt "foo"))
|
|
|
|
|
|
(file1 (expand-file-name (concat "foo/" elt) tmp-name1))
|
|
|
|
|
|
(file2 (expand-file-name elt file1))
|
|
|
|
|
|
(file3 (expand-file-name elt1 file1)))
|
|
|
|
|
|
(make-directory file1 'parents)
|
|
|
|
|
|
(should (file-directory-p file1))
|
|
|
|
|
|
(write-region elt nil file2)
|
|
|
|
|
|
(should (file-exists-p file2))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(directory-files
|
|
|
|
|
|
file1 nil directory-files-no-dot-files-regexp)
|
|
|
|
|
|
`(,elt)))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
(caar (directory-files-and-attributes
|
|
|
|
|
|
file1 nil directory-files-no-dot-files-regexp))
|
|
|
|
|
|
elt))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check symlink in `directory-files-and-attributes'.
|
2017-09-04 13:10:52 +02:00
|
|
|
|
;; It does not work in the "smb" case, only relative
|
2023-09-14 14:38:27 +02:00
|
|
|
|
;; symlinks to existing files are shown there. On
|
|
|
|
|
|
;; NetBSD, there are problems with loooong file names,
|
|
|
|
|
|
;; see Bug#65324.
|
2017-08-28 18:08:16 +02:00
|
|
|
|
(tramp--test-ignore-make-symbolic-link-error
|
2023-09-14 14:38:27 +02:00
|
|
|
|
(unless (or (tramp--test-netbsd-p) (tramp--test-smb-p))
|
2017-09-04 13:10:52 +02:00
|
|
|
|
(make-symbolic-link file2 file3)
|
|
|
|
|
|
(should (file-symlink-p file3))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(caar (directory-files-and-attributes
|
2023-01-06 13:34:33 +01:00
|
|
|
|
file1 nil (rx (literal elt1))))
|
2017-09-04 13:10:52 +02:00
|
|
|
|
elt1))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string-equal
|
|
|
|
|
|
(funcall
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(if quoted #'file-name-quote #'identity)
|
2017-09-04 13:10:52 +02:00
|
|
|
|
(cadr (car (directory-files-and-attributes
|
2023-01-06 13:34:33 +01:00
|
|
|
|
file1 nil (rx (literal elt1))))))
|
2017-09-04 13:10:52 +02:00
|
|
|
|
(file-remote-p (file-truename file2) 'localname)))
|
|
|
|
|
|
(delete-file file3)
|
|
|
|
|
|
(should-not (file-exists-p file3))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2022-02-08 15:45:09 +01:00
|
|
|
|
;; Check, that a process runs on a remote
|
|
|
|
|
|
;; `default-directory' with special characters. See
|
|
|
|
|
|
;; Bug#53846.
|
|
|
|
|
|
(when (and (tramp--test-expensive-test-p)
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(tramp--test-supports-processes-p))
|
2022-02-08 15:45:09 +01:00
|
|
|
|
(let ((default-directory file1))
|
|
|
|
|
|
(dolist (this-shell-command
|
|
|
|
|
|
(append
|
|
|
|
|
|
;; Synchronously.
|
|
|
|
|
|
'(shell-command)
|
|
|
|
|
|
;; Asynchronously.
|
|
|
|
|
|
(and (tramp--test-asynchronous-processes-p)
|
|
|
|
|
|
'(tramp--test-async-shell-command))))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(funcall this-shell-command "cat -- *" (current-buffer))
|
|
|
|
|
|
(should (string-equal elt (buffer-string)))))))
|
|
|
|
|
|
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(delete-file file2)
|
|
|
|
|
|
(should-not (file-exists-p file2))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(delete-directory file1 'recursive)
|
2016-12-15 09:37:35 +01:00
|
|
|
|
(should-not (file-exists-p file1))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check, that environment variables are set correctly.
|
2019-08-27 18:53:26 +02:00
|
|
|
|
;; We do not run on macOS due to encoding problems. See
|
|
|
|
|
|
;; Bug#36940.
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (and (tramp--test-expensive-test-p) (tramp--test-sh-p)
|
2020-06-09 13:43:30 +02:00
|
|
|
|
(not (tramp--test-crypt-p))
|
2019-08-27 18:53:26 +02:00
|
|
|
|
(not (eq system-type 'darwin)))
|
2016-12-23 09:31:23 +01:00
|
|
|
|
(dolist (elt files)
|
|
|
|
|
|
(let ((envvar (concat "VAR_" (upcase (md5 elt))))
|
2018-03-28 18:05:58 +02:00
|
|
|
|
(elt (encode-coding-string elt coding-system-for-read))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(default-directory ert-remote-temporary-file-directory)
|
2016-12-23 09:31:23 +01:00
|
|
|
|
(process-environment process-environment))
|
|
|
|
|
|
(setenv envvar elt)
|
|
|
|
|
|
;; The value of PS1 could confuse Tramp's detection
|
|
|
|
|
|
;; of process output. So we unset it temporarily.
|
|
|
|
|
|
(setenv "PS1")
|
|
|
|
|
|
(with-temp-buffer
|
2023-10-01 11:28:20 +02:00
|
|
|
|
(when (zerop (process-file "printenv" nil t nil))
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(search-forward-regexp
|
|
|
|
|
|
(rx
|
|
|
|
|
|
bol (literal envvar)
|
|
|
|
|
|
"=" (literal (getenv envvar)) eol)))))))))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2021-01-04 16:32:32 +01:00
|
|
|
|
(ignore-errors (kill-buffer buffer))
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
(ignore-errors (delete-directory tmp-name1 'recursive))
|
|
|
|
|
|
(ignore-errors (delete-directory tmp-name2 'recursive))))))
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
;; These tests are inspired by Bug#17238.
|
|
|
|
|
|
(ert-deftest tramp-test41-special-characters ()
|
|
|
|
|
|
"Check special characters in file names."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 245s
|
|
|
|
|
|
(skip-unless (not (tramp--test-rsync-p)))
|
|
|
|
|
|
(skip-unless (not (tramp--test-rclone-p)))
|
2023-08-10 12:17:59 +02:00
|
|
|
|
(skip-unless (not (or (eq system-type 'darwin) (tramp--test-macos-p))))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
|
2015-03-16 12:25:42 -04:00
|
|
|
|
;; Newlines, slashes and backslashes in file names are not
|
|
|
|
|
|
;; supported. So we don't test. And we don't test the tab
|
|
|
|
|
|
;; character on Windows or Cygwin, because the backslash is
|
|
|
|
|
|
;; interpreted as a path separator, preventing "\t" from being
|
|
|
|
|
|
;; expanded to <TAB>.
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(let ((files
|
|
|
|
|
|
(list
|
2021-01-24 19:26:02 +01:00
|
|
|
|
(cond ((or (tramp--test-ange-ftp-p)
|
2023-01-13 19:41:08 +01:00
|
|
|
|
(tramp--test-container-p)
|
2021-01-24 19:26:02 +01:00
|
|
|
|
(tramp--test-gvfs-p)
|
2023-08-06 13:50:11 +02:00
|
|
|
|
(tramp--test-openbsd-p)
|
2021-01-24 19:26:02 +01:00
|
|
|
|
(tramp--test-rclone-p)
|
|
|
|
|
|
(tramp--test-sudoedit-p)
|
|
|
|
|
|
(tramp--test-windows-nt-or-smb-p))
|
|
|
|
|
|
"foo bar baz")
|
|
|
|
|
|
((or (tramp--test-adb-p)
|
|
|
|
|
|
(eq system-type 'cygwin))
|
|
|
|
|
|
" foo bar baz ")
|
|
|
|
|
|
((tramp--test-sh-no-ls--dired-p)
|
|
|
|
|
|
"\tfoo bar baz\t")
|
|
|
|
|
|
(t " foo\tbar baz\t"))
|
|
|
|
|
|
"@foo@bar@baz@"
|
2021-05-09 15:37:37 +02:00
|
|
|
|
(unless (tramp--test-windows-nt-and-out-of-band-p) "$foo$bar$$baz$")
|
2018-03-17 15:10:46 +01:00
|
|
|
|
"-foo-bar-baz-"
|
2021-05-09 15:37:37 +02:00
|
|
|
|
(unless (tramp--test-windows-nt-and-out-of-band-p) "%foo%bar%baz%")
|
2018-03-17 15:10:46 +01:00
|
|
|
|
"&foo&bar&baz&"
|
|
|
|
|
|
(unless (or (tramp--test-ftp-p)
|
|
|
|
|
|
(tramp--test-gvfs-p)
|
|
|
|
|
|
(tramp--test-windows-nt-or-smb-p))
|
|
|
|
|
|
"?foo?bar?baz?")
|
|
|
|
|
|
(unless (or (tramp--test-ftp-p)
|
|
|
|
|
|
(tramp--test-gvfs-p)
|
|
|
|
|
|
(tramp--test-windows-nt-or-smb-p))
|
2022-01-26 14:05:30 +01:00
|
|
|
|
"*foo+bar*baz+")
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(if (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p))
|
|
|
|
|
|
"'foo'bar'baz'"
|
|
|
|
|
|
"'foo\"bar'baz\"")
|
|
|
|
|
|
"#foo~bar#baz~"
|
2021-05-09 15:37:37 +02:00
|
|
|
|
(unless (tramp--test-windows-nt-and-out-of-band-p)
|
2021-05-07 17:25:49 +02:00
|
|
|
|
(if (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p))
|
|
|
|
|
|
"!foo!bar!baz!"
|
|
|
|
|
|
"!foo|bar!baz|"))
|
2018-12-06 16:11:27 +01:00
|
|
|
|
(if (or (tramp--test-gvfs-p)
|
|
|
|
|
|
(tramp--test-rclone-p)
|
|
|
|
|
|
(tramp--test-windows-nt-or-smb-p))
|
2018-03-17 15:10:46 +01:00
|
|
|
|
";foo;bar;baz;"
|
|
|
|
|
|
":foo;bar:baz;")
|
|
|
|
|
|
(unless (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p))
|
|
|
|
|
|
"<foo>bar<baz>")
|
|
|
|
|
|
"(foo)bar(baz)"
|
|
|
|
|
|
(unless (or (tramp--test-ftp-p) (tramp--test-gvfs-p)) "[foo]bar[baz]")
|
|
|
|
|
|
"{foo}bar{baz}")))
|
|
|
|
|
|
;; Simplify test in order to speed up.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(apply #'tramp--test-check-files
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(if (tramp--test-expensive-test-p)
|
2023-02-14 18:51:44 +01:00
|
|
|
|
files (list (string-join files ""))))))
|
2014-04-18 20:58:13 +02:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-stat tramp-test41-special-characters)
|
2014-04-18 20:58:13 +02:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-perl tramp-test41-special-characters)
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-ls tramp-test41-special-characters)
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test42-utf8 ()
|
|
|
|
|
|
"Check UTF8 encoding in file names and file contents."
|
2015-03-04 11:46:06 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 620s
|
2023-01-13 19:41:08 +01:00
|
|
|
|
(skip-unless (not (tramp--test-container-p)))
|
2016-12-17 19:52:38 +01:00
|
|
|
|
(skip-unless (not (tramp--test-rsync-p)))
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(skip-unless (not (tramp--test-windows-nt-and-out-of-band-p)))
|
|
|
|
|
|
(skip-unless (not (tramp--test-ksh-p)))
|
|
|
|
|
|
(skip-unless (not (tramp--test-gdrive-p)))
|
|
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
|
|
|
|
|
(skip-unless (not (tramp--test-rclone-p)))
|
2023-08-06 16:24:19 +02:00
|
|
|
|
(skip-unless (not (or (eq system-type 'darwin) (tramp--test-macos-p))))
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
2023-08-06 16:24:19 +02:00
|
|
|
|
(let ((coding-system-for-read 'utf-8)
|
|
|
|
|
|
(coding-system-for-write 'utf-8)
|
|
|
|
|
|
(file-name-coding-system
|
|
|
|
|
|
(coding-system-change-eol-conversion 'utf-8 'unix)))
|
2018-03-20 16:33:51 +01:00
|
|
|
|
(apply
|
2019-02-28 10:33:05 +01:00
|
|
|
|
#'tramp--test-check-files
|
2018-05-06 12:39:36 +02:00
|
|
|
|
(append
|
|
|
|
|
|
(list
|
|
|
|
|
|
(unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
|
|
|
|
|
|
(unless (tramp--test-hpux-p)
|
|
|
|
|
|
"أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
|
|
|
|
|
|
"银河系漫游指南系列"
|
|
|
|
|
|
"Автостопом по гала́ктике"
|
|
|
|
|
|
;; Use codepoints without a name. See Bug#31272.
|
2022-08-11 12:34:01 +02:00
|
|
|
|
;; Works on some Android systems only.
|
2023-08-06 11:43:48 +02:00
|
|
|
|
(unless (or (tramp--test-adb-p) (tramp--test-openbsd-p))
|
|
|
|
|
|
"bung")
|
2020-07-11 14:46:18 +02:00
|
|
|
|
;; Use codepoints from Supplementary Multilingual Plane (U+10000
|
|
|
|
|
|
;; to U+1FFFF).
|
|
|
|
|
|
"🌈🍒👋")
|
2018-05-06 12:39:36 +02:00
|
|
|
|
|
2021-12-24 11:32:34 +01:00
|
|
|
|
(when (tramp--test-expensive-test-p)
|
2018-05-06 12:39:36 +02:00
|
|
|
|
(delete-dups
|
|
|
|
|
|
(mapcar
|
2020-07-11 14:46:18 +02:00
|
|
|
|
;; Use all available language specific snippets.
|
2018-05-06 12:39:36 +02:00
|
|
|
|
(lambda (x)
|
|
|
|
|
|
(and
|
2023-01-23 11:02:56 +01:00
|
|
|
|
;; The "Oriya" and "Odia" languages use some problematic
|
|
|
|
|
|
;; composition characters.
|
|
|
|
|
|
(not (member (car x) '("Oriya" "Odia")))
|
2021-11-20 12:54:48 +01:00
|
|
|
|
(stringp (setq x (eval (get-language-info (car x) 'sample-text) t)))
|
2020-07-11 14:46:18 +02:00
|
|
|
|
;; Filter out strings which use unencodable characters.
|
|
|
|
|
|
(not (and (or (tramp--test-gvfs-p) (tramp--test-smb-p))
|
|
|
|
|
|
(unencodable-char-position
|
|
|
|
|
|
0 (length x) file-name-coding-system nil x)))
|
2020-08-02 13:26:00 +02:00
|
|
|
|
;; Filter out not displayable characters.
|
|
|
|
|
|
(setq x (mapconcat
|
|
|
|
|
|
(lambda (y)
|
|
|
|
|
|
(and (char-displayable-p y) (char-to-string y)))
|
|
|
|
|
|
x ""))
|
|
|
|
|
|
(not (string-empty-p x))
|
2018-05-06 12:39:36 +02:00
|
|
|
|
;; ?\n and ?/ shouldn't be part of any file name. ?\t,
|
2021-06-29 17:15:55 +02:00
|
|
|
|
;; ?. and ?? do not work for "smb" method. " " does not
|
|
|
|
|
|
;; work at begin or end of the string for MS Windows.
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(replace-regexp-in-string (rx (any " \t\n/.?")) "" x)))
|
2018-05-06 12:39:36 +02:00
|
|
|
|
language-info-alist)))))))
|
2014-04-18 20:58:13 +02:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-stat tramp-test42-utf8)
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-perl tramp-test42-utf8)
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
2022-07-15 19:52:10 +02:00
|
|
|
|
(tramp--test-deftest-with-ls tramp-test42-utf8)
|
2015-03-04 11:46:06 +01:00
|
|
|
|
|
Implement file locks for remote files (Bug#49261)
* doc/lispref/files.texi (Magic File Names): Add file-locked-p,
lock-file and unlock-file.
* etc/NEWS: Tramp supports file locks now.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-adb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
* lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-crypt-handle-file-locked-p, tramp-crypt-handle-lock-file)
(tramp-crypt-handle-unlock-file): New defun.
* lisp/net/tramp-fuse.el (tramp-fuse-mounted-p): Simplify.
(tramp-fuse-unmount): New defun.
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-gvfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-rclone-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sh-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-smb-handle-copy-directory): Use `sleep-for'.
(tramp-smb-handle-write-region): Handle LOCKNAME.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sshfs-handle-write-region): Handle LOCKNAME.
(tramp-sshfs-maybe-open-connection): Set "lock-pid" connection property.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-sudoedit-maybe-open-connection):
Set "lock-pid" connection property.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `file-locked-p', `lock-file' and `unlock-file'.
(tramp-make-lock-name, tramp-get-lock-file, tramp-get-lock-pid)
(tramp-handle-file-locked-p, tramp-handle-lock-file)
(tramp-handle-unlock-file): New defuns.
(tramp-lock-file-contents-regexp): New regexp.
(tramp-handle-write-region): Handle LOCKNAME.
* src/filelock.c (lock_file, unlock_file_body, Ffile_locked_p):
Call handler if exists.
(Flock_file, Funlock_file): New defuns.
(Qlock_file, Qunlock_file, Qfile_locked_p): Declare symbols.
(Slock_file, Sunlock_file): Declare subroutines.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-make-nearby-temp-file)
(tramp-archive-test43-file-system-info): Rename.
* test/lisp/net/tramp-tests.el (top): Set `create-lockfiles' to nil.
(tramp--test-fuse-p): New defun.
(tramp-test14-delete-directory): Use it.
(tramp-test39-lock-file): New test.
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters)
(tramp-test41-special-characters-with-stat)
(tramp-test41-special-characters-with-perl)
(tramp-test41-special-characters-with-ls, tramp-test42-utf8)
(tramp-test42-utf8-with-stat, tramp-test42-utf8-with-perl)
(tramp-test42-utf8-with-ls, tramp-test43-file-system-info)
(tramp-test44-asynchronous-requests, tramp-test45-auto-load)
(tramp-test45-delay-load, tramp-test45-recursive-load)
(tramp-test45-remote-load-path, tramp-test46-unload): Rename.
(tramp--test-special-characters, tramp--test-utf8)
(tramp--test-asynchronous-requests-timeout): Modify docstring.
2021-07-07 18:36:53 +02:00
|
|
|
|
(ert-deftest tramp-test43-file-system-info ()
|
2017-10-03 16:07:32 +02:00
|
|
|
|
"Check that `file-system-info' returns proper values."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(when-let ((fsi (file-system-info ert-remote-temporary-file-directory)))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(should (consp fsi))
|
Upgrade to length* functions in Tramp
* lisp/net/tramp-compat.el (tramp-compat-replace-regexp-in-region):
Move up.
(tramp-compat-length<, tramp-compat-length>)
(tramp-compat-length=): New defaliases.
(tramp-compat-file-name-unquote, tramp-compat-take)
(tramp-compat-ntake): Use them.
* lisp/net/tramp.el (tramp-string-empty-or-nil-p): New defsubst.
(tramp-find-host, tramp-buffer-name, tramp-make-tramp-file-name)
(tramp-completion-make-tramp-file-name, tramp-debug-buffer-name)
(tramp-completion-handle-file-name-all-completions)
(tramp-handle-directory-file-name)
(tramp-handle-expand-file-name)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-direct-async-process-p, tramp-call-process)
(tramp-read-passwd):
* lisp/net/tramp-adb.el (tramp-adb-get-device)
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
* lisp/net/tramp-archive.el (tramp-archive-handle-directory-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handle-get-home-directory)
(tramp-gvfs-handler-askpassword)
(tramp-gvfs-maybe-open-connection, tramp-get-media-devices):
* lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-directory-p)
(tramp-sh-handle-insert-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-make-process)
(tramp-sh-gio-monitor-process-filter, tramp-set-remote-path)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection, tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-expand-file-name, tramp-smb-handle-file-acl)
(tramp-smb-handle-insert-directory)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-get-home-directory)
(tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name)
(tramp-sudoedit-handle-file-name-all-completions): Use the new
functions.
* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test43-file-system-info):
* test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion)
(tramp-test31-memory-info, tramp-test35-remote-path)
(tramp-test43-file-system-info): Use new compat functions.
2023-01-15 17:50:17 +01:00
|
|
|
|
(should (tramp-compat-length= fsi 3))
|
2022-05-21 15:44:22 +02:00
|
|
|
|
(dotimes (i (length fsi))
|
|
|
|
|
|
(should (natnump (or (nth i fsi) 0))))))
|
2017-10-03 16:07:32 +02:00
|
|
|
|
|
2023-05-01 09:49:00 -07:00
|
|
|
|
;; `file-user-uid' and `file-group-gid' were introduced in Emacs 30.1.
|
|
|
|
|
|
(ert-deftest tramp-test44-file-user-group-ids ()
|
|
|
|
|
|
"Check results of user/group functions.
|
|
|
|
|
|
`file-user-uid', `file-group-gid', and `tramp-get-remote-*'
|
|
|
|
|
|
should all return proper values."
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory))
|
2023-05-01 09:49:00 -07:00
|
|
|
|
;; `file-user-uid' and `file-group-gid' exist since Emacs 30.1.
|
|
|
|
|
|
;; We don't want to see compiler warnings for older Emacsen.
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(when (fboundp 'file-user-uid)
|
|
|
|
|
|
(should (integerp (with-no-warnings (file-user-uid)))))
|
2023-05-01 09:49:00 -07:00
|
|
|
|
(when (fboundp 'file-group-gid)
|
|
|
|
|
|
(should (integerp (with-no-warnings (file-group-gid)))))
|
2023-01-17 16:00:08 +01:00
|
|
|
|
|
|
|
|
|
|
(with-parsed-tramp-file-name default-directory nil
|
|
|
|
|
|
(should (or (integerp (tramp-get-remote-uid v 'integer))
|
|
|
|
|
|
(null (tramp-get-remote-uid v 'integer))))
|
|
|
|
|
|
(should (or (stringp (tramp-get-remote-uid v 'string))
|
|
|
|
|
|
(null (tramp-get-remote-uid v 'string))))
|
|
|
|
|
|
|
|
|
|
|
|
(should (or (integerp (tramp-get-remote-gid v 'integer))
|
|
|
|
|
|
(null (tramp-get-remote-gid v 'integer))))
|
|
|
|
|
|
(should (or (stringp (tramp-get-remote-gid v 'string))
|
|
|
|
|
|
(null (tramp-get-remote-gid v 'string))))
|
|
|
|
|
|
|
|
|
|
|
|
(when-let ((groups (tramp-get-remote-groups v 'integer)))
|
|
|
|
|
|
(should (consp groups))
|
|
|
|
|
|
(dolist (group groups) (should (integerp group))))
|
|
|
|
|
|
(when-let ((groups (tramp-get-remote-groups v 'string)))
|
|
|
|
|
|
(should (consp groups))
|
|
|
|
|
|
(dolist (group groups) (should (stringp group)))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; `tramp-test45-asynchronous-requests' could be blocked. So we set a
|
2019-02-03 11:07:36 +01:00
|
|
|
|
;; timeout of 300 seconds, and we send a SIGUSR1 signal after 300
|
|
|
|
|
|
;; seconds. Similar check is performed in the timer function.
|
|
|
|
|
|
(defconst tramp--test-asynchronous-requests-timeout 300
|
2023-01-17 16:00:08 +01:00
|
|
|
|
"Timeout for `tramp-test45-asynchronous-requests'.")
|
2017-07-27 12:51:45 +02:00
|
|
|
|
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(defmacro tramp--test-with-proper-process-name-and-buffer (proc &rest body)
|
|
|
|
|
|
"Set \"process-name\" and \"process-buffer\" connection properties.
|
Adapt Tramp docstrings according to checkdoc
* lisp/net/tramp.el (tramp-backup-directory-alist)
(tramp-echoed-echo-mark-regexp, tramp-syntax-values)
(tramp-lookup-syntax, tramp-build-prefix-format)
(tramp-build-prefix-regexp, tramp-build-method-regexp)
(tramp-build-postfix-method-format)
(tramp-build-postfix-method-regexp)
(tramp-build-prefix-ipv6-format, tramp-build-prefix-ipv6-regexp)
(tramp-build-postfix-ipv6-format)
(tramp-build-postfix-ipv6-regexp)
(tramp-build-postfix-host-format)
(tramp-build-postfix-host-regexp, tramp-unknown-id-string)
(tramp-unknown-id-integer, tramp-build-file-name-regexp)
(tramp-build-completion-file-name-regexp, tramp-chunksize)
(tramp-find-method, tramp-find-user, tramp-find-host)
(tramp-dissect-file-name, tramp-get-buffer)
(tramp-get-connection-buffer, tramp-debug-message, tramp-error)
(with-tramp-connection-property, tramp-run-real-handler)
(tramp-file-name-for-operation, tramp-file-name-handler)
(tramp-completion-file-name-handler)
(tramp-completion-handle-file-name-completion)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-mode-string-to-int)
(tramp-file-mode-from-int):
* lisp/net/tramp-adb.el (tramp-adb-file-name-p):
* lisp/net/tramp-archive.el (tramp-archive-run-real-handler)
(tramp-archive-file-name-handler)
(tramp-archive-dissect-file-name)
(with-parsed-tramp-archive-file-name)
(tramp-archive-gvfs-file-name, tramp-archive-handle-access-file):
* lisp/net/tramp-cmds.el (tramp-list-remote-buffers):
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-compat-funcall, tramp-compat-tramp-file-name-slots):
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-p)
(tramp-gvfs-file-name-handler)
(tramp-gvfs-stringify-dbus-message)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handler-mounted-unmounted):
* lisp/net/tramp-integration.el
(tramp-rfn-eshadow-update-overlay-regexp):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-p)
(tramp-rclone-file-name-handler, tramp-rclone-send-command):
* lisp/net/tramp-sh.el (tramp-sh--quoting-style-options)
(tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter, tramp-find-executable)
(tramp-set-remote-path, tramp-open-shell, tramp-find-shell)
(tramp-send-command-and-check, tramp-shell-case-fold)
(tramp-get-remote-path):
* lisp/net/tramp-smb.el (tramp-smb-file-name-p)
(tramp-smb-file-name-handler)
(tramp-smb-do-file-attributes-with-stat)
(tramp-smb-handle-substitute-in-file-name)
(tramp-smb-get-stat-capability, tramp-smb-shell-quote-argument):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-p)
(tramp-sudoedit-file-name-handler)
(tramp-sudoedit-send-command-string):
* test/lisp/net/tramp-archive-tests.el (tramp-archive-test-all):
* test/lisp/net/tramp-tests.el (tramp--test-gvfs-p)
(tramp--test-with-proper-process-name-and-buffer)
(tramp-test-all): Adapt docstrings according to `checkdoc'.
2019-11-13 13:10:58 +01:00
|
|
|
|
The values are derived from PROC. Run BODY.
|
2019-06-10 17:53:15 +02:00
|
|
|
|
This is needed in timer functions as well as process filters and sentinels."
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
;; FIXME: For tramp-sshfs.el, `processp' does not work.
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(declare (indent 1) (debug (processp body)))
|
2022-07-03 18:23:55 +02:00
|
|
|
|
`(let* ((v (tramp-get-connection-property ,proc "vector"))
|
|
|
|
|
|
(pname (tramp-get-connection-property v "process-name"))
|
|
|
|
|
|
(pbuffer (tramp-get-connection-property v "process-buffer")))
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"tramp--test-with-proper-process-name-and-buffer before %s %s"
|
2022-07-03 18:23:55 +02:00
|
|
|
|
(tramp-get-connection-property v "process-name")
|
|
|
|
|
|
(tramp-get-connection-property v "process-buffer"))
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(if (process-name ,proc)
|
|
|
|
|
|
(tramp-set-connection-property v "process-name" (process-name ,proc))
|
|
|
|
|
|
(tramp-flush-connection-property v "process-name"))
|
|
|
|
|
|
(if (process-buffer ,proc)
|
|
|
|
|
|
(tramp-set-connection-property
|
|
|
|
|
|
v "process-buffer" (process-buffer ,proc))
|
|
|
|
|
|
(tramp-flush-connection-property v "process-buffer"))
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"tramp--test-with-proper-process-name-and-buffer changed %s %s"
|
2022-07-03 18:23:55 +02:00
|
|
|
|
(tramp-get-connection-property v "process-name")
|
|
|
|
|
|
(tramp-get-connection-property v "process-buffer"))
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn ,@body)
|
|
|
|
|
|
(if pname
|
|
|
|
|
|
(tramp-set-connection-property v "process-name" pname)
|
|
|
|
|
|
(tramp-flush-connection-property v "process-name"))
|
|
|
|
|
|
(if pbuffer
|
|
|
|
|
|
(tramp-set-connection-property v "process-buffer" pbuffer)
|
|
|
|
|
|
(tramp-flush-connection-property v "process-buffer")))))
|
|
|
|
|
|
|
2014-03-07 15:11:37 +01:00
|
|
|
|
;; This test is inspired by Bug#16928.
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test45-asynchronous-requests ()
|
2014-03-07 15:11:37 +01:00
|
|
|
|
"Check parallel asynchronous requests.
|
|
|
|
|
|
Such requests could arrive from timers, process filters and
|
|
|
|
|
|
process sentinels. They shall not disturb each other."
|
2023-05-04 20:42:24 +02:00
|
|
|
|
:tags '(:expensive-test :tramp-asynchronous-processes)
|
2014-03-07 15:11:37 +01:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (tramp--test-supports-processes-p))
|
2023-01-13 19:41:08 +01:00
|
|
|
|
(skip-unless (not (tramp--test-container-p)))
|
2021-09-16 16:50:24 +02:00
|
|
|
|
(skip-unless (not (tramp--test-telnet-p)))
|
2021-10-29 14:06:47 +02:00
|
|
|
|
(skip-unless (not (tramp--test-sshfs-p)))
|
2021-01-19 18:45:55 +01:00
|
|
|
|
(skip-unless (not (tramp--test-windows-nt-p)))
|
2014-03-07 15:11:37 +01:00
|
|
|
|
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(with-timeout
|
|
|
|
|
|
(tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler))
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(define-key special-event-map [sigusr1] #'tramp--test-timeout-handler)
|
2017-08-17 11:35:41 +02:00
|
|
|
|
(let* (;; For the watchdog.
|
|
|
|
|
|
(default-directory (expand-file-name temporary-file-directory))
|
Add remote processes to Tramp sshfs method
* doc/misc/tramp.texi (FUSE setup): Method sshfs supports also
remote processes.
* lisp/net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Move setting of
`tramp-cache-unload-hook' out of function.
* lisp/net/tramp.el (tramp-expand-args): New defun.
(tramp-handle-make-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.
* lisp/net/tramp-sshfs.el (tramp-methods) <sshfs>:
Adapt `tramp-mount-args'. Add `tramp-login-args',
`tramp-direct-async', `tramp-remote-shell',
`tramp-remote-shell-login' and `tramp-remote-shell-args'.
(tramp-connection-properties): Set "direct-async-process" fir sshfs.
(tramp-sshfs-file-name-handler-alist): Add `exec-path',
`make-process', `process-file', `set-file-modes', `shell-command',
`start-file-process', `tramp-get-remote-gid',
`tramp-get-remote-uid' and `tramp-set-file-uid-gid'.
(tramp-sshfs-handle-exec-path, tramp-sshfs-handle-process-file)
(tramp-sshfs-handle-set-file-modes): New defuns.
* test/lisp/net/tramp-tests.el (tramp-test20-file-modes)
(tramp-test28-process-file, tramp-test29-start-file-process)
(tramp-test30-make-process, tramp-test32-shell-command)
(tramp-test32-shell-command-dont-erase-buffer)
(tramp-test34-explicit-shell-file-name, tramp-test35-exec-path)
(tramp-test43-asynchronous-requests): Run also for tramp-sshfs.
(tramp--test-shell-file-name): New defun.
(tramp-test28-process-file)
(tramp-test34-explicit-shell-file-name)
(tramp-test43-asynchronous-requests): Use it.
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Remove superfluous skip.
2021-03-11 17:16:50 +01:00
|
|
|
|
(shell-file-name (tramp--test-shell-file-name))
|
2019-06-11 20:28:31 +02:00
|
|
|
|
;; It doesn't work on w32 systems.
|
2017-08-17 11:35:41 +02:00
|
|
|
|
(watchdog
|
2021-01-19 18:45:55 +01:00
|
|
|
|
(start-process-shell-command
|
|
|
|
|
|
"*watchdog*" nil
|
|
|
|
|
|
(format
|
|
|
|
|
|
"sleep %d; kill -USR1 %d"
|
|
|
|
|
|
tramp--test-asynchronous-requests-timeout (emacs-pid))))
|
2017-07-27 12:51:45 +02:00
|
|
|
|
(tmp-name (tramp--test-make-temp-name))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(default-directory tmp-name)
|
|
|
|
|
|
;; Do not cache Tramp properties.
|
|
|
|
|
|
(remote-file-name-inhibit-cache t)
|
|
|
|
|
|
(process-file-side-effects t)
|
|
|
|
|
|
;; Suppress nasty messages.
|
|
|
|
|
|
(inhibit-message t)
|
2017-07-17 14:12:20 +02:00
|
|
|
|
;; Do not run delayed timers.
|
|
|
|
|
|
(timer-max-repeats 0)
|
2017-12-16 10:47:06 +01:00
|
|
|
|
;; Number of asynchronous processes for test. Tests on
|
|
|
|
|
|
;; some machines handle less parallel processes.
|
|
|
|
|
|
(number-proc
|
2018-03-17 15:10:46 +01:00
|
|
|
|
(cond
|
|
|
|
|
|
((ignore-errors
|
|
|
|
|
|
(string-to-number (getenv "REMOTE_PARALLEL_PROCESSES"))))
|
|
|
|
|
|
((getenv "EMACS_HYDRA_CI") 5)
|
|
|
|
|
|
(t 10)))
|
2023-05-16 17:19:20 +02:00
|
|
|
|
;; PuTTY-based methods can only share up to 10 connections.
|
|
|
|
|
|
(tramp-use-connection-share
|
|
|
|
|
|
(if (and (tramp--test-putty-p) (>= number-proc 10))
|
|
|
|
|
|
'suppress (bound-and-true-p tramp-use-connection-share)))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
;; On hydra, timings are bad.
|
|
|
|
|
|
(timer-repeat
|
|
|
|
|
|
(cond
|
2017-07-18 12:53:46 -04:00
|
|
|
|
((getenv "EMACS_HYDRA_CI") 10)
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(t 1)))
|
2019-02-03 11:07:36 +01:00
|
|
|
|
;; This is when all timers start. We check inside the
|
|
|
|
|
|
;; timer function, that we don't exceed timeout.
|
|
|
|
|
|
(timer-start (current-time))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
timer buffers kill-buffer-query-functions)
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(make-directory tmp-name)
|
|
|
|
|
|
|
|
|
|
|
|
;; Setup a timer in order to raise an ordinary command
|
|
|
|
|
|
;; again and again. `vc-registered' is well suited,
|
|
|
|
|
|
;; because there are many checks.
|
|
|
|
|
|
(setq
|
|
|
|
|
|
timer
|
|
|
|
|
|
(run-at-time
|
|
|
|
|
|
0 timer-repeat
|
|
|
|
|
|
(lambda ()
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(tramp--test-with-proper-process-name-and-buffer
|
2020-04-06 14:26:49 +02:00
|
|
|
|
(get-buffer-process (tramp-get-buffer tramp-test-vec))
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(when (> (- (time-to-seconds) (time-to-seconds timer-start))
|
|
|
|
|
|
tramp--test-asynchronous-requests-timeout)
|
|
|
|
|
|
(tramp--test-timeout-handler))
|
|
|
|
|
|
(when buffers
|
|
|
|
|
|
(let ((time (float-time))
|
|
|
|
|
|
(default-directory tmp-name)
|
2023-05-04 20:42:24 +02:00
|
|
|
|
(file (buffer-name (seq-random-elt buffers))))
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Start timer %s %s" file (current-time-string))
|
2023-05-04 20:42:24 +02:00
|
|
|
|
(dired-uncache file)
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Continue timer %s %s" file (file-attributes file))
|
2021-09-11 15:35:51 +02:00
|
|
|
|
(vc-registered file)
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(tramp--test-message
|
2019-06-10 17:53:15 +02:00
|
|
|
|
"Stop timer %s %s" file (current-time-string))
|
|
|
|
|
|
;; Adjust timer if it takes too much time.
|
|
|
|
|
|
(when (> (- (float-time) time) timer-repeat)
|
|
|
|
|
|
(setq timer-repeat (* 1.1 timer-repeat))
|
|
|
|
|
|
(setf (timer--repeat-delay timer) timer-repeat)
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Increase timer %s" timer-repeat))))))))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
|
|
|
|
|
|
;; Create temporary buffers. The number of buffers
|
|
|
|
|
|
;; corresponds to the number of processes; it could be
|
|
|
|
|
|
;; increased in order to make pressure on Tramp.
|
2017-08-30 12:00:26 +02:00
|
|
|
|
(dotimes (_ number-proc)
|
2017-07-12 14:53:53 +02:00
|
|
|
|
(setq buffers (cons (generate-new-buffer "foo") buffers)))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
|
|
|
|
|
|
;; Open asynchronous processes. Set process filter and sentinel.
|
|
|
|
|
|
(dolist (buf buffers)
|
2017-07-05 17:03:42 +02:00
|
|
|
|
;; Activate timer.
|
|
|
|
|
|
(sit-for 0.01 'nodisp)
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(let ((proc
|
|
|
|
|
|
(start-file-process-shell-command
|
|
|
|
|
|
(buffer-name buf) buf
|
|
|
|
|
|
(concat
|
2019-02-03 11:07:36 +01:00
|
|
|
|
"(read line && echo $line >$line && echo $line);"
|
|
|
|
|
|
"(read line && cat $line);"
|
|
|
|
|
|
"(read line && rm -f $line)")))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(file (expand-file-name (buffer-name buf))))
|
|
|
|
|
|
;; Remember the file name. Add counter.
|
|
|
|
|
|
(process-put proc 'foo file)
|
|
|
|
|
|
(process-put proc 'bar 0)
|
|
|
|
|
|
;; Add process filter.
|
|
|
|
|
|
(set-process-filter
|
|
|
|
|
|
proc
|
|
|
|
|
|
(lambda (proc string)
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(tramp--test-with-proper-process-name-and-buffer proc
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Process filter %s %s %s"
|
|
|
|
|
|
proc string (current-time-string))
|
|
|
|
|
|
(with-current-buffer (process-buffer proc)
|
|
|
|
|
|
(insert string))
|
|
|
|
|
|
(when (< (process-get proc 'bar) 2)
|
|
|
|
|
|
(dired-uncache (process-get proc 'foo))
|
|
|
|
|
|
(should (file-attributes (process-get proc 'foo)))))))
|
2019-02-03 11:07:36 +01:00
|
|
|
|
;; Add process sentinel. It shall not perform remote
|
|
|
|
|
|
;; operations, triggering Tramp processes. This blocks.
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(set-process-sentinel
|
|
|
|
|
|
proc
|
|
|
|
|
|
(lambda (proc _state)
|
2019-06-10 17:53:15 +02:00
|
|
|
|
(tramp--test-with-proper-process-name-and-buffer proc
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Process sentinel %s %s" proc (current-time-string)))))))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
|
2019-02-03 11:07:36 +01:00
|
|
|
|
;; Send a string to the processes. Use a random order of
|
|
|
|
|
|
;; the buffers. Mix with regular operation.
|
2023-05-20 12:13:09 +02:00
|
|
|
|
(let ((buffers (copy-sequence buffers))
|
|
|
|
|
|
buf)
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(while buffers
|
2023-05-20 12:13:09 +02:00
|
|
|
|
(setq buf (seq-random-elt buffers))
|
|
|
|
|
|
(if-let ((proc (get-buffer-process buf))
|
|
|
|
|
|
(file (process-get proc 'foo))
|
|
|
|
|
|
(count (process-get proc 'bar)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Start action %d %s %s" count buf (current-time-string))
|
|
|
|
|
|
;; Regular operation prior process action.
|
|
|
|
|
|
(dired-uncache file)
|
|
|
|
|
|
(if (= count 0)
|
|
|
|
|
|
(should-not (file-attributes file))
|
|
|
|
|
|
(should (file-attributes file)))
|
|
|
|
|
|
;; Send string to process.
|
|
|
|
|
|
(process-send-string proc (format "%s\n" (buffer-name buf)))
|
|
|
|
|
|
(while (accept-process-output nil 0))
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Continue action %d %s %s" count buf (current-time-string))
|
|
|
|
|
|
;; Regular operation post process action.
|
|
|
|
|
|
(dired-uncache file)
|
|
|
|
|
|
(if (= count 2)
|
|
|
|
|
|
(should-not (file-attributes file))
|
|
|
|
|
|
(should (file-attributes file)))
|
|
|
|
|
|
(tramp--test-message
|
|
|
|
|
|
"Stop action %d %s %s" count buf (current-time-string))
|
|
|
|
|
|
(process-put proc 'bar (1+ count))
|
|
|
|
|
|
(unless (process-live-p proc)
|
|
|
|
|
|
(setq buffers (delq buf buffers))))
|
|
|
|
|
|
(setq buffers (delq buf buffers)))))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; Checks. All process output shall exist in the
|
2017-07-03 13:21:39 +02:00
|
|
|
|
;; respective buffers. All created files shall be
|
|
|
|
|
|
;; deleted.
|
2017-07-27 12:51:45 +02:00
|
|
|
|
(tramp--test-message "Check %s" (current-time-string))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(dolist (buf buffers)
|
|
|
|
|
|
(with-current-buffer buf
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(should
|
2019-04-04 13:41:53 +02:00
|
|
|
|
(string-equal
|
|
|
|
|
|
;; tramp-adb.el echoes, so we must add the three strings.
|
|
|
|
|
|
(if (tramp--test-adb-p)
|
|
|
|
|
|
(format "%s\n%s\n%s\n%s\n%s\n" buf buf buf buf buf)
|
|
|
|
|
|
(format "%s\n%s\n" buf buf))
|
|
|
|
|
|
(buffer-string)))))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(should-not
|
|
|
|
|
|
(directory-files
|
|
|
|
|
|
tmp-name nil directory-files-no-dot-files-regexp)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Cleanup.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(define-key special-event-map [sigusr1] #'ignore)
|
2017-07-27 12:51:45 +02:00
|
|
|
|
(ignore-errors (quit-process watchdog))
|
2017-07-03 13:21:39 +02:00
|
|
|
|
(dolist (buf buffers)
|
|
|
|
|
|
(ignore-errors (delete-process (get-buffer-process buf)))
|
|
|
|
|
|
(ignore-errors (kill-buffer buf)))
|
|
|
|
|
|
(ignore-errors (cancel-timer timer))
|
2019-02-03 11:07:36 +01:00
|
|
|
|
(ignore-errors (delete-directory tmp-name 'recursive))))))
|
2014-03-07 15:11:37 +01:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; (tramp--test-deftest-direct-async-process tramp-test45-asynchronous-requests
|
2022-07-15 19:52:10 +02:00
|
|
|
|
;; 'unstable)
|
2020-12-20 19:45:11 +01:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test46-dired-compress-file ()
|
2021-11-07 13:59:32 +01:00
|
|
|
|
"Check that Tramp (un)compresses normal files."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2021-11-13 15:14:02 +01:00
|
|
|
|
;; Starting with Emacs 29.1, `dired-compress-file' is performed by
|
|
|
|
|
|
;; default handler.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(skip-unless (not (tramp--test-emacs29-p)))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
2021-11-07 13:59:32 +01:00
|
|
|
|
(tmp-name (tramp--test-make-temp-name)))
|
|
|
|
|
|
(write-region "foo" nil tmp-name)
|
|
|
|
|
|
(dired default-directory)
|
|
|
|
|
|
(dired-revert)
|
|
|
|
|
|
(dired-goto-file tmp-name)
|
|
|
|
|
|
(should-not (dired-compress))
|
|
|
|
|
|
(should (string= (concat tmp-name ".gz") (dired-get-filename)))
|
|
|
|
|
|
(should-not (dired-compress))
|
|
|
|
|
|
(should (string= tmp-name (dired-get-filename)))
|
|
|
|
|
|
(delete-file tmp-name)))
|
|
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test46-dired-compress-dir ()
|
2021-11-07 13:59:32 +01:00
|
|
|
|
"Check that Tramp (un)compresses directories."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-sh-p))
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(skip-unless (not (tramp--test-crypt-p)))
|
2021-11-13 15:14:02 +01:00
|
|
|
|
;; Starting with Emacs 29.1, `dired-compress-file' is performed by
|
|
|
|
|
|
;; default handler.
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
(skip-unless (not (tramp--test-emacs29-p)))
|
|
|
|
|
|
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(let ((default-directory ert-remote-temporary-file-directory)
|
2021-11-07 13:59:32 +01:00
|
|
|
|
(tmp-name (tramp--test-make-temp-name)))
|
|
|
|
|
|
(make-directory tmp-name)
|
|
|
|
|
|
(dired default-directory)
|
|
|
|
|
|
(dired-revert)
|
|
|
|
|
|
(dired-goto-file tmp-name)
|
|
|
|
|
|
(should-not (dired-compress))
|
|
|
|
|
|
(should (string= (concat tmp-name ".tar.gz") (dired-get-filename)))
|
|
|
|
|
|
(should-not (dired-compress))
|
|
|
|
|
|
(should (string= tmp-name (dired-get-filename)))
|
2021-11-12 08:56:51 +01:00
|
|
|
|
(delete-directory tmp-name)
|
|
|
|
|
|
(delete-file (concat tmp-name ".tar.gz"))))
|
2021-11-07 13:59:32 +01:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test47-read-password ()
|
2022-04-25 12:57:01 +02:00
|
|
|
|
"Check Tramp password handling."
|
2023-10-01 11:28:20 +02:00
|
|
|
|
:tags '(:expensive-test)
|
2022-04-25 12:57:01 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
(skip-unless (tramp--test-mock-p))
|
2022-04-27 20:15:07 +02:00
|
|
|
|
;; Not all read commands understand argument "-s" or "-p".
|
|
|
|
|
|
(skip-unless
|
|
|
|
|
|
(string-empty-p
|
|
|
|
|
|
(let ((shell-file-name "sh"))
|
|
|
|
|
|
(shell-command-to-string "read -s -p Password: pass"))))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
|
2022-04-27 07:07:21 +02:00
|
|
|
|
(let ((pass "secret")
|
2023-09-25 12:48:32 +02:00
|
|
|
|
(mock-entry (copy-tree (assoc "mock" tramp-methods)))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
mocked-input tramp-methods)
|
|
|
|
|
|
;; We must mock `read-string', in order to avoid interactive
|
|
|
|
|
|
;; arguments.
|
|
|
|
|
|
(cl-letf* (((symbol-function #'read-string)
|
|
|
|
|
|
(lambda (&rest _args) (pop mocked-input))))
|
|
|
|
|
|
(setcdr
|
|
|
|
|
|
(assq 'tramp-login-args mock-entry)
|
|
|
|
|
|
`((("-c")
|
|
|
|
|
|
(,(tramp-shell-quote-argument
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"read -s -p 'Password: ' pass; echo; "
|
|
|
|
|
|
"(test \"pass$pass\" != \"pass" pass "\" && "
|
|
|
|
|
|
"echo \"Login incorrect\" || sh -i)"))))))
|
|
|
|
|
|
(setq tramp-methods `(,mock-entry))
|
|
|
|
|
|
|
|
|
|
|
|
;; Reading password from stdin works.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
;; We don't want to invalidate the password.
|
|
|
|
|
|
(setq mocked-input `(,(copy-sequence pass)))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(should (file-exists-p ert-remote-temporary-file-directory))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
|
|
|
|
|
|
;; Don't entering a password returns in error.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input nil)
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(should-error (file-exists-p ert-remote-temporary-file-directory))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
|
|
|
|
|
|
;; A wrong password doesn't work either.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input `(,(concat pass pass)))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(should-error (file-exists-p ert-remote-temporary-file-directory))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
|
|
|
|
|
|
;; Reading password from auth-source works. We use the netrc
|
|
|
|
|
|
;; backend; the other backends shall behave similar.
|
|
|
|
|
|
;; Macro `ert-with-temp-file' was introduced in Emacs 29.1.
|
|
|
|
|
|
(with-no-warnings (when (symbol-plist 'ert-with-temp-file)
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input nil)
|
|
|
|
|
|
(auth-source-forget-all-cached)
|
|
|
|
|
|
(ert-with-temp-file netrc-file
|
|
|
|
|
|
:prefix "tramp-test" :suffix ""
|
|
|
|
|
|
:text (format
|
|
|
|
|
|
"machine %s port mock password %s"
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'host) pass)
|
2022-04-25 12:57:01 +02:00
|
|
|
|
(let ((auth-sources `(,netrc-file)))
|
2022-06-08 12:06:56 +02:00
|
|
|
|
(should (file-exists-p ert-remote-temporary-file-directory)))))))))
|
2022-04-25 12:57:01 +02:00
|
|
|
|
|
2023-10-01 11:28:20 +02:00
|
|
|
|
(ert-deftest tramp-test47-read-otp-password ()
|
2023-09-25 12:48:32 +02:00
|
|
|
|
"Check Tramp one-time password handling."
|
|
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
(skip-unless (tramp--test-mock-p))
|
|
|
|
|
|
;; Not all read commands understand argument "-s" or "-p".
|
|
|
|
|
|
(skip-unless
|
|
|
|
|
|
(string-empty-p
|
|
|
|
|
|
(let ((shell-file-name "sh"))
|
|
|
|
|
|
(shell-command-to-string "read -s -p Password: pass"))))
|
|
|
|
|
|
|
|
|
|
|
|
(let ((pass "secret")
|
|
|
|
|
|
(mock-entry (copy-tree (assoc "mock" tramp-methods)))
|
|
|
|
|
|
mocked-input tramp-methods)
|
|
|
|
|
|
;; We must mock `read-string', in order to avoid interactive
|
|
|
|
|
|
;; arguments.
|
|
|
|
|
|
(cl-letf* (((symbol-function #'read-string)
|
|
|
|
|
|
(lambda (&rest _args) (pop mocked-input))))
|
|
|
|
|
|
(setcdr
|
|
|
|
|
|
(assq 'tramp-login-args mock-entry)
|
|
|
|
|
|
`((("-c")
|
|
|
|
|
|
(,(tramp-shell-quote-argument
|
|
|
|
|
|
(concat
|
|
|
|
|
|
"read -s -p 'Verification code: ' pass; echo; "
|
|
|
|
|
|
"(test \"pass$pass\" != \"pass" pass "\" && "
|
|
|
|
|
|
"echo \"Login incorrect\" || sh -i)"))))))
|
|
|
|
|
|
(setq tramp-methods `(,mock-entry))
|
|
|
|
|
|
|
|
|
|
|
|
;; Reading password from stdin works.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
;; We don't want to invalidate the password.
|
|
|
|
|
|
(setq mocked-input `(,(copy-sequence pass)))
|
|
|
|
|
|
(should (file-exists-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
|
|
|
|
|
|
;; Don't entering a password returns in error.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input nil)
|
|
|
|
|
|
(should-error (file-exists-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
|
|
|
|
|
|
;; A wrong password doesn't work either.
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input `(,(concat pass pass)))
|
|
|
|
|
|
(should-error (file-exists-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
|
|
|
|
|
|
;; The password shouldn't be read from auth-source.
|
|
|
|
|
|
;; Macro `ert-with-temp-file' was introduced in Emacs 29.1.
|
|
|
|
|
|
(with-no-warnings (when (symbol-plist 'ert-with-temp-file)
|
|
|
|
|
|
(tramp-cleanup-connection tramp-test-vec 'keep-debug)
|
|
|
|
|
|
(setq mocked-input nil)
|
|
|
|
|
|
(auth-source-forget-all-cached)
|
|
|
|
|
|
(ert-with-temp-file netrc-file
|
|
|
|
|
|
:prefix "tramp-test" :suffix ""
|
|
|
|
|
|
:text (format
|
|
|
|
|
|
"machine %s port mock password %s"
|
|
|
|
|
|
(file-remote-p ert-remote-temporary-file-directory 'host)
|
|
|
|
|
|
pass)
|
|
|
|
|
|
(let ((auth-sources `(,netrc-file)))
|
|
|
|
|
|
(should-error
|
|
|
|
|
|
(file-exists-p ert-remote-temporary-file-directory)))))))))
|
|
|
|
|
|
|
2017-11-30 20:31:33 +01:00
|
|
|
|
;; This test is inspired by Bug#29163.
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test48-auto-load ()
|
2017-11-27 13:31:53 +01:00
|
|
|
|
"Check that Tramp autoloads properly."
|
2019-12-22 13:48:36 +01:00
|
|
|
|
;; If we use another syntax but `default', Tramp is already loaded
|
|
|
|
|
|
;; due to the `tramp-change-syntax' call.
|
|
|
|
|
|
(skip-unless (eq tramp-syntax 'default))
|
2018-08-08 19:57:54 +02:00
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(let ((default-directory (expand-file-name temporary-file-directory))
|
|
|
|
|
|
(code
|
|
|
|
|
|
(format
|
2019-06-04 12:51:45 +02:00
|
|
|
|
;; Suppress method name check.
|
|
|
|
|
|
"(let ((non-essential t)) \
|
|
|
|
|
|
(message \"Tramp loaded: %%s\" (and (file-remote-p %S) t)))"
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory)))
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2023-01-28 10:26:44 +01:00
|
|
|
|
(rx "Tramp loaded: t" (+ (any "\r\n")))
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(shell-command-to-string
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s -batch -Q -L %s --eval %s"
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(shell-quote-argument
|
|
|
|
|
|
(expand-file-name invocation-name invocation-directory))
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(mapconcat #'shell-quote-argument load-path " -L ")
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(shell-quote-argument code)))))))
|
|
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test48-delay-load ()
|
2017-11-29 09:37:42 +01:00
|
|
|
|
"Check that Tramp is loaded lazily, only when needed."
|
|
|
|
|
|
;; Tramp is neither loaded at Emacs startup, nor when completing a
|
|
|
|
|
|
;; non-Tramp file name like "/foo". Completing a Tramp-alike file
|
|
|
|
|
|
;; name like "/foo:" autoloads Tramp, when `tramp-mode' is t.
|
|
|
|
|
|
(let ((default-directory (expand-file-name temporary-file-directory))
|
|
|
|
|
|
(code
|
|
|
|
|
|
"(progn \
|
|
|
|
|
|
(setq tramp-mode %s) \
|
|
|
|
|
|
(message \"Tramp loaded: %%s\" (featurep 'tramp)) \
|
|
|
|
|
|
(file-name-all-completions \"/foo\" \"/\") \
|
|
|
|
|
|
(message \"Tramp loaded: %%s\" (featurep 'tramp)) \
|
|
|
|
|
|
(file-name-all-completions \"/foo:\" \"/\") \
|
|
|
|
|
|
(message \"Tramp loaded: %%s\" (featurep 'tramp)))"))
|
2017-12-08 16:37:53 +01:00
|
|
|
|
;; Tramp doesn't load when `tramp-mode' is nil.
|
|
|
|
|
|
(dolist (tm '(t nil))
|
2017-11-27 13:31:53 +01:00
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2023-01-28 10:26:44 +01:00
|
|
|
|
"Tramp loaded: nil" (+ (any "\r\n"))
|
|
|
|
|
|
"Tramp loaded: nil" (+ (any "\r\n"))
|
|
|
|
|
|
"Tramp loaded: " (literal (symbol-name tm)) (+ (any "\r\n")))
|
2017-11-27 13:31:53 +01:00
|
|
|
|
(shell-command-to-string
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s -batch -Q -L %s --eval %s"
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(shell-quote-argument
|
|
|
|
|
|
(expand-file-name invocation-name invocation-directory))
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(mapconcat #'shell-quote-argument load-path " -L ")
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(shell-quote-argument (format code tm)))))))))
|
2017-11-27 13:31:53 +01:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test48-recursive-load ()
|
2014-04-18 20:58:13 +02:00
|
|
|
|
"Check that Tramp does not fail due to recursive load."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
2017-07-05 17:03:42 +02:00
|
|
|
|
(let ((default-directory (expand-file-name temporary-file-directory)))
|
|
|
|
|
|
(dolist (code
|
|
|
|
|
|
(list
|
|
|
|
|
|
(format
|
2022-06-08 12:06:56 +02:00
|
|
|
|
"(expand-file-name %S)" ert-remote-temporary-file-directory)
|
2017-07-05 17:03:42 +02:00
|
|
|
|
(format
|
|
|
|
|
|
"(let ((default-directory %S)) (expand-file-name %S))"
|
2022-06-08 12:06:56 +02:00
|
|
|
|
ert-remote-temporary-file-directory
|
2017-07-05 17:03:42 +02:00
|
|
|
|
temporary-file-directory)))
|
|
|
|
|
|
(should-not
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2017-07-05 17:03:42 +02:00
|
|
|
|
"Recursive load"
|
|
|
|
|
|
(shell-command-to-string
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s -batch -Q -L %s --eval %s"
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(shell-quote-argument
|
|
|
|
|
|
(expand-file-name invocation-name invocation-directory))
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(mapconcat #'shell-quote-argument load-path " -L ")
|
2017-07-05 17:03:42 +02:00
|
|
|
|
(shell-quote-argument code))))))))
|
2014-04-18 20:58:13 +02:00
|
|
|
|
|
2023-01-17 16:00:08 +01:00
|
|
|
|
(ert-deftest tramp-test48-remote-load-path ()
|
2017-06-16 14:46:25 +02:00
|
|
|
|
"Check that Tramp autoloads its packages with remote `load-path'."
|
|
|
|
|
|
;; `tramp-cleanup-all-connections' is autoloaded from tramp-cmds.el.
|
|
|
|
|
|
;; It shall still work, when a remote file name is in the
|
|
|
|
|
|
;; `load-path'.
|
2017-07-05 17:03:42 +02:00
|
|
|
|
(let ((default-directory (expand-file-name temporary-file-directory))
|
|
|
|
|
|
(code
|
|
|
|
|
|
"(let ((force-load-messages t) \
|
|
|
|
|
|
(load-path (cons \"/foo:bar:\" load-path))) \
|
2017-06-16 14:46:25 +02:00
|
|
|
|
(tramp-cleanup-all-connections))"))
|
|
|
|
|
|
(should
|
Some Tramp adaptions, mainly direct async processes
* doc/misc/tramp.texi (Firewalls, Remote processes)
(Frequently Asked Questions): Add @vindex.
(Predefined connection information): Precise precondition or direct
async processes.
(Remote shell setup): Ban ssh RemoteCommand option.
(Frequently Asked Questions): Adapt quoting.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.5.1-pre".
* lisp/net/tramp-adb.el (tramp-methods) <adb>: Add `tramp-direct-async'
parameter.
(tramp-adb-handle-make-process): Adapt docstring.
* lisp/net/tramp-sh.el (tramp-methods) <scp, scpx, rsync, ssh, sshx>:
Add `tramp-direct-async' parameter.
(tramp-sh-handle-insert-directory): Simplify merkers.
(tramp-sh-handle-make-process): Adapt docstring.
* lisp/net/tramp.el (tramp-methods): Adapt docstring.
(tramp-debug-message): Suppress lockfiles.
(tramp-test-message): New defun.
(tramp-direct-async-process-p): Check also for `tramp-direct-async'.
(tramp-handle-make-process): Do not check for `tramp-direct-async-args'.
* test/lisp/net/tramp-tests.el (all): Replace `string-match' by
`string-match-p'.
(dired-copy-dereference): Declare.
(tramp-test-temporary-file-directory):
Remove `tramp-direct-async-args` for mock method.
(tramp-test15-copy-directory, tramp-test40-special-characters)
(tramp-test40-special-characters-with-stat)
(tramp-test40-special-characters-with-perl)
(tramp-test40-special-characters-with-ls, tramp-test41-utf8)
(tramp-test41-utf8-with-stat, tramp-test41-utf8-with-perl)
(tramp-test41-utf8-with-ls): Skip for tramp-rclone.el.
(tramp--test--deftest-direct-async-process): Do not skip for mock
method.
(tramp-test32-shell-command): Adapt test for direct async processes.
(tramp-test36-vc-registered, tramp--test-hpux-p, tramp--test-ksh-p):
Use `tramp-test-vec'.
2021-01-15 11:32:12 +01:00
|
|
|
|
(string-match-p
|
2023-01-06 13:34:33 +01:00
|
|
|
|
(rx
|
2022-09-09 17:10:28 +02:00
|
|
|
|
"Loading "
|
|
|
|
|
|
(literal
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
"tramp-cmds" (file-name-directory (locate-library "tramp")))))
|
2017-06-16 14:46:25 +02:00
|
|
|
|
(shell-command-to-string
|
|
|
|
|
|
(format
|
|
|
|
|
|
"%s -batch -Q -L %s -l tramp-sh --eval %s"
|
2018-01-07 18:50:06 +01:00
|
|
|
|
(shell-quote-argument
|
|
|
|
|
|
(expand-file-name invocation-name invocation-directory))
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(mapconcat #'shell-quote-argument load-path " -L ")
|
2017-06-16 14:46:25 +02:00
|
|
|
|
(shell-quote-argument code)))))))
|
|
|
|
|
|
|
2023-07-22 10:16:04 +02:00
|
|
|
|
(ert-deftest tramp-test49-without-remote-files ()
|
|
|
|
|
|
"Check that Tramp can be suppressed."
|
|
|
|
|
|
(skip-unless (tramp--test-enabled))
|
|
|
|
|
|
|
|
|
|
|
|
(should (file-remote-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(without-remote-files (file-remote-p ert-remote-temporary-file-directory)))
|
|
|
|
|
|
(should (file-remote-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
|
|
|
|
|
|
(inhibit-remote-files)
|
|
|
|
|
|
(should-not (file-remote-p ert-remote-temporary-file-directory))
|
|
|
|
|
|
(tramp-register-file-name-handlers)
|
|
|
|
|
|
(setq tramp-mode t)
|
|
|
|
|
|
(should (file-remote-p ert-remote-temporary-file-directory)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest tramp-test50-unload ()
|
2014-04-18 20:58:13 +02:00
|
|
|
|
"Check that Tramp and its subpackages unload completely.
|
|
|
|
|
|
Since it unloads Tramp, it shall be the last test to run."
|
2018-08-09 14:08:25 +02:00
|
|
|
|
:tags '(:expensive-test)
|
|
|
|
|
|
;; We have autoloaded objects from tramp.el and tramp-archive.el.
|
|
|
|
|
|
;; In order to remove them, we first need to load both packages.
|
|
|
|
|
|
(require 'tramp)
|
|
|
|
|
|
(require 'tramp-archive)
|
|
|
|
|
|
(should (featurep 'tramp))
|
|
|
|
|
|
(should (featurep 'tramp-archive))
|
|
|
|
|
|
;; This unloads also tramp-archive.el and tramp-theme.el if needed.
|
|
|
|
|
|
(unload-feature 'tramp 'force)
|
2022-02-13 20:50:51 +01:00
|
|
|
|
|
|
|
|
|
|
;; No Tramp feature must be left except the test packages.
|
2018-08-09 14:08:25 +02:00
|
|
|
|
(should-not (featurep 'tramp))
|
|
|
|
|
|
(should-not (featurep 'tramp-archive))
|
|
|
|
|
|
(should-not (featurep 'tramp-theme))
|
|
|
|
|
|
(should-not
|
|
|
|
|
|
(all-completions
|
|
|
|
|
|
"tramp" (delq 'tramp-tests (delq 'tramp-archive-tests features))))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
|
2018-08-09 14:08:25 +02:00
|
|
|
|
;; `file-name-handler-alist' must be clean.
|
2019-02-28 10:33:05 +01:00
|
|
|
|
(should-not (all-completions "tramp" (mapcar #'cdr file-name-handler-alist)))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
|
2018-08-09 14:08:25 +02:00
|
|
|
|
;; There shouldn't be left a bound symbol, except buffer-local
|
2022-02-13 20:50:51 +01:00
|
|
|
|
;; variables, and autoloaded functions. We do not regard our test
|
2018-08-09 14:08:25 +02:00
|
|
|
|
;; symbols, and the Tramp unload hooks.
|
|
|
|
|
|
(mapatoms
|
|
|
|
|
|
(lambda (x)
|
|
|
|
|
|
(and (or (and (boundp x) (null (local-variable-if-set-p x)))
|
2022-02-05 19:17:47 +01:00
|
|
|
|
(and (functionp x) (null (autoloadp (symbol-function x))))
|
|
|
|
|
|
(macrop x))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-prefix-p "tramp" (symbol-name x))
|
2023-07-05 11:33:57 +02:00
|
|
|
|
(string-match-p (rx bol "with" (| "tramp" "parsed")) (symbol-name x))
|
Sync with Tramp 2.5.0-pre
* doc/misc/tramp.texi: Protext Tramp x.y and Emacs x.y by @w{}.
(GVFS-based methods): Move "GNOME Online Accounts" index.
(Customizing Methods, Android shell setup, File name completion)
(Frequently Asked Questions): Fix typos.
* doc/misc/trampver.texi: Change version to "2.5.0-pre".
* lisp/net/trampver.el: Change version to "2.5.0-pre".
(inhibit-message): Don't declare.
* lisp/net/tramp.el: Bump version to 2.5.0-pre. Require Emacs 25.1.
(tramp-debug-message): Simplify.
(tramp-message): Don't use `tramp-message-show-message'.
(tramp-with-demoted-errors, with-parsed-tramp-file-name)
(with-tramp-file-property, with-tramp-connection-property):
Adapt `declare' form.
(with-tramp-progress-reporter): Suppress progress reporter when
noninteractive.
(tramp-completion-mode, tramp-completion-mode-p): Remove.
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(format-message): Remove compatibility code.
(tramp-compat-directory-name-p)
(tramp-compat-tramp-file-name-slots): Remove.
* lisp/net/tramp.el (tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-with-buffer)
(tramp-user-error, tramp-with-demoted-errors)
(tramp-signal-hook-function):
* lisp/net/tramp-compat.el (tramp-compat-funcall)
* lisp/net/tramp-gvfs.el (tramp-dbus-function):
Add `tramp-suppress-trace' property.
* lisp/net/tramp.el (tramp-get-method-parameter)
(tramp-dissect-file-name, tramp-error, tramp-error-with-buffer)
(tramp-user-error, with-parsed-tramp-file-name)
(with-tramp-progress-reporter, tramp-file-name-handler)
(tramp-completion-file-name-handler, tramp-autoload-file-name-handler)
(tramp-register-file-name-handlers, tramp-connectable-p)
(tramp-handle-file-modes, tramp-handle-file-regular-p)
(tramp-handle-file-truename, tramp-handle-insert-directory)
(tramp-handle-load, tramp-set-file-uid-gid):
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler)
(tramp-adb-handle-file-truename, tramp-adb-handle-copy-file)
(tramp-adb-handle-rename-file):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-cache.el (tramp-get-file-property, tramp-cache-print):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(tramp-compat-exec-path):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
(tramp-gvfs-dbus-byte-array-to-string)
(tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler)
(tramp-rclone-do-copy-or-rename-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file)
(tramp-sh-handle-insert-directory, tramp-sh-file-name-handler)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler)
(tramp-smb-handle-copy-file, tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-insert-directory)
(tramp-smb-handle-rename-file, tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler)
(tramp-sudoedit-do-copy-or-rename-file)
(tramp-sudoedit-handle-file-truename):
Use `if-let', `when-let', `directory-name-p', `inhibit-message',
`non-essential and `cl-struct-slot-info'. Don't use `seconds-to-time'.
* test/lisp/net/tramp-archive-tests.el (tramp-message-show-message):
Don't set.
* test/lisp/net/tramp-tests.el (inhibit-message): Don't declare.
(tramp-message-show-message): Don't set.
(tramp-test06-directory-file-name): Use `non-essential'.
(tramp-test10-write-region): Use `inhibit-message'.
(tramp-test36-vc-registered): No special handling for old Emacsen.
(tramp--test-emacs25-p): Remove.
(tramp-test45-unload): Special case of `tramp-completion-mode'.
2020-01-19 14:11:07 +01:00
|
|
|
|
;; `tramp-completion-mode' is autoloaded in Emacs < 28.1.
|
|
|
|
|
|
(not (eq 'tramp-completion-mode x))
|
2022-11-23 12:00:35 +01:00
|
|
|
|
;; `tramp-register-archive-file-name-handler' is autoloaded
|
|
|
|
|
|
;; in Emacs < 29.1.
|
|
|
|
|
|
(not (eq 'tramp-register-archive-file-name-handler x))
|
2023-01-08 19:24:17 +01:00
|
|
|
|
;; `tramp-compat-rx' is autoloaded in Emacs 29.1.
|
|
|
|
|
|
(not (eq 'tramp-compat-rx x))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(not (string-match-p
|
|
|
|
|
|
(rx bol "tramp" (? "-archive") (** 1 2 "-") "test")
|
|
|
|
|
|
(symbol-name x)))
|
|
|
|
|
|
(not (string-suffix-p "unload-hook" (symbol-name x)))
|
2022-02-05 19:17:47 +01:00
|
|
|
|
(not (get x 'tramp-autoload))
|
2018-08-09 14:08:25 +02:00
|
|
|
|
(ert-fail (format "`%s' still bound" x)))))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
|
2018-08-09 14:08:25 +02:00
|
|
|
|
;; The defstruct `tramp-file-name' and all its internal functions
|
Sync with Tramp 2.5.0-pre
* doc/misc/tramp.texi: Protext Tramp x.y and Emacs x.y by @w{}.
(GVFS-based methods): Move "GNOME Online Accounts" index.
(Customizing Methods, Android shell setup, File name completion)
(Frequently Asked Questions): Fix typos.
* doc/misc/trampver.texi: Change version to "2.5.0-pre".
* lisp/net/trampver.el: Change version to "2.5.0-pre".
(inhibit-message): Don't declare.
* lisp/net/tramp.el: Bump version to 2.5.0-pre. Require Emacs 25.1.
(tramp-debug-message): Simplify.
(tramp-message): Don't use `tramp-message-show-message'.
(tramp-with-demoted-errors, with-parsed-tramp-file-name)
(with-tramp-file-property, with-tramp-connection-property):
Adapt `declare' form.
(with-tramp-progress-reporter): Suppress progress reporter when
noninteractive.
(tramp-completion-mode, tramp-completion-mode-p): Remove.
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(format-message): Remove compatibility code.
(tramp-compat-directory-name-p)
(tramp-compat-tramp-file-name-slots): Remove.
* lisp/net/tramp.el (tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-with-buffer)
(tramp-user-error, tramp-with-demoted-errors)
(tramp-signal-hook-function):
* lisp/net/tramp-compat.el (tramp-compat-funcall)
* lisp/net/tramp-gvfs.el (tramp-dbus-function):
Add `tramp-suppress-trace' property.
* lisp/net/tramp.el (tramp-get-method-parameter)
(tramp-dissect-file-name, tramp-error, tramp-error-with-buffer)
(tramp-user-error, with-parsed-tramp-file-name)
(with-tramp-progress-reporter, tramp-file-name-handler)
(tramp-completion-file-name-handler, tramp-autoload-file-name-handler)
(tramp-register-file-name-handlers, tramp-connectable-p)
(tramp-handle-file-modes, tramp-handle-file-regular-p)
(tramp-handle-file-truename, tramp-handle-insert-directory)
(tramp-handle-load, tramp-set-file-uid-gid):
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler)
(tramp-adb-handle-file-truename, tramp-adb-handle-copy-file)
(tramp-adb-handle-rename-file):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-cache.el (tramp-get-file-property, tramp-cache-print):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(tramp-compat-exec-path):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
(tramp-gvfs-dbus-byte-array-to-string)
(tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler)
(tramp-rclone-do-copy-or-rename-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file)
(tramp-sh-handle-insert-directory, tramp-sh-file-name-handler)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler)
(tramp-smb-handle-copy-file, tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-insert-directory)
(tramp-smb-handle-rename-file, tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler)
(tramp-sudoedit-do-copy-or-rename-file)
(tramp-sudoedit-handle-file-truename):
Use `if-let', `when-let', `directory-name-p', `inhibit-message',
`non-essential and `cl-struct-slot-info'. Don't use `seconds-to-time'.
* test/lisp/net/tramp-archive-tests.el (tramp-message-show-message):
Don't set.
* test/lisp/net/tramp-tests.el (inhibit-message): Don't declare.
(tramp-message-show-message): Don't set.
(tramp-test06-directory-file-name): Use `non-essential'.
(tramp-test10-write-region): Use `inhibit-message'.
(tramp-test36-vc-registered): No special handling for old Emacsen.
(tramp--test-emacs25-p): Remove.
(tramp-test45-unload): Special case of `tramp-completion-mode'.
2020-01-19 14:11:07 +01:00
|
|
|
|
;; shall be purged.
|
|
|
|
|
|
(should-not (cl--find-class 'tramp-file-name))
|
2018-08-09 14:08:25 +02:00
|
|
|
|
(mapatoms
|
|
|
|
|
|
(lambda (x)
|
2022-08-04 11:59:18 +02:00
|
|
|
|
(and (functionp x) (null (autoloadp (symbol-function x)))
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-prefix-p "tramp-file-name" (symbol-name x))
|
2018-08-09 14:08:25 +02:00
|
|
|
|
(ert-fail (format "Structure function `%s' still exists" x)))))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
|
2018-08-09 14:08:25 +02:00
|
|
|
|
;; There shouldn't be left a hook function containing a Tramp
|
|
|
|
|
|
;; function. We do not regard the Tramp unload hooks.
|
|
|
|
|
|
(mapatoms
|
|
|
|
|
|
(lambda (x)
|
|
|
|
|
|
(and (boundp x)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(string-match-p
|
|
|
|
|
|
(rx "-" (| "hook" "function") (? "s") eol) (symbol-name x))
|
|
|
|
|
|
(not (string-suffix-p "unload-hook" (symbol-name x)))
|
2018-08-09 14:08:25 +02:00
|
|
|
|
(consp (symbol-value x))
|
|
|
|
|
|
(ignore-errors (all-completions "tramp" (symbol-value x)))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(ert-fail (format "Hook `%s' still contains Tramp function" x)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; There shouldn't be left an advice function from Tramp.
|
|
|
|
|
|
(mapatoms
|
|
|
|
|
|
(lambda (x)
|
|
|
|
|
|
(and (functionp x)
|
|
|
|
|
|
(advice-mapc
|
|
|
|
|
|
(lambda (fun _symbol)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(and (string-prefix-p "tramp" (symbol-name fun))
|
2022-02-13 20:50:51 +01:00
|
|
|
|
(ert-fail
|
|
|
|
|
|
(format "Function `%s' still contains Tramp advice" x))))
|
2022-03-17 15:32:01 +01:00
|
|
|
|
x))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Reload.
|
|
|
|
|
|
(require 'tramp)
|
|
|
|
|
|
(require 'tramp-archive)
|
|
|
|
|
|
(should (featurep 'tramp))
|
|
|
|
|
|
(should (featurep 'tramp-archive)))
|
2014-04-18 20:58:13 +02:00
|
|
|
|
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(defun tramp-test-all (&optional interactive)
|
Adapt Tramp docstrings according to checkdoc
* lisp/net/tramp.el (tramp-backup-directory-alist)
(tramp-echoed-echo-mark-regexp, tramp-syntax-values)
(tramp-lookup-syntax, tramp-build-prefix-format)
(tramp-build-prefix-regexp, tramp-build-method-regexp)
(tramp-build-postfix-method-format)
(tramp-build-postfix-method-regexp)
(tramp-build-prefix-ipv6-format, tramp-build-prefix-ipv6-regexp)
(tramp-build-postfix-ipv6-format)
(tramp-build-postfix-ipv6-regexp)
(tramp-build-postfix-host-format)
(tramp-build-postfix-host-regexp, tramp-unknown-id-string)
(tramp-unknown-id-integer, tramp-build-file-name-regexp)
(tramp-build-completion-file-name-regexp, tramp-chunksize)
(tramp-find-method, tramp-find-user, tramp-find-host)
(tramp-dissect-file-name, tramp-get-buffer)
(tramp-get-connection-buffer, tramp-debug-message, tramp-error)
(with-tramp-connection-property, tramp-run-real-handler)
(tramp-file-name-for-operation, tramp-file-name-handler)
(tramp-completion-file-name-handler)
(tramp-completion-handle-file-name-completion)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-mode-string-to-int)
(tramp-file-mode-from-int):
* lisp/net/tramp-adb.el (tramp-adb-file-name-p):
* lisp/net/tramp-archive.el (tramp-archive-run-real-handler)
(tramp-archive-file-name-handler)
(tramp-archive-dissect-file-name)
(with-parsed-tramp-archive-file-name)
(tramp-archive-gvfs-file-name, tramp-archive-handle-access-file):
* lisp/net/tramp-cmds.el (tramp-list-remote-buffers):
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-compat-funcall, tramp-compat-tramp-file-name-slots):
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-p)
(tramp-gvfs-file-name-handler)
(tramp-gvfs-stringify-dbus-message)
(tramp-gvfs-monitor-process-filter)
(tramp-gvfs-handler-mounted-unmounted):
* lisp/net/tramp-integration.el
(tramp-rfn-eshadow-update-overlay-regexp):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-p)
(tramp-rclone-file-name-handler, tramp-rclone-send-command):
* lisp/net/tramp-sh.el (tramp-sh--quoting-style-options)
(tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter, tramp-find-executable)
(tramp-set-remote-path, tramp-open-shell, tramp-find-shell)
(tramp-send-command-and-check, tramp-shell-case-fold)
(tramp-get-remote-path):
* lisp/net/tramp-smb.el (tramp-smb-file-name-p)
(tramp-smb-file-name-handler)
(tramp-smb-do-file-attributes-with-stat)
(tramp-smb-handle-substitute-in-file-name)
(tramp-smb-get-stat-capability, tramp-smb-shell-quote-argument):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-p)
(tramp-sudoedit-file-name-handler)
(tramp-sudoedit-send-command-string):
* test/lisp/net/tramp-archive-tests.el (tramp-archive-test-all):
* test/lisp/net/tramp-tests.el (tramp--test-gvfs-p)
(tramp--test-with-proper-process-name-and-buffer)
(tramp-test-all): Adapt docstrings according to `checkdoc'.
2019-11-13 13:10:58 +01:00
|
|
|
|
"Run all tests for \\[tramp].
|
|
|
|
|
|
If INTERACTIVE is non-nil, the tests are run interactively."
|
2017-11-29 09:37:42 +01:00
|
|
|
|
(interactive "p")
|
|
|
|
|
|
(funcall
|
2021-02-17 18:04:35 +01:00
|
|
|
|
(if interactive #'ert-run-tests-interactively #'ert-run-tests-batch)
|
Use `rx' in Tramp where possible
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Use `rx' where possible.
* lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times):
Use `eval-when-compile'.
(tramp-adb-maybe-open-connection): Use file-property for "/". Use
`eval-when-compile'.
* lisp/net/tramp-cmds.el (mm-7bit-chars): Declare.
(tramp-reporter-dump-variable): Simplify point movement.
* lisp/net/tramp-gvfs.el (tramp-dbus-function): Fix typo.
(tramp-zeroconf-parse-device-names): Use `tramp-prefix-port-format'.
* lisp/net/tramp-sh.el (tramp-open-shell, tramp-find-shell):
Use `eval-when-compile'. Improve sanity check.
* lisp/net/tramp.el (tramp-prefix-format, tramp-prefix-regexp)
(tramp-method-regexp, tramp-postfix-method-format)
(tramp-postfix-method-regexp, tramp-prefix-ipv6-format)
(tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format)
(tramp-postfix-ipv6-regexp, tramp-postfix-host-format)
(tramp-postfix-host-regexp, tramp-remote-file-name-spec-regexp)
(tramp-file-name-structure, tramp-file-name-regexp)
(tramp-completion-method-regexp)
(tramp-completion-file-name-regexp): Declare.
(tramp-set-syntax): Set also `tramp-completion-method-regexp'.
(tramp-volume-letter-regexp, tramp-completion-method-regexp-alist):
New defconsts.
(tramp-build-completion-method-regexp): New defun.
(tramp-completion-method-regexp): New defvar.
(tramp-completion-file-name-regexp-default)
(tramp-completion-file-name-regexp-simplified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-alist): Remove.
(tramp-build-completion-file-name-regexp): Rwrite.
(tramp-make-tramp-file-name): Use `tramp-archive-method'.
(tramp-handle-file-directory-p): Ignore errors.
(tramp-handle-find-backup-file-name, tramp-handle-lock-file)
(tramp-handle-make-auto-save-file-name): Use `eval-when-compile'.
* test/lisp/net/tramp-archive-tests.el:
* test/lisp/net/tramp-tests.el: Use `rx' where possible.
(tramp-test01-file-name-syntax): Adapt test.
2022-08-26 16:19:47 +02:00
|
|
|
|
(rx bol "tramp")))
|
2017-11-29 09:37:42 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;; TODO:
|
|
|
|
|
|
|
Remove Emacs 25 compatibility from Tramp
* doc/misc/tramp.texi (Remote programs, Remote processes)
(Frequently Asked Questions): Adapt Emacs versions.
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.6.0-pre".
* lisp/net/tramp-adb.el (top): Don't use `tramp-compat-funcall' for
connection-local functions.
* lisp/net/tramp-compat.el (tramp-unload-file-name-handlers)
(tramp-handle-temporary-file-directory)
(tramp-compat-temporary-file-directory-function)
(tramp-compat-file-attribute-type)
(tramp-compat-file-attribute-link-number)
(tramp-compat-file-attribute-user-id)
(tramp-compat-file-attribute-group-id)
(tramp-compat-file-attribute-access-time)
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-status-change-time)
(tramp-compat-file-attribute-size)
(tramp-compat-file-attribute-modes, tramp-file-missing)
(tramp-compat-file-missing, tramp-compat-file-local-name): Remove.
(tramp-compat-file-name-quoted-p, tramp-compat-file-name-quote)
(tramp-compat-file-name-unquote)
(tramp-compat-progress-reporter-update)
(tramp-compat-file-modes, tramp-compat-set-file-modes)
(tramp-compat-set-file-times, tramp-compat-directory-files)
(tramp-compat-directory-files-and-attributes): Adapt implementation.
* lisp/net/tramp.el:
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sudoedit.el: Adapt callees.
* lisp/net/tramp-crypt.el (tramp-crypt-config-file-name):
Expand file name.
* lisp/net/tramp-fuse.el (tramp-fuse-handle-file-readable-p): Remove.
* lisp/net/tramp-gvfs.el (tramp-gvfs-enabled): Don't check Emacs version.
(tramp-gvfs-handler-mounted-unmounted): Use `make-tramp-file-name'.
* lisp/net/tramp-integration.el (rfn-eshadow-overlay):
Remove declaration.
(top): Don't use `tramp-compat-funcall' for connection-local functions.
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist):
Use `tramp-rclone-handle-file-readable-p'.
(tramp-rclone-handle-file-readable-p): New defun.
* lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist):
Use `tramp-handle-file-readable-p'.
* lisp/net/tramp.el (tramp-temp-name-prefix, tramp-lookup-syntax):
Adapt docstring.
(tramp-set-connection-local-variables)
(tramp-set-connection-local-variables-for-buffer): Don't use
`tramp-compat-funcall' for connection-local functions.
(tramp-file-name-for-operation): Reorder list.
(tramp-handle-make-symbolic-link): Don't handle TARGET and
OK-IF-ALREADY-EXISTS.
(tramp-read-passwd): Don't use `read-passwd' any longer.
(top): Don't check for `interrupt-process-functions'.
* test/lisp/net/tramp-archive-tests.el (tramp-archive--test-emacs26-p):
Remove.
(tramp-archive-test02-file-name-dissect): Use `make-tramp-file-name'.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-archive-test46-auto-load)
(tramp-archive-test46-delay-load): Rename.
* test/lisp/net/tramp-tests.el (dired-aux, seq): Require them.
(dired-compress, connection-local-criteria-alist)
(connection-local-profile-alist, async-shell-command-width):
Don't declare.
(all): Replace Emacs 26 compatibility functions with their
original name.
(tramp-test04-substitute-in-file-name)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test15-copy-directory)
(tramp-test17-insert-directory)
(tramp-test17-dired-with-wildcards, tramp-test21-file-links)
(tramp-test31-interrupt-process)
(tramp-test34-connection-local-variables)
(tramp-test34-explicit-shell-file-name)
(tramp-test40-make-nearby-temp-file)
(tramp-test41-special-characters, tramp-test42-utf8)
(tramp-test46-delay-load, tramp-test46-remote-load-path)
(tramp-test47-unload): Don't check for Emacs 26 special features.
(tramp--test-emacs26-p): Remove.
(tramp--test-emacs29-p): New defun.
(tramp-test45-dired-compress-file)
(tramp-test45-dired-compress-dir): Use it.
(tramp-test44-asynchronous-requests): Use `seq-random-elt'.
2021-11-12 18:17:32 +01:00
|
|
|
|
;; * dired-uncache (partly done in other test functions)
|
2017-12-08 16:37:53 +01:00
|
|
|
|
;; * file-equal-p (partly done in `tramp-test21-file-links')
|
|
|
|
|
|
;; * file-in-directory-p
|
Implement quoting the local part of a remote file name
* doc/emacs/files.texi (Quoted File Names):
* etc/NEWS: Mention quoting the local part of a remote file name.
* lisp/net/tramp.el (tramp-dissect-file-name): Check with
`tramp-tramp-file-p'.
(tramp-quoted-name-p, tramp-quote-name, tramp-unquote-name):
New defsubst.
(tramp-handle-substitute-in-file-name)
(tramp-handle-make-auto-save-file-name): Handle quoted files.
(tramp-shell-quote-argument): Unquote argument.
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename):
Handle quoted files.
* test/lisp/net/tramp-tests.el (tramp--test-expensive-test): New defvar.
(tramp--test-make-temp-name): New argument QUOTED.
(tramp-test01-file-name-syntax)
(tramp-test02-file-name-dissect)
(tramp-test04-substitute-in-file-name)
(tramp-test05-expand-file-name, tramp-test07-file-exists-p)
(tramp-test08-file-local-copy)
(tramp-test09-insert-file-contents)
(tramp-test10-write-region, tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test13-make-directory)
(tramp-test14-delete-directory, tramp-test15-copy-directory)
(tramp-test16-directory-files)
(tramp-test17-insert-directory)
(tramp-test18-file-attributes)
(tramp-test19-directory-files-and-attributes)
(tramp-test20-file-modes, tramp-test21-file-links)
(tramp-test22-file-times, tramp-test23-visited-file-modtime)
(tramp-test24-file-name-completion, tramp-test25-load)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command, tramp-test30-vc-registered)
(tramp-test31-make-auto-save-file-name)
(tramp--test-check-files)
(tramp-test35-asynchronous-requests): Test also quoted file names.
(tramp--test-shell-command-to-string-asynchronously): Rename.
(tramp-test29-environment-variables): Use it.
2016-12-04 12:12:06 +01:00
|
|
|
|
;; * file-name-case-insensitive-p
|
2023-01-08 19:24:17 +01:00
|
|
|
|
;; * memory-info
|
|
|
|
|
|
;; * tramp-get-home-directory
|
2019-01-22 15:22:52 +01:00
|
|
|
|
;; * tramp-set-file-uid-gid
|
2013-11-05 15:46:57 +01:00
|
|
|
|
|
2014-06-15 17:56:58 +02:00
|
|
|
|
;; * Work on skipped tests. Make a comment, when it is impossible.
|
2023-09-14 14:38:27 +02:00
|
|
|
|
;; * Use `skip-when' starting with Emacs 30.1.
|
2018-06-20 12:13:56 +02:00
|
|
|
|
;; * Revisit expensive tests, once problems in `tramp-error' are solved.
|
2021-10-20 18:14:00 +02:00
|
|
|
|
;; * Fix `tramp-test06-directory-file-name' for "ftp".
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; * Check, why a process filter t doesn't work in
|
|
|
|
|
|
;; `tramp-test29-start-file-process' and
|
|
|
|
|
|
;; `tramp-test30-make-process'.
|
2022-05-05 09:54:31 +02:00
|
|
|
|
;; * Implement `tramp-test31-interrupt-process' and
|
|
|
|
|
|
;; `tramp-test31-signal-process' for "adb", "sshfs" and for direct
|
|
|
|
|
|
;; async processes. Check, why they don't run stable.
|
2021-03-12 16:09:42 +01:00
|
|
|
|
;; * Check, why direct async processes do not work for
|
2023-01-17 16:00:08 +01:00
|
|
|
|
;; `tramp-test45-asynchronous-requests'.
|
2013-11-27 15:23:32 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
(provide 'tramp-tests)
|
Sync with Tramp 2.5.0-pre
* doc/misc/tramp.texi: Protext Tramp x.y and Emacs x.y by @w{}.
(GVFS-based methods): Move "GNOME Online Accounts" index.
(Customizing Methods, Android shell setup, File name completion)
(Frequently Asked Questions): Fix typos.
* doc/misc/trampver.texi: Change version to "2.5.0-pre".
* lisp/net/trampver.el: Change version to "2.5.0-pre".
(inhibit-message): Don't declare.
* lisp/net/tramp.el: Bump version to 2.5.0-pre. Require Emacs 25.1.
(tramp-debug-message): Simplify.
(tramp-message): Don't use `tramp-message-show-message'.
(tramp-with-demoted-errors, with-parsed-tramp-file-name)
(with-tramp-file-property, with-tramp-connection-property):
Adapt `declare' form.
(with-tramp-progress-reporter): Suppress progress reporter when
noninteractive.
(tramp-completion-mode, tramp-completion-mode-p): Remove.
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(format-message): Remove compatibility code.
(tramp-compat-directory-name-p)
(tramp-compat-tramp-file-name-slots): Remove.
* lisp/net/tramp.el (tramp-debug-message, tramp-message)
(tramp-backtrace, tramp-error, tramp-error-with-buffer)
(tramp-user-error, tramp-with-demoted-errors)
(tramp-signal-hook-function):
* lisp/net/tramp-compat.el (tramp-compat-funcall)
* lisp/net/tramp-gvfs.el (tramp-dbus-function):
Add `tramp-suppress-trace' property.
* lisp/net/tramp.el (tramp-get-method-parameter)
(tramp-dissect-file-name, tramp-error, tramp-error-with-buffer)
(tramp-user-error, with-parsed-tramp-file-name)
(with-tramp-progress-reporter, tramp-file-name-handler)
(tramp-completion-file-name-handler, tramp-autoload-file-name-handler)
(tramp-register-file-name-handlers, tramp-connectable-p)
(tramp-handle-file-modes, tramp-handle-file-regular-p)
(tramp-handle-file-truename, tramp-handle-insert-directory)
(tramp-handle-load, tramp-set-file-uid-gid):
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler)
(tramp-adb-handle-file-truename, tramp-adb-handle-copy-file)
(tramp-adb-handle-rename-file):
* lisp/net/tramp-archive.el (with-parsed-tramp-archive-file-name):
* lisp/net/tramp-cache.el (tramp-get-file-property, tramp-cache-print):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p)
(tramp-compat-exec-path):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler)
(tramp-gvfs-dbus-byte-array-to-string)
(tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler)
(tramp-rclone-do-copy-or-rename-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file)
(tramp-sh-handle-insert-directory, tramp-sh-file-name-handler)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler)
(tramp-smb-handle-copy-file, tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-insert-directory)
(tramp-smb-handle-rename-file, tramp-smb-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler)
(tramp-sudoedit-do-copy-or-rename-file)
(tramp-sudoedit-handle-file-truename):
Use `if-let', `when-let', `directory-name-p', `inhibit-message',
`non-essential and `cl-struct-slot-info'. Don't use `seconds-to-time'.
* test/lisp/net/tramp-archive-tests.el (tramp-message-show-message):
Don't set.
* test/lisp/net/tramp-tests.el (inhibit-message): Don't declare.
(tramp-message-show-message): Don't set.
(tramp-test06-directory-file-name): Use `non-essential'.
(tramp-test10-write-region): Use `inhibit-message'.
(tramp-test36-vc-registered): No special handling for old Emacsen.
(tramp--test-emacs25-p): Remove.
(tramp-test45-unload): Special case of `tramp-completion-mode'.
2020-01-19 14:11:07 +01:00
|
|
|
|
|
2013-11-05 15:46:57 +01:00
|
|
|
|
;;; tramp-tests.el ends here
|