[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/tramp-vc.el
From: |
Kai Großjohann |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp-vc.el |
Date: |
Sat, 17 Jul 2004 13:31:27 -0400 |
Index: emacs/lisp/net/tramp-vc.el
diff -c emacs/lisp/net/tramp-vc.el:1.8 emacs/lisp/net/tramp-vc.el:1.9
*** emacs/lisp/net/tramp-vc.el:1.8 Fri May 7 21:19:48 2004
--- emacs/lisp/net/tramp-vc.el Sat Jul 17 17:28:06 2004
***************
*** 77,83 ****
"Like `vc-do-command' but invoked for tramp files.
See `vc-do-command' for more information."
(save-match-data
! (and file (setq file (tramp-handle-expand-file-name file)))
(if (not buffer) (setq buffer "*vc*"))
(if vc-command-messages
(message "Running `%s' on `%s'..." command file))
--- 77,83 ----
"Like `vc-do-command' but invoked for tramp files.
See `vc-do-command' for more information."
(save-match-data
! (and file (setq file (expand-file-name file)))
(if (not buffer) (setq buffer "*vc*"))
(if vc-command-messages
(message "Running `%s' on `%s'..." command file))
***************
*** 85,91 ****
(squeezed nil)
(olddir default-directory)
vc-file status)
! (let* ((v (tramp-dissect-file-name (tramp-handle-expand-file-name
file)))
(multi-method (tramp-file-name-multi-method v))
(method (tramp-file-name-method v))
(user (tramp-file-name-user v))
--- 85,91 ----
(squeezed nil)
(olddir default-directory)
vc-file status)
! (let* ((v (tramp-dissect-file-name (expand-file-name file)))
(multi-method (tramp-file-name-multi-method v))
(method (tramp-file-name-method v))
(user (tramp-file-name-user v))
***************
*** 130,136 ****
(save-excursion
(save-window-excursion
;; Actually execute remote command
! (tramp-handle-shell-command
(mapconcat 'tramp-shell-quote-argument
(cons command squeezed) " ") t)
;;(tramp-wait-for-output)
--- 130,136 ----
(save-excursion
(save-window-excursion
;; Actually execute remote command
! (shell-command
(mapconcat 'tramp-shell-quote-argument
(cons command squeezed) " ") t)
;;(tramp-wait-for-output)
***************
*** 190,196 ****
(let ((w32-quote-process-args t))
(when (eq okstatus 'async)
(message "Tramp doesn't do async commands, running synchronously."))
! (setq status (tramp-handle-shell-command
(mapconcat 'tramp-shell-quote-argument
(cons command squeezed) " ") t))
(when (or (not (integerp status))
--- 190,196 ----
(let ((w32-quote-process-args t))
(when (eq okstatus 'async)
(message "Tramp doesn't do async commands, running synchronously."))
! (setq status (shell-command
(mapconcat 'tramp-shell-quote-argument
(cons command squeezed) " ") t))
(when (or (not (integerp status))
***************
*** 257,263 ****
;; Don't switch to the *vc-info* buffer before running the
;; command, because that would change its default directory
(save-match-data
! (let* ((v (tramp-dissect-file-name (tramp-handle-expand-file-name file)))
(multi-method (tramp-file-name-multi-method v))
(method (tramp-file-name-method v))
(user (tramp-file-name-user v))
--- 257,263 ----
;; Don't switch to the *vc-info* buffer before running the
;; command, because that would change its default directory
(save-match-data
! (let* ((v (tramp-dissect-file-name (expand-file-name file)))
(multi-method (tramp-file-name-multi-method v))
(method (tramp-file-name-method v))
(user (tramp-file-name-user v))
***************
*** 284,290 ****
(save-excursion
(save-window-excursion
;; Actually execute remote command
! (tramp-handle-shell-command
(mapconcat 'tramp-shell-quote-argument
(append (list command) args (list localname)) " ")
(get-buffer-create"*vc-info*"))
--- 284,290 ----
(save-excursion
(save-window-excursion
;; Actually execute remote command
! (shell-command
(mapconcat 'tramp-shell-quote-argument
(append (list command) args (list localname)) " ")
(get-buffer-create"*vc-info*"))
***************
*** 414,420 ****
(nth 2 (file-attributes file)))))
(if (and uid (/= uid remote-uid))
(error "tramp-handle-vc-user-login-name cannot map a uid to a name")
! (let* ((v (tramp-dissect-file-name (tramp-handle-expand-file-name
file)))
(u (tramp-file-name-user v)))
(cond ((stringp u) u)
((vectorp u) (elt u (1- (length u))))
--- 414,420 ----
(nth 2 (file-attributes file)))))
(if (and uid (/= uid remote-uid))
(error "tramp-handle-vc-user-login-name cannot map a uid to a name")
! (let* ((v (tramp-dissect-file-name (expand-file-name file)))
(u (tramp-file-name-user v)))
(cond ((stringp u) u)
((vectorp u) (elt u (1- (length u))))
***************
*** 445,452 ****
(defun tramp-file-owner (filename)
"Return who owns FILE (user name, as a string)."
(let ((v (tramp-dissect-file-name
! (tramp-handle-expand-file-name filename))))
! (if (not (tramp-handle-file-exists-p filename))
nil ; file cannot be opened
;; file exists, find out stuff
(save-excursion
--- 445,452 ----
(defun tramp-file-owner (filename)
"Return who owns FILE (user name, as a string)."
(let ((v (tramp-dissect-file-name
! (expand-file-name filename))))
! (if (not (file-exists-p filename))
nil ; file cannot be opened
;; file exists, find out stuff
(save-excursion
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/net/tramp-vc.el,
Kai Großjohann <=