[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp.el |
Date: |
Sun, 05 Dec 2004 16:49:24 -0500 |
Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.57 emacs/lisp/net/tramp.el:1.58
*** emacs/lisp/net/tramp.el:1.57 Fri Nov 26 21:39:02 2004
--- emacs/lisp/net/tramp.el Sun Dec 5 21:42:44 2004
***************
*** 34,40 ****
;;
;; Notes:
;; -----
! ;;
;; This package only works for Emacs 20 and higher, and for XEmacs 21
;; and higher. (XEmacs 20 is missing the `with-timeout' macro. Emacs
;; 19 is reported to have other problems. For XEmacs 21, you need the
--- 34,40 ----
;;
;; Notes:
;; -----
! ;;
;; This package only works for Emacs 20 and higher, and for XEmacs 21
;; and higher. (XEmacs 20 is missing the `with-timeout' macro. Emacs
;; 19 is reported to have other problems. For XEmacs 21, you need the
***************
*** 205,211 ****
gives the same backup policy for Tramp files on their hosts like the
policy for local files."
! :type '(repeat
(list (regexp :tag "File regexp")
(string :tag "Backup Dir")
(set :inline t
--- 205,211 ----
gives the same backup policy for Tramp files on their hosts like the
policy for local files."
! :type '(repeat
(list (regexp :tag "File regexp")
(string :tag "Backup Dir")
(set :inline t
***************
*** 506,512 ****
(tramp-copy-args nil)
(tramp-copy-keep-date-arg "-p")
(tramp-password-end-of-line "xy")) ;see docstring for "xy"
! ("fcp"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-login-program "fsh")
(tramp-copy-program "fcp")
--- 506,512 ----
(tramp-copy-args nil)
(tramp-copy-keep-date-arg "-p")
(tramp-password-end-of-line "xy")) ;see docstring for "xy"
! ("fcp"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-login-program "fsh")
(tramp-copy-program "fcp")
***************
*** 633,639 ****
("rsh" tramp-multi-connect-rlogin "rsh %h -l %u%n")
("remsh" tramp-multi-connect-rlogin "remsh %h -l %u%n")
("ssh" tramp-multi-connect-rlogin "ssh %h -l %u%n")
! ("ssht" tramp-multi-connect-rlogin "ssh %h -e none -t -t -l %u%n")
("su" tramp-multi-connect-su "su - %u%n")
("sudo" tramp-multi-connect-su "sudo -u %u -s -p Password:%n"))
"*List of connection functions for multi-hop methods.
--- 633,639 ----
("rsh" tramp-multi-connect-rlogin "rsh %h -l %u%n")
("remsh" tramp-multi-connect-rlogin "remsh %h -l %u%n")
("ssh" tramp-multi-connect-rlogin "ssh %h -l %u%n")
! ("ssht" tramp-multi-connect-rlogin "ssh %h -e none -t -t -l %u%n")
("su" tramp-multi-connect-su "su - %u%n")
("sudo" tramp-multi-connect-su "sudo -u %u -s -p Password:%n"))
"*List of connection functions for multi-hop methods.
***************
*** 777,783 ****
"sudo" tramp-completion-function-alist-su)
(tramp-set-completion-function
"multi" nil)
! (tramp-set-completion-function
"scpx" tramp-completion-function-alist-ssh)
(tramp-set-completion-function
"sshx" tramp-completion-function-alist-ssh)
--- 777,783 ----
"sudo" tramp-completion-function-alist-su)
(tramp-set-completion-function
"multi" nil)
! (tramp-set-completion-function
"scpx" tramp-completion-function-alist-ssh)
(tramp-set-completion-function
"sshx" tramp-completion-function-alist-ssh)
***************
*** 2056,2062 ****
(setq filename (tramp-file-name-localname
(tramp-dissect-file-name
(expand-file-name filename)))))
!
;; Right, they are on the same host, regardless of user, method, etc.
;; We now make the link on the remote machine. This will occur as the
user
;; that FILENAME belongs to.
--- 2056,2062 ----
(setq filename (tramp-file-name-localname
(tramp-dissect-file-name
(expand-file-name filename)))))
!
;; Right, they are on the same host, regardless of user, method, etc.
;; We now make the link on the remote machine. This will occur as the
user
;; that FILENAME belongs to.
***************
*** 2065,2071 ****
l-multi-method l-method l-user l-host
(format "cd %s && %s -sf %s %s"
cwd ln
! filename
l-localname)
t)))))
--- 2065,2071 ----
l-multi-method l-method l-user l-host
(format "cd %s && %s -sf %s %s"
cwd ln
! filename
l-localname)
t)))))
***************
*** 2406,2412 ****
(let* ((attr (file-attributes f))
(modtime (nth 5 attr))
(mt (visited-file-modtime)))
!
(cond
;; file exists, and has a known modtime.
((and attr (not (equal modtime '(0 0))))
--- 2406,2412 ----
(let* ((attr (file-attributes f))
(modtime (nth 5 attr))
(mt (visited-file-modtime)))
!
(cond
;; file exists, and has a known modtime.
((and attr (not (equal modtime '(0 0))))
***************
*** 2496,2502 ****
(fa2 (file-attributes file2)))
(if (and (not (equal (nth 5 fa1) '(0 0)))
(not (equal (nth 5 fa2) '(0 0))))
! (> 0 (tramp-time-diff (nth 5 fa1) (nth 5 fa2)))
;; If one of them is the dont-know value, then we can
;; still try to run a shell command on the remote host.
;; However, this only works if both files are Tramp
--- 2496,2502 ----
(fa2 (file-attributes file2)))
(if (and (not (equal (nth 5 fa1) '(0 0)))
(not (equal (nth 5 fa2) '(0 0))))
! (< 0 (tramp-time-diff (nth 5 fa1) (nth 5 fa2)))
;; If one of them is the dont-know value, then we can
;; still try to run a shell command on the remote host.
;; However, this only works if both files are Tramp
***************
*** 2753,2759 ****
(push (buffer-substring (point)
(tramp-line-end-position))
result))
!
(tramp-send-command multi-method method user host "cd")
(tramp-wait-for-output)
--- 2753,2759 ----
(push (buffer-substring (point)
(tramp-line-end-position))
result))
!
(tramp-send-command multi-method method user host "cd")
(tramp-wait-for-output)
***************
*** 3170,3176 ****
'file-error
(list "Removing old file name" "no such directory" filename)))
;; Which is better, -r or -R? (-r works for me <address@hidden>)
! (tramp-send-command multi-method method user host
(format "rm -r %s" (tramp-shell-quote-argument
localname)))
;; Wait for the remote system to return to us...
;; This might take a while, allow it plenty of time.
--- 3170,3176 ----
'file-error
(list "Removing old file name" "no such directory" filename)))
;; Which is better, -r or -R? (-r works for me <address@hidden>)
! (tramp-send-command multi-method method user host
(format "rm -r %s" (tramp-shell-quote-argument
localname)))
;; Wait for the remote system to return to us...
;; This might take a while, allow it plenty of time.
***************
*** 3178,3184 ****
;; Make sure that it worked...
(and (file-exists-p filename)
(error "Failed to recusively delete %s" filename))))
!
(defun tramp-handle-dired-call-process (program discard &rest arguments)
"Like `dired-call-process' for tramp files."
(with-parsed-tramp-file-name default-directory nil
--- 3178,3184 ----
;; Make sure that it worked...
(and (file-exists-p filename)
(error "Failed to recusively delete %s" filename))))
!
(defun tramp-handle-dired-call-process (program discard &rest arguments)
"Like `dired-call-process' for tramp files."
(with-parsed-tramp-file-name default-directory nil
***************
*** 3200,3206 ****
(tramp-send-command-and-check multi-method method user host nil)
(tramp-send-command multi-method method user host "cd")
(tramp-wait-for-output)))))
!
(defun tramp-handle-dired-compress-file (file &rest ok-flag)
"Like `dired-compress-file' for tramp files."
;; OK-FLAG is valid for XEmacs only, but not implemented.
--- 3200,3206 ----
(tramp-send-command-and-check multi-method method user host nil)
(tramp-send-command multi-method method user host "cd")
(tramp-wait-for-output)))))
!
(defun tramp-handle-dired-compress-file (file &rest ok-flag)
"Like `dired-compress-file' for tramp files."
;; OK-FLAG is valid for XEmacs only, but not implemented.
***************
*** 3568,3574 ****
(when (and (numberp buffer) (zerop buffer))
(error "Implementation does not handle immediate return"))
(when (consp buffer) (error "Implementation does not handle error files"))
! (shell-command
(mapconcat 'tramp-shell-quote-argument
(cons program args)
" ")
--- 3568,3574 ----
(when (and (numberp buffer) (zerop buffer))
(error "Implementation does not handle immediate return"))
(when (consp buffer) (error "Implementation does not handle error files"))
! (shell-command
(mapconcat 'tramp-shell-quote-argument
(cons program args)
" ")
***************
*** 4250,4256 ****
;; `tramp-completion-file-name-regexp-unified' aren't different.
;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to
;; `tramp-file-name-handler'). Otherwise, it takes `tramp-run-real-handler'.
! ;; Using `last-input-event' is a little bit risky, because completing a file
;; might require loading other files, like "~/.netrc", and for them it
;; shouldn't be decided based on that variable. On the other hand, those files
;; shouldn't have partial tramp file name syntax. Maybe another variable
should
--- 4250,4256 ----
;; `tramp-completion-file-name-regexp-unified' aren't different.
;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to
;; `tramp-file-name-handler'). Otherwise, it takes `tramp-run-real-handler'.
! ;; Using `last-input-event' is a little bit risky, because completing a file
;; might require loading other files, like "~/.netrc", and for them it
;; shouldn't be decided based on that variable. On the other hand, those files
;; shouldn't have partial tramp file name syntax. Maybe another variable
should
***************
*** 4354,4360 ****
(funcall (nth 0 x) (nth 1 x)))))
(tramp-get-completion-function m))
! (setq result (append result
(mapcar
(lambda (x)
(tramp-get-completion-user-host
--- 4354,4360 ----
(funcall (nth 0 x) (nth 1 x)))))
(tramp-get-completion-function m))
! (setq result (append result
(mapcar
(lambda (x)
(tramp-get-completion-user-host
***************
*** 4395,4401 ****
;; [nil nil "x" nil nil]
;; [nil "x" nil nil nil]
! ;; "/x:" "/x:y" "/x:y:"
;; [nil nil nil "x" ""] [nil nil nil "x" "y"] [nil "x" nil "y" ""]
;; "/[x/" "/[x/y"
;; [nil "x" nil "" nil] [nil "x" nil "y" nil]
--- 4395,4401 ----
;; [nil nil "x" nil nil]
;; [nil "x" nil nil nil]
! ;; "/x:" "/x:y" "/x:y:"
;; [nil nil nil "x" ""] [nil nil nil "x" "y"] [nil "x" nil "y" ""]
;; "/[x/" "/[x/y"
;; [nil "x" nil "" nil] [nil "x" nil "y" nil]
***************
*** 4864,4870 ****
"touch" nil (current-buffer) nil "-t" touch-time file))
(pop-to-buffer (current-buffer))
(error "tramp-touch: touch failed"))))))
!
(defun tramp-buffer-name (multi-method method user host)
"A name for the connection buffer for USER at HOST using METHOD."
(if multi-method
--- 4864,4870 ----
"touch" nil (current-buffer) nil "-t" touch-time file))
(pop-to-buffer (current-buffer))
(error "tramp-touch: touch failed"))))))
!
(defun tramp-buffer-name (multi-method method user host)
"A name for the connection buffer for USER at HOST using METHOD."
(if multi-method
***************
*** 5022,5028 ****
(file-exists-p existing)
(not (file-exists-p nonexisting))))
(error "Couldn't find command to check if file exists."))))
!
;; CCC test ksh or bash found for tilde expansion?
(defun tramp-find-shell (multi-method method user host)
--- 5022,5028 ----
(file-exists-p existing)
(not (file-exists-p nonexisting))))
(error "Couldn't find command to check if file exists."))))
!
;; CCC test ksh or bash found for tilde expansion?
(defun tramp-find-shell (multi-method method user host)
***************
*** 5121,5129 ****
(tramp-check-ls-commands multi-method method user host "gnuls"
tramp-remote-path)
(tramp-check-ls-commands multi-method method user host "gls"
tramp-remote-path)))
! ;; ------------------------------------------------------------
! ;; -- Functions for establishing connection --
! ;; ------------------------------------------------------------
;; The following functions are actions to be taken when seeing certain
;; prompts from the remote host. See the variable
--- 5121,5129 ----
(tramp-check-ls-commands multi-method method user host "gnuls"
tramp-remote-path)
(tramp-check-ls-commands multi-method method user host "gls"
tramp-remote-path)))
! ;; ------------------------------------------------------------
! ;; -- Functions for establishing connection --
! ;; ------------------------------------------------------------
;; The following functions are actions to be taken when seeing certain
;; prompts from the remote host. See the variable
***************
*** 5364,5370 ****
(when multi-method
(error "Cannot multi-connect using telnet connection method"))
(tramp-pre-connection multi-method method user host)
! (tramp-message 7 "Opening connection for address@hidden using %s..."
(or user (user-login-name)) host method)
(let ((process-environment (copy-sequence process-environment)))
(setenv "TERM" tramp-terminal-type)
--- 5364,5370 ----
(when multi-method
(error "Cannot multi-connect using telnet connection method"))
(tramp-pre-connection multi-method method user host)
! (tramp-message 7 "Opening connection for address@hidden using %s..."
(or user (user-login-name)) host method)
(let ((process-environment (copy-sequence process-environment)))
(setenv "TERM" tramp-terminal-type)
***************
*** 5398,5404 ****
p multi-method method user host)
(tramp-post-connection multi-method method user host)))))
!
(defun tramp-open-connection-rsh (multi-method method user host)
"Open a connection using an rsh METHOD.
This starts the command `rsh HOST -l USER'[*], then waits for a remote
--- 5398,5404 ----
p multi-method method user host)
(tramp-post-connection multi-method method user host)))))
!
(defun tramp-open-connection-rsh (multi-method method user host)
"Open a connection using an rsh METHOD.
This starts the command `rsh HOST -l USER'[*], then waits for a remote
***************
*** 5423,5429 ****
(error "Cannot multi-connect using rsh connection method"))
(tramp-pre-connection multi-method method user host)
(if (and user (not (string= user "")))
! (tramp-message 7 "Opening connection for address@hidden using %s..."
user host method)
(tramp-message 7 "Opening connection at %s using %s..." host method))
(let ((process-environment (copy-sequence process-environment))
--- 5423,5429 ----
(error "Cannot multi-connect using rsh connection method"))
(tramp-pre-connection multi-method method user host)
(if (and user (not (string= user "")))
! (tramp-message 7 "Opening connection for address@hidden using %s..."
user host method)
(tramp-message 7 "Opening connection at %s using %s..." host method))
(let ((process-environment (copy-sequence process-environment))
***************
*** 5452,5460 ****
(> emacs-major-version 20))
tramp-dos-coding-system))
(p (if (and user (not (string= user "")))
! (apply #'start-process bufnam buf login-program
real-host "-l" user login-args)
! (apply #'start-process bufnam buf login-program
real-host login-args)))
(found nil))
(tramp-set-process-query-on-exit-flag p nil)
--- 5452,5460 ----
(> emacs-major-version 20))
tramp-dos-coding-system))
(p (if (and user (not (string= user "")))
! (apply #'start-process bufnam buf login-program
real-host "-l" user login-args)
! (apply #'start-process bufnam buf login-program
real-host login-args)))
(found nil))
(tramp-set-process-query-on-exit-flag p nil)
***************
*** 5524,5533 ****
tramp-actions-before-shell)
(tramp-open-connection-setup-interactive-shell
p multi-method method user host)
! (tramp-post-connection multi-method method
user host)))))
! ;; HHH: Not Changed. Multi method. It is not clear to me how this can
;; handle not giving a user name in the "file name".
;;
;; This is more difficult than for the single-hop method. In the
--- 5524,5533 ----
tramp-actions-before-shell)
(tramp-open-connection-setup-interactive-shell
p multi-method method user host)
! (tramp-post-connection multi-method method
user host)))))
! ;; HHH: Not Changed. Multi method. It is not clear to me how this can
;; handle not giving a user name in the "file name".
;;
;; This is more difficult than for the single-hop method. In the
***************
*** 5597,5603 ****
(tramp-post-connection multi-method method user host)))))
;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-telnet (p method user host command)
--- 5597,5603 ----
(tramp-post-connection multi-method method user host)))))
;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-telnet (p method user host command)
***************
*** 5619,5626 ****
(tramp-process-multi-actions p method user host
tramp-multi-actions)))
! ;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-rlogin (p method user host command)
--- 5619,5626 ----
(tramp-process-multi-actions p method user host
tramp-multi-actions)))
! ;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-rlogin (p method user host command)
***************
*** 5645,5652 ****
(tramp-process-multi-actions p method user host
tramp-multi-actions)))
! ;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-su (p method user host command)
--- 5645,5652 ----
(tramp-process-multi-actions p method user host
tramp-multi-actions)))
! ;; HHH: Changed. Multi method. Don't know how to handle this in the case
! ;; of no user name provided. Hack to make it work as it did before:
;; changed `user' to `(or user (user-login-name))' in the places where
;; the value is actually used.
(defun tramp-multi-connect-su (p method user host command)
***************
*** 6276,6282 ****
(tramp-barf-if-no-shell-prompt
nil 30
"Couldn't `%s', see buffer `%s'" command (buffer-name)))
!
(defun tramp-wait-for-output (&optional timeout)
"Wait for output from remote rsh command."
(let ((proc (get-buffer-process (current-buffer)))
--- 6276,6282 ----
(tramp-barf-if-no-shell-prompt
nil 30
"Couldn't `%s', see buffer `%s'" command (buffer-name)))
!
(defun tramp-wait-for-output (&optional timeout)
"Wait for output from remote rsh command."
(let ((proc (get-buffer-process (current-buffer)))
***************
*** 6609,6617 ****
""))
! ;; ------------------------------------------------------------
! ;; -- TRAMP file names --
! ;; ------------------------------------------------------------
;; Conversion functions between external representation and
;; internal data structure. Convenience functions for internal
;; data structure.
--- 6609,6617 ----
""))
! ;; ------------------------------------------------------------
! ;; -- TRAMP file names --
! ;; ------------------------------------------------------------
;; Conversion functions between external representation and
;; internal data structure. Convenience functions for internal
;; data structure.
***************
*** 6622,6628 ****
"Return t iff NAME is a tramp file."
(save-match-data
(string-match tramp-file-name-regexp name)))
!
;; HHH: Changed. Used to assign the return value of (user-login-name)
;; to the `user' part of the structure if a user name was not
;; provided, now it assigns nil.
--- 6622,6628 ----
"Return t iff NAME is a tramp file."
(save-match-data
(string-match tramp-file-name-regexp name)))
!
;; HHH: Changed. Used to assign the return value of (user-login-name)
;; to the `user' part of the structure if a user name was not
;; provided, now it assigns nil.
***************
*** 6675,6681 ****
If both MULTI-METHOD and METHOD are nil, do a lookup in
`tramp-default-method-alist'."
(or multi-method method (tramp-find-default-method user host)))
!
;; HHH: Not Changed. Multi method. Will probably not handle the case where
;; a user name is not provided in the "file name" very well.
(defun tramp-dissect-multi-file-name (name)
--- 6675,6681 ----
If both MULTI-METHOD and METHOD are nil, do a lookup in
`tramp-default-method-alist'."
(or multi-method method (tramp-find-default-method user host)))
!
;; HHH: Not Changed. Multi method. Will probably not handle the case where
;; a user name is not provided in the "file name" very well.
(defun tramp-dissect-multi-file-name (name)
***************
*** 6847,6853 ****
(if entry
(second entry)
(symbol-value param))))
!
;; Auto saving to a special directory.
--- 6847,6853 ----
(if entry
(second entry)
(symbol-value param))))
!
;; Auto saving to a special directory.
***************
*** 7039,7047 ****
process flag)))
! ;; ------------------------------------------------------------
! ;; -- Kludges section --
! ;; ------------------------------------------------------------
;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
;; does not deal well with newline characters. Newline is replaced by
--- 7039,7047 ----
process flag)))
! ;; ------------------------------------------------------------
! ;; -- Kludges section --
! ;; ------------------------------------------------------------
;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
;; does not deal well with newline characters. Newline is replaced by
***************
*** 7304,7310 ****
;; strange when doing zerop, we should kill the process and start
;; again. (Greg Stark)
;; * Add caching for filename completion. (Greg Stark)
! ;; Of course, this has issues with usability (stale cache bites)
;; -- <address@hidden>
;; * Provide a local cache of old versions of remote files for the rsync
;; transfer method to use. (Greg Stark)
--- 7304,7310 ----
;; strange when doing zerop, we should kill the process and start
;; again. (Greg Stark)
;; * Add caching for filename completion. (Greg Stark)
! ;; Of course, this has issues with usability (stale cache bites)
;; -- <address@hidden>
;; * Provide a local cache of old versions of remote files for the rsync
;; transfer method to use. (Greg Stark)
- [Emacs-diffs] Changes to emacs/lisp/net/tramp.el,
Sam Steingold <=