Mercurial > emacs
annotate lisp/vc-hooks.el @ 31479:d58461428926
(diff-mouse-goto-source): New function.
author | Dave Love <fx@gnu.org> |
---|---|
date | Thu, 07 Sep 2000 20:14:27 +0000 |
parents | c1eb46906717 |
children | 00efca34e7d0 |
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 |
31382 | 3 ;; Copyright (C) 1992,93,94,95,96,98,99,2000 Free Software Foundation, Inc. |
904 | 4 |
31382 | 5 ;; Author: FSF (see vc.el for full credits) |
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | |
904 | 7 |
31405
c1eb46906717
Don't require `vc' during compilation;
Gerd Moellmann <gerd@gnu.org>
parents:
31404
diff
changeset
|
8 ;; $Id: vc-hooks.el,v 1.1 2000/09/06 09:19:14 gerd Exp gerd $ |
20989 | 9 |
904 | 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 | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
904 | 26 |
27 ;;; Commentary: | |
28 | |
31382 | 29 ;; This is the always-loaded portion of VC. It takes care of |
30 ;; VC-related activities that are done when you visit a file, so that | |
31 ;; vc.el itself is loaded only when you use a VC command. See the | |
32 ;; commentary of vc.el. | |
904 | 33 |
34 ;;; Code: | |
35 | |
31405
c1eb46906717
Don't require `vc' during compilation;
Gerd Moellmann <gerd@gnu.org>
parents:
31404
diff
changeset
|
36 ;(eval-when-compile |
c1eb46906717
Don't require `vc' during compilation;
Gerd Moellmann <gerd@gnu.org>
parents:
31404
diff
changeset
|
37 ; (require 'vc)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
38 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
39 ;; 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
|
40 |
31382 | 41 (defvar vc-ignore-vc-files nil "Obsolete -- use `vc-handled-backends'.") |
42 (defvar vc-master-templates () "Obsolete -- use vc-BACKEND-master-templates.") | |
43 (defvar vc-header-alist () "Obsolete -- use vc-BACKEND-header.") | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
44 |
31382 | 45 (defcustom vc-handled-backends '(RCS CVS SCCS) |
46 "*List of version control backends for which VC will be used. | |
47 Entries in this list will be tried in order to determine whether a | |
48 file is under that sort of version control. | |
49 Removing an entry from the list prevents VC from being activated | |
50 when visiting a file managed by that backend. | |
51 An empty list disables VC altogether." | |
52 :type '(repeat symbol) | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
53 :version "21.1" |
20413 | 54 :group 'vc) |
13378
96ff45331eb4
(vc-utc-string): Use timezone of TIMEVAL for the correction, not the
André Spiegel <spiegel@gnu.org>
parents:
13034
diff
changeset
|
55 |
20413 | 56 (defcustom vc-path |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
57 (if (file-directory-p "/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
58 '("/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
59 nil) |
20413 | 60 "*List of extra directories to search for version control commands." |
61 :type '(repeat directory) | |
62 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
63 |
20413 | 64 (defcustom vc-make-backup-files nil |
5164
04d6b9e7782a
(vc-make-backup-files): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4726
diff
changeset
|
65 "*If non-nil, backups of registered files are made as with other files. |
20413 | 66 If nil (the default), files covered by version control don't get backups." |
67 :type 'boolean | |
68 :group 'vc) | |
904 | 69 |
20413 | 70 (defcustom vc-follow-symlinks 'ask |
31382 | 71 "*What to do if visiting a symbolic link to a file under version control. |
72 Editing such a file through the link bypasses the version control system, | |
73 which is dangerous and probably not what you want. | |
74 | |
75 If this variable is t, VC follows the link and visits the real file, | |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
76 telling you about it in the echo area. If it is `ask', VC asks for |
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
77 confirmation whether it should follow the link. If nil, the link is |
20413 | 78 visited and a warning displayed." |
31382 | 79 :type '(choice (const :tag "Ask for confirmation" ask) |
80 (const :tag "Visit link and warn" nil) | |
81 (const :tag "Follow link" t)) | |
20413 | 82 :group 'vc) |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
83 |
20413 | 84 (defcustom vc-display-status t |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
85 "*If non-nil, display revision number and lock status in modeline. |
20413 | 86 Otherwise, not displayed." |
87 :type 'boolean | |
88 :group 'vc) | |
89 | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
90 |
20413 | 91 (defcustom vc-consult-headers t |
92 "*If non-nil, identify work files by searching for version headers." | |
93 :type 'boolean | |
94 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
95 |
20413 | 96 (defcustom vc-keep-workfiles t |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
97 "*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
|
98 If the back-end is CVS, workfiles are always kept, regardless of the |
20413 | 99 value of this flag." |
100 :type 'boolean | |
101 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
102 |
20413 | 103 (defcustom vc-mistrust-permissions nil |
31382 | 104 "*If non-nil, don't assume permissions/ownership track version-control status. |
105 If nil, do rely on the permissions. | |
20413 | 106 See also variable `vc-consult-headers'." |
107 :type 'boolean | |
108 :group 'vc) | |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
109 |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
110 (defun vc-mistrust-permissions (file) |
31382 | 111 "Internal access function to variable `vc-mistrust-permissions' for FILE." |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
112 (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
|
113 (and vc-mistrust-permissions |
31382 | 114 (funcall vc-mistrust-permissions |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
115 (vc-backend-subdirectory-name file))))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
116 |
904 | 117 ;; Tell Emacs about this new kind of minor mode |
31382 | 118 (add-to-list 'minor-mode-alist '(vc-mode vc-mode)) |
904 | 119 |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
120 (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
|
121 (put 'vc-mode 'permanent-local t) |
904 | 122 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
123 (defmacro vc-error-occurred (&rest body) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
124 (list 'condition-case nil (cons 'progn (append body '(nil))) '(error t))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
125 |
904 | 126 ;; 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
|
127 ;; control state of a file is expensive to derive --- we compute |
31382 | 128 ;; them when the file is initially found, keep them up to date |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
129 ;; 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
|
130 ;; the buffer is killed. |
904 | 131 |
31382 | 132 (defvar vc-file-prop-obarray (make-vector 16 0) |
904 | 133 "Obarray for per-file properties.") |
134 | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
135 (defvar vc-touched-properties nil) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
136 |
904 | 137 (defun vc-file-setprop (file property value) |
31382 | 138 "Set per-file VC PROPERTY for FILE to VALUE." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
139 (if (and vc-touched-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
140 (not (memq property vc-touched-properties))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
141 (setq vc-touched-properties (append (list property) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
142 vc-touched-properties))) |
904 | 143 (put (intern file vc-file-prop-obarray) property value)) |
144 | |
145 (defun vc-file-getprop (file property) | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
146 "Get per-file VC PROPERTY for FILE." |
904 | 147 (get (intern file vc-file-prop-obarray) property)) |
148 | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
149 (defun vc-file-clearprops (file) |
31382 | 150 "Clear all VC properties of FILE." |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
151 (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
|
152 |
31382 | 153 |
154 ;; We keep properties on each symbol naming a backend as follows: | |
155 ;; * `vc-functions': an alist mapping vc-FUNCTION to vc-BACKEND-FUNCTION. | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
156 |
31382 | 157 (defun vc-make-backend-sym (backend sym) |
158 "Return BACKEND-specific version of VC symbol SYM." | |
159 (intern (concat "vc-" (downcase (symbol-name backend)) | |
160 "-" (symbol-name sym)))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
161 |
31382 | 162 (defun vc-find-backend-function (backend fun) |
163 "Return BACKEND-specific implementation of FUN. | |
164 If there is no such implementation, return the default implementation; | |
165 if that doesn't exist either, return nil." | |
166 (let ((f (vc-make-backend-sym backend fun))) | |
167 (if (fboundp f) f | |
168 ;; Load vc-BACKEND.el if needed. | |
169 (require (intern (concat "vc-" (downcase (symbol-name backend))))) | |
170 (if (fboundp f) f | |
171 (let ((def (vc-make-backend-sym 'default fun))) | |
172 (if (fboundp def) (cons def backend) nil)))))) | |
173 | |
174 (defun vc-call-backend (backend function-name &rest args) | |
175 "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS. | |
176 Calls | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
177 |
31382 | 178 (apply 'vc-BACKEND-FUN ARGS) |
179 | |
180 if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el) | |
181 and else calls | |
182 | |
183 (apply 'vc-default-FUN BACKEND ARGS) | |
184 | |
185 It is usually called via the `vc-call' macro." | |
186 (let ((f (cdr (assoc function-name (get backend 'vc-functions))))) | |
187 (unless f | |
188 (setq f (vc-find-backend-function backend function-name)) | |
189 (put backend 'vc-functions (cons (cons function-name f) | |
190 (get backend 'vc-functions)))) | |
191 (if (consp f) | |
192 (apply (car f) (cdr f) args) | |
193 (apply f args)))) | |
194 | |
195 (defmacro vc-call (fun file &rest args) | |
196 ;; BEWARE!! `file' is evaluated twice!! | |
197 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args)) | |
198 | |
199 | |
200 (defsubst vc-parse-buffer (pattern i) | |
201 "Find PATTERN in the current buffer and return its Ith submatch." | |
202 (goto-char (point-min)) | |
203 (if (re-search-forward pattern nil t) | |
204 (match-string i))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
205 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
206 (defun vc-insert-file (file &optional limit blocksize) |
31382 | 207 "Insert the contents of FILE into the current buffer. |
208 | |
209 Optional argument LIMIT is a regexp. If present, the file is inserted | |
210 in chunks of size BLOCKSIZE (default 8 kByte), until the first | |
211 occurrence of LIMIT is found. The function returns nil if FILE doesn't | |
212 exist." | |
12367
f268f652055e
(vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents:
12359
diff
changeset
|
213 (erase-buffer) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
214 (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
|
215 (cond (limit |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
216 (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
|
217 (let (found s) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
218 (while (not found) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
219 (setq s (buffer-size)) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
220 (goto-char (1+ s)) |
31382 | 221 (setq found |
222 (or (zerop (cadr (insert-file-contents | |
223 file nil s (+ s blocksize)))) | |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
224 (progn (beginning-of-line) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
225 (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
|
226 (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
|
227 (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
|
228 (auto-save-mode nil) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
229 t) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
230 (t nil))) |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
231 |
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
232 ;;; 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
|
233 ;;; (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
|
234 ;;; _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
|
235 ;;; if the property is already known or not. A property should |
31382 | 236 ;;; only be retrieved by vc-file-getprop if there is no |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
237 ;;; access function.) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
238 |
31382 | 239 ;;; properties indicating the backend being used for FILE |
240 | |
241 (defun vc-registered (file) | |
242 "Return non-nil if FILE is registered in a version control system. | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
243 |
31382 | 244 This function does not cache its result; it performs the test each |
245 time it is invoked on a file. For a caching check whether a file is | |
246 registered, use `vc-backend'." | |
247 (let (handler) | |
248 (if (boundp 'file-name-handler-alist) | |
249 (setq handler (find-file-name-handler file 'vc-registered))) | |
250 (if handler | |
251 ;; handler should set vc-backend and return t if registered | |
252 (funcall handler 'vc-registered file) | |
253 ;; There is no file name handler. | |
254 ;; Try vc-BACKEND-registered for each handled BACKEND. | |
255 (catch 'found | |
256 (mapcar | |
257 (lambda (b) | |
258 (and (vc-call-backend b 'registered file) | |
259 (vc-file-setprop file 'vc-backend b) | |
260 (throw 'found t))) | |
261 (unless vc-ignore-vc-files | |
262 vc-handled-backends)) | |
263 ;; File is not registered. | |
264 (vc-file-setprop file 'vc-backend 'none) | |
265 nil)))) | |
266 | |
267 (defun vc-backend (file) | |
268 "Return the version control type of FILE, nil if it is not registered." | |
269 ;; `file' can be nil in several places (typically due to the use of | |
270 ;; code like (vc-backend (buffer-file-name))). | |
271 (when (stringp file) | |
272 (let ((property (vc-file-getprop file 'vc-backend))) | |
273 ;; Note that internally, Emacs remembers unregistered | |
274 ;; files by setting the property to `none'. | |
275 (cond ((eq property 'none) nil) | |
276 (property) | |
277 ;; vc-registered sets the vc-backend property | |
278 (t (if (vc-registered file) | |
279 (vc-file-getprop file 'vc-backend) | |
280 nil)))))) | |
281 | |
282 (defun vc-backend-subdirectory-name (file) | |
283 "Return where the master and lock FILEs for the current directory are kept." | |
284 (symbol-name (vc-backend file))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
285 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
286 (defun vc-name (file) |
31382 | 287 "Return the master name of FILE. If the file is not registered, or |
288 the master name is not known, return nil." | |
289 ;; TODO: This should ultimately become obsolete, at least up here | |
290 ;; in vc-hooks. | |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
291 (or (vc-file-getprop file 'vc-name) |
21356
c714817643a9
(vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21232
diff
changeset
|
292 (if (vc-backend file) |
c714817643a9
(vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21232
diff
changeset
|
293 (vc-file-getprop file 'vc-name)))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
294 |
31382 | 295 (defun vc-checkout-model (file) |
296 "Indicate how FILE is checked out. | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
297 |
31382 | 298 Possible values: |
12884
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
299 |
31382 | 300 'implicit File is always writeable, and checked out `implicitly' |
301 when the user saves the first changes to the file. | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
302 |
31382 | 303 'locking File is read-only if up-to-date; user must type |
304 \\[vc-toggle-read-only] before editing. Strict locking | |
305 is assumed. | |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
306 |
31382 | 307 'announce File is read-only if up-to-date; user must type |
308 \\[vc-toggle-read-only] before editing. But other users | |
309 may be editing at the same time." | |
310 (or (vc-file-getprop file 'vc-checkout-model) | |
311 (vc-file-setprop file 'vc-checkout-model | |
312 (vc-call checkout-model file)))) | |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
313 |
16742
25558bcdfc93
(vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents:
16446
diff
changeset
|
314 (defun vc-user-login-name (&optional uid) |
31382 | 315 "Return the name under which the user is logged in, as a string. |
316 \(With optional argument UID, return the name of that user.) | |
317 This function does the same as function `user-login-name', but unlike | |
318 that, it never returns nil. If a UID cannot be resolved, that | |
319 UID is returned as a string." | |
16742
25558bcdfc93
(vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents:
16446
diff
changeset
|
320 (or (user-login-name uid) |
31382 | 321 (number-to-string (or uid (user-uid))))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
322 |
31382 | 323 (defun vc-state (file) |
324 "Return the version control state of FILE. | |
325 | |
326 The value returned is one of: | |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
327 |
31382 | 328 'up-to-date The working file is unmodified with respect to the |
329 latest version on the current branch, and not locked. | |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
330 |
31382 | 331 'edited The working file has been edited by the user. If |
332 locking is used for the file, this state means that | |
333 the current version is locked by the calling user. | |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
334 |
31382 | 335 USER The current version of the working file is locked by |
336 some other USER (a string). | |
337 | |
338 'needs-patch The file has not been edited by the user, but there is | |
339 a more recent version on the current branch stored | |
340 in the master file. | |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
341 |
31382 | 342 'needs-merge The file has been edited by the user, and there is also |
343 a more recent version on the current branch stored in | |
344 the master file. This state can only occur if locking | |
345 is not used for the file. | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
346 |
31382 | 347 'unlocked-changes The current version of the working file is not locked, |
348 but the working file has been changed with respect | |
349 to that version. This state can only occur for files | |
350 with locking; it represents an erroneous condition that | |
351 should be resolved by the user (vc-next-action will | |
352 prompt the user to do it)." | |
353 (or (vc-file-getprop file 'vc-state) | |
354 (vc-file-setprop file 'vc-state | |
355 (vc-call state-heuristic file)))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
356 |
31382 | 357 (defsubst vc-up-to-date-p (file) |
358 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'." | |
359 (eq (vc-state file) 'up-to-date)) | |
360 | |
361 (defun vc-default-state-heuristic (backend file) | |
362 "Default implementation of vc-state-heuristic. It simply calls the | |
363 real state computation function `vc-BACKEND-state' and does not employ | |
364 any heuristic at all." | |
365 (vc-call-backend backend 'state file)) | |
12252
e07d55d05864
(vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents:
12251
diff
changeset
|
366 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
367 (defun vc-workfile-version (file) |
31382 | 368 "Return version level of the current workfile FILE." |
369 (or (vc-file-getprop file 'vc-workfile-version) | |
370 (vc-file-setprop file 'vc-workfile-version | |
371 (vc-call workfile-version file)))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
372 |
904 | 373 ;;; actual version-control code starts here |
374 | |
31382 | 375 (defun vc-default-registered (backend file) |
376 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates." | |
377 (let ((sym (vc-make-backend-sym backend 'master-templates))) | |
378 (unless (get backend 'vc-templates-grabbed) | |
379 (put backend 'vc-templates-grabbed t) | |
380 (set sym (append (delq nil | |
381 (mapcar | |
382 (lambda (template) | |
383 (and (consp template) | |
384 (eq (cdr template) backend) | |
385 (car template))) | |
386 vc-master-templates)) | |
387 (symbol-value sym)))) | |
388 (let ((result (vc-check-master-templates file (symbol-value sym)))) | |
389 (if (stringp result) | |
390 (vc-file-setprop file 'vc-name result) | |
391 nil)))) ; Not registered | |
904 | 392 |
31382 | 393 (defun vc-possible-master (s dirname basename) |
394 (cond | |
395 ((stringp s) (format s dirname basename)) | |
396 ((functionp s) | |
397 ;; The template is a function to invoke. If the | |
398 ;; function returns non-nil, that means it has found a | |
399 ;; master. For backward compatibility, we also handle | |
400 ;; the case that the function throws a 'found atom | |
401 ;; and a pair (cons MASTER-FILE BACKEND). | |
402 (let ((result (catch 'found (funcall s dirname basename)))) | |
403 (if (consp result) (car result) result))))) | |
21232
b682a769996d
(vc-sccs-project-dir, vc-search-sccs-project-dir): New functions.
André Spiegel <spiegel@gnu.org>
parents:
20989
diff
changeset
|
404 |
31382 | 405 (defun vc-check-master-templates (file templates) |
406 "Return non-nil if there is a master corresponding to FILE, | |
407 according to any of the elements in TEMPLATES. | |
408 | |
409 TEMPLATES is a list of strings or functions. If an element is a | |
410 string, it must be a control string as required by `format', with two | |
411 string placeholders, such as \"%sRCS/%s,v\". The directory part of | |
412 FILE is substituted for the first placeholder, the basename of FILE | |
413 for the second. If a file with the resulting name exists, it is taken | |
414 as the master of FILE, and returned. | |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
415 |
31382 | 416 If an element of TEMPLATES is a function, it is called with the |
417 directory part and the basename of FILE as arguments. It should | |
418 return non-nil if it finds a master; that value is then returned by | |
419 this function." | |
420 (let ((dirname (or (file-name-directory file) "")) | |
421 (basename (file-name-nondirectory file))) | |
422 (catch 'found | |
423 (mapcar | |
424 (lambda (s) | |
425 (let ((trial (vc-possible-master s dirname basename))) | |
426 (if (and trial (file-exists-p trial) | |
427 ;; Make sure the file we found with name | |
428 ;; TRIAL is not the source file itself. | |
429 ;; That can happen with RCS-style names if | |
430 ;; the file name is truncated (e.g. to 14 | |
431 ;; chars). See if either directory or | |
432 ;; attributes differ. | |
433 (or (not (string= dirname | |
434 (file-name-directory trial))) | |
435 (not (equal (file-attributes file) | |
436 (file-attributes trial))))) | |
437 (throw 'found trial)))) | |
438 templates)))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
439 |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
440 (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
|
441 "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
|
442 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
|
443 then check the file in or out. Otherwise, just change the read-only flag |
23693
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
444 of the buffer. |
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
445 With prefix argument, ask for version number to check in or check out. |
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
446 Check-out of a specified version number does not lock the file; |
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
447 to do that, use this command a second time with no argument." |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
448 (interactive "P") |
18850
238067491696
(vc-find-cvs-master): Corrected parsing of CVS/Entries, according to CVS docs.
André Spiegel <spiegel@gnu.org>
parents:
18403
diff
changeset
|
449 (if (or (and (boundp 'vc-dired-mode) vc-dired-mode) |
31382 | 450 ;; use boundp because vc.el might not be loaded |
451 (vc-backend (buffer-file-name))) | |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
452 (vc-next-action verbose) |
904 | 453 (toggle-read-only))) |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
454 (define-key global-map "\C-x\C-q" 'vc-toggle-read-only) |
904 | 455 |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
456 (defun vc-after-save () |
31382 | 457 "Function to be called by `basic-save-buffer' (in files.el)." |
458 ;; If the file in the current buffer is under version control, | |
459 ;; up-to-date, and locking is not used for the file, set | |
460 ;; the state to 'edited and redisplay the mode line. | |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
461 (let ((file (buffer-file-name))) |
21356
c714817643a9
(vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21232
diff
changeset
|
462 (and (vc-backend file) |
12967
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
463 (or (and (equal (vc-file-getprop file 'vc-checkout-time) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
464 (nth 5 (file-attributes file))) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
465 ;; File has been saved in the same second in which |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
466 ;; it was checked out. Clear the checkout-time |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
467 ;; to avoid confusion. |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
468 (vc-file-setprop file 'vc-checkout-time nil)) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
469 t) |
31382 | 470 (vc-up-to-date-p file) |
471 (eq (vc-checkout-model file) 'implicit) | |
472 (vc-file-setprop file 'vc-state 'edited) | |
473 (vc-mode-line file) | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
474 (if (featurep 'vc) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
475 ;; If VC is not loaded, then there can't be |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
476 ;; any VC Dired buffer to synchronize. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
477 (vc-dired-resynch-file file))))) |
12884
f47248851f26
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents:
12874
diff
changeset
|
478 |
31382 | 479 (defun vc-mode-line (file) |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
480 "Set `vc-mode' to display type of version control for FILE. |
904 | 481 The value is set in the current buffer, which should be the buffer |
31382 | 482 visiting FILE." |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
483 (interactive (list buffer-file-name nil)) |
31382 | 484 (unless (not (vc-backend file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
485 (setq vc-mode (concat " " (if vc-display-status |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
486 (vc-call mode-line-string file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
487 (symbol-name (vc-backend file))))) |
15448
593dadb4f287
(vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents:
15196
diff
changeset
|
488 ;; If the file is locked by some other user, make |
593dadb4f287
(vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents:
15196
diff
changeset
|
489 ;; the buffer read-only. Like this, even root |
15517 | 490 ;; cannot modify a file that someone else has locked. |
31382 | 491 (and (equal file (buffer-file-name)) |
492 (stringp (vc-state file)) | |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
493 (setq buffer-read-only t)) |
15517 | 494 ;; If the user is root, and the file is not owner-writable, |
495 ;; then pretend that we can't write it | |
496 ;; even though we can (because root can write anything). | |
497 ;; This way, even root cannot modify a file that isn't locked. | |
31382 | 498 (and (equal file (buffer-file-name)) |
15448
593dadb4f287
(vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents:
15196
diff
changeset
|
499 (not buffer-read-only) |
593dadb4f287
(vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents:
15196
diff
changeset
|
500 (zerop (user-real-uid)) |
593dadb4f287
(vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents:
15196
diff
changeset
|
501 (zerop (logand (file-modes (buffer-file-name)) 128)) |
31382 | 502 (setq buffer-read-only t))) |
503 (force-mode-line-update) | |
504 (vc-backend file)) | |
505 | |
506 (defun vc-default-mode-line-string (backend file) | |
507 "Return string for placement in modeline by `vc-mode-line' for FILE. | |
508 Format: | |
509 | |
510 \"BACKEND-REV\" if the file is up-to-date | |
511 \"BACKEND:REV\" if the file is edited (or locked by the calling user) | |
512 \"BACKEND:LOCKER:REV\" if the file is locked by somebody else | |
904 | 513 |
31382 | 514 This function assumes that the file is registered." |
515 (setq backend (symbol-name backend)) | |
516 (let ((state (vc-state file)) | |
517 (rev (vc-workfile-version file))) | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
518 (cond ((or (eq state 'up-to-date) |
31382 | 519 (eq state 'needs-patch)) |
520 (concat backend "-" rev)) | |
521 ((stringp state) | |
522 (concat backend ":" state ":" rev)) | |
523 (t | |
524 ;; Not just for the 'edited state, but also a fallback | |
525 ;; for all other states. Think about different symbols | |
526 ;; for 'needs-patch and 'needs-merge. | |
527 (concat backend ":" rev))))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
528 |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
529 (defun vc-follow-link () |
31382 | 530 "If current buffer visits a symbolic link, visit the real file. |
531 If the real file is already visited in another buffer, make that buffer | |
532 current, and kill the buffer that visits the link." | |
15161
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
533 (let* ((truename (abbreviate-file-name (file-chase-links buffer-file-name))) |
14673
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
534 (true-buffer (find-buffer-visiting truename)) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
535 (this-buffer (current-buffer))) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
536 (if (eq true-buffer this-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
537 (progn |
14674
f585d3bf3a73
(vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents:
14673
diff
changeset
|
538 (kill-buffer this-buffer) |
14673
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
539 ;; In principle, we could do something like set-visited-file-name. |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
540 ;; However, it can't be exactly the same as set-visited-file-name. |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
541 ;; I'm not going to work out the details right now. -- rms. |
14674
f585d3bf3a73
(vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents:
14673
diff
changeset
|
542 (set-buffer (find-file-noselect truename))) |
14673
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
543 (set-buffer true-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
544 (kill-buffer this-buffer)))) |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
545 |
904 | 546 (defun vc-find-file-hook () |
31382 | 547 "Function for `find-file-hooks' activating VC mode if appropriate." |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
548 ;; 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
|
549 ;; if user has killed the buffer and revisited. |
31382 | 550 (when buffer-file-name |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
551 (vc-file-clearprops buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
552 (cond |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
553 ((vc-backend buffer-file-name) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
554 (vc-mode-line buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
555 (cond ((not vc-make-backup-files) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
556 ;; Use this variable, not make-backup-files, |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
557 ;; 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
|
558 (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
|
559 (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
|
560 ((let* ((link (file-symlink-p buffer-file-name)) |
15196
414e523050d5
(vc-find-file-hook): Follow multiple links all the way.
Richard M. Stallman <rms@gnu.org>
parents:
15161
diff
changeset
|
561 (link-type (and link (vc-backend (file-chase-links link))))) |
12590
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
562 (if link-type |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
563 (cond ((eq vc-follow-symlinks nil) |
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
564 (message |
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
565 "Warning: symbolic link to %s-controlled source file" link-type)) |
15161
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
566 ((or (not (eq vc-follow-symlinks 'ask)) |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
567 ;; If we already visited this file by following |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
568 ;; the link, don't ask again if we try to visit |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
569 ;; it again. GUD does that, and repeated questions |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
570 ;; are painful. |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
571 (get-file-buffer |
31382 | 572 (abbreviate-file-name |
573 (file-chase-links buffer-file-name)))) | |
15161
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
574 |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
575 (vc-follow-link) |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
576 (message "Followed link to %s" buffer-file-name) |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
577 (vc-find-file-hook)) |
ea07411f268e
(vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
578 (t |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
579 (if (yes-or-no-p (format |
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
580 "Symbolic link to %s-controlled source file; follow link? " link-type)) |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
581 (progn (vc-follow-link) |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
582 (message "Followed link to %s" buffer-file-name) |
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
583 (vc-find-file-hook)) |
31382 | 584 (message |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
585 "Warning: editing through the link bypasses version control") |
31382 | 586 ))))))))) |
904 | 587 |
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
|
588 (add-hook 'find-file-hooks 'vc-find-file-hook) |
904 | 589 |
590 ;;; more hooks, this time for file-not-found | |
591 (defun vc-file-not-found-hook () | |
31382 | 592 "When file is not found, try to check it out from version control. |
593 Returns t if checkout was successful, nil otherwise. | |
594 Used in `find-file-not-found-hooks'." | |
22947
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
595 ;; When a file does not exist, ignore cached info about it |
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
596 ;; from a previous visit. |
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
597 (vc-file-clearprops buffer-file-name) |
31382 | 598 (if (and (vc-backend buffer-file-name) |
599 (yes-or-no-p | |
600 (format "File %s was lost; check out from version control? " | |
601 (file-name-nondirectory buffer-file-name)))) | |
602 (save-excursion | |
603 (require 'vc) | |
604 (setq default-directory (file-name-directory buffer-file-name)) | |
605 (not (vc-error-occurred (vc-checkout buffer-file-name)))))) | |
904 | 606 |
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
|
607 (add-hook 'find-file-not-found-hooks 'vc-file-not-found-hook) |
904 | 608 |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
609 (defun vc-kill-buffer-hook () |
31382 | 610 "Discard VC info about a file when we kill its buffer." |
611 (if (buffer-file-name) | |
612 (vc-file-clearprops (buffer-file-name)))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
613 |
31382 | 614 ;; ??? DL: why is this not done? |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
615 ;;;(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
|
616 |
904 | 617 ;;; 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
|
618 ;;; 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
|
619 ;;; want to call them from random buffers. |
904 | 620 |
31382 | 621 (autoload 'vc-prefix-map "vc" nil nil 'keymap) |
622 (define-key global-map "\C-xv" 'vc-prefix-map) | |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
623 |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
624 (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
|
625 ;; 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
|
626 ;; vc-menu-map. |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
627 () |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
628 ;;(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
|
629 ;; '("Show Files under VC" . (vc-directory t))) |
18403
bb63fa860267
(vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents:
18148
diff
changeset
|
630 (define-key vc-menu-map [vc-retrieve-snapshot] |
bb63fa860267
(vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents:
18148
diff
changeset
|
631 '("Retrieve Snapshot" . vc-retrieve-snapshot)) |
bb63fa860267
(vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents:
18148
diff
changeset
|
632 (define-key vc-menu-map [vc-create-snapshot] |
bb63fa860267
(vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents:
18148
diff
changeset
|
633 '("Create Snapshot" . vc-create-snapshot)) |
23255
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
634 (define-key vc-menu-map [vc-directory] '("VC Directory Listing" . vc-directory)) |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
635 (define-key vc-menu-map [separator1] '("----")) |
18148
c6e694b6de26
(vc-annotate): Entry "Annotate" added to menu and
Richard M. Stallman <rms@gnu.org>
parents:
17642
diff
changeset
|
636 (define-key vc-menu-map [vc-annotate] '("Annotate" . vc-annotate)) |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
637 (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
|
638 (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
|
639 '("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
|
640 (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
|
641 (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
|
642 '("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
|
643 (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
|
644 (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
|
645 (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
|
646 (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
|
647 '("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
|
648 (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
|
649 '("Insert Header" . vc-insert-headers)) |
19103
3a841692390c
(vc-menu-map): Replace entries for "Check In" and "Check Out" with
André Spiegel <spiegel@gnu.org>
parents:
19054
diff
changeset
|
650 (define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action)) |
14622
3d47471d947d
Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents:
14566
diff
changeset
|
651 (define-key vc-menu-map [vc-register] '("Register" . vc-register))) |
3d47471d947d
Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents:
14566
diff
changeset
|
652 |
23255
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
653 ;;; These are not correct and it's not currently clear how doing it |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
654 ;;; better (with more complicated expressions) might slow things down |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
655 ;;; on older systems. |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
656 |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
657 ;;;(put 'vc-rename-file 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
658 ;;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS)) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
659 ;;;(put 'vc-version-other-window 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
660 ;;;(put 'vc-diff 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
661 ;;;(put 'vc-update-change-log 'menu-enable |
31382 | 662 ;;; '(member (vc-buffer-backend) '(RCS CVS))) |
23255
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
663 ;;;(put 'vc-print-log 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
664 ;;;(put 'vc-cancel-version 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
665 ;;;(put 'vc-revert-buffer 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
666 ;;;(put 'vc-insert-headers 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
667 ;;;(put 'vc-next-action 'menu-enable 'vc-mode) |
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
668 ;;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode))) |
904 | 669 |
670 (provide 'vc-hooks) | |
671 | |
672 ;;; vc-hooks.el ends here |