[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: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/tramp-vc.el |
Date: |
Wed, 09 Feb 2005 10:52:26 -0500 |
Index: emacs/lisp/net/tramp-vc.el
diff -c emacs/lisp/net/tramp-vc.el:1.11 emacs/lisp/net/tramp-vc.el:1.12
*** emacs/lisp/net/tramp-vc.el:1.11 Sun Jan 16 13:18:31 2005
--- emacs/lisp/net/tramp-vc.el Wed Feb 9 15:50:37 2005
***************
*** 51,57 ****
;; This used to blow away the file-name-handler-alist and reinstall
;; TRAMP into it. This was intended to let VC work remotely. It didn't,
;; at least not in my XEmacs 21.2 install.
! ;;
;; In any case, tramp-run-real-handler now deals correctly with disabling
;; the things that should be, making this a no-op.
;;
--- 51,57 ----
;; This used to blow away the file-name-handler-alist and reinstall
;; TRAMP into it. This was intended to let VC work remotely. It didn't,
;; at least not in my XEmacs 21.2 install.
! ;;
;; In any case, tramp-run-real-handler now deals correctly with disabling
;; the things that should be, making this a no-op.
;;
***************
*** 96,102 ****
(set (make-local-variable 'vc-parent-buffer-name)
(concat " from " (buffer-name camefrom)))
(setq default-directory olddir)
!
(erase-buffer)
(mapcar
--- 96,102 ----
(set (make-local-variable 'vc-parent-buffer-name)
(concat " from " (buffer-name camefrom)))
(setq default-directory olddir)
!
(erase-buffer)
(mapcar
***************
*** 230,236 ****
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p
(buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-do-command-new buffer okstatus command
file ;(or file (buffer-file-name))
flags))
ad-do-it)))
--- 230,236 ----
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p
(buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-do-command-new buffer okstatus command
file ;(or file (buffer-file-name))
flags))
ad-do-it)))
***************
*** 243,249 ****
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p
(buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-do-command buffer okstatus command
(or file (buffer-file-name)) last flags))
ad-do-it)))))
;;-)
--- 243,249 ----
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p
(buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-do-command buffer okstatus command
(or file (buffer-file-name)) last flags))
ad-do-it)))))
;;-)
***************
*** 298,304 ****
(tramp-wait-for-output)
(setq exec-status (read (current-buffer)))
(message "Command %s returned status %d." command exec-status)))
!
;; Maybe okstatus can be `async' here. But then, maybe the
;; async thing is new in Emacs 21, but this function is only
;; used in Emacs 20.
--- 298,304 ----
(tramp-wait-for-output)
(setq exec-status (read (current-buffer)))
(message "Command %s returned status %d." command exec-status)))
!
;; Maybe okstatus can be `async' here. But then, maybe the
;; async thing is new in Emacs 21, but this function is only
;; used in Emacs 20.
***************
*** 319,325 ****
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-simple-command okstatus command
(or file (buffer-file-name)) args))
ad-do-it)))
--- 319,325 ----
(if (or (and (stringp file) (tramp-tramp-file-p file))
(and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
(setq ad-return-value
! (apply 'tramp-vc-simple-command okstatus command
(or file (buffer-file-name)) args))
ad-do-it)))
***************
*** 381,397 ****
;; Do we need to advise the vc-user-login-name function anyway?
! ;; This will return the correct login name for the owner of a
;; file. It does not deal with the default remote user name...
;;
! ;; That is, when vc calls (vc-user-login-name), we return the
;; local login name, something that may be different to the remote
! ;; default.
;;
;; The remote VC operations will occur as the user that we logged
;; in with however - not always the same as the local user.
;;
! ;; In the end, I did advise the function. This is because, well,
;; the thing didn't work right otherwise ;)
;;
;; Daniel Pittman <address@hidden>
--- 381,397 ----
;; Do we need to advise the vc-user-login-name function anyway?
! ;; This will return the correct login name for the owner of a
;; file. It does not deal with the default remote user name...
;;
! ;; That is, when vc calls (vc-user-login-name), we return the
;; local login name, something that may be different to the remote
! ;; default.
;;
;; The remote VC operations will occur as the user that we logged
;; in with however - not always the same as the local user.
;;
! ;; In the end, I did advise the function. This is because, well,
;; the thing didn't work right otherwise ;)
;;
;; Daniel Pittman <address@hidden>
***************
*** 409,415 ****
;; boundness-checking into this function?
(let* ((file (symbol-value 'file))
(remote-uid
! ;; With Emacs 21.4, `file-attributes' has got an optional parameter
;; ID-FORMAT. Handle this case backwards compatible.
(if (and (functionp 'subr-arity)
(= 2 (cdr (funcall (symbol-function 'subr-arity)
--- 409,415 ----
;; boundness-checking into this function?
(let* ((file (symbol-value 'file))
(remote-uid
! ;; With Emacs 22.1, `file-attributes' has got an optional parameter
;; ID-FORMAT. Handle this case backwards compatible.
(if (and (functionp 'subr-arity)
(= 2 (cdr (funcall (symbol-function 'subr-arity)
***************
*** 444,454 ****
(tramp-handle-vc-user-login-name uid)))) ; get the owner
name
ad-do-it))) ; else call the original
!
;; Determine the name of the user owning a file.
(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
--- 444,454 ----
(tramp-handle-vc-user-login-name uid)))) ; get the owner
name
ad-do-it))) ; else call the original
!
;; Determine the name of the user owning a file.
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/net/tramp-vc.el,
Kim F . Storm <=