1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
emacs/lisp/vc-hooks.el

876 lines
34 KiB
EmacsLisp
Raw Normal View History

1993-03-17 16:56:02 +00:00
;;; vc-hooks.el --- resident support for version-control
1992-07-31 22:24:03 +00:00
;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
1992-07-31 22:24:03 +00:00
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Modified by:
;; Per Cederqvist <ceder@lysator.liu.se>
;; Andre Spiegel <spiegel@berlin.informatik.uni-stuttgart.de>
1992-07-31 22:24:03 +00:00
;; 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
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;; Commentary:
;; This is the always-loaded portion of VC.
;; It takes care VC-related activities that are done when you visit a file,
;; so that vc.el itself is loaded only when you use a VC command.
1992-07-31 22:24:03 +00:00
;; See the commentary of vc.el.
;;; Code:
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; Customization Variables (the rest is in vc.el)
(defvar vc-default-back-end nil
"*Back-end actually used by this interface; may be SCCS or RCS.
The value is only computed when needed to avoid an expensive search.")
(defvar vc-path
(if (file-directory-p "/usr/sccs")
'("/usr/sccs")
nil)
"*List of extra directories to search for version control commands.")
1992-07-31 22:24:03 +00:00
(defvar vc-master-templates
'(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS)
("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS)
vc-find-cvs-master)
1992-07-31 22:24:03 +00:00
"*Where to look for version-control master files.
The first pair corresponding to a given back end is used as a template
when creating new masters.")
(defvar vc-make-backup-files nil
"*If non-nil, backups of registered files are made as with other files.
1994-02-04 23:01:27 +00:00
If nil (the default), files covered by version control don't get backups.")
1992-07-31 22:24:03 +00:00
(defvar vc-display-status t
"*If non-nil, display revision number and lock status in modeline.
Otherwise, not displayed.")
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defvar vc-consult-headers t
"*Identify work files by searching for version headers.")
(defvar vc-mistrust-permissions nil
"*Don't assume that permissions and ownership track version-control status.")
(defvar vc-keep-workfiles t
"*If non-nil, don't delete working files after registering changes.
If the back-end is CVS, workfiles are always kept, regardless of the
value of this flag.")
1992-07-31 22:24:03 +00:00
;; Tell Emacs about this new kind of minor mode
1993-04-08 16:35:57 +00:00
(if (not (assoc 'vc-mode minor-mode-alist))
(setq minor-mode-alist (cons '(vc-mode vc-mode)
1992-07-31 22:24:03 +00:00
minor-mode-alist)))
1993-04-08 16:35:57 +00:00
(make-variable-buffer-local 'vc-mode)
(put 'vc-mode 'permanent-local t)
1992-07-31 22:24:03 +00:00
;; We need a notion of per-file properties because the version
;; control state of a file is expensive to derive --- we compute
;; them when the file is initially found, keep them up to date
;; during any subsequent VC operations, and forget them when
;; the buffer is killed.
1992-07-31 22:24:03 +00:00
(defmacro vc-error-occurred (&rest body)
(list 'condition-case nil (cons 'progn (append body '(nil))) '(error t)))
1992-07-31 22:24:03 +00:00
(defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
"Obarray for per-file properties.")
(defvar vc-buffer-backend t)
(make-variable-buffer-local 'vc-buffer-backend)
1992-07-31 22:24:03 +00:00
(defun vc-file-setprop (file property value)
;; set per-file property
(put (intern file vc-file-prop-obarray) property value))
(defun vc-file-getprop (file property)
;; get per-file property
(get (intern file vc-file-prop-obarray) property))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-file-clearprops (file)
;; clear all properties of a given file
(setplist (intern file vc-file-prop-obarray) nil))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;;; Functions that determine property values, by examining the
;;; working file, the master file, or log program output
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-match-substring (bn)
(buffer-substring (match-beginning bn) (match-end bn)))
(defun vc-lock-file (file)
;; Generate lock file name corresponding to FILE
(let ((master (vc-name file)))
(and
master
(string-match "\\(.*/\\)s\\.\\(.*\\)" master)
(concat
(substring master (match-beginning 1) (match-end 1))
"p."
(substring master (match-beginning 2) (match-end 2))))))
(defun vc-parse-buffer (patterns &optional file properties)
;; Use PATTERNS to parse information out of the current buffer.
;; Each element of PATTERNS is a list of 2 to 3 elements. The first element
;; is the pattern to be matched, and the second (an integer) is the
;; 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.
;; 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.
(mapcar (function (lambda (p)
(goto-char (point-min))
(cond
((eq (length p) 2) ;; search for first entry
(let ((value nil))
(if (re-search-forward (car p) nil t)
(setq value (vc-match-substring (elt p 1))))
(if file
(progn (vc-file-setprop file (car properties) value)
(setq properties (cdr properties))))
value))
((eq (length p) 3) ;; search for latest entry
(let ((latest-date "") (latest-val))
(while (re-search-forward (car p) nil t)
(let ((date (vc-match-substring (elt p 2))))
(if (string< latest-date date)
(progn
(setq latest-date date)
(setq latest-val
(vc-match-substring (elt p 1)))))))
(if file
(progn (vc-file-setprop file (car properties) latest-val)
(setq properties (cdr properties))))
latest-val)))))
patterns)
)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(defun vc-insert-file (file &optional limit blocksize)
;; Insert the contents of FILE into the current buffer.
;; Optional argument LIMIT is a regexp. If present,
;; the file is inserted in chunks of size BLOCKSIZE
;; (default 8 kByte), until the first occurence of
;; LIMIT is found. The function returns nil if FILE
;; doesn't exist.
(cond ((file-exists-p file)
(cond (limit
(if (not blocksize) (setq blocksize 8192))
(let (found s)
(while (not found)
(setq s (buffer-size))
(goto-char (1+ s))
(setq found
(or (zerop (car (cdr
(insert-file-contents file nil s
(+ s blocksize)))))
(progn (beginning-of-line)
(re-search-forward limit nil t)))))))
(t (insert-file-contents file)))
(set-buffer-modified-p nil)
(auto-save-mode nil)
t)
(t nil)))
(defun vc-parse-locks (file locks)
;; Parse RCS or SCCS locks.
;; The result is a list of the form ((VERSION USER) (VERSION USER) ...),
;; which is returned and stored into the property `vc-master-locks'.
(if (not locks)
(vc-file-setprop file 'vc-master-locks 'none)
(let ((found t) (index 0) master-locks version user)
(cond ((eq (vc-backend file) 'SCCS)
(while (string-match "^\\([0-9.]+\\) [0-9.]+ \\([^ ]+\\) .*\n?"
locks index)
(setq version (substring locks
(match-beginning 1) (match-end 1)))
(setq user (substring locks
(match-beginning 2) (match-end 2)))
(setq master-locks (append master-locks
(list (cons version user))))
(setq index (match-end 0))))
((eq (vc-backend file) 'RCS)
(while (string-match "[ \t\n]*\\([^:]+\\):\\([0-9.]+\\)"
locks index)
(setq version (substring locks
(match-beginning 2) (match-end 2)))
(setq user (substring locks
(match-beginning 1) (match-end 1)))
(setq master-locks (append master-locks
(list (cons version user))))
(setq index (match-end 0)))))
(vc-file-setprop file 'vc-master-locks (or master-locks 'none)))))
(defun vc-fetch-master-properties (file)
;; Fetch those properties of FILE that are stored in the master file.
;; For an RCS file, we don't get vc-latest-version vc-your-latest-version
;; here because that is slow.
;; That gets done if/when the functions vc-latest-version
;; and vc-your-latest-version get called.
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(save-excursion
(cond
((eq (vc-backend file) 'SCCS)
(set-buffer (get-buffer-create "*vc-info*"))
(if (vc-insert-file (vc-lock-file file))
(progn (vc-parse-locks file (buffer-string))
(erase-buffer))
(vc-file-setprop file 'vc-master-locks 'none))
(vc-insert-file (vc-name file) "^\001e")
(vc-parse-buffer
(list '("^\001d D \\([^ ]+\\)" 1)
(list (concat "^\001d D \\([^ ]+\\) .* "
(regexp-quote (user-login-name)) " ") 1))
file
'(vc-latest-version vc-your-latest-version)))
((eq (vc-backend file) 'RCS)
(set-buffer (get-buffer-create "*vc-info*"))
(vc-insert-file (vc-name file) "^locks")
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-parse-buffer
(list '("^head[ \t\n]+\\([^;]+\\);" 1)
'("^branch[ \t\n]+\\([^;]+\\);" 1)
'("^locks\\([^;]+\\);" 1))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
file
'(vc-head-version
vc-default-branch
vc-master-locks))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;; determine vc-top-version: it is either the head version,
;; or the tip of the default branch
(let ((default-branch (vc-file-getprop file 'vc-default-branch)))
(cond
;; no default branch
((or (not default-branch) (string= "" default-branch))
(vc-file-setprop file 'vc-top-version
(vc-file-getprop file 'vc-head-version)))
;; default branch is actually a revision
((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$"
default-branch)
(vc-file-setprop file 'vc-top-version default-branch))
;; else, search for the tip of the default branch
(t (erase-buffer)
(vc-insert-file (vc-name file) "^desc")
(vc-parse-buffer (list (list
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(concat "^\\("
(regexp-quote default-branch)
"\\.[0-9]+\\)\ndate[ \t]+\\([0-9.]+\\);") 1 2))
file '(vc-top-version)))))
;; translate the locks
(vc-parse-locks file (vc-file-getprop file 'vc-master-locks)))
((eq (vc-backend file) 'CVS)
;; don't switch to the *vc-info* buffer before running the
;; command, because that would change its default directory
(save-excursion (set-buffer (get-buffer-create "*vc-info*"))
(erase-buffer))
(let ((exec-path (append vc-path exec-path))
;; Add vc-path to PATH for the execution of this command.
(process-environment
(cons (concat "PATH=" (getenv "PATH")
path-separator
(mapconcat 'identity vc-path path-separator))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
process-environment)))
(apply 'call-process "cvs" nil "*vc-info*" nil
(list "status" (file-name-nondirectory file))))
(set-buffer (get-buffer "*vc-info*"))
(set-buffer-modified-p nil)
(auto-save-mode nil)
(vc-parse-buffer
;; CVS 1.3 says "RCS Version:", other releases "RCS Revision:",
;; and CVS 1.4a1 says "Repository revision:".
'(("\\(RCS Version\\|RCS Revision\\|Repository revision\\):[\t ]+\\([0-9.]+\\)" 2)
("^File: [^ \t]+[ \t]+Status: \\(.*\\)" 1))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
file
'(vc-latest-version vc-cvs-status))
;; Translate those status values that are needed into symbols.
;; Any other value is converted to nil.
(let ((status (vc-file-getprop file 'vc-cvs-status)))
(cond ((string-match "Up-to-date" status)
(vc-file-setprop file 'vc-cvs-status 'up-to-date)
(vc-file-setprop file 'vc-checkout-time
(nth 5 (file-attributes file))))
((string-match "Locally Modified" status)
(vc-file-setprop file 'vc-cvs-status 'locally-modified))
((string-match "Needs Merge" status)
(vc-file-setprop file 'vc-cvs-status 'needs-merge))
(t (vc-file-setprop file 'vc-cvs-status nil))))))
(kill-buffer (current-buffer))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;;; Functions that determine property values, by examining the
;;; working file, the master file, or log program output
(defun vc-consult-rcs-headers (file)
;; Search for RCS headers in FILE, and set properties
;; accordingly. This function can be disabled by setting
;; vc-consult-headers to nil.
;; Returns: nil if no headers were found
;; (or if the feature is disabled,
;; or if there is currently no buffer
;; visiting FILE)
;; 'rev if a workfile revision was found
;; 'rev-and-lock if revision and lock info was found
(cond
((or (not vc-consult-headers)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(not (get-file-buffer file))) nil)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
((save-excursion
(set-buffer (get-file-buffer file))
(goto-char (point-min))
(cond
;; search for $Id or $Header
;; -------------------------
((or (and (search-forward "$Id: " nil t)
(looking-at "[^ ]+ \\([0-9.]+\\) "))
(and (progn (goto-char (point-min))
(search-forward "$Header: " nil t))
(looking-at "[^ ]+ \\([0-9.]+\\) ")))
(goto-char (match-end 0))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; if found, store the revision number ...
(let ((rev (buffer-substring (match-beginning 1)
(match-end 1))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; ... and check for the locking state
(if (re-search-forward
(concat "\\=[0-9]+/[0-9]+/[0-9]+ " ; date
"[0-9]+:[0-9]+:[0-9]+ " ; time
"[^ ]+ [^ ]+ ") ; author & state
nil t)
(cond
;; unlocked revision
((looking-at "\\$")
(vc-file-setprop file 'vc-workfile-version rev)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-file-setprop file 'vc-locking-user 'none)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
'rev-and-lock)
;; revision is locked by some user
((looking-at "\\([^ ]+\\) \\$")
(vc-file-setprop file 'vc-workfile-version rev)
(vc-file-setprop file 'vc-locking-user
(buffer-substring (match-beginning 1)
(match-end 1)))
'rev-and-lock)
;; everything else: false
(nil))
;; unexpected information in
;; keyword string --> quit
nil)))
;; search for $Revision
;; --------------------
((re-search-forward (concat "\\$"
"Revision: \\([0-9.]+\\) \\$")
nil t)
;; if found, store the revision number ...
(let ((rev (buffer-substring (match-beginning 1)
(match-end 1))))
;; and see if there's any lock information
(goto-char (point-min))
(if (re-search-forward (concat "\\$" "Locker:") nil t)
(cond ((looking-at " \\([^ ]+\\) \\$")
(vc-file-setprop file 'vc-workfile-version rev)
(vc-file-setprop file 'vc-locking-user
(buffer-substring (match-beginning 1)
(match-end 1)))
'rev-and-lock)
((looking-at " *\\$")
(vc-file-setprop file 'vc-workfile-version rev)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-file-setprop file 'vc-locking-user 'none)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
'rev-and-lock)
(t
(vc-file-setprop file 'vc-workfile-version rev)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-file-setprop file 'vc-locking-user 'none)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
'rev-and-lock))
(vc-file-setprop file 'vc-workfile-version rev)
'rev)))
;; else: nothing found
;; -------------------
(t nil))))))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;;; Access functions to file properties
;;; (Properties should be _set_ using vc-file-setprop, but
;;; _retrieved_ only through these functions, which decide
;;; if the property is already known or not. A property should
;;; only be retrieved by vc-file-getprop if there is no
;;; access function.)
;;; properties indicating the backend
;;; being used for FILE
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-backend-subdirectory-name (&optional file)
;; Where the master and lock files for the current directory are kept
(symbol-name
(or
(and file (vc-backend file))
vc-default-back-end
(setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS)))))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(defun vc-name (file)
"Return the master name of a file, nil if it is not registered."
(or (vc-file-getprop file 'vc-name)
(let ((name-and-type (vc-registered file)))
(if name-and-type
(progn
(vc-file-setprop file 'vc-backend (cdr name-and-type))
(vc-file-setprop file 'vc-name (car name-and-type)))))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(defun vc-backend (file)
"Return the version-control type of a file, nil if it is not registered."
(and file
(or (vc-file-getprop file 'vc-backend)
(let ((name-and-type (vc-registered file)))
(if name-and-type
(progn
(vc-file-setprop file 'vc-name (car name-and-type))
(vc-file-setprop file 'vc-backend (cdr name-and-type))))))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;;; properties indicating the locking state
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-cvs-status (file)
;; Return the cvs status of FILE
;; (Status field in output of "cvs status")
(cond ((vc-file-getprop file 'vc-cvs-status))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(t (vc-fetch-master-properties file)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(vc-file-getprop file 'vc-cvs-status))))
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(defun vc-master-locks (file)
;; Return the lock entries in the master of FILE.
;; Return 'none if there are no such entries, and a list
;; of the form ((VERSION USER) (VERSION USER) ...) otherwise.
(cond ((vc-file-getprop file 'vc-master-locks))
(t (vc-fetch-master-properties file)
(vc-file-getprop file 'vc-master-locks))))
(defun vc-master-locking-user (file)
;; Return the master file's idea of who is locking
;; the current workfile version of FILE.
;; Return 'none if it is not locked.
(let ((master-locks (vc-master-locks file)) lock)
(if (eq master-locks 'none) 'none
;; search for a lock on the current workfile version
(setq lock (assoc (vc-workfile-version file) master-locks))
(cond (lock (cdr lock))
('none)))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-locking-user (file)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;; Return the name of the person currently holding a lock on FILE.
;; Return nil if there is no such person.
;; Under CVS, a file is considered locked if it has been modified since
;; it was checked out. Under CVS, this will sometimes return the uid of
;; the owner of the file (as a number) instead of a string.
;; The property is cached. It is only looked up if it is currently nil.
;; Note that, for a file that is not locked, the actual property value
;; is 'none, to distinguish it from an unknown locking state. That value
;; is converted to nil by this function, and returned to the caller.
(let ((locking-user (vc-file-getprop file 'vc-locking-user)))
(if locking-user
;; if we already know the property, return it
(if (eq locking-user 'none) nil locking-user)
;; otherwise, infer the property...
(cond
;; in the CVS case, check the status
((eq (vc-backend file) 'CVS)
(if (eq (vc-cvs-status file) 'up-to-date)
(vc-file-setprop file 'vc-locking-user 'none)
;; The expression below should return the username of the owner
;; of the file. It doesn't. It returns the username if it is
;; you, or otherwise the UID of the owner of the file. The
;; return value from this function is only used by
;; vc-dired-reformat-line, and it does the proper thing if a UID
;; is returned.
;;
;; The *proper* way to fix this would be to implement a built-in
;; function in Emacs, say, (username UID), that returns the
;; username of a given UID.
;;
;; The result of this hack is that vc-directory will print the
;; name of the owner of the file for any files that are
;; modified.
(let ((uid (nth 2 (file-attributes file))))
(if (= uid (user-uid))
(vc-file-setprop file 'vc-locking-user (user-login-name))
(vc-file-setprop file 'vc-locking-user uid)))))
;; RCS case: attempt a header search. If this feature is
;; disabled, vc-consult-rcs-headers always returns nil.
((and (eq (vc-backend file) 'RCS)
(eq (vc-consult-rcs-headers file) 'rev-and-lock)))
;; if the file permissions are not trusted,
;; use the information from the master file
((or (not vc-keep-workfiles)
(eq vc-mistrust-permissions 't)
(and vc-mistrust-permissions
(funcall vc-mistrust-permissions
(vc-backend-subdirectory-name file))))
(vc-file-setprop file 'vc-locking-user (vc-master-locking-user file)))
;; Otherwise: Use the file permissions. (But if it turns out that the
;; file is not owned by the user, use the master file.)
;; This implementation assumes that any file which is under version
;; control and has -rw-r--r-- is locked by its owner. This is true
;; for both RCS and SCCS, which keep unlocked files at -r--r--r--.
;; We have to be careful not to exclude files with execute bits on;
;; scripts can be under version control too. Also, we must ignore the
;; group-read and other-read bits, since paranoid users turn them off.
;; This hack wins because calls to the somewhat expensive
;; `vc-fetch-master-properties' function only have to be made if
;; (a) the file is locked by someone other than the current user,
;; or (b) some untoward manipulation behind vc's back has changed
;; the owner or the `group' or `other' write bits.
(t
(let ((attributes (file-attributes file)))
(cond ((string-match ".r-..-..-." (nth 8 attributes))
(vc-file-setprop file 'vc-locking-user 'none))
((and (= (nth 2 attributes) (user-uid))
(string-match ".rw..-..-." (nth 8 attributes)))
(vc-file-setprop file 'vc-locking-user (user-login-name)))
(t
(vc-file-setprop file 'vc-locking-user
(vc-master-locking-user file))))
)))
;; recursively call the function again,
;; to convert a possible 'none value
(vc-locking-user file))))
;;; properties to store current and recent version numbers
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-latest-version (file)
;; Return version level of the latest version of FILE
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(cond ((vc-file-getprop file 'vc-latest-version))
(t (vc-fetch-properties file)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-file-getprop file 'vc-latest-version))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-your-latest-version (file)
;; Return version level of the latest version of FILE checked in by you
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(cond ((vc-file-getprop file 'vc-your-latest-version))
(t (vc-fetch-properties file)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(vc-file-getprop file 'vc-your-latest-version))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(defun vc-top-version (file)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; Return version level of the highest revision on the default branch
;; If there is no default branch, return the highest version number
;; on the trunk.
;; This property is defined for RCS only.
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(cond ((vc-file-getprop file 'vc-top-version))
(t (vc-fetch-master-properties file)
(vc-file-getprop file 'vc-top-version))))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-fetch-properties (file)
;; Fetch vc-latest-version and vc-your-latest-version
;; if that wasn't already done.
(cond
((eq (vc-backend file) 'RCS)
(set-buffer (get-buffer-create "*vc-info*"))
(vc-insert-file (vc-name file) "^desc")
(vc-parse-buffer
(list '("^\\([0-9]+\\.[0-9.]+\\)\ndate[ \t]+\\([0-9.]+\\);" 1 2)
(list (concat "^\\([0-9]+\\.[0-9.]+\\)\n"
"date[ \t]+\\([0-9.]+\\);[ \t]+"
"author[ \t]+"
(regexp-quote (user-login-name)) ";") 1 2))
file
'(vc-latest-version vc-your-latest-version)))
(t (vc-fetch-master-properties file))
))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-workfile-version (file)
;; Return version level of the current workfile FILE
;; This is attempted by first looking at the RCS keywords.
;; If there are no keywords in the working file,
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
;; vc-top-version is taken.
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; Note that this property is cached, that is, it is only
;; looked up if it is nil.
;; For SCCS, this property is equivalent to vc-latest-version.
(cond ((vc-file-getprop file 'vc-workfile-version))
((eq (vc-backend file) 'SCCS) (vc-latest-version file))
((eq (vc-backend file) 'RCS)
(if (vc-consult-rcs-headers file)
(vc-file-getprop file 'vc-workfile-version)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(let ((rev (cond ((vc-top-version file))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
((vc-latest-version file)))))
(vc-file-setprop file 'vc-workfile-version rev)
rev)))
((eq (vc-backend file) 'CVS)
(if (vc-consult-rcs-headers file) ;; CVS
(vc-file-getprop file 'vc-workfile-version)
(vc-find-cvs-master (file-name-directory file)
(file-name-nondirectory file))
(vc-file-getprop file 'vc-workfile-version)))))
1992-07-31 22:24:03 +00:00
;;; actual version-control code starts here
(defun vc-registered (file)
(let (handler handlers)
(if (boundp 'file-name-handler-alist)
(setq handler (find-file-name-handler file 'vc-registered)))
(if handler
(funcall handler 'vc-registered file)
;; Search for a master corresponding to the given file
(let ((dirname (or (file-name-directory file) ""))
(basename (file-name-nondirectory file)))
(catch 'found
(mapcar
(function (lambda (s)
(if (atom s)
(funcall s dirname basename)
(let ((trial (format (car s) dirname basename)))
(if (and (file-exists-p trial)
;; Make sure the file we found with name
;; TRIAL is not the source file itself.
;; That can happen with RCS-style names
;; if the file name is truncated
;; (e.g. to 14 chars). See if either
;; directory or attributes differ.
(or (not (string= dirname
(file-name-directory trial)))
(not (equal
(file-attributes file)
(file-attributes trial)))))
(throw 'found (cons trial (cdr s))))))))
vc-master-templates)
nil)))))
1992-07-31 22:24:03 +00:00
(defun vc-find-cvs-master (dirname basename)
;; Check if DIRNAME/BASENAME is handled by CVS.
;; If it is, do a (throw 'found (cons MASTER 'CVS)).
;; Note: If the file is ``cvs add''ed but not yet ``cvs commit''ed
;; the MASTER will not actually exist yet. The other parts of VC
;; checks for this condition. This function returns nil if
;; DIRNAME/BASENAME is not handled by CVS.
(if (and (file-directory-p (concat dirname "CVS/"))
(file-readable-p (concat dirname "CVS/Entries"))
(file-readable-p (concat dirname "CVS/Repository")))
(let ((bufs nil) (fold case-fold-search))
(unwind-protect
(save-excursion
(setq bufs (list
(find-file-noselect (concat dirname "CVS/Entries"))))
(set-buffer (car bufs))
(goto-char (point-min))
;; make sure the file name is searched
;; case-sensitively
(setq case-fold-search nil)
(cond
((re-search-forward
(concat "^/" (regexp-quote basename) "/\\([^/]*\\)/")
nil t)
(setq case-fold-search fold) ;; restore the old value
;; We found it. Store away version number, now
;; that we are anyhow so close to finding it.
(vc-file-setprop (concat dirname basename)
'vc-workfile-version
(buffer-substring (match-beginning 1)
(match-end 1)))
(setq bufs (cons (find-file-noselect
(concat dirname "CVS/Repository"))
bufs))
(set-buffer (car bufs))
(let ((master
(concat (file-name-as-directory
(buffer-substring (point-min)
(1- (point-max))))
basename
",v")))
(throw 'found (cons master 'CVS))))
(t (setq case-fold-search fold) ;; restore the old value
nil)))
(mapcar (function kill-buffer) bufs)))))
(defun vc-buffer-backend ()
"Return the version-control type of the visited file, or nil if none."
(if (eq vc-buffer-backend t)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(setq vc-buffer-backend (vc-backend (buffer-file-name)))
vc-buffer-backend))
(defun vc-toggle-read-only (&optional verbose)
"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."
(interactive "P")
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(if (vc-backend (buffer-file-name))
(vc-next-action verbose)
1992-07-31 22:24:03 +00:00
(toggle-read-only)))
(define-key global-map "\C-x\C-q" 'vc-toggle-read-only)
1992-07-31 22:24:03 +00:00
(defun vc-mode-line (file &optional label)
1993-04-08 16:35:57 +00:00
"Set `vc-mode' to display type of version control for FILE.
1992-07-31 22:24:03 +00:00
The value is set in the current buffer, which should be the buffer
visiting FILE. Second optional arg LABEL is put in place of version
control system name."
(interactive (list buffer-file-name nil))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(let ((vc-type (vc-backend file))
(vc-status-string (and vc-display-status (vc-status file))))
(setq vc-mode
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(concat " " (or label (symbol-name vc-type)) vc-status-string))
;; Make the buffer read-only if the file is not locked
;; (or unchanged, in the CVS case).
;; Determine this by looking at the mode string,
;; so that no further external status query is necessary
(if vc-status-string
(if (eq (elt vc-status-string 0) ?-)
(setq buffer-read-only t))
(if (not (vc-locking-user file))
(setq buffer-read-only t)))
;; Even root shouldn't modify a registered file without
;; locking it first.
(and vc-type
(not buffer-read-only)
(zerop (user-uid))
(require 'vc)
(not (equal (user-login-name) (vc-locking-user file)))
(setq buffer-read-only t))
(and (null vc-type)
(file-symlink-p file)
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(let ((link-type (vc-backend (file-symlink-p file))))
(if link-type
(message
"Warning: symbolic link to %s-controlled source file"
link-type))))
(force-mode-line-update)
;;(set-buffer-modified-p (buffer-modified-p)) ;;use this if Emacs 18
vc-type))
1992-07-31 22:24:03 +00:00
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(defun vc-status (file)
;; Return string for placement in modeline by `vc-mode-line'.
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; Format:
;;
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; "-REV" if the revision is not locked
;; ":REV" if the revision is locked by the user
;; ":LOCKER:REV" if the revision is locked by somebody else
;; " @@" for a CVS file that is added, but not yet committed
;;
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
;; In the CVS case, a "locked" working file is a
;; working file that is modified with respect to the master.
;; The file is "locked" from the moment when the user makes
;; the buffer writable.
;;
;; This function assumes that the file is registered.
(let ((locker (vc-locking-user file))
(rev (vc-workfile-version file)))
(cond ((string= "0" rev)
" @@")
((not locker)
(concat "-" rev))
((if (stringp locker)
(string= locker (user-login-name))
(= locker (user-uid)))
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(concat ":" rev))
(t
(concat ":" locker ":" rev)))))
1992-07-31 22:24:03 +00:00
;;; install a call to the above as a find-file hook
(defun vc-find-file-hook ()
;; Recompute whether file is version controlled,
;; if user has killed the buffer and revisited.
(cond
(buffer-file-name
(vc-file-clearprops buffer-file-name)
(cond
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
((vc-backend buffer-file-name)
(vc-mode-line buffer-file-name)
(cond ((not vc-make-backup-files)
;; Use this variable, not make-backup-files,
;; because this is for things that depend on the file name.
(make-local-variable 'backup-inhibited)
(setq backup-inhibited t))))))))
1992-07-31 22:24:03 +00:00
(add-hook 'find-file-hooks 'vc-find-file-hook)
1992-07-31 22:24:03 +00:00
;;; more hooks, this time for file-not-found
(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."
(vc-default-backend, vc-path, vc-consult-headers): (vc-mistrust-permissions, vc-keep-workfiles): Customization variables, moved here from vc.el. (vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el. (vc-backend): Renamed from vc-backend-deduce. Callers changed. (vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info): (vc-log-info, vc-consult-rcs-headers, vc-fetch-properties): (vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user): (vc-latest-version, vc-your-latest-version, vc-branch-version): (vc-workfile-version): Functions moved here from vc.el. (vc-log-info): Log program is no longer called through vc-do-command, to avoid including the lengthy vc-do-command here. It is done directly through call-process now. Removed obsolete parameter LAST. (vc-status): Replaced by the much simpler version that gets the information from the file properties. Removed the obsolete parameter vc-type. (vc-parse-buffer): changed format of PATTERNS. Each pattern is now a list of 2 to 3 elements, the first being the pattern, the remaining ones the numbers of subexpressions to refer to. (vc-cvs-status): New per-file property, only used in the CVS case. (vc-cvs-status): New function. (vc-log-info): Adapted to new version of vc-parse-buffer (vc-fetch-properties): Adapted to new version of vc-parse-buffer. Better search regexp for CVS latest version. (vc-log-info): Search for branch version only in the RCS case, since this doesn't make sense for SCCS or CVS. (vc-fetch-properties): CVS case: set vc-cvs-status. (vc-locking-user): CVS case: use vc-cvs-status to determine if the file is up-to-date, thus avoiding an expensive call to vc-workfile-unchanged-p. (vc-mode-line): Re-activated the code that makes the buffer read-only if the work file is unchanged. But the status of the work file is now determined by looking at the already-computed mode string.
1995-04-26 21:42:20 +00:00
(if (vc-backend buffer-file-name)
(save-excursion
1992-07-31 22:24:03 +00:00
(require 'vc)
The RCS status is now found by reading the master file directly, instead of using rlog. The properties retrieved from the master file are kept separately. The two main properties, `vc-workfile-version' and `vc-locking-user', are inferred from those master file properties if the information cannot be found elsehow. All properties are consistently cached now. (vc-master-info, vc-log-info, vc-fetch-properties): functions removed. Their job is now done by `vc-fetch-master-properties' and `vc-insert-file'. (vc-fetch-master-properties): new function, replaces vc-fetch-properties. Retrieves all the properties that can be found in the master file, for all three backends (calls `cvs status' in the CVS case). (vc-insert-file): new function. Inserts an arbitrary file into the current buffer, optionally chunkwise, until a certain regexp shows up. (vc-parse-locks): new function. Translates SCCS or RCS lock lists, as found in the master files, into lisp lists. Sets the new property `vc-master-locks'. (vc-locked-version): property removed. Was unnecessary, and only referenced in vc-hooks.el. (vc-head-version, vc-default-branch, vc-master-locks): new properties. (vc-top-version): new name for the old property `vc-branch-version'. ("top-version" is better because it might also be the RCS "head" if there is no default branch.) (vc-master-locking-user): replaces `vc-true-locking-user'. Scans the new `vc-master-locks' property, yielding the master file's idea of who is locking the current workfile version. (vc-locking-user): slightly changed to use the new properties. Changed the actual property value for an unlocked file to 'none. This is to distinguish it from an unknown locking state, which is represented by nil. The function vc-locking-user returns nil if the property is 'none, to make it compatible with the rest of VC. (vc-consult-rcs-headers, vc-master-locking-user): adpated to the new 'none-value of vc-locking-user. (vc-consult-rcs-headers): fixed bug that prevented (not vc-consult-headers) from working (vc-file-not-found-hook): set the default-directory of the new buffer before check-out. (Otherwise, setting vc-keep-workfiles to nil doesn't work.) (vc-occurences, vc-branch-p): functions removed (no longer needed) Reordered some defuns so they are grouped in a logical way.
1995-06-15 23:06:45 +00:00
(setq default-directory (file-name-directory (buffer-file-name)))
1992-07-31 22:24:03 +00:00
(not (vc-error-occurred (vc-checkout buffer-file-name))))))
(add-hook 'find-file-not-found-hooks 'vc-file-not-found-hook)
1992-07-31 22:24:03 +00:00
;; Discard info about a file when we kill its buffer.
(defun vc-kill-buffer-hook ()
(if (stringp (buffer-file-name))
(progn
(vc-file-clearprops (buffer-file-name))
(kill-local-variable 'vc-buffer-backend))))
;;;(add-hook 'kill-buffer-hook 'vc-kill-buffer-hook)
1992-07-31 22:24:03 +00:00
;;; Now arrange for bindings and autoloading of the main package.
1993-04-08 16:35:57 +00:00
;;; Bindings for this have to go in the global map, as we'll often
;;; want to call them from random buffers.
1992-07-31 22:24:03 +00:00
(setq vc-prefix-map (lookup-key global-map "\C-xv"))
(if (not (keymapp vc-prefix-map))
(progn
(setq vc-prefix-map (make-sparse-keymap))
(define-key global-map "\C-xv" vc-prefix-map)
(define-key vc-prefix-map "a" 'vc-update-change-log)
(define-key vc-prefix-map "c" 'vc-cancel-version)
(define-key vc-prefix-map "d" 'vc-directory)
1992-07-31 22:24:03 +00:00
(define-key vc-prefix-map "h" 'vc-insert-headers)
(define-key vc-prefix-map "i" 'vc-register)
(define-key vc-prefix-map "l" 'vc-print-log)
(define-key vc-prefix-map "r" 'vc-retrieve-snapshot)
(define-key vc-prefix-map "s" 'vc-create-snapshot)
(define-key vc-prefix-map "u" 'vc-revert-buffer)
(define-key vc-prefix-map "v" 'vc-next-action)
(define-key vc-prefix-map "=" 'vc-diff)
(define-key vc-prefix-map "~" 'vc-version-other-window)))
(if (not (boundp 'vc-menu-map))
;; Don't do the menu bindings if menu-bar.el wasn't loaded to defvar
;; vc-menu-map.
()
;;(define-key vc-menu-map [show-files]
;; '("Show Files under VC" . (vc-directory t)))
(define-key vc-menu-map [vc-directory] '("Show Locked Files" . vc-directory))
(define-key vc-menu-map [separator1] '("----"))
(define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file))
(define-key vc-menu-map [vc-version-other-window]
'("Show Other Version" . vc-version-other-window))
(define-key vc-menu-map [vc-diff] '("Compare with Last Version" . vc-diff))
(define-key vc-menu-map [vc-update-change-log]
'("Update ChangeLog" . vc-update-change-log))
(define-key vc-menu-map [vc-print-log] '("Show History" . vc-print-log))
(define-key vc-menu-map [separator2] '("----"))
(define-key vc-menu-map [undo] '("Undo Last Check-In" . vc-cancel-version))
(define-key vc-menu-map [vc-revert-buffer]
'("Revert to Last Version" . vc-revert-buffer))
(define-key vc-menu-map [vc-insert-header]
'("Insert Header" . vc-insert-headers))
(define-key vc-menu-map [vc-menu-check-in] '("Check In" . vc-next-action))
(define-key vc-menu-map [vc-check-out] '("Check Out" . vc-toggle-read-only))
(define-key vc-menu-map [vc-register] '("Register" . vc-register))
(put 'vc-rename-file 'menu-enable 'vc-mode)
(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 '(and vc-mode (not buffer-read-only)))
(put 'vc-toggle-read-only 'menu-enable '(and vc-mode buffer-read-only))
(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
)
1992-07-31 22:24:03 +00:00
(provide 'vc-hooks)
;;; vc-hooks.el ends here