/[emacs]/emacs/lisp/vc-mcvs.el
ViewVC logotype

Diff of /emacs/lisp/vc-mcvs.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11.2.2 by uid65618, Thu Feb 5 14:48:33 2004 UTC revision 1.11.2.3 by miles, Tue Jul 6 09:31:50 2004 UTC
# Line 438  The changes are between FIRST-VERSION an Line 438  The changes are between FIRST-VERSION an
438  ;;; History functions  ;;; History functions
439  ;;;  ;;;
440    
441  (defun vc-mcvs-print-log (file)  (defun vc-mcvs-print-log (file &optional buffer)
442    "Get change log associated with FILE."    "Get change log associated with FILE."
443    (let ((default-directory (vc-mcvs-root file)))    (let ((default-directory (vc-mcvs-root file)))
444      ;; Run the command from the root dir so that `mcvs filt' returns      ;; Run the command from the root dir so that `mcvs filt' returns
445      ;; valid relative names.      ;; valid relative names.
446      (vc-mcvs-command      (vc-mcvs-command
447       nil       buffer
448       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
449       file "log")))       file "log")))
450    
451  (defun vc-mcvs-diff (file &optional oldvers newvers)  (defun vc-mcvs-diff (file &optional oldvers newvers buffer)
452    "Get a difference report using Meta-CVS between two versions of FILE."    "Get a difference report using Meta-CVS between two versions of FILE."
453    (if (string= (vc-workfile-version file) "0")    (if (string= (vc-workfile-version file) "0")
454        ;; This file is added but not yet committed; there is no master file.        ;; This file is added but not yet committed; there is no master file.
# Line 457  The changes are between FIRST-VERSION an Line 457  The changes are between FIRST-VERSION an
457          ;; We regard this as "changed".          ;; We regard this as "changed".
458          ;; Diff it against /dev/null.          ;; Diff it against /dev/null.
459          ;; Note: this is NOT a "mcvs diff".          ;; Note: this is NOT a "mcvs diff".
460          (apply 'vc-do-command "*vc-diff*"          (apply 'vc-do-command (or buffer "*vc-diff*")
461                 1 "diff" file                 1 "diff" file
462                 (append (vc-switches nil 'diff) '("/dev/null")))                 (append (vc-switches nil 'diff) '("/dev/null")))
463          ;; Even if it's empty, it's locally modified.          ;; Even if it's empty, it's locally modified.
# Line 467  The changes are between FIRST-VERSION an Line 467  The changes are between FIRST-VERSION an
467             ;; valid relative names.             ;; valid relative names.
468             (default-directory (vc-mcvs-root file))             (default-directory (vc-mcvs-root file))
469             (status             (status
470              (apply 'vc-mcvs-command "*vc-diff*"              (apply 'vc-mcvs-command (or buffer "*vc-diff*")
471                     (if async 'async 1)                     (if async 'async 1)
472                     file "diff"                     file "diff"
473                     (and oldvers (concat "-r" oldvers))                     (and oldvers (concat "-r" oldvers))

Legend:
Removed from v.1.11.2.2  
changed lines
  Added in v.1.11.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26