Mercurial > emacs
annotate lisp/vc-hooks.el @ 12942:3685b0e52d2a
(next-file): Advance next-file-list before finding the file named in its
car, in case finding signals an error.
author | Roland McGrath <roland@gnu.org> |
---|---|
date | Fri, 25 Aug 1995 16:39:34 +0000 |
parents | 77c9a594fe55 |
children | b10874fddeb3 |
rev | line source |
---|---|
2232
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2227
diff
changeset
|
1 ;;; vc-hooks.el --- resident support for version-control |
904 | 2 |
11803
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. |
904 | 4 |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
6 ;; Modified by: |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
7 ;; Per Cederqvist <ceder@lysator.liu.se> |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
8 ;; Andre Spiegel <spiegel@berlin.informatik.uni-stuttgart.de> |
904 | 9 |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
24 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
25 | |
26 ;;; Commentary: | |
27 | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
28 ;; This is the always-loaded portion of VC. |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
29 ;; It takes care VC-related activities that are done when you visit a file, |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
30 ;; so that vc.el itself is loaded only when you use a VC command. |
904 | 31 ;; See the commentary of vc.el. |
32 | |
33 ;;; Code: | |
34 | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
35 ;; Customization Variables (the rest is in vc.el) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
36 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
37 (defvar vc-default-back-end nil |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
38 "*Back-end actually used by this interface; may be SCCS or RCS. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
39 The value is only computed when needed to avoid an expensive search.") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
40 |
12359
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
41 (defvar vc-handle-cvs t |
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
42 "*If non-nil, use VC for files managed with CVS. |
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
43 If it is nil, don't use VC for those files.") |
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
44 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
45 (defvar vc-path |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
46 (if (file-directory-p "/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
47 '("/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
48 nil) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
49 "*List of extra directories to search for version control commands.") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
50 |
904 | 51 (defvar vc-master-templates |
52 '(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS) | |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
53 ("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
54 vc-find-cvs-master) |
904 | 55 "*Where to look for version-control master files. |
56 The first pair corresponding to a given back end is used as a template | |
57 when creating new masters.") | |
58 | |
59 (defvar vc-make-backup-files nil | |
5164
04d6b9e7782a
(vc-make-backup-files): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4726
diff
changeset
|
60 "*If non-nil, backups of registered files are made as with other files. |
5783
6a97e54241a3
(vc-make-backup-files): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5743
diff
changeset
|
61 If nil (the default), files covered by version control don't get backups.") |
904 | 62 |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
63 (defvar vc-display-status t |
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
64 "*If non-nil, display revision number and lock status in modeline. |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
65 Otherwise, not displayed.") |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
66 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
67 (defvar vc-consult-headers t |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
68 "*Identify work files by searching for version headers.") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
69 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
70 (defvar vc-keep-workfiles t |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
71 "*If non-nil, don't delete working files after registering changes. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
72 If the back-end is CVS, workfiles are always kept, regardless of the |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
73 value of this flag.") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
74 |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
75 (defvar vc-mistrust-permissions nil |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
76 "*Don't assume that permissions and ownership track version-control status.") |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
77 |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
78 (defun vc-mistrust-permissions (file) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
79 ;; Access function to the above. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
80 (or (eq vc-mistrust-permissions 't) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
81 (and vc-mistrust-permissions |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
82 (funcall vc-mistrust-permissions |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
83 (vc-backend-subdirectory-name file))))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
84 |
904 | 85 ;; Tell Emacs about this new kind of minor mode |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
86 (if (not (assoc 'vc-mode minor-mode-alist)) |
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
87 (setq minor-mode-alist (cons '(vc-mode vc-mode) |
904 | 88 minor-mode-alist))) |
89 | |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
90 (make-variable-buffer-local 'vc-mode) |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
91 (put 'vc-mode 'permanent-local t) |
904 | 92 |
93 ;; We need a notion of per-file properties because the version | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
94 ;; control state of a file is expensive to derive --- we compute |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
95 ;; them when the file is initially found, keep them up to date |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
96 ;; during any subsequent VC operations, and forget them when |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
97 ;; the buffer is killed. |
904 | 98 |
2213
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
99 (defmacro vc-error-occurred (&rest body) |
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
100 (list 'condition-case nil (cons 'progn (append body '(nil))) '(error t))) |
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
101 |
904 | 102 (defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] |
103 "Obarray for per-file properties.") | |
104 | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
105 (defvar vc-buffer-backend t) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
106 (make-variable-buffer-local 'vc-buffer-backend) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
107 |
904 | 108 (defun vc-file-setprop (file property value) |
109 ;; set per-file property | |
110 (put (intern file vc-file-prop-obarray) property value)) | |
111 | |
112 (defun vc-file-getprop (file property) | |
113 ;; get per-file property | |
114 (get (intern file vc-file-prop-obarray) property)) | |
115 | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
116 (defun vc-file-clearprops (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
117 ;; clear all properties of a given file |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
118 (setplist (intern file vc-file-prop-obarray) nil)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
119 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
120 ;;; Functions that determine property values, by examining the |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
121 ;;; working file, the master file, or log program output |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
122 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
123 (defun vc-match-substring (bn) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
124 (buffer-substring (match-beginning bn) (match-end bn))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
125 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
126 (defun vc-lock-file (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
127 ;; Generate lock file name corresponding to FILE |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
128 (let ((master (vc-name file))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
129 (and |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
130 master |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
131 (string-match "\\(.*/\\)s\\.\\(.*\\)" master) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
132 (concat |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
133 (substring master (match-beginning 1) (match-end 1)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
134 "p." |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
135 (substring master (match-beginning 2) (match-end 2)))))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
136 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
137 (defun vc-parse-buffer (patterns &optional file properties) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
138 ;; Use PATTERNS to parse information out of the current buffer. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
139 ;; Each element of PATTERNS is a list of 2 to 3 elements. The first element |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
140 ;; is the pattern to be matched, and the second (an integer) is the |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
141 ;; number of the subexpression that should be returned. If there's |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
142 ;; a third element (also the number of a subexpression), that |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
143 ;; subexpression is assumed to be a date field and we want the most |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
144 ;; recent entry matching the template. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
145 ;; If FILE and PROPERTIES are given, the latter must be a list of |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
146 ;; properties of the same length as PATTERNS; each property is assigned |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
147 ;; the corresponding value. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
148 (mapcar (function (lambda (p) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
149 (goto-char (point-min)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
150 (cond |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
151 ((eq (length p) 2) ;; search for first entry |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
152 (let ((value nil)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
153 (if (re-search-forward (car p) nil t) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
154 (setq value (vc-match-substring (elt p 1)))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
155 (if file |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
156 (progn (vc-file-setprop file (car properties) value) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
157 (setq properties (cdr properties)))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
158 value)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
159 ((eq (length p) 3) ;; search for latest entry |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
160 (let ((latest-date "") (latest-val)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
161 (while (re-search-forward (car p) nil t) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
162 (let ((date (vc-match-substring (elt p 2)))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
163 (if (string< latest-date date) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
164 (progn |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
165 (setq latest-date date) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
166 (setq latest-val |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
167 (vc-match-substring (elt p 1))))))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
168 (if file |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
169 (progn (vc-file-setprop file (car properties) latest-val) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
170 (setq properties (cdr properties)))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
171 latest-val))))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
172 patterns) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
173 ) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
174 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
175 (defun vc-insert-file (file &optional limit blocksize) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
176 ;; Insert the contents of FILE into the current buffer. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
177 ;; Optional argument LIMIT is a regexp. If present, |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
178 ;; the file is inserted in chunks of size BLOCKSIZE |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
179 ;; (default 8 kByte), until the first occurence of |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
180 ;; LIMIT is found. The function returns nil if FILE |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
181 ;; doesn't exist. |
12367
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
182 (erase-buffer) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
183 (cond ((file-exists-p file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
184 (cond (limit |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
185 (if (not blocksize) (setq blocksize 8192)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
186 (let (found s) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
187 (while (not found) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
188 (setq s (buffer-size)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
189 (goto-char (1+ s)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
190 (setq found |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
191 (or (zerop (car (cdr |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
192 (insert-file-contents file nil s |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
193 (+ s blocksize))))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
194 (progn (beginning-of-line) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
195 (re-search-forward limit nil t))))))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
196 (t (insert-file-contents file))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
197 (set-buffer-modified-p nil) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
198 (auto-save-mode nil) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
199 t) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
200 (t nil))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
201 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
202 (defun vc-parse-locks (file locks) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
203 ;; Parse RCS or SCCS locks. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
204 ;; The result is a list of the form ((VERSION USER) (VERSION USER) ...), |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
205 ;; which is returned and stored into the property `vc-master-locks'. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
206 (if (not locks) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
207 (vc-file-setprop file 'vc-master-locks 'none) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
208 (let ((found t) (index 0) master-locks version user) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
209 (cond ((eq (vc-backend file) 'SCCS) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
210 (while (string-match "^\\([0-9.]+\\) [0-9.]+ \\([^ ]+\\) .*\n?" |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
211 locks index) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
212 (setq version (substring locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
213 (match-beginning 1) (match-end 1))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
214 (setq user (substring locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
215 (match-beginning 2) (match-end 2))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
216 (setq master-locks (append master-locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
217 (list (cons version user)))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
218 (setq index (match-end 0)))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
219 ((eq (vc-backend file) 'RCS) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
220 (while (string-match "[ \t\n]*\\([^:]+\\):\\([0-9.]+\\)" |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
221 locks index) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
222 (setq version (substring locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
223 (match-beginning 2) (match-end 2))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
224 (setq user (substring locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
225 (match-beginning 1) (match-end 1))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
226 (setq master-locks (append master-locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
227 (list (cons version user)))) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
228 (setq index (match-end 0))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
229 (if (string-match ";[ \t\n]+strict;" locks index) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
230 (vc-file-setprop file 'vc-checkout-model 'manual) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
231 (vc-file-setprop file 'vc-checkout-model 'implicit)))) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
232 (vc-file-setprop file 'vc-master-locks (or master-locks 'none))))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
233 |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
234 (defun vc-simple-command (okstatus command file &rest args) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
235 ;; Simple version of vc-do-command, for use in vc-hooks only. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
236 ;; Don't switch to the *vc-info* buffer before running the |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
237 ;; command, because that would change its default directory |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
238 (save-excursion (set-buffer (get-buffer-create "*vc-info*")) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
239 (erase-buffer)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
240 (let ((exec-path (append vc-path exec-path)) exec-status |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
241 ;; Add vc-path to PATH for the execution of this command. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
242 (process-environment |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
243 (cons (concat "PATH=" (getenv "PATH") |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
244 path-separator |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
245 (mapconcat 'identity vc-path path-separator)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
246 process-environment))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
247 (setq exec-status |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
248 (apply 'call-process command nil "*vc-info*" nil |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
249 (append args (list file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
250 (cond ((> exec-status okstatus) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
251 (switch-to-buffer (get-file-buffer file)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
252 (shrink-window-if-larger-than-buffer |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
253 (display-buffer "*vc-info*")) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
254 (error "Couldn't find version control information"))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
255 exec-status)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
256 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
257 (defun vc-fetch-master-properties (file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
258 ;; Fetch those properties of FILE that are stored in the master file. |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
259 ;; For an RCS file, we don't get vc-latest-version vc-your-latest-version |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
260 ;; here because that is slow. |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
261 ;; That gets done if/when the functions vc-latest-version |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
262 ;; and vc-your-latest-version get called. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
263 (save-excursion |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
264 (cond |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
265 ((eq (vc-backend file) 'SCCS) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
266 (set-buffer (get-buffer-create "*vc-info*")) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
267 (if (vc-insert-file (vc-lock-file file)) |
12367
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
268 (vc-parse-locks file (buffer-string)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
269 (vc-file-setprop file 'vc-master-locks 'none)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
270 (vc-insert-file (vc-name file) "^\001e") |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
271 (vc-parse-buffer |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
272 (list '("^\001d D \\([^ ]+\\)" 1) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
273 (list (concat "^\001d D \\([^ ]+\\) .* " |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
274 (regexp-quote (user-login-name)) " ") 1)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
275 file |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
276 '(vc-latest-version vc-your-latest-version))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
277 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
278 ((eq (vc-backend file) 'RCS) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
279 (set-buffer (get-buffer-create "*vc-info*")) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
280 (vc-insert-file (vc-name file) "^[0-9]") |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
281 (vc-parse-buffer |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
282 (list '("^head[ \t\n]+\\([^;]+\\);" 1) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
283 '("^branch[ \t\n]+\\([^;]+\\);" 1) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
284 '("^locks[ \t\n]*\\([^;]*;\\([ \t\n]*strict;\\)?\\)" 1)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
285 file |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
286 '(vc-head-version |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
287 vc-default-branch |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
288 vc-master-locks)) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
289 ;; determine vc-master-workfile-version: it is either the head |
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
290 ;; of the trunk, the head of the default branch, or the |
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
291 ;; "default branch" itself, if that is a full revision number. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
292 (let ((default-branch (vc-file-getprop file 'vc-default-branch))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
293 (cond |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
294 ;; no default branch |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
295 ((or (not default-branch) (string= "" default-branch)) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
296 (vc-file-setprop file 'vc-master-workfile-version |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
297 (vc-file-getprop file 'vc-head-version))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
298 ;; default branch is actually a revision |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
299 ((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$" |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
300 default-branch) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
301 (vc-file-setprop file 'vc-master-workfile-version default-branch)) |
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
302 ;; else, search for the head of the default branch |
12367
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
303 (t (vc-insert-file (vc-name file) "^desc") |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
304 (vc-parse-buffer (list (list |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
305 (concat "^\\(" |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
306 (regexp-quote default-branch) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
307 "\\.[0-9]+\\)\ndate[ \t]+\\([0-9.]+\\);") 1 2)) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
308 file '(vc-master-workfile-version))))) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
309 ;; translate the locks |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
310 (vc-parse-locks file (vc-file-getprop file 'vc-master-locks))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
311 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
312 ((eq (vc-backend file) 'CVS) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
313 (save-excursion |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
314 (vc-simple-command 0 "cvs" file "status") |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
315 (set-buffer (get-buffer "*vc-info*")) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
316 (vc-parse-buffer |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
317 ;; CVS 1.3 says "RCS Version:", other releases "RCS Revision:", |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
318 ;; and CVS 1.4a1 says "Repository revision:". |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
319 '(("\\(RCS Version\\|RCS Revision\\|Repository revision\\):[\t ]+\\([0-9.]+\\)" 2) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
320 ("^File: [^ \t]+[ \t]+Status: \\(.*\\)" 1)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
321 file |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
322 '(vc-latest-version vc-cvs-status)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
323 ;; Translate those status values that we understand into symbols. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
324 ;; Any other value is converted to nil. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
325 (let ((status (vc-file-getprop file 'vc-cvs-status))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
326 (cond |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
327 ((string-match "Up-to-date" status) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
328 (vc-file-setprop file 'vc-cvs-status 'up-to-date) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
329 (vc-file-setprop file 'vc-checkout-time |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
330 (nth 5 (file-attributes file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
331 ((vc-file-setprop file 'vc-cvs-status |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
332 (cond |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
333 ((string-match "Locally Modified" status) 'locally-modified) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
334 ((string-match "Needs Merge" status) 'needs-merge) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
335 ((string-match "Needs Checkout" status) 'needs-checkout) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
336 ((string-match "Unresolved Conflict" status) 'unresolved-conflict) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
337 ((string-match "Locally Added" status) 'locally-added) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
338 )))))))) |
12327
2a02456ddc4b
(vc-fetch-master-properties): Be more careful
Richard M. Stallman <rms@gnu.org>
parents:
12302
diff
changeset
|
339 (if (get-buffer "*vc-info*") |
2a02456ddc4b
(vc-fetch-master-properties): Be more careful
Richard M. Stallman <rms@gnu.org>
parents:
12302
diff
changeset
|
340 (kill-buffer (get-buffer "*vc-info*"))))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
341 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
342 ;;; Functions that determine property values, by examining the |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
343 ;;; working file, the master file, or log program output |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
344 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
345 (defun vc-consult-rcs-headers (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
346 ;; Search for RCS headers in FILE, and set properties |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
347 ;; accordingly. This function can be disabled by setting |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
348 ;; vc-consult-headers to nil. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
349 ;; Returns: nil if no headers were found |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
350 ;; (or if the feature is disabled, |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
351 ;; or if there is currently no buffer |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
352 ;; visiting FILE) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
353 ;; 'rev if a workfile revision was found |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
354 ;; 'rev-and-lock if revision and lock info was found |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
355 (cond |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
356 ((or (not vc-consult-headers) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
357 (not (get-file-buffer file))) nil) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
358 ((let (status version locking-user) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
359 (save-excursion |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
360 (set-buffer (get-file-buffer file)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
361 (goto-char (point-min)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
362 (cond |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
363 ;; search for $Id or $Header |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
364 ;; ------------------------- |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
365 ((or (and (search-forward "$Id: " nil t) |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
366 (looking-at "[^ ]+ \\([0-9.]+\\) ")) |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
367 (and (progn (goto-char (point-min)) |
12272
9c8be78affe6
(vc-consult-rcs-headers): Fix typo in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
12252
diff
changeset
|
368 (search-forward "$Header: " nil t)) |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
369 (looking-at "[^ ]+ \\([0-9.]+\\) "))) |
12302
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
370 (goto-char (match-end 0)) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
371 ;; if found, store the revision number ... |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
372 (setq version (buffer-substring (match-beginning 1) (match-end 1))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
373 ;; ... and check for the locking state |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
374 (cond |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
375 ((looking-at |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
376 (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] " ; date |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
377 "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
378 "[^ ]+ [^ ]+ ")) ; author & state |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
379 (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds |
12402
62e4bc95cecd
(vc-consult-rcs-headers): Use an even more
Richard M. Stallman <rms@gnu.org>
parents:
12391
diff
changeset
|
380 (cond |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
381 ;; unlocked revision |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
382 ((looking-at "\\$") |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
383 (setq locking-user 'none) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
384 (setq status 'rev-and-lock)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
385 ;; revision is locked by some user |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
386 ((looking-at "\\([^ ]+\\) \\$") |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
387 (setq locking-user |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
388 (buffer-substring (match-beginning 1) (match-end 1))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
389 (setq status 'rev-and-lock)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
390 ;; everything else: false |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
391 (nil))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
392 ;; unexpected information in |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
393 ;; keyword string --> quit |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
394 (nil))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
395 ;; search for $Revision |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
396 ;; -------------------- |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
397 ((re-search-forward (concat "\\$" |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
398 "Revision: \\([0-9.]+\\) \\$") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
399 nil t) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
400 ;; if found, store the revision number ... |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
401 (setq version (buffer-substring (match-beginning 1) (match-end 1))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
402 ;; and see if there's any lock information |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
403 (goto-char (point-min)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
404 (if (re-search-forward (concat "\\$" "Locker:") nil t) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
405 (cond ((looking-at " \\([^ ]+\\) \\$") |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
406 (setq locking-user (buffer-substring (match-beginning 1) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
407 (match-end 1))) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
408 (setq status 'rev-and-lock)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
409 ((looking-at " *\\$") |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
410 (setq locking-user 'none) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
411 (setq status 'rev-and-lock)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
412 (t |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
413 (setq locking-user 'none) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
414 (setq status 'rev-and-lock))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
415 (setq status 'rev))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
416 ;; else: nothing found |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
417 ;; ------------------- |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
418 (t nil))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
419 (if status (vc-file-setprop file 'vc-workfile-version version)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
420 (and (eq status 'rev-and-lock) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
421 (eq (vc-backend file) 'RCS) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
422 (vc-file-setprop file 'vc-locking-user locking-user) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
423 ;; If the file has headers, we don't want to query the master file, |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
424 ;; because that would eliminate all the performance gain the headers |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
425 ;; brought us. We therefore use a heuristic for the checkout model |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
426 ;; now: If we trust the file permissions, and the file is not |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
427 ;; locked, then if the file is read-only the checkout model is |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
428 ;; `manual', otherwise `implicit'. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
429 (not (vc-mistrust-permissions file)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
430 (not (vc-locking-user file)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
431 (if (string-match ".r-..-..-." (nth 8 (file-attributes file))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
432 (vc-file-setprop file 'vc-checkout-model 'manual) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
433 (vc-file-setprop file 'vc-checkout-model 'implicit))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
434 status)))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
435 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
436 ;;; Access functions to file properties |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
437 ;;; (Properties should be _set_ using vc-file-setprop, but |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
438 ;;; _retrieved_ only through these functions, which decide |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
439 ;;; if the property is already known or not. A property should |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
440 ;;; only be retrieved by vc-file-getprop if there is no |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
441 ;;; access function.) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
442 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
443 ;;; properties indicating the backend |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
444 ;;; being used for FILE |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
445 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
446 (defun vc-backend-subdirectory-name (&optional file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
447 ;; Where the master and lock files for the current directory are kept |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
448 (symbol-name |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
449 (or |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
450 (and file (vc-backend file)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
451 vc-default-back-end |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
452 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
453 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
454 (defun vc-name (file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
455 "Return the master name of a file, nil if it is not registered." |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
456 (or (vc-file-getprop file 'vc-name) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
457 (let ((name-and-type (vc-registered file))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
458 (if name-and-type |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
459 (progn |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
460 (vc-file-setprop file 'vc-backend (cdr name-and-type)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
461 (vc-file-setprop file 'vc-name (car name-and-type))))))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
462 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
463 (defun vc-backend (file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
464 "Return the version-control type of a file, nil if it is not registered." |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
465 (and file |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
466 (or (vc-file-getprop file 'vc-backend) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
467 (let ((name-and-type (vc-registered file))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
468 (if name-and-type |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
469 (progn |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
470 (vc-file-setprop file 'vc-name (car name-and-type)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
471 (vc-file-setprop file 'vc-backend (cdr name-and-type)))))))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
472 |
12884
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
473 (defun vc-checkout-model (file) |
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
474 ;; Return `manual' if the user has to type C-x C-q to check out FILE. |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
475 ;; Return `implicit' if the file can be modified without locking it first. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
476 (or |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
477 (vc-file-getprop file 'vc-checkout-model) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
478 (cond |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
479 ((eq (vc-backend file) 'SCCS) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
480 (vc-file-setprop file 'vc-checkout-model 'manual)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
481 ((eq (vc-backend file) 'RCS) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
482 (vc-consult-rcs-headers file) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
483 (or (vc-file-getprop file 'vc-checkout-model) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
484 (progn (vc-fetch-master-properties file) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
485 (vc-file-getprop file 'vc-checkout-model)))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
486 ((eq (vc-backend file) 'CVS) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
487 (vc-file-setprop file 'vc-checkout-model |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
488 (if (getenv "CVSREAD") 'manual 'implicit)))))) |
12884
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
489 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
490 ;;; properties indicating the locking state |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
491 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
492 (defun vc-cvs-status (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
493 ;; Return the cvs status of FILE |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
494 ;; (Status field in output of "cvs status") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
495 (cond ((vc-file-getprop file 'vc-cvs-status)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
496 (t (vc-fetch-master-properties file) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
497 (vc-file-getprop file 'vc-cvs-status)))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
498 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
499 (defun vc-master-locks (file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
500 ;; Return the lock entries in the master of FILE. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
501 ;; Return 'none if there are no such entries, and a list |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
502 ;; of the form ((VERSION USER) (VERSION USER) ...) otherwise. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
503 (cond ((vc-file-getprop file 'vc-master-locks)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
504 (t (vc-fetch-master-properties file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
505 (vc-file-getprop file 'vc-master-locks)))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
506 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
507 (defun vc-master-locking-user (file) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
508 ;; Return the master file's idea of who is locking |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
509 ;; the current workfile version of FILE. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
510 ;; Return 'none if it is not locked. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
511 (let ((master-locks (vc-master-locks file)) lock) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
512 (if (eq master-locks 'none) 'none |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
513 ;; search for a lock on the current workfile version |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
514 (setq lock (assoc (vc-workfile-version file) master-locks)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
515 (cond (lock (cdr lock)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
516 ('none))))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
517 |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
518 (defun vc-lock-from-permissions (file) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
519 ;; If the permissions can be trusted for this file, determine the |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
520 ;; locking state from them. Returns (user-login-name), `none', or nil. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
521 ;; This implementation assumes that any file which is under version |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
522 ;; control and has -rw-r--r-- is locked by its owner. This is true |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
523 ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
524 ;; We have to be careful not to exclude files with execute bits on; |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
525 ;; scripts can be under version control too. Also, we must ignore the |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
526 ;; group-read and other-read bits, since paranoid users turn them off. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
527 ;; This hack wins because calls to the somewhat expensive |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
528 ;; `vc-fetch-master-properties' function only have to be made if |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
529 ;; (a) the file is locked by someone other than the current user, |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
530 ;; or (b) some untoward manipulation behind vc's back has changed |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
531 ;; the owner or the `group' or `other' write bits. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
532 (let ((attributes (file-attributes file))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
533 (if (not (vc-mistrust-permissions file)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
534 (cond ((string-match ".r-..-..-." (nth 8 attributes)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
535 (vc-file-setprop file 'vc-locking-user 'none)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
536 ((and (= (nth 2 attributes) (user-uid)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
537 (string-match ".rw..-..-." (nth 8 attributes))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
538 (vc-file-setprop file 'vc-locking-user (user-login-name))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
539 (nil))))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
540 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
541 (defun vc-file-owner (file) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
542 ;; The expression below should return the username of the owner |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
543 ;; of the file. It doesn't. It returns the username if it is |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
544 ;; you, or otherwise the UID of the owner of the file. The |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
545 ;; return value from this function is only used by |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
546 ;; vc-dired-reformat-line, and it does the proper thing if a UID |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
547 ;; is returned. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
548 ;; The *proper* way to fix this would be to implement a built-in |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
549 ;; function in Emacs, say, (username UID), that returns the |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
550 ;; username of a given UID. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
551 ;; The result of this hack is that vc-directory will print the |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
552 ;; name of the owner of the file for any files that are |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
553 ;; modified. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
554 (let ((uid (nth 2 (file-attributes file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
555 (if (= uid (user-uid)) (user-login-name) uid))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
556 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
557 (defun vc-rcs-lock-from-diff (file) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
558 ;; Diff the file against the master version. If differences are found, |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
559 ;; mark the file locked. This is only meaningful for RCS with non-strict |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
560 ;; locking. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
561 (if (zerop (vc-simple-command 1 "rcsdiff" file |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
562 "--brief" ; Some diffs don't understand "--brief", but |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
563 ; for non-strict locking under VC we require it. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
564 (concat "-r" (vc-workfile-version file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
565 (vc-file-setprop file 'vc-locking-user 'none) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
566 (vc-file-setprop file 'vc-locking-user (vc-file-owner file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
567 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
568 (defun vc-locking-user (file) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
569 ;; Return the name of the person currently holding a lock on FILE. |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
570 ;; Return nil if there is no such person. (Sometimes, not the name |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
571 ;; of the locking user but his uid will be returned.) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
572 ;; Under CVS, a file is considered locked if it has been modified since |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
573 ;; it was checked out. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
574 ;; The property is cached. It is only looked up if it is currently nil. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
575 ;; Note that, for a file that is not locked, the actual property value |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
576 ;; is `none', to distinguish it from an unknown locking state. That value |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
577 ;; is converted to nil by this function, and returned to the caller. |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
578 (let ((locking-user (vc-file-getprop file 'vc-locking-user))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
579 (if locking-user |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
580 ;; if we already know the property, return it |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
581 (if (eq locking-user 'none) nil locking-user) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
582 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
583 ;; otherwise, infer the property... |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
584 (cond |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
585 ((eq (vc-backend file) 'CVS) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
586 (or (and (eq (vc-checkout-model file) 'manual) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
587 (vc-lock-from-permissions file)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
588 (if (or (eq (vc-cvs-status file) 'up-to-date) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
589 (eq (vc-cvs-status file) 'needs-checkout)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
590 (vc-file-setprop file 'vc-locking-user 'none) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
591 (vc-file-setprop file 'vc-locking-user (vc-file-owner file))))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
592 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
593 ((eq (vc-backend file) 'RCS) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
594 (let (p-lock) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
595 |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
596 ;; Check for RCS headers first |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
597 (or (eq (vc-consult-rcs-headers file) 'rev-and-lock) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
598 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
599 ;; If there are no headers, try to learn it |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
600 ;; from the permissions. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
601 (and (setq p-lock (vc-lock-from-permissions file)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
602 (if (eq p-lock 'none) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
603 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
604 ;; If the permissions say "not locked", we know |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
605 ;; that the checkout model must be `manual'. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
606 (vc-file-setprop file 'vc-checkout-model 'manual) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
607 |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
608 ;; If the permissions say "locked", we can only trust |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
609 ;; this *if* the checkout model is `manual'. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
610 (eq (vc-checkout-model file) 'manual))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
611 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
612 ;; Otherwise, use lock information from the master file. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
613 (vc-file-setprop file 'vc-locking-user |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
614 (vc-master-locking-user file))) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
615 |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
616 ;; Finally, if the file is not explicitly locked |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
617 ;; it might still be locked implicitly. |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
618 (and (eq (vc-file-getprop file 'vc-locking-user) 'none) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
619 (eq (vc-checkout-model file) 'implicit) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
620 (vc-rcs-lock-from-diff file)))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
621 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
622 ((eq (vc-backend file) 'SCCS) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
623 (or (vc-lock-from-permissions file) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
624 (vc-file-setprop file 'vc-locking-user |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
625 (vc-master-locking-user file)))))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
626 |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
627 ;; convert a possible 'none value |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
628 (setq locking-user (vc-file-getprop file 'vc-locking-user)) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
629 (if (eq locking-user 'none) nil locking-user))) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
630 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
631 ;;; properties to store current and recent version numbers |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
632 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
633 (defun vc-latest-version (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
634 ;; Return version level of the latest version of FILE |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
635 (cond ((vc-file-getprop file 'vc-latest-version)) |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
636 (t (vc-fetch-properties file) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
637 (vc-file-getprop file 'vc-latest-version)))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
638 |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
639 (defun vc-your-latest-version (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
640 ;; Return version level of the latest version of FILE checked in by you |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
641 (cond ((vc-file-getprop file 'vc-your-latest-version)) |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
642 (t (vc-fetch-properties file) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
643 (vc-file-getprop file 'vc-your-latest-version)))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
644 |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
645 (defun vc-master-workfile-version (file) |
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
646 ;; Return the master file's idea of what is the current workfile version. |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
647 ;; This property is defined for RCS only. |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
648 (cond ((vc-file-getprop file 'vc-master-workfile-version)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
649 (t (vc-fetch-master-properties file) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
650 (vc-file-getprop file 'vc-master-workfile-version)))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
651 |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
652 (defun vc-fetch-properties (file) |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
653 ;; Fetch vc-latest-version and vc-your-latest-version |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
654 ;; if that wasn't already done. |
12302
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
655 (cond |
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
656 ((eq (vc-backend file) 'RCS) |
12330
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
657 (save-excursion |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
658 (set-buffer (get-buffer-create "*vc-info*")) |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
659 (vc-insert-file (vc-name file) "^desc") |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
660 (vc-parse-buffer |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
661 (list '("^\\([0-9]+\\.[0-9.]+\\)\ndate[ \t]+\\([0-9.]+\\);" 1 2) |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
662 (list (concat "^\\([0-9]+\\.[0-9.]+\\)\n" |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
663 "date[ \t]+\\([0-9.]+\\);[ \t]+" |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
664 "author[ \t]+" |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
665 (regexp-quote (user-login-name)) ";") 1 2)) |
2e2af003b9c5
(vc-fetch-properties): Add save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
12327
diff
changeset
|
666 file |
12367
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
667 '(vc-latest-version vc-your-latest-version)) |
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
668 (if (get-buffer "*vc-info*") |
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
669 (kill-buffer (get-buffer "*vc-info*"))))) |
12302
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
670 (t (vc-fetch-master-properties file)) |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
671 )) |
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
672 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
673 (defun vc-workfile-version (file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
674 ;; Return version level of the current workfile FILE |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
675 ;; This is attempted by first looking at the RCS keywords. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
676 ;; If there are no keywords in the working file, |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
677 ;; vc-master-workfile-version is taken. |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
678 ;; Note that this property is cached, that is, it is only |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
679 ;; looked up if it is nil. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
680 ;; For SCCS, this property is equivalent to vc-latest-version. |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
681 (cond ((vc-file-getprop file 'vc-workfile-version)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
682 ((eq (vc-backend file) 'SCCS) (vc-latest-version file)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
683 ((eq (vc-backend file) 'RCS) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
684 (if (vc-consult-rcs-headers file) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
685 (vc-file-getprop file 'vc-workfile-version) |
12874
3afd71d56015
(vc-top-version): Renamed to vc-master-workfile-version. Updated all
André Spiegel <spiegel@gnu.org>
parents:
12590
diff
changeset
|
686 (let ((rev (cond ((vc-master-workfile-version file)) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
687 ((vc-latest-version file))))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
688 (vc-file-setprop file 'vc-workfile-version rev) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
689 rev))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
690 ((eq (vc-backend file) 'CVS) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
691 (if (vc-consult-rcs-headers file) ;; CVS |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
692 (vc-file-getprop file 'vc-workfile-version) |
12561
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
693 (catch 'found |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
694 (vc-find-cvs-master (file-name-directory file) |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
695 (file-name-nondirectory file))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
696 (vc-file-getprop file 'vc-workfile-version))))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
697 |
904 | 698 ;;; actual version-control code starts here |
699 | |
700 (defun vc-registered (file) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
701 (let (handler handlers) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
702 (if (boundp 'file-name-handler-alist) |
7483
dfd719c64907
(vc-registered): Use find-file-name-handler.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
703 (setq handler (find-file-name-handler file 'vc-registered))) |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
704 (if handler |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
705 (funcall handler 'vc-registered file) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
706 ;; Search for a master corresponding to the given file |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
707 (let ((dirname (or (file-name-directory file) "")) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
708 (basename (file-name-nondirectory file))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
709 (catch 'found |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
710 (mapcar |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
711 (function (lambda (s) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
712 (if (atom s) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
713 (funcall s dirname basename) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
714 (let ((trial (format (car s) dirname basename))) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
715 (if (and (file-exists-p trial) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
716 ;; Make sure the file we found with name |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
717 ;; TRIAL is not the source file itself. |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
718 ;; That can happen with RCS-style names |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
719 ;; if the file name is truncated |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
720 ;; (e.g. to 14 chars). See if either |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
721 ;; directory or attributes differ. |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
722 (or (not (string= dirname |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
723 (file-name-directory trial))) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
724 (not (equal |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
725 (file-attributes file) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
726 (file-attributes trial))))) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
727 (throw 'found (cons trial (cdr s)))))))) |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
728 vc-master-templates) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
729 nil))))) |
904 | 730 |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
731 (defun vc-find-cvs-master (dirname basename) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
732 ;; Check if DIRNAME/BASENAME is handled by CVS. |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
733 ;; If it is, do a (throw 'found (cons MASTER 'CVS)). |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
734 ;; Note: If the file is ``cvs add''ed but not yet ``cvs commit''ed |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
735 ;; the MASTER will not actually exist yet. The other parts of VC |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
736 ;; checks for this condition. This function returns nil if |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
737 ;; DIRNAME/BASENAME is not handled by CVS. |
12359
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
738 (if (and vc-handle-cvs |
6da25b126f03
(vc-fetch-master-properties): Pass an absolute
Richard M. Stallman <rms@gnu.org>
parents:
12330
diff
changeset
|
739 (file-directory-p (concat dirname "CVS/")) |
12302
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
740 (file-readable-p (concat dirname "CVS/Entries")) |
6d99dc5117e3
(vc-fetch-master-properties): Use path-separator
Richard M. Stallman <rms@gnu.org>
parents:
12272
diff
changeset
|
741 (file-readable-p (concat dirname "CVS/Repository"))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
742 (let (buffer (fold case-fold-search)) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
743 (unwind-protect |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
744 (save-excursion |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
745 (setq buffer (set-buffer (get-buffer-create "*vc-info*"))) |
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
746 (vc-insert-file (concat dirname "CVS/Entries")) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
747 (goto-char (point-min)) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
748 ;; make sure the file name is searched |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
749 ;; case-sensitively |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
750 (setq case-fold-search nil) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
751 (cond |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
752 ((re-search-forward |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
753 (concat "^/" (regexp-quote basename) "/\\([^/]*\\)/") |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
754 nil t) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
755 (setq case-fold-search fold) ;; restore the old value |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
756 ;; We found it. Store away version number, now |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
757 ;; that we are anyhow so close to finding it. |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
758 (vc-file-setprop (concat dirname basename) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
759 'vc-workfile-version |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
760 (buffer-substring (match-beginning 1) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
761 (match-end 1))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
762 (vc-insert-file (concat dirname "CVS/Repository")) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
763 (let ((master |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
764 (concat (file-name-as-directory |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
765 (buffer-substring (point-min) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
766 (1- (point-max)))) |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
767 basename |
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
768 ",v"))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
769 (throw 'found (cons master 'CVS)))) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
770 (t (setq case-fold-search fold) ;; restore the old value |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
771 nil))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
772 (kill-buffer buffer))))) |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
773 |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
774 (defun vc-buffer-backend () |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
775 "Return the version-control type of the visited file, or nil if none." |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
776 (if (eq vc-buffer-backend t) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
777 (setq vc-buffer-backend (vc-backend (buffer-file-name))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
778 vc-buffer-backend)) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
779 |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
780 (defun vc-toggle-read-only (&optional verbose) |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
781 "Change read-only status of current buffer, perhaps via version control. |
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
782 If the buffer is visiting a file registered with version control, |
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
783 then check the file in or out. Otherwise, just change the read-only flag |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
784 of the buffer. With prefix argument, ask for version number." |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
785 (interactive "P") |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
786 (if (vc-backend (buffer-file-name)) |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
787 (vc-next-action verbose) |
904 | 788 (toggle-read-only))) |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
789 (define-key global-map "\C-x\C-q" 'vc-toggle-read-only) |
904 | 790 |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
791 (defun vc-after-save () |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
792 ;; Function to be called by basic-save-buffer (in files.el). |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
793 ;; If the file in the current buffer is under version control, |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
794 ;; not locked, and the checkout model for it is `implicit', |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
795 ;; mark it "locked" and redisplay the mode line. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
796 (let ((file (buffer-file-name))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
797 (and (vc-file-getprop file 'vc-backend) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
798 ;; ...check the property directly, not through the function of the |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
799 ;; same name. Otherwise Emacs would check for a master file |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
800 ;; each time a non-version-controlled buffer is saved. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
801 ;; The property is computed when the file is visited, so if it |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
802 ;; is `nil' now, it is certain that the file is NOT |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
803 ;; version-controlled. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
804 (not (vc-locking-user file)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
805 (eq (vc-checkout-model file) 'implicit) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
806 (vc-file-setprop file 'vc-locking-user (user-login-name)) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
807 (vc-mode-line file)))) |
12884
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
808 |
904 | 809 (defun vc-mode-line (file &optional label) |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
810 "Set `vc-mode' to display type of version control for FILE. |
904 | 811 The value is set in the current buffer, which should be the buffer |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
812 visiting FILE. Second optional arg LABEL is put in place of version |
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
813 control system name." |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
814 (interactive (list buffer-file-name nil)) |
12561
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
815 (let ((vc-type (vc-backend file))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
816 (setq vc-mode |
12561
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
817 (and vc-type |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
818 (concat " " (or label (symbol-name vc-type)) |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
819 (and vc-display-status (vc-status file))))) |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
820 (and vc-type |
348341c2d7d1
(vc-mode-line): Don't write-protect a
Karl Heuer <kwzh@gnu.org>
parents:
12481
diff
changeset
|
821 (equal file (buffer-file-name)) |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
822 (vc-locking-user file) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
823 ;; If the file is locked by some other user, make |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
824 ;; the buffer read-only. Like this, even root |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
825 ;; cannot modify a file without locking it first. |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
826 (not (string= (user-login-name) (vc-locking-user file))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
827 (setq buffer-read-only t)) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
828 (force-mode-line-update) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
829 ;;(set-buffer-modified-p (buffer-modified-p)) ;;use this if Emacs 18 |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
830 vc-type)) |
904 | 831 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
832 (defun vc-status (file) |
4063
cebb261b0f10
(vc-rcs-status): Include head version number in mode line if there
Paul Eggert <eggert@twinsun.com>
parents:
4024
diff
changeset
|
833 ;; Return string for placement in modeline by `vc-mode-line'. |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
834 ;; Format: |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
835 ;; |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
836 ;; "-REV" if the revision is not locked |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
837 ;; ":REV" if the revision is locked by the user |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
838 ;; ":LOCKER:REV" if the revision is locked by somebody else |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
839 ;; " @@" for a CVS file that is added, but not yet committed |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
840 ;; |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
841 ;; In the CVS case, a "locked" working file is a |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
842 ;; working file that is modified with respect to the master. |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
843 ;; The file is "locked" from the moment when the user saves |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
844 ;; the modified buffer. |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
845 ;; |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
846 ;; This function assumes that the file is registered. |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
847 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
848 (let ((locker (vc-locking-user file)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
849 (rev (vc-workfile-version file))) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
850 (cond ((string= "0" rev) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
851 " @@") |
11803
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
852 ((not locker) |
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
853 (concat "-" rev)) |
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
854 ((if (stringp locker) |
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
855 (string= locker (user-login-name)) |
0e58ab232517
(vc-status): If vc-locking-user returns a number, compare it to (user-uid).
Roland McGrath <roland@gnu.org>
parents:
11604
diff
changeset
|
856 (= locker (user-uid))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
857 (concat ":" rev)) |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
858 (t |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
859 (concat ":" locker ":" rev))))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
860 |
904 | 861 ;;; install a call to the above as a find-file hook |
862 (defun vc-find-file-hook () | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
863 ;; Recompute whether file is version controlled, |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
864 ;; if user has killed the buffer and revisited. |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
865 (cond |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
866 (buffer-file-name |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
867 (vc-file-clearprops buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
868 (cond |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
869 ((vc-backend buffer-file-name) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
870 (vc-mode-line buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
871 (cond ((not vc-make-backup-files) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
872 ;; Use this variable, not make-backup-files, |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
873 ;; because this is for things that depend on the file name. |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
874 (make-local-variable 'backup-inhibited) |
12590
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
875 (setq backup-inhibited t)))) |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
876 ((let* ((link (file-symlink-p buffer-file-name)) |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
877 (link-type (and link (vc-backend link)))) |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
878 (if link-type |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
879 (message |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
880 "Warning: symbolic link to %s-controlled source file" |
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
881 link-type)))))))) |
904 | 882 |
4655
604a401e05a4
(vc-find-file-hook, vc-file-not-found-hook): Use add-hook to install.
Paul Eggert <eggert@twinsun.com>
parents:
4338
diff
changeset
|
883 (add-hook 'find-file-hooks 'vc-find-file-hook) |
904 | 884 |
885 ;;; more hooks, this time for file-not-found | |
886 (defun vc-file-not-found-hook () | |
887 "When file is not found, try to check it out from RCS or SCCS. | |
888 Returns t if checkout was successful, nil otherwise." | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
889 (if (vc-backend buffer-file-name) |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
890 (save-excursion |
904 | 891 (require 'vc) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
892 (setq default-directory (file-name-directory (buffer-file-name))) |
904 | 893 (not (vc-error-occurred (vc-checkout buffer-file-name)))))) |
894 | |
4655
604a401e05a4
(vc-find-file-hook, vc-file-not-found-hook): Use add-hook to install.
Paul Eggert <eggert@twinsun.com>
parents:
4338
diff
changeset
|
895 (add-hook 'find-file-not-found-hooks 'vc-file-not-found-hook) |
904 | 896 |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
897 ;; Discard info about a file when we kill its buffer. |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
898 (defun vc-kill-buffer-hook () |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
899 (if (stringp (buffer-file-name)) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
900 (progn |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
901 (vc-file-clearprops (buffer-file-name)) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
902 (kill-local-variable 'vc-buffer-backend)))) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
903 |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
904 ;;;(add-hook 'kill-buffer-hook 'vc-kill-buffer-hook) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
905 |
904 | 906 ;;; Now arrange for bindings and autoloading of the main package. |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
907 ;;; Bindings for this have to go in the global map, as we'll often |
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
908 ;;; want to call them from random buffers. |
904 | 909 |
910 (setq vc-prefix-map (lookup-key global-map "\C-xv")) | |
911 (if (not (keymapp vc-prefix-map)) | |
912 (progn | |
913 (setq vc-prefix-map (make-sparse-keymap)) | |
914 (define-key global-map "\C-xv" vc-prefix-map) | |
915 (define-key vc-prefix-map "a" 'vc-update-change-log) | |
916 (define-key vc-prefix-map "c" 'vc-cancel-version) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
917 (define-key vc-prefix-map "d" 'vc-directory) |
904 | 918 (define-key vc-prefix-map "h" 'vc-insert-headers) |
919 (define-key vc-prefix-map "i" 'vc-register) | |
920 (define-key vc-prefix-map "l" 'vc-print-log) | |
921 (define-key vc-prefix-map "r" 'vc-retrieve-snapshot) | |
922 (define-key vc-prefix-map "s" 'vc-create-snapshot) | |
923 (define-key vc-prefix-map "u" 'vc-revert-buffer) | |
924 (define-key vc-prefix-map "v" 'vc-next-action) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
925 (define-key vc-prefix-map "=" 'vc-diff) |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
926 (define-key vc-prefix-map "~" 'vc-version-other-window))) |
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
927 |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
928 (if (not (boundp 'vc-menu-map)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
929 ;; Don't do the menu bindings if menu-bar.el wasn't loaded to defvar |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
930 ;; vc-menu-map. |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
931 () |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
932 ;;(define-key vc-menu-map [show-files] |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
933 ;; '("Show Files under VC" . (vc-directory t))) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
934 (define-key vc-menu-map [vc-directory] '("Show Locked Files" . vc-directory)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
935 (define-key vc-menu-map [separator1] '("----")) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
936 (define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
937 (define-key vc-menu-map [vc-version-other-window] |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
938 '("Show Other Version" . vc-version-other-window)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
939 (define-key vc-menu-map [vc-diff] '("Compare with Last Version" . vc-diff)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
940 (define-key vc-menu-map [vc-update-change-log] |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
941 '("Update ChangeLog" . vc-update-change-log)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
942 (define-key vc-menu-map [vc-print-log] '("Show History" . vc-print-log)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
943 (define-key vc-menu-map [separator2] '("----")) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
944 (define-key vc-menu-map [undo] '("Undo Last Check-In" . vc-cancel-version)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
945 (define-key vc-menu-map [vc-revert-buffer] |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
946 '("Revert to Last Version" . vc-revert-buffer)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
947 (define-key vc-menu-map [vc-insert-header] |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
948 '("Insert Header" . vc-insert-headers)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
949 (define-key vc-menu-map [vc-menu-check-in] '("Check In" . vc-next-action)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
950 (define-key vc-menu-map [vc-check-out] '("Check Out" . vc-toggle-read-only)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
951 (define-key vc-menu-map [vc-register] '("Register" . vc-register)) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
952 (put 'vc-rename-file 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
953 (put 'vc-version-other-window 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
954 (put 'vc-diff 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
955 (put 'vc-update-change-log 'menu-enable |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
956 '(eq (vc-buffer-backend) 'RCS)) |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
957 (put 'vc-print-log 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
958 (put 'vc-cancel-version 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
959 (put 'vc-revert-buffer 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
960 (put 'vc-insert-headers 'menu-enable 'vc-mode) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
961 (put 'vc-next-action 'menu-enable '(and vc-mode (not buffer-read-only))) |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
962 (put 'vc-toggle-read-only 'menu-enable '(and vc-mode buffer-read-only)) |
12102
01cc5af0985b
(vc-menu-map): Disable Register when no visited file.
Karl Heuer <kwzh@gnu.org>
parents:
11958
diff
changeset
|
963 (put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode))) |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
964 ) |
904 | 965 |
966 (provide 'vc-hooks) | |
967 | |
968 ;;; vc-hooks.el ends here |