[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el |
Date: |
Sat, 29 May 2004 01:09:55 -0400 |
Index: emacs/lisp/vc-mcvs.el
diff -c emacs/lisp/vc-mcvs.el:1.12 emacs/lisp/vc-mcvs.el:1.13
*** emacs/lisp/vc-mcvs.el:1.12 Tue Jan 20 21:56:16 2004
--- emacs/lisp/vc-mcvs.el Fri May 28 23:04:54 2004
***************
*** 438,454 ****
;;; History functions
;;;
! (defun vc-mcvs-print-log (file)
"Get change log associated with FILE."
(let ((default-directory (vc-mcvs-root file)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(vc-mcvs-command
! nil
(if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
file "log")))
! (defun vc-mcvs-diff (file &optional oldvers newvers)
"Get a difference report using Meta-CVS between two versions of FILE."
(if (string= (vc-workfile-version file) "0")
;; This file is added but not yet committed; there is no master file.
--- 438,454 ----
;;; History functions
;;;
! (defun vc-mcvs-print-log (file &optional buffer)
"Get change log associated with FILE."
(let ((default-directory (vc-mcvs-root file)))
;; Run the command from the root dir so that `mcvs filt' returns
;; valid relative names.
(vc-mcvs-command
! buffer
(if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
file "log")))
! (defun vc-mcvs-diff (file &optional oldvers newvers buffer)
"Get a difference report using Meta-CVS between two versions of FILE."
(if (string= (vc-workfile-version file) "0")
;; This file is added but not yet committed; there is no master file.
***************
*** 457,463 ****
;; We regard this as "changed".
;; Diff it against /dev/null.
;; Note: this is NOT a "mcvs diff".
! (apply 'vc-do-command "*vc-diff*"
1 "diff" file
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
--- 457,463 ----
;; We regard this as "changed".
;; Diff it against /dev/null.
;; Note: this is NOT a "mcvs diff".
! (apply 'vc-do-command (or buffer "*vc-diff*")
1 "diff" file
(append (vc-switches nil 'diff) '("/dev/null")))
;; Even if it's empty, it's locally modified.
***************
*** 467,473 ****
;; valid relative names.
(default-directory (vc-mcvs-root file))
(status
! (apply 'vc-mcvs-command "*vc-diff*"
(if async 'async 1)
file "diff"
(and oldvers (concat "-r" oldvers))
--- 467,473 ----
;; valid relative names.
(default-directory (vc-mcvs-root file))
(status
! (apply 'vc-mcvs-command (or buffer "*vc-diff*")
(if async 'async 1)
file "diff"
(and oldvers (concat "-r" oldvers))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/vc-mcvs.el,
Stefan Monnier <=