;;; vc-cvs.el --- non-resident support for CVS version-control
;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
:group 'vc)
(defcustom vc-cvs-register-switches nil
- "Extra switches for registering a file into CVS.
+ "Switches for registering a file into CVS.
A string or list of strings passed to the checkin program by
-\\[vc-register]."
- :type '(choice (const :tag "None" nil)
+\\[vc-register]. If nil, use the value of `vc-register-switches'.
+If t, use no switches."
+ :type '(choice (const :tag "Unspecified" nil)
+ (const :tag "None" t)
(string :tag "Argument String")
- (repeat :tag "Argument List"
- :value ("")
- string))
+ (repeat :tag "Argument List" :value ("") string))
:version "21.1"
:group 'vc)
(defun vc-cvs-state (file)
"CVS-specific version of `vc-state'."
- (if (vc-stay-local-p file)
+ (if (vc-stay-local-p file 'CVS)
(let ((state (vc-file-getprop file 'vc-state)))
;; If we should stay local, use the heuristic but only if
;; we don't have a more precise state already available.
state))
(with-temp-buffer
(cd (file-name-directory file))
- (vc-cvs-command t 0 file "status")
+ (let (process-file-side-effects)
+ (vc-cvs-command t 0 file "status"))
(vc-cvs-parse-status t))))
(defun vc-cvs-state-heuristic (file)
;;; State-changing functions
;;;
-;; FIXME doc is wrong re switches.
(defun vc-cvs-register (files &optional rev comment)
"Register FILES into the CVS version-control system.
COMMENT can be used to provide an initial description of FILES.
-
-`vc-register-switches' and `vc-cvs-register-switches' are passed to
-the CVS command (in that order)."
+Passes either `vc-cvs-register-switches' or `vc-register-switches'
+to the CVS command."
;; Register the directories if needed.
(let (dirs)
(dolist (file files)
(while (and (stringp dir)
(not (equal dir (setq dir (file-name-directory dir))))
dir)
- (setq dir (if (file-directory-p
+ (setq dir (if (file-exists-p
(expand-file-name "CVS/Entries" dir))
- t (directory-file-name dir))))
+ t
+ (directory-file-name dir))))
(eq dir t)))
(defun vc-cvs-checkin (files rev comment)
"-A"
(concat "-r" rev))))
(vc-switches 'CVS 'checkout)))
- (vc-mode-line file))
+ (vc-mode-line file 'CVS))
(message "Checking out %s...done" file))
(defun vc-cvs-delete-file (file)
0 ;; there were no news; indicate success
(if (re-search-forward
(concat "^\\([CMUP] \\)?"
- (regexp-quote (file-name-nondirectory file))
+ (regexp-quote
+ (substring file (1+ (length (expand-file-name
+ "." default-directory)))))
"\\( already contains the differences between \\)?")
nil t)
(cond
;;; History functions
;;;
-(defun vc-cvs-print-log (files &optional buffer)
+(declare-function vc-rcs-print-log-cleanup "vc-rcs" ())
+
+(defun vc-cvs-print-log (files buffer &optional shortlog start-revision-ignored limit)
"Get change logs associated with FILES."
+ (require 'vc-rcs)
;; It's just the catenation of the individual logs.
(vc-cvs-command
buffer
- (if (vc-stay-local-p files) 'async 0)
- files "log"))
+ (if (vc-stay-local-p files 'CVS) 'async 0)
+ files "log")
+ (with-current-buffer buffer
+ (vc-exec-after (vc-rcs-print-log-cleanup)))
+ (when limit 'limit-unsupported))
(defun vc-cvs-comment-history (file)
"Get comment history of a file."
(defun vc-cvs-diff (files &optional oldvers newvers buffer)
"Get a difference report using CVS between two revisions of FILE."
- (let* ((async (and (not vc-disable-async-diff)
- (vc-stay-local-p files)))
+ (let* (process-file-side-effects
+ (async (and (not vc-disable-async-diff)
+ (vc-stay-local-p files 'CVS)))
(invoke-cvs-diff-list nil)
status)
;; Look through the file list and see if any files have backups
"Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
Optional arg REVISION is a revision to annotate from."
(vc-cvs-command buffer
- (if (vc-stay-local-p file)
+ (if (vc-stay-local-p file 'CVS)
'async 0)
file "annotate"
(if revision (concat "-r" revision)))
(match-string-no-properties 1)
nil)))
+(defun vc-cvs-previous-revision (file rev)
+ (vc-call-backend 'RCS 'previous-revision file rev))
+
+(defun vc-cvs-next-revision (file rev)
+ (vc-call-backend 'RCS 'next-revision file rev))
+
+;; FIXME: This should probably be replaced by code using cvs2cl.
+(defun vc-cvs-update-changelog (files)
+ (vc-call-backend 'RCS 'update-changelog files))
+
;;;
;;; Tag system
;;;
;;; Miscellaneous
;;;
-(defalias 'vc-cvs-make-version-backups-p 'vc-stay-local-p
- "Return non-nil if version backups should be made for FILE.")
+(defun vc-cvs-make-version-backups-p (file)
+ "Return non-nil if version backups should be made for FILE."
+ (vc-stay-local-p file 'CVS))
(defun vc-cvs-check-headers ()
"Check if the current file has any headers in it."
(append vc-cvs-global-switches
flags))))
-(defalias 'vc-cvs-stay-local-p 'vc-stay-local-p) ;Back-compatibility.
+(defun vc-cvs-stay-local-p (file) ;Back-compatibility.
+ (vc-stay-local-p file 'CVS))
(defun vc-cvs-repository-hostname (dirname)
"Hostname of the CVS server associated to workarea DIRNAME."
)
;; Based on vc-cvs-dir-state-heuristic from Emacs 22.
+;; FIXME does not mention unregistered files.
(defun vc-cvs-dir-status-heuristic (dir update-function &optional basedir)
"Find the CVS state of all files in DIR, using only local information."
(let (file basename status result dirlist)
(defun vc-cvs-dir-status (dir update-function)
"Create a list of conses (file . state) for DIR."
;; FIXME check all files in DIR instead?
- (let ((local (vc-stay-local-p dir)))
+ (let ((local (vc-stay-local-p dir 'CVS)))
(if (and local (not (eq local 'only-file)))
(vc-cvs-dir-status-heuristic dir update-function)
(vc-cvs-command (current-buffer) 'async dir "-f" "status")
;; This is intentionally different from the algorithm that CVS uses
;; (which is based on textual comparison), because there can be problems
;; generating a time string that looks exactly like the one from CVS.
- (let ((mtime (nth 5 (file-attributes file))))
- (require 'parse-time)
- (let ((parsed-time
- (parse-time-string (concat (match-string 2) " +0000"))))
- (cond ((and (not (string-match "\\+" (match-string 2)))
- (car parsed-time)
- (equal mtime (apply 'encode-time parsed-time)))
- (vc-file-setprop file 'vc-checkout-time mtime)
- (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
- (t
- (vc-file-setprop file 'vc-checkout-time 0)
- (if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
+ (let* ((time (match-string 2))
+ (mtime (nth 5 (file-attributes file)))
+ (parsed-time (progn (require 'parse-time)
+ (parse-time-string (concat time " +0000")))))
+ (cond ((and (not (string-match "\\+" time))
+ (car parsed-time)
+ (equal mtime (apply 'encode-time parsed-time)))
+ (vc-file-setprop file 'vc-checkout-time mtime)
+ (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
+ (t
+ (vc-file-setprop file 'vc-checkout-time 0)
+ (if set-state (vc-file-setprop file 'vc-state 'edited))))))))
;; Completion of revision names.
;; Just so I don't feel like I'm duplicating code from pcl-cvs, I'll use
;; tag names.
(defun vc-cvs-revision-table (file)
- (let ((default-directory (file-name-directory file))
+ (let (process-file-side-effects
+ (default-directory (file-name-directory file))
(res nil))
(with-temp-buffer
(vc-cvs-command t nil file "log")