emacs: lisp/vc-cvs.el comparison

comparison lisp/vc-cvs.el @ 44436:f9db51bb423b

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

author	Sam Steingold <sds@gnu.org>
date	Mon, 08 Apr 2002 13:38:48 +0000
parents	e255f8fa4f62
children	6eb10924e77f

comparison

equal deleted inserted replaced

-:343a3a52107d
+:f9db51bb423b
 ;; Copyright (C) 1995,98,99,2000,2001  Free Software Foundation, Inc.
 ;; Author:      FSF (see vc.el for full credits)
 ;; 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.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 Here's an example that will display the formatted date for sticky
 dates and the word \"Sticky\" for sticky tag names and revisions.
 (lambda (tag type)
 (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,
 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)
 (condition-case nil
 (progn
 (string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
 (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)
 (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-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)))
 (set-buffer "*vc*")
 (goto-char (point-min))
 (apply 'encode-time 0 0 0 (nthcdr 3 (decode-time (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
 	 "^\\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)
 				    vc-cvs-local-month-numbers)))
 	       (year-tmp (string-to-number (match-string 3)))
 	       ;; Years 0..68 are 2000..2068.
 	       ;; Years 69..99 are 1969..1999.
 	       (year (+ (cond ((> 69 year-tmp) 2000)
 (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)
 (re-search-forward
 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
 \[\t ]+\\([0-9.]+\\)"
 nil t))
 (vc-file-setprop file 'vc-latest-version (match-string 2)))
 (vc-file-setprop
 file 'vc-state
 (cond
 ((string-match "Up-to-date" status)
 (vc-file-setprop file 'vc-checkout-time
 (nth 5 (file-attributes file)))
 ;; According to the CVS manual, a valid symbolic tag must start with
 ;; an uppercase or lowercase letter and can contain uppercase and
 ;; lowercase letters, digits, `-', and `_'.
 (and (string-match "^[a-zA-Z]" tag)
 (not (string-match "[^a-z0-9A-Z-_]" tag))))
 (defun vc-cvs-parse-sticky-tag (match-type match-tag)
 "Parse and return the sticky tag as a string.
 `match-data' is protected."
 (let ((data (match-data))
 	(tag)
 	(type (cond ((string= match-type "D") 'date)
 		    ((string= match-type "T")
 			 'symbolic-name
 		       'revision-number))
 		    (t nil))))
 (unwind-protect
 	(progn
 	  (cond
 	   ;; Sticky Date tag.  Convert to to a proper date value (`encode-time')
 	   ((eq type 'date)
 	    (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)))
 		   (day      (string-to-number (match-string 3 match-tag)))
 		   (hour     (string-to-number (match-string 4 match-tag)))
 	   ((eq type 'revision-number) (setq tag match-tag))
 	   ;; Default is no sticky tag at all
 	   (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
 					 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)
 		 (funcall vc-cvs-sticky-tag-display tag type))
 		(t nil)))
 (set-match-data data))))
 	     (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

Mercurial > emacs

comparison lisp/vc-cvs.el @ 44436:f9db51bb423b