branch: externals/tramp
commit 65787fc66892f47cf984973712c8465cc7dadb45
Author: Michael Albinus
Commit: Michael Albinus
Sync with Tramp master
---
Makefile | 23 ++-
README-GIT | 4 +-
test/Makefile| 5 +-
test/tramp-tests.el | 393 +--
texi/Makefile| 6 +-
texi/tramp.texi | 4 +
tramp-adb.el | 7 +-
tramp-gvfs.el| 2 +-
tramp-integration.el | 7 +-
tramp-rclone.el | 2 +-
tramp-sh.el | 46 +++---
tramp-smb.el | 12 +-
tramp-sudoedit.el| 14 +-
tramp.el | 25 +++-
tramp.info | 107 +++---
15 files changed, 383 insertions(+), 274 deletions(-)
diff --git a/Makefile b/Makefile
index 9b23a9d..30d250b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,30 @@
EMACS = emacs -Q -batch -L .
LISP_FILES = $(wildcard *.el)
-.PHONY: all autoloads check info test
+.PHONY: all autoloads check info sync test
.SUFFIXES: .el
-all: autoloads info
+all: sync autoloads info
+
+sync:
+ cp -p ~/src/tramp/lisp/tramp-adb.el tramp-adb.el
+ cp -p ~/src/tramp/lisp/tramp-archive.el tramp-archive.el
+ cp -p ~/src/tramp/lisp/tramp-cache.el tramp-cache.el
+ cp -p ~/src/tramp/lisp/tramp-cmds.el tramp-cmds.el
+ cp -p ~/src/tramp/lisp/tramp-compat.el tramp-compat.el
+ cp -p ~/src/tramp/lisp/tramp-ftp.el tramp-ftp.el
+ cp -p ~/src/tramp/lisp/tramp-gvfs.el tramp-gvfs.el
+ cp -p ~/src/tramp/lisp/tramp-integration.el tramp-integration.el
+ cp -p ~/src/tramp/lisp/tramp-rclone.el tramp-rclone.el
+ cp -p ~/src/tramp/lisp/tramp-sh.el tramp-sh.el
+ cp -p ~/src/tramp/lisp/tramp-smb.el tramp-smb.el
+ cp -p ~/src/tramp/lisp/tramp-sudoedit.el tramp-sudoedit.el
+ cp -p ~/src/tramp/lisp/tramp-uu.el tramp-uu.el
+ cp -p ~/src/tramp/lisp/tramp.el tramp.el
+ cp -p ~/src/tramp/lisp/trampver.el trampver.el
+ $(MAKE) -C texi sync
+ $(MAKE) -C test sync
autoloads: $(LISP_FILES)
$(EMACS) -l autoload\
diff --git a/README-GIT b/README-GIT
index 0b9bc6c..5dab910 100644
--- a/README-GIT
+++ b/README-GIT
@@ -8,5 +8,5 @@ remotes, "origin" and "elpa". They are pulled/pushed like this:
# git push elpa externals/tramp
These commands do not apply to the local ELPA repository. This uses
-"make externals" for a pull; a push for the Tramp part is not
-expected.
+"git pull; make externals" for a pull; a push for the Tramp part is
+not expected.
diff --git a/test/Makefile b/test/Makefile
index 0f5441e..092f2b4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,7 +28,7 @@ TESTS = tramp-tests
TRAMP_TEST_ARGS ?=
SELECTOR ?= t
-.PHONY: all check test clean distclean
+.PHONY: all check clean distclean sync test
# We want to keep *.elc files.
.SECONDARY:
@@ -46,6 +46,9 @@ check test: $(TESTS)
%.elc: %.el
$(EMACS) -l bytecomp -f batch-byte-compile $?
+sync:
+ cp -p ~/src/tramp/test/tramp-tests.el tramp-tests.el
+
clean:
$(RM) $(CLEAN_FILES)
diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index fd30e9c..5b7d149 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -176,10 +176,9 @@ properly. BODY shall not contain a timeout."
(let ((tramp--test-instrument-test-case-p t)) ,@body)
;; Unwind forms.
(when (and (null tramp--test-instrument-test-case-p) (> tramp-verbose
3))
-(with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
- (with-current-buffer (tramp-get-connection-buffer v)
-(message "%s" (buffer-string)))
- (with-current-buffer (tramp-get-debug-buffer v)
+(dolist (buf (tramp-list-tramp-buffers))
+ (message ";; %s" buf)
+ (with-current-buffer buf
(message "%s" (buffer-string
(defsubst tramp--test-message (fmt-string &rest arguments)
@@ -412,15 +411,26 @@ properly. BODY shall not contain a timeout."
(ert-deftest tramp-test02-file-name-dissect ()
"Check remote file name components."
+ ;; `user-error' has appeared in Emacs 24.3.
+ (skip-unless (fboundp 'user-error))
+
(let ((tramp-default-method "default-method")
(tramp-default-user "default-user")
(tramp-default-host "default-host")
tramp-default-method-alist
tramp-default-user-alist
tramp-default-host-alist
+ ;; Suppress method name check.
+ (non-essential t)
;; Suppress check for multihops.
(tramp-cache-data (make-hash-table :test #'equal))
(tramp-connection-properties '((nil "login-program" t
+;; An unknown method shall raise an error.
+(let (non-essential)
+ (should-error
+ (expand-file-name "/method:user@host:")
+ :type 'user-error))
+
;; Expand `tramp-default-user' and `tramp-default-host'.
(should (string-equal
(file-remote-p
