;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
-;; $Id: vc-hooks.el,v 1.106 1998/04/20 02:00:00 done Exp spiegel $
+;; $Id: vc-hooks.el,v 1.1 2000/01/10 13:25:12 gerd Exp gerd $
;; This file is part of GNU Emacs.
;; number of the subexpression that should be returned. If there's
;; a third element (also the number of a subexpression), that
;; subexpression is assumed to be a date field and we want the most
- ;; recent entry matching the template.
+ ;; recent entry matching the template; this works for RCS format dates only.
;; If FILE and PROPERTIES are given, the latter must be a list of
;; properties of the same length as PATTERNS; each property is assigned
;; the corresponding value.
(let ((latest-date "") (latest-val))
(while (re-search-forward (car p) nil t)
(let ((date (vc-match-substring (elt p 2))))
+ ;; Most (but not all) versions of RCS use two-digit years
+ ;; to represent dates in the range 1900 through 1999.
+ ;; The two-digit and four-digit notations can both appear
+ ;; in the same file. Normalize the two-digit versions.
+ (save-match-data
+ (if (string-match "\\`[0-9][0-9]\\." date)
+ (setq date (concat "19" date))))
(if (string< latest-date date)
(progn
(setq latest-date date)
((string-match "Needs Merge" status) 'needs-merge)
((string-match "Needs \\(Checkout\\|Patch\\)" status)
'needs-checkout)
- ((string-match "Unresolved Conflict" status) 'unresolved-conflict)
+ ((string-match "Unresolved Conflict" status)
+ 'unresolved-conflict)
+ ((string-match "File had conflicts on merge" status)
+ 'unresolved-conflict)
((string-match "Locally Added" status) 'locally-added)
((string-match "New file!" status) 'locally-added)
(t 'unknown))))))))))
(cond
;; search for $Id or $Header
;; -------------------------
- ((or (and (search-forward "$Id: " nil t)
+ ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file.
+ ((or (and (search-forward "$Id\ : " nil t)
(looking-at "[^ ]+ \\([0-9.]+\\) "))
(and (progn (goto-char (point-min))
- (search-forward "$Header: " nil t))
+ (search-forward "$Header\ : " nil t))
(looking-at "[^ ]+ \\([0-9.]+\\) ")))
(goto-char (match-end 0))
;; if found, store the revision number ...
(file-directory-p (concat dirname "CVS/"))
(file-readable-p (concat dirname "CVS/Entries")))
(let ((file (concat dirname basename))
- ;; make sure that the file name is searched
- ;; case-sensitively
- (case-fold-search nil)
buffer)
(unwind-protect
(save-excursion
(setq buffer (set-buffer (get-buffer-create "*vc-info*")))
(vc-insert-file (concat dirname "CVS/Entries"))
(goto-char (point-min))
+ ;; make sure that the file name is searched
+ ;; case-sensitively - case-fold-search is a buffer-local
+ ;; variable, so setting it here won't affect any other buffers
+ (setq case-fold-search nil)
(cond
;; entry for a "locally added" file (not yet committed)
((re-search-forward
"Change read-only status of current buffer, perhaps via version control.
If the buffer is visiting a file registered with version control,
then check the file in or out. Otherwise, just change the read-only flag
-of the buffer. With prefix argument, ask for version number."
+of the buffer.
+With prefix argument, ask for version number to check in or check out.
+Check-out of a specified version number does not lock the file;
+to do that, use this command a second time with no argument."
(interactive "P")
(if (or (and (boundp 'vc-dired-mode) vc-dired-mode)
;; use boundp because vc.el might not be loaded
(defun vc-file-not-found-hook ()
"When file is not found, try to check it out from RCS or SCCS.
Returns t if checkout was successful, nil otherwise."
+ ;; When a file does not exist, ignore cached info about it
+ ;; from a previous visit.
+ (vc-file-clearprops buffer-file-name)
(if (and (not vc-ignore-vc-files)
(vc-backend buffer-file-name))
(save-excursion
'("Retrieve Snapshot" . vc-retrieve-snapshot))
(define-key vc-menu-map [vc-create-snapshot]
'("Create Snapshot" . vc-create-snapshot))
- (define-key vc-menu-map [vc-directory] '("Show Locked Files" . vc-directory))
+ (define-key vc-menu-map [vc-directory] '("VC Directory Listing" . vc-directory))
(define-key vc-menu-map [separator1] '("----"))
(define-key vc-menu-map [vc-annotate] '("Annotate" . vc-annotate))
(define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file))
(define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action))
(define-key vc-menu-map [vc-register] '("Register" . vc-register)))
-(put 'vc-rename-file 'menu-enable 'vc-mode)
-(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS))
-(put 'vc-version-other-window 'menu-enable 'vc-mode)
-(put 'vc-diff 'menu-enable 'vc-mode)
-(put 'vc-update-change-log 'menu-enable
- '(eq (vc-buffer-backend) 'RCS))
-(put 'vc-print-log 'menu-enable 'vc-mode)
-(put 'vc-cancel-version 'menu-enable 'vc-mode)
-(put 'vc-revert-buffer 'menu-enable 'vc-mode)
-(put 'vc-insert-headers 'menu-enable 'vc-mode)
-(put 'vc-next-action 'menu-enable 'vc-mode)
-(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
+;;; These are not correct and it's not currently clear how doing it
+;;; better (with more complicated expressions) might slow things down
+;;; on older systems.
+
+;;;(put 'vc-rename-file 'menu-enable 'vc-mode)
+;;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS))
+;;;(put 'vc-version-other-window 'menu-enable 'vc-mode)
+;;;(put 'vc-diff 'menu-enable 'vc-mode)
+;;;(put 'vc-update-change-log 'menu-enable
+;;; '(eq (vc-buffer-backend) 'RCS))
+;;;(put 'vc-print-log 'menu-enable 'vc-mode)
+;;;(put 'vc-cancel-version 'menu-enable 'vc-mode)
+;;;(put 'vc-revert-buffer 'menu-enable 'vc-mode)
+;;;(put 'vc-insert-headers 'menu-enable 'vc-mode)
+;;;(put 'vc-next-action 'menu-enable 'vc-mode)
+;;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
(provide 'vc-hooks)
HCoop / bpt / emacs.git / blobdiff