mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 11:20:39 -08:00
Code Issues Projects Releases Wiki Activity

(vc-cvs-checkin): Pass the required argument to `error'.

Browse source
This commit is contained in:
Sam Steingold 2002-04-08 13:38:48 +00:00
parent 2c9dccc9e8
commit 968b980cd8
2 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2002-04-07 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.
2002-04-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 2002-04-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* files.el (display-time-string): Fix last change. * files.el (display-time-string): Fix last change.

38
lisp/vc-cvs.el
View file

@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits) ;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-cvs.el,v 1.37 2002/03/22 23:10:01 monnier Exp $ ;; $Id: vc-cvs.el,v 1.38 2002/03/28 14:27:30 spiegel Exp $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -114,7 +114,7 @@ Here's an example that will display the formatted date for sticky
dates and the word \"Sticky\" for sticky tag names and revisions. dates and the word \"Sticky\" for sticky tag names and revisions.
(lambda (tag type) (lambda (tag type)
(cond ((eq type 'date) (format-time-string (cond ((eq type 'date) (format-time-string
vc-cvs-sticky-date-format-string tag)) vc-cvs-sticky-date-format-string tag))
((eq type 'revision-number) \"Sticky\") ((eq type 'revision-number) \"Sticky\")
((eq type 'symbolic-name) \"Sticky\"))) ((eq type 'symbolic-name) \"Sticky\")))
@ -127,11 +127,11 @@ displayed. Date and time is displayed for sticky dates.
(lambda (tag type) (lambda (tag type)
(cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag)) (cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag))
((eq type 'revision-number) \"Sticky\") ((eq type 'revision-number) \"Sticky\")
((eq type 'symbolic-name) ((eq type 'symbolic-name)
(condition-case nil (condition-case nil
(progn (progn
(string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag) (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))) (substring (match-string 2 tag) 1 nil)))
(error tag))))) ; Fall-back to given tag name. (error tag))))) ; Fall-back to given tag name.
@ -328,13 +328,13 @@ This is only possible if CVS is responsible for FILE's directory."
(concat "-m" comment) (concat "-m" comment)
switches)) switches))
(if (not (vc-cvs-valid-symbolic-tag-name-p rev)) (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 ;; If the input revison is a valid symbolic tag name, we create it
;; as a branch, commit and switch to it. ;; 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 "tag" "-b" (list rev))
(apply 'vc-cvs-command nil 0 file "update" "-r" (list rev)) (apply 'vc-cvs-command nil 0 file "update" "-r" (list rev))
(setq status (apply 'vc-cvs-command nil 1 file (setq status (apply 'vc-cvs-command nil 1 file
"ci" "ci"
(concat "-m" comment) (concat "-m" comment)
switches)) switches))
(vc-file-setprop file 'vc-cvs-sticky-tag rev))) (vc-file-setprop file 'vc-cvs-sticky-tag rev)))
@ -634,12 +634,12 @@ encoded as fractional days."
(defun vc-cvs-annotate-time () (defun vc-cvs-annotate-time ()
"Return the time of the next annotation (as fraction of days) "Return the time of the next annotation (as fraction of days)
systime, or nil if there is none." systime, or nil if there is none."
(let ((time-stamp (let ((time-stamp
"^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): ")) "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "))
(if (looking-at time-stamp) (if (looking-at time-stamp)
(progn (progn
(let* ((day (string-to-number (match-string 1))) (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))) vc-cvs-local-month-numbers)))
(year-tmp (string-to-number (match-string 3))) (year-tmp (string-to-number (match-string 3)))
;; Years 0..68 are 2000..2068. ;; Years 0..68 are 2000..2068.
@ -731,7 +731,7 @@ If UPDATE is non-nil, then update (resynch) any affected buffers."
The difference to vc-do-command is that this function always invokes `cvs', 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." and that it passes `vc-cvs-global-switches' to it before FLAGS."
(apply 'vc-do-command buffer okstatus "cvs" file (apply 'vc-do-command buffer okstatus "cvs" file
(if (stringp vc-cvs-global-switches) (if (stringp vc-cvs-global-switches)
(cons vc-cvs-global-switches flags) (cons vc-cvs-global-switches flags)
(append vc-cvs-global-switches (append vc-cvs-global-switches
flags)))) flags))))
@ -782,7 +782,7 @@ essential information."
\[\t ]+\\([0-9.]+\\)" \[\t ]+\\([0-9.]+\\)"
nil t)) nil t))
(vc-file-setprop file 'vc-latest-version (match-string 2))) (vc-file-setprop file 'vc-latest-version (match-string 2)))
(vc-file-setprop (vc-file-setprop
file 'vc-state file 'vc-state
(cond (cond
((string-match "Up-to-date" status) ((string-match "Up-to-date" status)
@ -815,10 +815,10 @@ essential information."
;; lowercase letters, digits, `-', and `_'. ;; lowercase letters, digits, `-', and `_'.
(and (string-match "^[a-zA-Z]" tag) (and (string-match "^[a-zA-Z]" tag)
(not (string-match "[^a-z0-9A-Z-_]" tag)))) (not (string-match "[^a-z0-9A-Z-_]" tag))))
(defun vc-cvs-parse-sticky-tag (match-type match-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." `match-data' is protected."
(let ((data (match-data)) (let ((data (match-data))
(tag) (tag)
@ -830,11 +830,11 @@ essential information."
(t nil)))) (t nil))))
(unwind-protect (unwind-protect
(progn (progn
(cond (cond
;; Sticky Date tag. Convert to to a proper date value (`encode-time') ;; Sticky Date tag. Convert to to a proper date value (`encode-time')
((eq type 'date) ((eq type 'date)
(string-match (string-match
"\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)" "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
match-tag) match-tag)
(let* ((year-tmp (string-to-number (match-string 1 match-tag))) (let* ((year-tmp (string-to-number (match-string 1 match-tag)))
(month (string-to-number (match-string 2 match-tag))) (month (string-to-number (match-string 2 match-tag)))
@ -856,13 +856,13 @@ essential information."
(t nil)) (t nil))
(cond ((eq vc-cvs-sticky-tag-display nil) nil) (cond ((eq vc-cvs-sticky-tag-display nil) nil)
((eq vc-cvs-sticky-tag-display t) ((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 vc-cvs-sticky-date-format-string
tag)) tag))
((eq type 'symbolic-name) tag) ((eq type 'symbolic-name) tag)
((eq type 'revision-number) tag) ((eq type 'revision-number) tag)
(t nil))) (t nil)))
((functionp vc-cvs-sticky-tag-display) ((functionp vc-cvs-sticky-tag-display)
(funcall vc-cvs-sticky-tag-display tag type)) (funcall vc-cvs-sticky-tag-display tag type))
(t nil))) (t nil)))
@ -905,7 +905,7 @@ is non-nil."
(t (t
(vc-file-setprop file 'vc-checkout-time 0) (vc-file-setprop file 'vc-checkout-time 0)
(if set-state (vc-file-setprop file 'vc-state 'edited)))))))) (if set-state (vc-file-setprop file 'vc-state 'edited))))))))
(provide 'vc-cvs) (provide 'vc-cvs)
;;; vc-cvs.el ends here ;;; vc-cvs.el ends here