;;; vc-cvs.el --- non-resident support for CVS version-control
-;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc.
+;; Copyright (C) 1995,98,99,2000,2001,2002 Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc-cvs.el,v 1.33 2002/02/21 20:16:47 spiegel Exp $
+;; $Id: vc-cvs.el,v 1.51 2003/02/17 08:11:13 spiegel Exp $
;; This file is part of GNU Emacs.
;;; Customization options
;;;
+(defcustom vc-cvs-global-switches nil
+ "*Global switches to pass to any CVS command."
+ :type '(choice (const :tag "None" nil)
+ (string :tag "Argument String")
+ (repeat :tag "Argument List"
+ :value ("")
+ string))
+ :version "21.4"
+ :group 'vc)
+
(defcustom vc-cvs-register-switches nil
"*Extra switches for registering a file into CVS.
A string or list of strings passed to the checkin program by
Format is according to `format-time-string'. Only used if
`vc-cvs-sticky-tag-display' is t."
:type '(string)
- :version "21.3"
+ :version "21.4"
:group 'vc)
(defcustom vc-cvs-sticky-tag-display t
dates and the word \"Sticky\" for sticky tag names and revisions.
(lambda (tag type)
- (cond ((eq type 'date) (format-time-string
+ (cond ((eq type 'date) (format-time-string
vc-cvs-sticky-date-format-string tag))
((eq type 'revision-number) \"Sticky\")
((eq type 'symbolic-name) \"Sticky\")))
Here's an example that will abbreviate to the first character only,
-any text before the first occurence of `-' for sticky symbolic tags.
+any text before the first occurrence of `-' for sticky symbolic tags.
If the sticky tag is a revision number, the word \"Sticky\" is
displayed. Date and time is displayed for sticky dates.
(lambda (tag type)
(cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag))
((eq type 'revision-number) \"Sticky\")
- ((eq type 'symbolic-name)
+ ((eq type 'symbolic-name)
(condition-case nil
(progn
(string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
- (concat (substring (match-string 1 tag) 0 1) \":\"
+ (concat (substring (match-string 1 tag) 0 1) \":\"
(substring (match-string 2 tag) 1 nil)))
(error tag))))) ; Fall-back to given tag name.
See also variable `vc-cvs-sticky-date-format-string'."
:type '(choice boolean function)
- :version "21.3"
+ :version "21.4"
:group 'vc)
;;;
;;;###autoload (defun vc-cvs-registered (f)
;;;###autoload (when (file-readable-p (expand-file-name
;;;###autoload "CVS/Entries" (file-name-directory f)))
-;;;###autoload (require 'vc-cvs)
+;;;###autoload (load "vc-cvs")
;;;###autoload (vc-cvs-registered f)))
(defun vc-cvs-registered (file)
(goto-char (point-min))
(cond
((re-search-forward
- (concat "^/" (regexp-quote basename) "/") nil t)
+ ;; CVS-removed files are not taken under VC control.
+ (concat "^/" (regexp-quote basename) "/[^/-]") nil t)
(beginning-of-line)
(vc-cvs-parse-entry file)
t)
state))
(with-temp-buffer
(cd (file-name-directory file))
- (vc-do-command t 0 "cvs" file "status")
+ (vc-cvs-command t 0 file "status")
(vc-cvs-parse-status t))))
(defun vc-cvs-state-heuristic (file)
(defun vc-cvs-dir-state (dir)
"Find the CVS state of all files in DIR."
- (if (vc-cvs-stay-local-p dir)
- (vc-cvs-dir-state-heuristic dir)
- (let ((default-directory dir))
- ;; Don't specify DIR in this command, the default-directory is
- ;; enough. Otherwise it might fail with remote repositories.
- (with-temp-buffer
- (vc-do-command t 0 "cvs" nil "status" "-l")
- (goto-char (point-min))
- (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
- (narrow-to-region (match-beginning 0) (match-end 0))
- (vc-cvs-parse-status)
- (goto-char (point-max))
- (widen))))))
+ ;; if DIR is not under CVS control, don't do anything
+ (if (file-readable-p (expand-file-name "CVS/Entries" dir))
+ (if (vc-cvs-stay-local-p dir)
+ (vc-cvs-dir-state-heuristic dir)
+ (let ((default-directory dir))
+ ;; Don't specify DIR in this command, the default-directory is
+ ;; enough. Otherwise it might fail with remote repositories.
+ (with-temp-buffer
+ (vc-do-command t 0 "cvs" nil "status" "-l")
+ (goto-char (point-min))
+ (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
+ (narrow-to-region (match-beginning 0) (match-end 0))
+ (vc-cvs-parse-status)
+ (goto-char (point-max))
+ (widen)))))))
(defun vc-cvs-workfile-version (file)
"CVS-specific version of `vc-workfile-version'."
`vc-register-switches' and `vc-cvs-register-switches' are passed to
the CVS command (in that order)."
- (let ((switches (list
+ (let ((switches (append
(if (stringp vc-register-switches)
(list vc-register-switches)
vc-register-switches)
(list vc-cvs-register-switches)
vc-cvs-register-switches))))
- (apply 'vc-do-command nil 0 "cvs" file
+ (apply 'vc-cvs-command nil 0 file
"add"
(and comment (string-match "[^\t\n ]" comment)
(concat "-m" comment))
(list vc-checkin-switches)
vc-checkin-switches))
status)
- (if (not rev)
- (setq status (apply 'vc-do-command nil 1 "cvs" file
+ (if (or (not rev) (vc-cvs-valid-version-number-p rev))
+ (setq status (apply 'vc-cvs-command nil 1 file
"ci" (if rev (concat "-r" rev))
(concat "-m" comment)
switches))
(if (not (vc-cvs-valid-symbolic-tag-name-p rev))
- (error "%s is not a valid symbolic tag name")
+ (error "%s is not a valid symbolic tag name" rev)
;; If the input revison is a valid symbolic tag name, we create it
- ;; as a branch, commit and switch to it.
- (apply 'vc-do-command nil 0 "cvs" file "tag" "-b" (list rev))
- (apply 'vc-do-command nil 0 "cvs" file "update" "-r" (list rev))
- (setq status (apply 'vc-do-command nil 1 "cvs" file
- "ci"
+ ;; as a branch, commit and switch to it.
+ (apply 'vc-cvs-command nil 0 file "tag" "-b" (list rev))
+ (apply 'vc-cvs-command nil 0 file "update" "-r" (list rev))
+ (setq status (apply 'vc-cvs-command nil 1 file
+ "ci"
(concat "-m" comment)
switches))
(vc-file-setprop file 'vc-cvs-sticky-tag rev)))
;; if this was an explicit check-in (does not include creation of
;; a branch), remove the sticky tag.
(if (and rev (not (vc-cvs-valid-symbolic-tag-name-p rev)))
- (vc-do-command nil 0 "cvs" file "update" "-A"))))
+ (vc-cvs-command nil 0 file "update" "-A"))))
+
+(defun vc-cvs-find-version (file rev buffer)
+ (apply 'vc-cvs-command
+ buffer 0 file
+ "-Q" ; suppress diagnostic output
+ "update"
+ (and rev (not (string= rev ""))
+ (concat "-r" rev))
+ "-p"
+ (if (stringp vc-checkout-switches)
+ (list vc-checkout-switches)
+ vc-checkout-switches)))
(defun vc-cvs-checkout (file &optional editable rev workfile)
"Retrieve a revision of FILE into a WORKFILE.
(let ((coding-system-for-read 'no-conversion)
(coding-system-for-write 'no-conversion))
(with-temp-file filename
- (apply 'vc-do-command
- (current-buffer) 0 "cvs" file
+ (apply 'vc-cvs-command
+ (current-buffer) 0 file
"-Q" ; suppress diagnostic output
- "update"
- (and rev (not (string= rev ""))
+ "update"
+ (and (stringp rev)
+ (not (string= rev ""))
(concat "-r" rev))
"-p"
switches)))
(if (and (file-exists-p file) (not rev))
;; If no revision was specified, just make the file writable
;; if necessary (using `cvs-edit' if requested).
- (and editable (not (eq (vc-cvs-checkout-model file) 'implicit))
- (if vc-cvs-use-edit
- (vc-do-command nil 0 "cvs" file "edit")
- (set-file-modes file (logior (file-modes file) 128))
- (if file-buffer (toggle-read-only -1))))
- ;; Check out a particular version (or recreate the file).
- (vc-file-setprop file 'vc-workfile-version nil)
- (apply 'vc-do-command nil 0 "cvs" file
- (and editable
- (or (not (file-exists-p file))
- (not (eq (vc-cvs-checkout-model file)
- 'implicit)))
- "-w")
- "update"
- ;; default for verbose checkout: clear the sticky tag so
- ;; that the actual update will get the head of the trunk
- (if (or (not rev) (string= rev ""))
- "-A"
- (concat "-r" rev))
- switches))))
+ (and editable (not (eq (vc-cvs-checkout-model file) 'implicit))
+ (if vc-cvs-use-edit
+ (vc-cvs-command nil 0 file "edit")
+ (set-file-modes file (logior (file-modes file) 128))
+ (if file-buffer (toggle-read-only -1))))
+ ;; Check out a particular version (or recreate the file).
+ (vc-file-setprop file 'vc-workfile-version nil)
+ (apply 'vc-cvs-command nil 0 file
+ (and editable
+ (or (not (file-exists-p file))
+ (not (eq (vc-cvs-checkout-model file)
+ 'implicit)))
+ "-w")
+ "update"
+ ;; default for verbose checkout: clear the sticky tag so
+ ;; that the actual update will get the head of the trunk
+ (if (or (not rev) (eq rev t) (string= rev ""))
+ "-A"
+ (concat "-r" rev))
+ switches))))
(vc-mode-line file)
(message "Checking out %s...done" filename)))))
(vc-cvs-checkout file nil (vc-workfile-version file) file))
(unless (eq (vc-checkout-model file) 'implicit)
(if vc-cvs-use-edit
- (vc-do-command nil 0 "cvs" file "unedit")
+ (vc-cvs-command nil 0 file "unedit")
;; Make the file read-only by switching off all w-bits
(set-file-modes file (logand (file-modes file) 3950)))))
(defun vc-cvs-merge (file first-version &optional second-version)
"Merge changes into current working copy of FILE.
The changes are between FIRST-VERSION and SECOND-VERSION."
- (vc-do-command nil 0 "cvs" file
+ (vc-cvs-command nil 0 file
"update" "-kk"
(concat "-j" first-version)
(concat "-j" second-version))
(save-excursion
;; (vc-file-setprop file 'vc-workfile-version nil)
(vc-file-setprop file 'vc-checkout-time 0)
- (vc-do-command nil 0 "cvs" file "update")
+ (vc-cvs-command nil 0 file "update")
;; Analyze the merge result reported by CVS, and set
;; file properties accordingly.
(set-buffer (get-buffer "*vc*"))
(defun vc-cvs-print-log (file)
"Get change log associated with FILE."
- (vc-do-command
+ (vc-cvs-command
nil
(if (and (vc-cvs-stay-local-p file) (fboundp 'start-process)) 'async 0)
- "cvs" file "log"))
-
-(defun vc-cvs-show-log-entry (version)
- (when (re-search-forward
- ;; also match some context, for safety
- (concat "----\nrevision " version
- "\\(\tlocked by:.*\n\\|\n\\)date: ") nil t)
- ;; set the display window so that
- ;; the whole log entry is displayed
- (let (start end lines)
- (beginning-of-line) (forward-line -1) (setq start (point))
- (if (not (re-search-forward "^----*\nrevision" nil t))
- (setq end (point-max))
- (beginning-of-line) (forward-line -1) (setq end (point)))
- (setq lines (count-lines start end))
- (cond
- ;; if the global information and this log entry fit
- ;; into the window, display from the beginning
- ((< (count-lines (point-min) end) (window-height))
- (goto-char (point-min))
- (recenter 0)
- (goto-char start))
- ;; if the whole entry fits into the window,
- ;; display it centered
- ((< (1+ lines) (window-height))
- (goto-char start)
- (recenter (1- (- (/ (window-height) 2) (/ lines 2)))))
- ;; otherwise (the entry is too large for the window),
- ;; display from the start
- (t
- (goto-char start)
- (recenter 0))))))
+ file "log"))
(defun vc-cvs-diff (file &optional oldvers newvers)
"Get a difference report using CVS between two versions of FILE."
;; This file is added but not yet committed; there is no master file.
(if (or oldvers newvers)
(error "No revisions of %s exist" file)
- ;; we regard this as "changed".
- ;; diff it against /dev/null.
+ ;; We regard this as "changed".
+ ;; Diff it against /dev/null.
+ ;; Note: this is NOT a "cvs diff".
(apply 'vc-do-command "*vc-diff*"
1 "diff" file
(append diff-switches-list '("/dev/null"))))
(setq status
- (apply 'vc-do-command "*vc-diff*"
+ (apply 'vc-cvs-command "*vc-diff*"
(if (and (vc-cvs-stay-local-p file)
(fboundp 'start-process))
'async
1)
- "cvs" file "diff"
+ file "diff"
(and oldvers (concat "-r" oldvers))
(and newvers (concat "-r" newvers))
diff-switches-list))
;; in the tree via vc-cvs-dir-state-heuristic
(unless (vc-up-to-date-p ',f)
(message "Looking at %s" ',f)
- (vc-diff-internal ',f ',rel1 ',rel2))))))
+ (vc-diff-internal ',f ',rev1 ',rev2))))))
;; cvs diff: use a single call for the entire tree
(let ((coding-system-for-read
(or coding-system-for-read 'undecided)))
- (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff"
- (and rel1 (concat "-r" rel1))
- (and rel2 (concat "-r" rel2))
+ (apply 'vc-cvs-command "*vc-diff*" 1 nil "diff"
+ (and rev1 (concat "-r" rev1))
+ (and rev2 (concat "-r" rev2))
(vc-diff-switches-list 'CVS))))))
(defun vc-cvs-annotate-command (file buffer &optional version)
"Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
Optional arg VERSION is a version to annotate from."
- (vc-do-command buffer 0 "cvs" file "annotate" (if version
+ (vc-cvs-command buffer 0 file "annotate" (if version
(concat "-r" version))))
(defun vc-cvs-annotate-current-time ()
(defun vc-cvs-annotate-time ()
"Return the time of the next annotation (as fraction of days)
systime, or nil if there is none."
- (let ((time-stamp
+ (let ((time-stamp
"^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "))
(if (looking-at time-stamp)
(progn
(let* ((day (string-to-number (match-string 1)))
- (month (cdr (assoc (match-string 2)
+ (month (cdr (assoc (match-string 2)
vc-cvs-local-month-numbers)))
(year-tmp (string-to-number (match-string 3)))
;; Years 0..68 are 2000..2068.
"Assign to DIR's current version a given NAME.
If BRANCHP is non-nil, the name is created as a branch (and the current
workspace is immediately moved to that new branch)."
- (vc-do-command nil 0 "cvs" dir "tag" "-c" (if branchp "-b") name)
- (when branchp (vc-do-command nil 0 "cvs" dir "update" "-r" name)))
+ (vc-cvs-command nil 0 dir "tag" "-c" (if branchp "-b") name)
+ (when branchp (vc-cvs-command nil 0 dir "update" "-r" name)))
(defun vc-cvs-retrieve-snapshot (dir name update)
"Retrieve a snapshot at and below DIR.
(sticky-tag))
(erase-buffer)
(if (or (not name) (string= name ""))
- (vc-do-command t 0 "cvs" nil "update")
- (vc-do-command t 0 "cvs" nil "update" "-r" name)
+ (vc-cvs-command t 0 nil "update")
+ (vc-cvs-command t 0 nil "update" "-r" name)
(setq sticky-tag name))
(when update
(goto-char (point-min))
;;; Internal functions
;;;
+(defun vc-cvs-command (buffer okstatus file &rest flags)
+ "A wrapper around `vc-do-command' for use in vc-cvs.el.
+The difference to vc-do-command is that this function always invokes `cvs',
+and that it passes `vc-cvs-global-switches' to it before FLAGS."
+ (apply 'vc-do-command buffer okstatus "cvs" file
+ (if (stringp vc-cvs-global-switches)
+ (cons vc-cvs-global-switches flags)
+ (append vc-cvs-global-switches
+ flags))))
+
(defun vc-cvs-stay-local-p (file)
"Return non-nil if VC should stay local when handling FILE."
(if vc-cvs-stay-local
\[\t ]+\\([0-9.]+\\)"
nil t))
(vc-file-setprop file 'vc-latest-version (match-string 2)))
- (vc-file-setprop
+ (vc-file-setprop
file 'vc-state
(cond
((string-match "Up-to-date" status)
(vc-insert-file (expand-file-name "CVS/Entries" dir))
(goto-char (point-min))
(while (not (eobp))
- (when (looking-at "/\\([^/]*\\)/")
+ ;; CVS-removed files are not taken under VC control.
+ (when (looking-at "/\\([^/]*\\)/[^/-]")
(let ((file (expand-file-name (match-string 1) dir)))
(unless (vc-file-getprop file 'vc-state)
(vc-cvs-parse-entry file t))))
;; lowercase letters, digits, `-', and `_'.
(and (string-match "^[a-zA-Z]" tag)
(not (string-match "[^a-z0-9A-Z-_]" tag))))
-
+
+(defun vc-cvs-valid-version-number-p (tag)
+ "Return non-nil if TAG is a valid version number."
+ (and (string-match "^[0-9]" tag)
+ (not (string-match "[^0-9.]" tag))))
(defun vc-cvs-parse-sticky-tag (match-type match-tag)
- "Parse and return the sticky tag as a string.
+ "Parse and return the sticky tag as a string.
`match-data' is protected."
(let ((data (match-data))
(tag)
(t nil))))
(unwind-protect
(progn
- (cond
- ;; Sticky Date tag. Convert to to a proper date value (`encode-time')
+ (cond
+ ;; Sticky Date tag. Convert to a proper date value (`encode-time')
((eq type 'date)
- (string-match
- "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
+ (string-match
+ "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
match-tag)
(let* ((year-tmp (string-to-number (match-string 1 match-tag)))
(month (string-to-number (match-string 2 match-tag)))
(t nil))
(cond ((eq vc-cvs-sticky-tag-display nil) nil)
((eq vc-cvs-sticky-tag-display t)
- (cond ((eq type 'date) (format-time-string
+ (cond ((eq type 'date) (format-time-string
vc-cvs-sticky-date-format-string
tag))
((eq type 'symbolic-name) tag)
((eq type 'revision-number) tag)
(t nil)))
- ((functionp vc-cvs-sticky-tag-display)
+ ((functionp vc-cvs-sticky-tag-display)
(funcall vc-cvs-sticky-tag-display tag type))
(t nil)))
(concat "/[^/]+"
;; revision
"/\\([^/]*\\)"
- ;; timestamp
- "/\\([^/]*\\)"
- ;; optional conflict field
- "\\(+[^/]*\\)?/"
+ ;; timestamp and optional conflict field
+ "/\\([^/]*\\)/"
;; options
"\\([^/]*\\)/"
;; sticky tag
"\\(.\\|\\)" ;Sticky tag type (date or tag name, could be empty)
"\\(.*\\)")) ;Sticky tag
(vc-file-setprop file 'vc-workfile-version (match-string 1))
- (vc-file-setprop file 'vc-cvs-sticky-tag
- (vc-cvs-parse-sticky-tag (match-string 5) (match-string 6)))
+ (vc-file-setprop file 'vc-cvs-sticky-tag
+ (vc-cvs-parse-sticky-tag (match-string 4) (match-string 5)))
;; compare checkout time and modification time
- (let ((mtime (nth 5 (file-attributes file)))
- (system-time-locale "C"))
- (cond ((equal (format-time-string "%c" mtime 'utc) (match-string 2))
- (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 ((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)))))))))
+
(provide 'vc-cvs)
;;; vc-cvs.el ends here
HCoop / bpt / emacs.git / blobdiff