Mercurial > emacs
annotate lisp/vc.el @ 1658:452ba03935d7
* xterm.c (XTread_socket): When we get MapNotify, UnmapNotify,
Expose, ExposeWindow, or UnmapWindow, set f->async_visible, not
f->visible.
(x_do_pending_expose, x_raise_frame, x_lower_frame,
x_make_frame_invisible, x_make_frame_visible, x_iconify_frame):
Test and set f->async_visible and f->async_iconified, not
f->visible or f->async_iconified.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Sun, 06 Dec 1992 22:22:09 +0000 |
parents | c2bea3f2f8cb |
children | 75e8a7f920c7 |
rev | line source |
---|---|
904 | 1 ;;; vc.el --- drive a version-control system from within Emacs |
2 | |
3 ;; Copyright (C) 1992 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
6 ;; Version: 4.0 | |
7 | |
1636
c2bea3f2f8cb
(vc-next-action): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1635
diff
changeset
|
8 ;; $Id: vc.el,v 1.17 1992/11/20 17:23:45 jimb Exp rms $ |
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 | |
28 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>. | |
29 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>, | |
30 ;; and Richard Stallman contributed valuable criticism, support, and testing. | |
31 ;; | |
32 ;; Supported version-control systems presently include SCCS and RCS; | |
33 ;; your RCS version should be 5.6.2 or later for proper operation of | |
34 ;; the lock-breaking code. | |
35 ;; | |
36 ;; The RCS code assumes strict locking. You can support the RCS -x option | |
37 ;; by adding pairs to the vc-master-templates list. | |
38 ;; | |
39 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
40 ;; to be installed somewhere on Emacs's path for executables. | |
41 ;; | |
42 ;; This code depends on call-process passing back the subprocess exit | |
43 ;; status. Thus, you need Emacs 18.58 or later to run it. | |
44 ;; | |
45 ;; The vc code maintains some internal state in order to reduce expensive | |
46 ;; version-control operations to a minimum. Some names are only computed | |
47 ;; once. If you perform version control operations with RCS/SCCS/CVS while | |
48 ;; vc's back is turned, or move/rename master files while vc is running, | |
49 ;; vc may get seriously confused. Don't do these things! | |
50 ;; | |
51 ;; Developer's notes on some concurrency issues are included at the end of | |
52 ;; the file. | |
53 | |
54 ;;; Code: | |
55 | |
56 (require 'vc-hooks) | |
57 | |
58 ;; General customization | |
59 | |
60 (defvar vc-default-back-end nil | |
61 "*Back-end actually used by this interface; may be SCCS or RCS. | |
62 The value is only computed when needed to avoid an expensive search.") | |
63 (defvar vc-diff-options '("-a" "-c1") | |
64 "*The command/flags list to be used in constructing diff commands.") | |
65 (defvar vc-suppress-confirm nil | |
66 "*If non-nil, reat user as expert; suppress yes-no prompts on some things.") | |
67 (defvar vc-keep-workfiles t | |
68 "*If non-nil, don't delete working files after registering changes.") | |
69 (defvar vc-initial-comment nil | |
70 "*Prompt for initial comment when a file is registered.") | |
71 (defvar vc-command-messages nil | |
72 "*Display run messages from back-end commands.") | |
73 (defvar vc-mistrust-permissions 'file-symlink-p | |
74 "*Don't assume that permissions and ownership track version-control status.") | |
75 | |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
76 (defvar vc-checkin-switches nil |
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
77 "*Extra switches passed to the checkin program by \\[vc-checkin].") |
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
78 |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
79 ;;;###autoload |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
80 (defvar vc-checkin-hook nil |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
81 "*List of functions called after a vc-checkin is done. See `runs-hooks'.") |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
82 |
904 | 83 ;; Header-insertion hair |
84 | |
85 (defvar vc-header-alist | |
86 '((SCCS "\%W\%") (RCS "\$Id\$")) | |
87 "*Header keywords to be inserted when vc-insert-header is executed.") | |
88 (defconst vc-static-header-alist | |
89 '(("\\.c$" . | |
90 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) | |
91 "*Associate static header string templates with file types. A \%s in the | |
92 template is replaced with the first string associated with the file's | |
93 verson-control type in vc-header-strings.") | |
94 (defvar vc-comment-alist | |
95 '((nroff-mode ".\\\"" "")) | |
96 "*Special comment delimiters to be used in generating vc headers only. | |
97 Add an entry in this list if you need to override the normal comment-start | |
98 and comment-end variables. This will only be necessary if the mode language | |
99 is sensitive to blank lines.") | |
100 | |
101 ;; Variables the user doesn't need to know about. | |
102 (defvar vc-log-entry-mode nil) | |
103 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
104 (defvar vc-log-after-operation-hook nil) |
904 | 105 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
106 (defvar vc-log-file) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
107 (defvar vc-log-version) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
108 |
904 | 109 (defconst vc-name-assoc-file "VC-names") |
110 | |
111 (defmacro vc-error-occurred (&rest body) | |
112 (list 'condition-case nil (cons 'progn (append body '(nil))) '(error t))) | |
113 | |
114 ;; File property caching | |
115 | |
116 (defun vc-file-clearprops (file) | |
117 ;; clear all properties of a given file | |
118 (setplist (intern file vc-file-prop-obarray) nil)) | |
119 | |
120 ;; Random helper functions | |
121 | |
122 (defun vc-name (file) | |
123 "Return the master name of a file, nil if it is not registered" | |
124 (or (vc-file-getprop file 'vc-name) | |
125 (vc-file-setprop file 'vc-name | |
126 (let ((name-and-type (vc-registered file))) | |
127 (and name-and-type (car name-and-type)))))) | |
128 | |
129 (defvar vc-binary-assoc nil) | |
130 | |
131 (defun vc-find-binary (name) | |
132 "Look for a command anywhere on the subprocess-command search path." | |
133 (or (cdr (assoc name vc-binary-assoc)) | |
134 (let ((full nil)) | |
135 (catch 'found | |
136 (mapcar | |
137 (function (lambda (s) | |
138 (if (and s (file-exists-p (setq full (concat s "/" name)))) | |
139 (throw 'found nil)))) | |
140 exec-path)) | |
141 (if full | |
142 (setq vc-binary-assoc (cons (cons name full) vc-binary-assoc))) | |
143 full))) | |
144 | |
145 (defun vc-do-command (okstatus command file &rest flags) | |
146 "Execute a version-control command, notifying user and checking for errors. | |
147 The command is successful if its exit status does not exceed OKSTATUS. | |
148 Output from COMMAND goes to buffer *vc*. The last argument of the command is | |
149 the master name of FILE; this is appended to an optional list of FLAGS." | |
150 (setq file (expand-file-name file)) | |
151 (if vc-command-messages | |
152 (message (format "Running %s on %s..." command file))) | |
153 (let ((obuf (current-buffer)) | |
154 (squeezed nil) | |
155 (vc-file (and file (vc-name file))) | |
156 status) | |
157 (set-buffer (get-buffer-create "*vc*")) | |
158 (erase-buffer) | |
159 (mapcar | |
160 (function (lambda (s) (and s (setq squeezed (append squeezed (list s)))))) | |
161 flags) | |
162 (if vc-file | |
163 (setq squeezed (append squeezed (list vc-file)))) | |
164 (let | |
165 ((default-directory (file-name-directory (or file "./")))) | |
166 (setq status (apply 'call-process command nil t nil squeezed)) | |
167 ) | |
168 (goto-char (point-max)) | |
169 (previous-line 1) | |
170 (if (or (not (integerp status)) (< okstatus status)) | |
171 (progn | |
172 (previous-line 1) | |
173 (print (cons command squeezed)) | |
174 (next-line 1) | |
175 (pop-to-buffer "*vc*") | |
176 (vc-shrink-to-fit) | |
177 (goto-char (point-min)) | |
178 (error (format "Running %s...FAILED (%s)" command | |
179 (if (integerp status) | |
180 (format "status %d" status) | |
181 status))) | |
182 ) | |
183 (if vc-command-messages | |
184 (message (format "Running %s...OK" command))) | |
185 ) | |
186 (set-buffer obuf) | |
187 status) | |
188 ) | |
189 | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
190 ;;; Save a bit of the text around POSN in the current buffer, to help |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
191 ;;; us find the corresponding position again later. This works even |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
192 ;;; if all markers are destroyed or corrupted. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
193 (defun vc-position-context (posn) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
194 (list posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
195 (buffer-size) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
196 (buffer-substring posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
197 (min (point-max) (+ posn 100))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
198 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
199 ;;; Return the position of CONTEXT in the current buffer, or nil if we |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
200 ;;; couldn't find it. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
201 (defun vc-find-position-by-context (context) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
202 (let ((context-string (nth 2 context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
203 (if (equal "" context-string) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
204 (point-max) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
205 (save-excursion |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
206 (let ((diff (- (nth 1 context) (buffer-size)))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
207 (if (< diff 0) (setq diff (- diff))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
208 (goto-char (nth 0 context)) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
209 (if (or (search-forward context-string nil t) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
210 ;; Can't use search-backward since the match may continue |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
211 ;; after point. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
212 (progn (goto-char (- (point) diff (length context-string))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
213 ;; goto-char doesn't signal an error at |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
214 ;; beginning of buffer like backward-char would |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
215 (search-forward context-string nil t))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
216 ;; to beginning of OSTRING |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
217 (- (point) (length context-string)))))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
218 |
904 | 219 (defun vc-revert-buffer1 (&optional arg no-confirm) |
220 ;; This code was shamelessly lifted from Sebastian Kremer's rcs.el mode. | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
221 ;; Revert buffer, try to keep point and mark where user expects them in spite |
904 | 222 ;; of changes because of expanded version-control key words. |
223 ;; This is quite important since otherwise typeahead won't work as expected. | |
224 (interactive "P") | |
225 (widen) | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
226 (let ((point-context (vc-position-context (point))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
227 (mark-context (if (mark) (vc-position-context (mark))))) |
904 | 228 (revert-buffer arg no-confirm) |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
229 (let ((new-point (vc-find-position-by-context point-context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
230 (if new-point (goto-char new-point))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
231 (if mark-context |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
232 (let ((new-mark (vc-find-position-by-context mark-context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
233 (if new-mark (set-mark new-mark)))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
234 |
904 | 235 |
236 (defun vc-buffer-sync () | |
237 ;; Make sure the current buffer and its working file are in sync | |
238 (if (and (buffer-modified-p) | |
239 (or | |
240 vc-suppress-confirm | |
241 (y-or-n-p (format "%s has been modified. Write it out? " | |
242 (buffer-name))))) | |
243 (save-buffer))) | |
244 | |
245 (defun vc-workfile-unchanged-p (file) | |
246 ;; Has the given workfile changed since last checkout? | |
247 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | |
248 (lastmod (nth 5 (file-attributes file)))) | |
249 (if checkout-time | |
250 (equal lastmod checkout-time) | |
251 (if (zerop (vc-backend-diff file nil)) | |
252 (progn | |
253 (vc-file-setprop file 'vc-checkout-time lastmod) | |
254 t) | |
255 (progn | |
256 (vc-file-setprop file 'vc-checkout-time '(0 . 0)) | |
257 nil | |
258 )) | |
259 ))) | |
260 | |
927 | 261 ;; Here's the major entry point. |
904 | 262 |
927 | 263 ;;;###autoload |
904 | 264 (defun vc-next-action (verbose) |
265 "Do the next logical checkin or checkout operation on the current file. | |
266 If the file is not already registered, this registers it for version | |
267 control and then retrieves a writeable, locked copy for editing. | |
268 If the file is registered and not locked by anyone, this checks out | |
269 a writeable and locked file ready for editing. | |
270 If the file is checked out and locked by the calling user, this | |
271 first checks to see if the file has changed since checkout. If not, | |
272 it performs a revert. | |
273 If the file has been changed, this pops up a buffer for creation of | |
274 a log message; when the message has been entered, it checks in the | |
275 resulting changes along with the log message as change commentary. If | |
276 the variable vc-keep-workfiles is non-nil (which is its default), a | |
277 read-only copy of the changed file is left in place afterwards. | |
278 If the file is registered and locked by someone else, you are given | |
279 the option to steal the lock." | |
280 (interactive "P") | |
281 (if buffer-file-name | |
282 (let | |
283 (do-update owner version | |
284 (file buffer-file-name) | |
285 (vc-file (vc-name buffer-file-name)) | |
286 (err-msg nil) | |
287 owner) | |
288 | |
289 (cond | |
290 | |
291 ;; if there is no master file corresponding, create one | |
292 ((not vc-file) | |
293 (vc-register verbose) | |
294 (vc-next-action verbose)) | |
295 | |
296 ;; if there is no lock on the file, assert one and get it | |
297 ((not (setq owner (vc-locking-user file))) | |
298 (vc-checkout file t)) | |
299 | |
300 ;; a checked-out version exists, but the user may not own the lock | |
301 ((not (string-equal owner (user-login-name))) | |
302 (vc-steal-lock | |
303 file | |
304 (and verbose (read-string "Version to steal: ")) | |
305 owner)) | |
306 | |
307 ;; OK, user owns the lock on the file | |
308 (t (progn | |
309 | |
310 ;; give luser a chance to save before checking in. | |
311 (vc-buffer-sync) | |
312 | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
313 ;; Revert if file is unchanged and buffer is too. |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
314 ;; If buffer is modified, that means the user just said no |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
315 ;; to saving it; in that case, don't revert, |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
316 ;; because the user might intend to save |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
317 ;; after finishing the log entry. |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
318 (if (and (vc-workfile-unchanged-p file) |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
319 (not (buffer-modified-p))) |
904 | 320 (progn |
321 (vc-backend-revert file) | |
1636
c2bea3f2f8cb
(vc-next-action): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1635
diff
changeset
|
322 ;; DO NOT revert the file without asking the user! |
c2bea3f2f8cb
(vc-next-action): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
1635
diff
changeset
|
323 (vc-resynch-window file t nil)) |
904 | 324 |
325 ;; user may want to set nonstandard parameters | |
326 (if verbose | |
327 (setq version (read-string "New version level: "))) | |
328 | |
329 ;; OK, let's do the checkin | |
330 (vc-checkin file version)))))) | |
331 (error "There is no file associated with buffer %s" (buffer-name)))) | |
332 | |
333 ;;; These functions help the vc-next-action entry point | |
334 | |
927 | 335 ;;;###autoload |
904 | 336 (defun vc-register (&optional override) |
337 "Register the current file into your version-control system." | |
338 (interactive "P") | |
339 (if (vc-name buffer-file-name) | |
340 (error "This file is already registered.")) | |
341 (vc-buffer-sync) | |
342 (vc-admin | |
343 buffer-file-name | |
344 (and override (read-string "Initial version level: "))) | |
345 ) | |
346 | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
347 (defun vc-resynch-window (file &optional keep noquery) |
904 | 348 ;; If the given file is in the current buffer, |
349 ;; either revert on it so we see expanded keyworks, | |
350 ;; or unvisit it (depending on vc-keep-workfiles) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
351 ;; NOQUERY if non-nil inhibits confirmation for reverting. |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
352 ;; NOQUERY should be t *only* if it is known the only difference |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
353 ;; between the buffer and the file is due to RCS rather than user editing! |
904 | 354 (and (string= buffer-file-name file) |
355 (if keep | |
356 (progn | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
357 (vc-revert-buffer1 nil noquery) |
904 | 358 (vc-mode-line buffer-file-name)) |
359 (progn | |
360 (delete-window) | |
361 (kill-buffer (current-buffer)))))) | |
362 | |
363 | |
364 (defun vc-admin (file rev) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
365 "Check a file into your version-control system. |
904 | 366 FILE is the unmodified name of the file. REV should be the base version |
367 level to check it in under." | |
368 (if vc-initial-comment | |
369 (progn | |
370 (pop-to-buffer (get-buffer-create "*VC-log*")) | |
371 (vc-log-mode) | |
372 (narrow-to-region (point-max) (point-max)) | |
373 (vc-mode-line file (file-name-nondirectory file)) | |
374 (setq vc-log-operation 'vc-backend-admin) | |
375 (setq vc-log-file file) | |
376 (setq vc-log-version rev) | |
377 (message "Enter initial comment. Type C-c C-c when done.")) | |
378 (progn | |
379 (vc-backend-admin file rev) | |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
380 ;; Inhibit query here, since otherwise we always get asked. |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
381 (vc-resynch-window file vc-keep-workfiles t)))) |
904 | 382 |
383 (defun vc-steal-lock (file rev &optional owner) | |
384 "Steal the lock on the current workfile." | |
385 (interactive) | |
386 (if (not owner) | |
387 (setq owner (vc-locking-user file))) | |
388 (if (not (y-or-n-p (format "Take the lock on %s:%s from %s?" file rev owner))) | |
389 (error "Steal cancelled.")) | |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
390 (require 'sendmail) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
391 (pop-to-buffer (get-buffer-create "*VC-mail*")) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
392 (setq default-directory (expand-file-name "~/")) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
393 (auto-save-mode auto-save-default) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
394 (mail-mode) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
395 (erase-buffer) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
396 (mail-setup owner (format "%s:%s" file rev) nil nil nil |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
397 (list (list 'vc-finish-steal file rev))) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
398 (goto-char (point-max)) |
904 | 399 (insert |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
400 (format "I stole the lock on %s:%s, " file rev) |
904 | 401 (current-time-string) |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
402 ".\n") |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
403 (message "Please explain why you stole the lock. Type C-c C-c when done.")) |
904 | 404 |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
405 ;; This is called when the notification has been sent. |
904 | 406 (defun vc-finish-steal (file version) |
407 (vc-backend-steal file version) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
408 (vc-resynch-window file t t)) |
904 | 409 |
410 (defun vc-checkout (file &optional writeable) | |
411 "Retrieve a copy of the latest version of the given file." | |
412 (vc-backend-checkout file writeable) | |
413 (if (string-equal file buffer-file-name) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
414 (vc-resynch-window file t t)) |
904 | 415 ) |
416 | |
417 (defun vc-checkin (file &optional rev comment) | |
418 "Check in the file specified by FILE. | |
419 The optional argument REV may be a string specifying the new version level | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
420 \(if nil increment the current level). The file is either retained with write |
904 | 421 permissions zeroed, or deleted (according to the value of vc-keep-workfiles). |
422 COMMENT is a comment string; if omitted, a buffer is | |
423 popped up to accept a comment." | |
424 (pop-to-buffer (get-buffer-create "*VC-log*")) | |
425 (vc-log-mode) | |
426 (narrow-to-region (point-max) (point-max)) | |
427 (vc-mode-line file (file-name-nondirectory file)) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
428 (setq vc-log-operation 'vc-backend-checkin |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
429 vc-log-file file |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
430 vc-log-version rev |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
431 vc-log-after-operation-hook 'vc-checkin-hook) |
904 | 432 (message "Enter log message. Type C-c C-c when done.") |
433 (if comment | |
434 (progn | |
435 (insert comment) | |
436 (vc-finish-logentry)))) | |
437 | |
438 (defun vc-finish-logentry () | |
439 "Complete the operation implied by the current log entry." | |
440 (interactive) | |
441 (goto-char (point-max)) | |
442 (if (not (bolp)) (newline)) | |
443 ;; delimit current page | |
444 (save-excursion | |
445 (widen) | |
446 (goto-char (point-max)) | |
447 (if (and (not (bobp)) (not (= (char-after (1- (point))) ?\f))) | |
448 (insert-char ?\f 1))) | |
449 (if (not (bobp)) | |
450 (forward-char -1)) | |
451 (mark-page) | |
452 ;; Check for errors | |
453 (vc-backend-logentry-check vc-log-file) | |
454 ;; OK, do it to it | |
455 (if vc-log-operation | |
456 (funcall vc-log-operation | |
457 vc-log-file | |
458 vc-log-version | |
459 (buffer-substring (region-beginning) (1- (region-end)))) | |
460 (error "No log operation is pending.")) | |
461 ;; Return to "parent" buffer of this checkin and remove checkin window | |
462 (pop-to-buffer (get-file-buffer vc-log-file)) | |
463 (delete-window (get-buffer-window "*VC-log*")) | |
464 (bury-buffer "*VC-log*") | |
465 ;; Now make sure we see the expanded headers | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
466 (vc-resynch-window buffer-file-name vc-keep-workfiles t) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
467 (run-hooks vc-log-after-operation-hook) |
904 | 468 ) |
469 | |
470 ;; Code for access to the comment ring | |
471 | |
472 (defun vc-next-comment () | |
473 "Fill the log buffer with the next message in the msg ring." | |
474 (interactive) | |
475 (widen) | |
476 (forward-page) | |
477 (if (= (point) (point-max)) | |
478 (goto-char (point-min))) | |
479 (mark-page) | |
480 (narrow-to-page)) | |
481 | |
482 (defun vc-previous-comment () | |
483 "Fill the log buffer with the previous message in the msg ring." | |
484 (interactive) | |
485 (widen) | |
486 (if (= (point) (point-min)) | |
487 (goto-char (point-max))) | |
488 (backward-page) | |
489 (mark-page) | |
490 (narrow-to-page)) | |
491 | |
492 (defun vc-comment-search-backward (regexp) | |
493 "Fill the log buffer with the last message in the msg ring matching REGEXP." | |
494 (interactive "sSearch backward for: ") | |
495 (widen) | |
496 (if (= (point) (point-min)) | |
497 (goto-char (point-max))) | |
498 (re-search-backward regexp nil t) | |
499 (mark-page) | |
500 (narrow-to-page)) | |
501 | |
502 (defun vc-comment-search-forward (regexp) | |
503 "Fill the log buffer with the next message in the msg ring matching REGEXP." | |
504 (interactive "sSearch forward for: ") | |
505 (widen) | |
506 (if (= (point) (point-min)) | |
507 (goto-char (point-max))) | |
508 (re-search-forward regexp nil t) | |
509 (mark-page) | |
510 (narrow-to-page)) | |
511 | |
512 ;; Additional entry points for examining version histories | |
513 | |
927 | 514 ;;;###autoload |
904 | 515 (defun vc-diff (historic) |
516 "Display diffs between file versions." | |
517 (interactive "P") | |
518 (if historic | |
519 (call-interactively 'vc-version-diff) | |
520 (let ((old | |
521 (and | |
522 current-prefix-arg | |
523 (read-string "Version to compare against: "))) | |
524 (file buffer-file-name) | |
525 unchanged) | |
526 (vc-buffer-sync) | |
527 (setq unchanged (vc-workfile-unchanged-p buffer-file-name)) | |
528 (if unchanged | |
529 (message (format "No changes to %s since latest version." file)) | |
530 (pop-to-buffer "*vc*") | |
531 (vc-backend-diff file nil) | |
532 (goto-char (point-min)) | |
533 ) | |
534 (not unchanged) | |
535 ) | |
536 ) | |
537 ) | |
538 | |
539 (defun vc-version-diff (file rel1 rel2) | |
540 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | |
541 If FILE is a directory, generate diffs between versions for all registered | |
542 files in or below it." | |
543 (interactive "FFile or directory: \nsOlder version: \nsNewer version: ") | |
544 (if (string-equal rel1 "") (setq rel1 nil)) | |
545 (if (string-equal rel2 "") (setq rel2 nil)) | |
546 (if (file-directory-p file) | |
547 (progn | |
548 (set-buffer (get-buffer-create "*vc-status*")) | |
549 (erase-buffer) | |
550 (insert "Diffs between " rel1 " and " rel2 ":\n\n") | |
551 (set-buffer (get-buffer-create "*vc*")) | |
552 (vc-file-tree-walk | |
553 (function (lambda (f) | |
554 (and | |
555 (not (file-directory-p f)) | |
556 (vc-name f) | |
557 (vc-backend-diff f rel1 rel2)) | |
558 (append-to-buffer "*vc-status*" (point-min) (point-max)) | |
559 )) | |
560 default-directory) | |
561 (pop-to-buffer "*vc-status*") | |
562 (insert "\nEnd of diffs.\n") | |
563 (goto-char (point-min)) | |
564 (set-buffer-modified-p nil) | |
565 ) | |
566 (progn | |
567 (vc-backend-diff file rel1 rel2) | |
568 (goto-char (point-min)) | |
569 (if (equal (point-min) (point-max)) | |
570 (message (format "No changes to %s between %s and %s." file rel1 rel2)) | |
571 (pop-to-buffer "*vc*") | |
572 (goto-char (point-min)) | |
573 ) | |
574 ) | |
575 ) | |
576 ) | |
577 | |
578 ;; Header-insertion code | |
579 | |
927 | 580 ;;;###autoload |
904 | 581 (defun vc-insert-headers () |
582 "Insert headers in a file for use with your version-control system. | |
583 Headers desired are inserted at the start of the buffer, and are pulled from | |
584 the variable vc-header-strings" | |
585 (interactive) | |
586 (save-excursion | |
587 (save-restriction | |
588 (widen) | |
589 (if (or (not (vc-check-headers)) | |
590 (y-or-n-p "Version headers already exist. Insert another set?")) | |
591 (progn | |
592 (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
593 (comment-start-vc (or (car delims) comment-start "#")) | |
594 (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
595 (hdstrings (cdr (assoc (vc-backend-deduce (buffer-file-name)) vc-header-alist)))) | |
596 (mapcar (function (lambda (s) | |
597 (insert comment-start-vc "\t" s "\t" | |
598 comment-end-vc "\n"))) | |
599 hdstrings) | |
600 (if vc-static-header-alist | |
601 (mapcar (function (lambda (f) | |
602 (if (string-match (car f) buffer-file-name) | |
603 (insert (format (cdr f) (car hdstrings)))))) | |
604 vc-static-header-alist)) | |
605 ) | |
606 ))))) | |
607 | |
608 ;; Status-checking functions | |
609 | |
927 | 610 ;;;###autoload |
904 | 611 (defun vc-directory (verbose) |
612 "Show version-control status of all files under the current directory." | |
613 (interactive "P") | |
614 (let ((dir (substring default-directory 0 (1- (length default-directory)))) | |
615 nonempty) | |
616 (save-excursion | |
617 (set-buffer (get-buffer-create "*vc-status*")) | |
618 (erase-buffer) | |
619 (vc-file-tree-walk | |
620 (function (lambda (f) | |
621 (if (vc-registered f) | |
622 (let ((user (vc-locking-user f))) | |
623 (if (or user verbose) | |
624 (insert (format | |
625 "%s %s\n" | |
626 (concat user) f))))))) | |
627 dir) | |
628 (setq nonempty (not (zerop (buffer-size))))) | |
629 (if nonempty | |
630 (progn | |
631 (pop-to-buffer "*vc-status*" t) | |
632 (vc-shrink-to-fit) | |
633 (goto-char (point-min))) | |
634 (message "No files are currently registered under %s" dir)) | |
635 )) | |
636 | |
637 ;; Named-configuration support for SCCS | |
638 | |
639 (defun vc-add-triple (name file rev) | |
640 (save-excursion | |
641 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file)) | |
642 (goto-char (point-max)) | |
643 (insert name "\t:\t" file "\t" rev "\n") | |
644 (basic-save-buffer) | |
645 (kill-buffer (current-buffer)) | |
646 )) | |
647 | |
648 (defun vc-record-rename (file newname) | |
649 (save-excursion | |
650 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file)) | |
651 (goto-char (point-min)) | |
652 (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname)) | |
653 (basic-save-buffer) | |
654 (kill-buffer (current-buffer)) | |
655 )) | |
656 | |
657 (defun vc-lookup-triple (file name) | |
658 (or | |
659 name | |
660 (let ((firstchar (aref name 0))) | |
661 (and (>= firstchar ?0) (<= firstchar ?9) name)) | |
662 (car (vc-master-info | |
663 (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file) | |
664 (list (concat name "\t:\t" file "\t\\(.+\\)")))) | |
665 )) | |
666 | |
667 ;; Named-configuration entry points | |
668 | |
669 (defun vc-quiescent-p () | |
670 ;; Is the current directory ready to be snapshot? | |
671 (let ((dir (substring default-directory 0 (1- (length default-directory))))) | |
672 (catch 'quiet | |
673 (vc-file-tree-walk | |
674 (function (lambda (f) | |
675 (if (and (vc-registered f) (vc-locking-user f)) | |
676 (throw 'quiet nil)))) | |
677 dir) | |
678 t))) | |
679 | |
927 | 680 ;;;###autoload |
904 | 681 (defun vc-create-snapshot (name) |
682 "Make a snapshot called NAME. | |
683 The snapshot is made from all registered files at or below the current | |
684 directory. For each file, the version level of its latest | |
685 version becomes part of the named configuration." | |
686 (interactive "sNew snapshot name: ") | |
687 (if (not (vc-quiescent-p)) | |
688 (error "Can't make a snapshot, locked files are in the way.") | |
689 (vc-file-tree-walk | |
690 (function (lambda (f) (and | |
691 (not (file-directory-p f)) | |
692 (vc-name f) | |
693 (vc-backend-assign-name f name)))) | |
694 default-directory) | |
695 )) | |
696 | |
927 | 697 ;;;###autoload |
904 | 698 (defun vc-retrieve-snapshot (name) |
699 "Retrieve the snapshot called NAME. | |
700 This function fails if any files are locked at or below the current directory | |
701 Otherwise, all registered files are checked out (unlocked) at their version | |
702 levels in the snapshot." | |
703 (interactive "sSnapshot name to retrieve: ") | |
704 (if (not (vc-quiescent-p)) | |
705 (error "Can't retrieve a snapshot, locked files are in the way.") | |
706 (vc-file-tree-walk | |
707 (function (lambda (f) (and | |
708 (not (file-directory-p f)) | |
709 (vc-name f) | |
710 (vc-error-occurred (vc-backend-checkout f nil name))))) | |
711 default-directory) | |
712 )) | |
713 | |
714 ;; Miscellaneous other entry points | |
715 | |
927 | 716 ;;;###autoload |
904 | 717 (defun vc-print-log () |
718 "List the change log of the current buffer in a window." | |
719 (interactive) | |
720 (if (and buffer-file-name (vc-name buffer-file-name)) | |
721 (progn | |
722 (vc-backend-print-log buffer-file-name) | |
723 (pop-to-buffer (get-buffer-create "*vc*")) | |
724 (goto-char (point-min)) | |
725 ) | |
726 (error "There is no version-control master associated with this buffer") | |
727 ) | |
728 ) | |
729 | |
927 | 730 ;;;###autoload |
904 | 731 (defun vc-revert-buffer () |
952 | 732 "Revert the current buffer's file back to the latest checked-in version. |
733 This asks for confirmation if the buffer contents are not identical | |
734 to that version." | |
904 | 735 (interactive) |
736 (let ((file buffer-file-name) | |
737 (obuf (current-buffer)) (changed (vc-diff nil))) | |
952 | 738 (if (and changed (or vc-suppress-confirm |
739 (not (yes-or-no-p "Discard changes? ")))) | |
904 | 740 (progn |
741 (delete-window) | |
742 (error "Revert cancelled.")) | |
743 (set-buffer obuf)) | |
744 (if changed | |
745 (delete-window)) | |
746 (vc-backend-revert file) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
747 (vc-resynch-window file t t) |
904 | 748 ) |
749 ) | |
750 | |
927 | 751 ;;;###autoload |
904 | 752 (defun vc-cancel-version (norevert) |
753 "Undo your latest checkin." | |
754 (interactive "P") | |
755 (let ((target (vc-your-latest-version (buffer-file-name)))) | |
756 (if (null target) | |
757 (error "You didn't check in the last change.")) | |
1575
ae13f4027ebd
(vc-cancel-version): Use yes-or-no-p.
Richard M. Stallman <rms@gnu.org>
parents:
1494
diff
changeset
|
758 (and (yes-or-no-p (format "Remove version %s from master? " target)) |
904 | 759 (vc-backend-uncheck (buffer-file-name) target))) |
760 (if norevert | |
761 (vc-mode-line (buffer-file-name)) | |
762 (vc-checkout (buffer-file-name) nil)) | |
763 ) | |
764 | |
765 (defun vc-rename-file (old new) | |
766 "Rename a file, taking its master files with it." | |
767 (interactive "fOld name: \nFNew name: ") | |
768 (let ((oldbuf (get-file-buffer old))) | |
769 (if (buffer-modified-p oldbuf) | |
770 (error "Please save files before moving them.")) | |
771 (if (get-file-buffer new) | |
772 (error "Already editing new file name.")) | |
773 (let ((oldmaster (vc-name old))) | |
774 (if oldmaster | |
775 (if (vc-locking-user old) | |
776 (error "Please check in files before moving them.")) | |
777 (if (or (file-symlink-p oldmaster) | |
1243
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
778 ;; This had FILE, I changed it to OLD. -- rms. |
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
779 (file-symlink-p (vc-backend-subdirectory-name old))) |
904 | 780 (error "This is not a safe thing to do in the presence of symbolic links.")) |
781 (rename-file oldmaster (vc-name new))) | |
782 (if (or (not oldmaster) (file-exists-p old)) | |
783 (rename-file old new))) | |
784 ; ?? Renaming a file might change its contents due to keyword expansion. | |
785 ; We should really check out a new copy if the old copy was precisely equal | |
786 ; to some checked in version. However, testing for this is tricky.... | |
787 (if oldbuf | |
788 (save-excursion | |
789 (set-buffer oldbuf) | |
790 (set-visited-file-name new) | |
791 (set-buffer-modified-p nil)))) | |
1243
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
792 ;; This had FILE, I changed it to OLD. -- rms. |
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
793 (vc-backend-dispatch old |
904 | 794 (vc-record-rename old new) |
795 nil) | |
796 ) | |
797 | |
927 | 798 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
799 (defun vc-update-change-log (&rest args) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
800 "Find change log file and add entries from recent RCS logs. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
801 The mark is left at the end of the text prepended to the change log. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
802 With prefix arg of C-u, only find log entries for the current buffer's file. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
803 With any numeric prefix arg, find log entries for all files currently visited. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
804 From a program, any arguments are passed to the `rcs2log' script." |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
805 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
806 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
807 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
808 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
809 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
810 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
811 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
812 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
813 (setq file (buffer-file-name (car buffers))) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
814 (and file (vc-backend-deduce file) |
1232
2c56a159c9b6
(vc-update-change-log): Use file-relative-name.
Roland McGrath <roland@gnu.org>
parents:
1227
diff
changeset
|
815 (setq files (cons (file-relative-name file) files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
816 (setq buffers (cdr buffers))) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
817 files)))) |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
818 (find-file-other-window "ChangeLog") |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
819 (vc-buffer-sync) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
820 (undo-boundary) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
821 (goto-char (point-min)) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
822 (message "Computing change log entries...") |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
823 (shell-command (mapconcat 'identity (cons "rcs2log" args) " ") t) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
824 (message "Computing change log entries... done")) |
904 | 825 |
826 ;; Functions for querying the master and lock files. | |
827 | |
828 (defun match-substring (bn) | |
829 (buffer-substring (match-beginning bn) (match-end bn))) | |
830 | |
831 (defun vc-parse-buffer (patterns &optional file properties) | |
832 ;; Use PATTERNS to parse information out of the current buffer | |
833 ;; by matching each regular expression in the list and returning \\1. | |
834 ;; If a regexp has two tag brackets, assume the second is a date | |
835 ;; field and we want the most recent entry matching the template. | |
836 ;; If FILE and PROPERTIES are given, the latter must be a list of | |
837 ;; properties of the same length as PATTERNS; each property is assigned | |
838 ;; the corresponding value. | |
839 (mapcar (function (lambda (p) | |
840 (goto-char (point-min)) | |
841 (if (string-match "\\\\(.*\\\\(" p) | |
842 (let ((latest-date "") (latest-val)) | |
843 (while (re-search-forward p nil t) | |
844 (let ((date (match-substring 2))) | |
845 (if (string< latest-date date) | |
846 (progn | |
847 (setq latest-date date) | |
848 (setq latest-val | |
849 (match-substring 1)))))) | |
850 latest-val)) | |
851 (prog1 | |
852 (and (re-search-forward p nil t) | |
853 (let ((value (match-substring 1))) | |
854 (if file | |
855 (vc-file-setprop file (car properties) value)) | |
856 value)) | |
857 (setq properties (cdr properties))))) | |
858 patterns) | |
859 ) | |
860 | |
861 (defun vc-master-info (file fields &optional rfile properties) | |
862 ;; Search for information in a master file. | |
863 (if (and file (file-exists-p file)) | |
864 (save-excursion | |
865 (let ((buf)) | |
866 (setq buf (create-file-buffer file)) | |
867 (set-buffer buf)) | |
868 (erase-buffer) | |
869 (insert-file-contents file nil) | |
870 (set-buffer-modified-p nil) | |
871 (auto-save-mode nil) | |
872 (prog1 | |
873 (vc-parse-buffer fields rfile properties) | |
874 (kill-buffer (current-buffer))) | |
875 ) | |
876 (if rfile | |
877 (mapcar | |
878 (function (lambda (p) (vc-file-setprop rfile p nil))) | |
879 properties)) | |
880 ) | |
881 ) | |
882 | |
883 (defun vc-log-info (command file patterns &optional properties) | |
884 ;; Search for information in log program output | |
885 (if (and file (file-exists-p file)) | |
886 (save-excursion | |
887 (let ((buf)) | |
888 (setq buf (get-buffer-create "*vc*")) | |
889 (set-buffer buf)) | |
890 (apply 'vc-do-command 0 command file nil) | |
891 (set-buffer-modified-p nil) | |
892 (prog1 | |
893 (vc-parse-buffer patterns file properties) | |
894 (kill-buffer (current-buffer)) | |
895 ) | |
896 ) | |
897 (if file | |
898 (mapcar | |
899 (function (lambda (p) (vc-file-setprop file p nil))) | |
900 properties)) | |
901 ) | |
902 ) | |
903 | |
904 (defun vc-locking-user (file) | |
905 "Return the name of the person currently holding a lock on FILE. | |
906 Return nil if there is no such person." | |
907 (if (or (not vc-keep-workfiles) | |
908 (eq vc-mistrust-permissions 't) | |
909 (and vc-mistrust-permissions | |
910 (funcall vc-mistrust-permissions (vc-backend-subdirectory-name file)))) | |
911 (vc-true-locking-user file) | |
912 ;; This implementation assumes that any file which is under version | |
913 ;; control and has -rw-r--r-- is locked by its owner. This is true | |
914 ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--. | |
915 ;; We have to be careful not to exclude files with execute bits on; | |
916 ;; scripts can be under version control too. The advantage of this | |
917 ;; hack is that calls to the very expensive vc-fetch-properties | |
918 ;; function only have to be made if (a) the file is locked by someone | |
919 ;; other than the current user, or (b) some untoward manipulation | |
920 ;; behind vc's back has twiddled the `group' or `other' write bits. | |
921 (let ((attributes (file-attributes file))) | |
922 (cond ((string-match ".r-.r-.r-." (nth 8 attributes)) | |
923 nil) | |
924 ((and (= (nth 2 attributes) (user-uid)) | |
925 (string-match ".rw.r-.r-." (nth 8 attributes))) | |
926 (user-login-name)) | |
927 (t | |
928 (vc-true-locking-user file)))))) | |
929 | |
930 (defun vc-true-locking-user (file) | |
931 ;; The slow but reliable version | |
932 (vc-fetch-properties file) | |
933 (vc-file-getprop file 'vc-locking-user)) | |
934 | |
935 (defun vc-latest-version (file) | |
936 ;; Return version level of the latest version of FILE | |
937 (vc-fetch-properties file) | |
938 (vc-file-getprop file 'vc-latest-version)) | |
939 | |
940 (defun vc-your-latest-version (file) | |
941 ;; Return version level of the latest version of FILE checked in by you | |
942 (vc-fetch-properties file) | |
943 (vc-file-getprop file 'vc-your-latest-version)) | |
944 | |
945 ;; Collect back-end-dependent stuff here | |
946 ;; | |
947 ;; Everything eventually funnels through these functions. To implement | |
948 ;; support for a new version-control system, add another branch to the | |
949 ;; vc-backend-dispatch macro (in vc-hooks.el) and fill it in in each call. | |
950 | |
951 (defmacro vc-backend-dispatch (f s r) | |
952 "Execute FORM1 or FORM2 depending on whether we're using SCCS or RCS." | |
953 (list 'let (list (list 'type (list 'vc-backend-deduce f))) | |
954 (list 'cond | |
955 (list (list 'eq 'type (quote 'SCCS)) s) ;; SCCS | |
956 (list (list 'eq 'type (quote 'RCS)) r) ;; RCS | |
957 ))) | |
958 | |
959 (defun vc-lock-file (file) | |
960 ;; Generate lock file name corresponding to FILE | |
961 (let ((master (vc-name file))) | |
962 (and | |
963 master | |
964 (string-match "\\(.*/\\)s\\.\\(.*\\)" master) | |
965 (concat | |
966 (substring master (match-beginning 1) (match-end 1)) | |
967 "p." | |
968 (substring master (match-beginning 2) (match-end 2)))))) | |
969 | |
970 | |
971 (defun vc-fetch-properties (file) | |
972 ;; Re-fetch all properties associated with the given file. | |
973 ;; Currently these properties are: | |
974 ;; vc-locking-user | |
975 ;; vc-locked-version | |
976 ;; vc-latest-version | |
977 ;; vc-your-latest-version | |
978 (vc-backend-dispatch | |
979 file | |
980 ;; SCCS | |
981 (progn | |
982 (vc-master-info (vc-lock-file file) | |
983 (list | |
984 "^[^ ]+ [^ ]+ \\([^ ]+\\)" | |
985 "^\\([^ ]+\\)") | |
986 file | |
987 '(vc-locking-user vc-locked-version)) | |
988 (vc-master-info (vc-name file) | |
989 (list | |
990 "^\001d D \\([^ ]+\\)" | |
991 (concat "^\001d D \\([^ ]+\\) .* " | |
992 (regexp-quote (user-login-name)) " ") | |
993 ) | |
994 file | |
995 '(vc-latest-version vc-your-latest-version)) | |
996 ) | |
997 ;; RCS | |
998 (vc-log-info "rlog" file | |
999 (list | |
1000 "^locks: strict\n\t\\([^:]+\\)" | |
1001 "^locks: strict\n\t[^:]+: \\(.+\\)" | |
1002 "^revision[\t ]+\\([0-9.]+\\).*\ndate: \\([ /0-9:]+\\);" | |
1003 (concat | |
1004 "^revision[\t ]+\\([0-9.]+\\).*locked by: " | |
1005 (regexp-quote (user-login-name)) | |
1006 ";\ndate: \\([ /0-9:]+\\);")) | |
1007 '(vc-locking-user vc-locked-version | |
1008 vc-latest-version vc-your-latest-version)) | |
1009 )) | |
1010 | |
1011 (defun vc-backend-subdirectory-name (&optional file) | |
1012 ;; Where the master and lock files for the current directory are kept | |
1013 (symbol-name | |
1014 (or | |
1015 (and file (vc-backend-deduce file)) | |
1016 vc-default-back-end | |
1017 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))))) | |
1018 | |
1019 (defun vc-backend-admin (file &optional rev comment) | |
1020 ;; Register a file into the version-control system | |
1021 ;; Automatically retrieves a read-only version of the file with | |
1022 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
1023 ;; it deletes the workfile. | |
1024 (vc-file-clearprops file) | |
1025 (or vc-default-back-end | |
1026 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))) | |
1027 (message "Registering %s..." file) | |
1028 (let ((backend | |
1029 (cond | |
1030 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end) | |
1031 ((file-exists-p "RCS") 'RCS) | |
1032 ((file-exists-p "SCCS") 'SCCS) | |
1033 (t vc-default-back-end)))) | |
1034 (cond ((eq backend 'SCCS) | |
1035 (vc-do-command 0 "admin" file ;; SCCS | |
1036 (and rev (concat "-r" rev)) | |
1037 "-fb" | |
1038 (concat "-i" file) | |
1039 (and comment (concat "-y" comment)) | |
1040 (format | |
1041 (car (rassq 'SCCS vc-master-templates)) | |
1042 (or (file-name-directory file) "") | |
1043 (file-name-nondirectory file))) | |
1044 (delete-file file) | |
1045 (if vc-keep-workfiles | |
1046 (vc-do-command 0 "get" file))) | |
1047 ((eq backend 'RCS) | |
1048 (vc-do-command 0 "ci" file ;; RCS | |
1049 (concat (if vc-keep-workfiles "-u" "-r") rev) | |
1050 (and comment (concat "-t-" comment)) | |
1051 file) | |
1052 ))) | |
1053 (message "Registering %s...done" file) | |
1054 ) | |
1055 | |
1056 (defun vc-backend-checkout (file &optional writeable rev) | |
1057 ;; Retrieve a copy of a saved version into a workfile | |
1058 (message "Checking out %s..." file) | |
1059 (vc-backend-dispatch file | |
1060 (progn | |
1061 (vc-do-command 0 "get" file ;; SCCS | |
1062 (if writeable "-e") | |
1063 (and rev (concat "-r" (vc-lookup-triple file rev)))) | |
1064 ) | |
1065 (vc-do-command 0 "co" file ;; RCS | |
1066 (if writeable "-l") | |
1067 (and rev (concat "-r" rev))) | |
1068 ) | |
1069 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file))) | |
1070 (message "Checking out %s...done" file) | |
1071 ) | |
1072 | |
1073 (defun vc-backend-logentry-check (file) | |
1074 (vc-backend-dispatch file | |
1075 (if (>= (- (region-end) (region-beginning)) 512) ;; SCCS | |
1076 (progn | |
1077 (goto-char 512) | |
1078 (error | |
1079 "Log must be less than 512 characters. Point is now at char 512."))) | |
1080 nil) | |
1081 ) | |
1082 | |
1083 (defun vc-backend-checkin (file &optional rev comment) | |
1084 ;; Register changes to FILE as level REV with explanatory COMMENT. | |
1085 ;; Automatically retrieves a read-only version of the file with | |
1086 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
1087 ;; it deletes the workfile. | |
1088 (message "Checking in %s..." file) | |
1337
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1089 (save-excursion |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1090 ;; Change buffers to get local value of vc-checkin-switches. |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1091 (set-buffer (or (get-file-buffer file) (current-buffer))) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1092 (vc-backend-dispatch file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1093 (progn |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1094 (apply 'vc-do-command 0 "delta" file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1095 (if rev (concat "-r" rev)) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1096 (concat "-y" comment) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1097 vc-checkin-switches) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1098 (if vc-keep-workfiles |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1099 (vc-do-command 0 "get" file)) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1100 ) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1101 (apply 'vc-do-command 0 "ci" file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1102 (concat (if vc-keep-workfiles "-u" "-r") rev) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1103 (concat "-m" comment) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1104 vc-checkin-switches) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1105 )) |
904 | 1106 (vc-file-setprop file 'vc-locking-user nil) |
1107 (message "Checking in %s...done" file) | |
1108 ) | |
1109 | |
1110 (defun vc-backend-revert (file) | |
1111 ;; Revert file to latest checked-in version. | |
1112 (message "Reverting %s..." file) | |
1113 (vc-backend-dispatch | |
1114 file | |
1115 (progn ;; SCCS | |
1116 (vc-do-command 0 "unget" file nil) | |
1117 (vc-do-command 0 "get" file nil)) | |
1118 (progn | |
1119 (delete-file file) ;; RCS | |
1120 (vc-do-command 0 "co" file "-u"))) | |
1121 (vc-file-setprop file 'vc-locking-user nil) | |
1122 (message "Reverting %s...done" file) | |
1123 ) | |
1124 | |
1125 (defun vc-backend-steal (file &optional rev) | |
1126 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M. | |
1127 (message "Stealing lock on %s..." file) | |
1128 (progn | |
1129 (vc-do-command 0 "unget" file "-n" (if rev (concat "-r" rev))) | |
1130 (vc-do-command 0 "get" file "-g" (if rev (concat "-r" rev))) | |
1131 ) | |
1132 (progn | |
1344
8d047d2d2592
(vc-backend-steal): Put filename after options in rcs commands.
Richard M. Stallman <rms@gnu.org>
parents:
1343
diff
changeset
|
1133 (vc-do-command 0 "rcs" "-M" (concat "-u" rev) file) |
1352
a8623439066b
(vc-backend-steal): Delete the workfile after the rcs -M -u.
Richard M. Stallman <rms@gnu.org>
parents:
1344
diff
changeset
|
1134 (delete-file file) |
1344
8d047d2d2592
(vc-backend-steal): Put filename after options in rcs commands.
Richard M. Stallman <rms@gnu.org>
parents:
1343
diff
changeset
|
1135 (vc-do-command 0 "rcs" (concat "-l" rev) file) |
904 | 1136 ) |
1137 (vc-file-setprop file 'vc-locking-user (user-login-name)) | |
1138 (message "Stealing lock on %s...done" file) | |
1139 ) | |
1140 | |
1141 (defun vc-backend-uncheck (file target) | |
1142 ;; Undo the latest checkin. Note: this code will have to get a lot | |
1143 ;; smarter when we support multiple branches. | |
1144 (message "Removing last change from %s..." file) | |
1145 (vc-backend-dispatch file | |
1146 (vc-do-command 0 "rmdel" file (concat "-r" target)) | |
1147 (vc-do-command 0 "rcs" file (concat "-o" target)) | |
1148 ) | |
1149 (message "Removing last change from %s...done" file) | |
1150 ) | |
1151 | |
1152 (defun vc-backend-print-log (file) | |
1153 ;; Print change log associated with FILE to buffer *vc*. | |
1154 (vc-do-command 0 | |
1155 (vc-backend-dispatch file "prs" "rlog") | |
1156 file) | |
1157 ) | |
1158 | |
1159 (defun vc-backend-assign-name (file name) | |
1160 ;; Assign to a FILE's latest version a given NAME. | |
1161 (vc-backend-dispatch file | |
1162 (vc-add-triple name file (vc-latest-version file)) ;; SCCS | |
1163 (vc-do-command 0 "rcs" file (concat "-n" name ":")) ;; RCS | |
1164 )) | |
1165 | |
1166 (defun vc-backend-diff (file oldvers &optional newvers) | |
1167 ;; Get a difference report between two versions | |
1168 (apply 'vc-do-command 1 | |
1169 (or (vc-backend-dispatch file "vcdiff" "rcsdiff") | |
1170 (error (format "File %s is not under version control." file))) | |
1171 file | |
1172 (and oldvers (concat "-r" oldvers)) | |
1173 (and newvers (concat "-r" newvers)) | |
1174 vc-diff-options | |
1175 )) | |
1176 | |
1177 (defun vc-check-headers () | |
1178 "Check if the current file has any headers in it." | |
1179 (interactive) | |
1180 (save-excursion | |
1181 (goto-char (point-min)) | |
1182 (vc-backend-dispatch buffer-file-name | |
1183 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS | |
1184 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS | |
1185 ) | |
1186 )) | |
1187 | |
1188 ;; Back-end-dependent stuff ends here. | |
1189 | |
1190 ;; Set up key bindings for use while editing log messages | |
1191 | |
1192 (defun vc-log-mode () | |
1193 "Minor mode for driving version-control tools. | |
1194 These bindings are added to the global keymap when you enter this mode: | |
1195 \\[vc-next-action] perform next logical version-control operation on current file | |
1196 \\[vc-register] register current file | |
1197 \\[vc-toggle-read-only] like next-action, but won't register files | |
1198 \\[vc-insert-headers] insert version-control headers in current file | |
1199 \\[vc-print-log] display change history of current file | |
1200 \\[vc-revert-buffer] revert buffer to latest version | |
1201 \\[vc-cancel-version] undo latest checkin | |
1202 \\[vc-diff] show diffs between file versions | |
1203 \\[vc-directory] show all files locked by any user in or below . | |
1204 \\[vc-update-change-log] add change log entry from recent checkins | |
1205 | |
1206 While you are entering a change log message for a version, the following | |
1207 additional bindings will be in effect. | |
1208 | |
1209 \\[vc-finish-logentry] proceed with check in, ending log message entry | |
1210 | |
1211 Whenever you do a checkin, your log comment is added to a ring of | |
1212 saved comments. These can be recalled as follows: | |
1213 | |
1214 \\[vc-next-comment] replace region with next message in comment ring | |
1215 \\[vc-previous-comment] replace region with previous message in comment ring | |
1216 \\[vc-search-comment-reverse] search backward for regexp in the comment ring | |
1217 \\[vc-search-comment-forward] search backward for regexp in the comment ring | |
1218 | |
1219 Entry to the change-log submode calls the value of text-mode-hook, then | |
1220 the value of vc-log-mode-hook. | |
1221 | |
1222 Global user options: | |
1223 vc-initial-comment If non-nil, require user to enter a change | |
1224 comment upon first checkin of the file. | |
1225 | |
1226 vc-keep-workfiles Non-nil value prevents workfiles from being | |
1227 deleted when changes are checked in | |
1228 | |
1229 vc-suppress-confirm Suppresses some confirmation prompts, | |
1230 notably for reversions. | |
1231 | |
1232 vc-diff-options A list consisting of the flags | |
1233 to be used for generating context diffs. | |
1234 | |
1235 vc-header-strings Which keywords to insert when adding headers | |
1236 with \\[vc-insert-headers]. Defaults to | |
1237 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS. | |
1238 | |
1239 vc-static-header-alist By default, version headers inserted in C files | |
1240 get stuffed in a static string area so that | |
1241 ident(RCS) or what(SCCS) can see them in the | |
1242 compiled object code. You can override this | |
1243 by setting this variable to nil, or change | |
1244 the header template by changing it. | |
1245 | |
1246 vc-command-messages if non-nil, display run messages from the | |
1247 actual version-control utilities (this is | |
1248 intended primarily for people hacking vc | |
1249 itself). | |
1250 " | |
1251 (interactive) | |
1252 (set-syntax-table text-mode-syntax-table) | |
1253 (use-local-map vc-log-entry-mode) | |
1254 (setq local-abbrev-table text-mode-abbrev-table) | |
1255 (setq major-mode 'vc-log-mode) | |
1256 (setq mode-name "VC-Log") | |
1257 (make-local-variable 'vc-log-file) | |
1258 (make-local-variable 'vc-log-version) | |
1259 (set-buffer-modified-p nil) | |
1260 (setq buffer-file-name nil) | |
1261 (run-hooks 'text-mode-hook 'vc-log-mode-hook) | |
1262 ) | |
1263 | |
1264 ;; Initialization code, to be done just once at load-time | |
1265 (if vc-log-entry-mode | |
1266 nil | |
1267 (setq vc-log-entry-mode (make-sparse-keymap)) | |
1268 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment) | |
1269 (define-key vc-log-entry-mode "\M-p" 'vc-previous-comment) | |
1270 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-backward) | |
1271 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward) | |
1272 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry) | |
1273 ) | |
1274 | |
1275 ;;; These things should probably be generally available | |
1276 | |
1277 (defun vc-shrink-to-fit () | |
1278 "Shrink a window vertically until it's just large enough to contain its text" | |
1279 (let ((minsize (1+ (count-lines (point-min) (point-max))))) | |
1280 (if (< minsize (window-height)) | |
1281 (let ((window-min-height 2)) | |
1282 (shrink-window (- (window-height) minsize)))))) | |
1283 | |
1284 (defun vc-file-tree-walk (func dir &rest args) | |
1285 "Apply a given function to dir and all files underneath it, recursively." | |
1286 (apply 'funcall func dir args) | |
1287 (and (file-directory-p dir) | |
1288 (mapcar | |
1289 (function (lambda (f) (or | |
1290 (string-equal f ".") | |
1291 (string-equal f "..") | |
1292 (file-symlink-p f) ;; Avoid possible loops | |
1293 (apply 'vc-file-tree-walk | |
1294 func | |
1295 (if (= (aref dir (1- (length dir))) ?/) | |
1296 (concat dir f) | |
1297 (concat dir "/" f)) | |
1298 args)))) | |
1299 (directory-files dir)))) | |
1300 | |
1301 (provide 'vc) | |
1302 | |
1303 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE | |
1304 ;;; | |
1305 ;;; These may be useful to anyone who has to debug or extend the package. | |
1306 ;;; | |
1307 ;;; A fundamental problem in VC is that there are time windows between | |
1308 ;;; vc-next-action's computations of the file's version-control state and | |
1309 ;;; the actions that change it. This is a window open to lossage in a | |
1310 ;;; multi-user environment; someone else could nip in and change the state | |
1311 ;;; of the master during it. | |
1312 ;;; | |
1313 ;;; The performance problem is that rlog/prs calls are very expensive; we want | |
1314 ;;; to avoid them as much as possible. | |
1315 ;;; | |
1316 ;;; ANALYSIS: | |
1317 ;;; | |
1318 ;;; The performance problem, it turns out, simplifies in practice to the | |
1319 ;;; problem of making vc-locking-user fast. The two other functions that call | |
1320 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one | |
1321 ;;; makes snapshots, the other deletes the calling user's last change in the | |
1322 ;;; master. | |
1323 ;;; | |
1324 ;;; The race condition implies that we have to either (a) lock the master | |
1325 ;;; during the entire execution of vc-next-action, or (b) detect and | |
1326 ;;; recover from errors resulting from dispatch on an out-of-date state. | |
1327 ;;; | |
1328 ;;; Alternative (a) appears to be unfeasible. The problem is that we can't | |
1329 ;;; guarantee that the lock will ever be removed. Suppose a user starts a | |
1330 ;;; checkin, the change message buffer pops up, and the user, having wandered | |
1331 ;;; off to do something else, simply forgets about it? | |
1332 ;;; | |
1333 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up | |
1334 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/ | |
1335 ;;; unlocked state and its current owner from its permissions. | |
1336 ;;; | |
1337 ;;; This shortcut will fail if someone has manually changed the workfile's | |
1338 ;;; permissions; also if developers are munging the workfile in several | |
1339 ;;; directories, with symlinks to a master (in this latter case, the | |
1340 ;;; permissions shortcut will fail to detect a lock asserted from another | |
1341 ;;; directory). | |
1342 ;;; | |
1343 ;;; Note that these cases correspond exactly to the errors which could happen | |
1344 ;;; because of a competing checkin/checkout race in between two instances of | |
1345 ;;; vc-next-action. | |
1346 ;;; | |
1347 ;;; For VC's purposes, a workfile/master pair may have the following states: | |
1348 ;;; | |
1349 ;;; A. Unregistered. There is a workfile, there is no master. | |
1350 ;;; | |
1351 ;;; B. Registered and not locked by anyone. | |
1352 ;;; | |
1353 ;;; C. Locked by calling user and unchanged. | |
1354 ;;; | |
1355 ;;; D. Locked by the calling user and changed. | |
1356 ;;; | |
1357 ;;; E. Locked by someone other than the calling user. | |
1358 ;;; | |
1359 ;;; This makes for 25 states and 20 error conditions. Here's the matrix: | |
1360 ;;; | |
1361 ;;; VC's idea of state | |
1362 ;;; | | |
1363 ;;; V Actual state RCS action SCCS action Effect | |
1364 ;;; A B C D E | |
1365 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
1366 ;;; B 5 . 6 7 8 co -l get -e checkout | |
1367 ;;; C 9 10 . 11 12 co -u unget; get revert | |
1368 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin | |
1369 ;;; E 17 18 19 20 . rcs -u -M ; rcs -l unget -n ; get -g steal lock | |
1370 ;;; | |
1371 ;;; All commands take the master file name as a last argument (not shown). | |
1372 ;;; | |
1373 ;;; In the discussion below, a "self-race" is a pathological situation in | |
1374 ;;; which VC operations are being attempted simultaneously by two or more | |
1375 ;;; Emacsen running under the same username. | |
1376 ;;; | |
1377 ;;; The vc-next-action code has the following windows: | |
1378 ;;; | |
1379 ;;; Window P: | |
1380 ;;; Between the check for existence of a master file and the call to | |
1381 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
1382 ;;; never close if the initial-comment feature is on. | |
1383 ;;; | |
1384 ;;; Window Q: | |
1385 ;;; Between the call to vc-workfile-unchanged-p in and the immediately | |
1386 ;;; following revert (apparent state C). | |
1387 ;;; | |
1388 ;;; Window R: | |
1389 ;;; Between the call to vc-workfile-unchanged-p in and the following | |
1390 ;;; checkin (apparent state D). This window may never close. | |
1391 ;;; | |
1392 ;;; Window S: | |
1393 ;;; Between the unlock and the immediately following checkout during a | |
1394 ;;; revert operation (apparent state C). Included in window Q. | |
1395 ;;; | |
1396 ;;; Window T: | |
1397 ;;; Between vc-locking-user and the following checkout (apparent state B). | |
1398 ;;; | |
1399 ;;; Window U: | |
1400 ;;; Between vc-locking-user and the following revert (apparent state C). | |
1401 ;;; Includes windows Q and S. | |
1402 ;;; | |
1403 ;;; Window V: | |
1404 ;;; Between vc-locking-user and the following checkin (apparent state | |
1405 ;;; D). This window may never be closed if the user fails to complete the | |
1406 ;;; checkin message. Includes window R. | |
1407 ;;; | |
1408 ;;; Window W: | |
1409 ;;; Between vc-locking-user and the following steal-lock (apparent | |
1410 ;;; state E). This window may never cloce if the user fails to complete | |
1411 ;;; the steal-lock message. Includes window X. | |
1412 ;;; | |
1413 ;;; Window X: | |
1414 ;;; Between the unlock and the immediately following re-lock during a | |
1415 ;;; steal-lock operation (apparent state E). This window may never cloce | |
1416 ;;; if the user fails to complete the steal-lock message. | |
1417 ;;; | |
1418 ;;; Errors: | |
1419 ;;; | |
1420 ;;; Apparent state A --- | |
1421 ;;; | |
1422 ;;; 1. File looked unregistered but is actually registered and not locked. | |
1423 ;;; | |
1424 ;;; Potential cause: someone else's admin during window P, with | |
1425 ;;; caller's admin happening before their checkout. | |
1426 ;;; | |
1427 ;;; RCS: ci will fail with a "no lock set by <user>" message. | |
1428 ;;; SCCS: admin will fail with error (ad19). | |
1429 ;;; | |
1430 ;;; We can let these errors be passed up to the user. | |
1431 ;;; | |
1432 ;;; 2. File looked unregistered but is actually locked by caller, unchanged. | |
1433 ;;; | |
1434 ;;; Potential cause: self-race during window P. | |
1435 ;;; | |
1436 ;;; RCS: will revert the file to the last saved version and unlock it. | |
1437 ;;; SCCS: will fail with error (ad19). | |
1438 ;;; | |
1439 ;;; Either of these consequences is acceptable. | |
1440 ;;; | |
1441 ;;; 3. File looked unregistered but is actually locked by caller, changed. | |
1442 ;;; | |
1443 ;;; Potential cause: self-race during window P. | |
1444 ;;; | |
1445 ;;; RCS: will register the caller's workfile as a delta with a | |
1446 ;;; null change comment (the -t- switch will be ignored). | |
1447 ;;; SCCS: will fail with error (ad19). | |
1448 ;;; | |
1449 ;;; 4. File looked unregistered but is locked by someone else. | |
1450 ;;; | |
1451 ;;; Potential cause: someone else's admin during window P, with | |
1452 ;;; caller's admin happening *after* their checkout. | |
1453 ;;; | |
1454 ;;; RCS: will fail with a "no lock set by <user>" message. | |
1455 ;;; SCCS: will fail with error (ad19). | |
1456 ;;; | |
1457 ;;; We can let these errors be passed up to the user. | |
1458 ;;; | |
1459 ;;; Apparent state B --- | |
1460 ;;; | |
1461 ;;; 5. File looked registered and not locked, but is actually unregistered. | |
1462 ;;; | |
1463 ;;; Potential cause: master file got nuked during window P. | |
1464 ;;; | |
1465 ;;; RCS: will fail with "RCS/<file>: No such file or directory" | |
1466 ;;; SCCS: will fail with error ut4. | |
1467 ;;; | |
1468 ;;; We can let these errors be passed up to the user. | |
1469 ;;; | |
1470 ;;; 6. File looked registered and not locked, but is actually locked by the | |
1471 ;;; calling user and unchanged. | |
1472 ;;; | |
1473 ;;; Potential cause: self-race during window T. | |
1474 ;;; | |
1475 ;;; RCS: in the same directory as the previous workfile, co -l will fail | |
1476 ;;; with "co error: writable foo exists; checkout aborted". In any other | |
1477 ;;; directory, checkout will succeed. | |
1478 ;;; SCCS: will fail with ge17. | |
1479 ;;; | |
1480 ;;; Either of these consequences is acceptable. | |
1481 ;;; | |
1482 ;;; 7. File looked registered and not locked, but is actually locked by the | |
1483 ;;; calling user and changed. | |
1484 ;;; | |
1485 ;;; As case 6. | |
1486 ;;; | |
1487 ;;; 8. File looked registered and not locked, but is actually locked by another | |
1488 ;;; user. | |
1489 ;;; | |
1490 ;;; Potential cause: someone else checks it out during window T. | |
1491 ;;; | |
1492 ;;; RCS: co error: revision 1.3 already locked by <user> | |
1493 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
1494 ;;; | |
1495 ;;; We can let these errors be passed up to the user. | |
1496 ;;; | |
1497 ;;; Apparent state C --- | |
1498 ;;; | |
1499 ;;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
1500 ;;; | |
1501 ;;; As case 5. | |
1502 ;;; | |
1503 ;;; 10. File looks locked by calling user and unchanged, but is actually not | |
1504 ;;; locked. | |
1505 ;;; | |
1506 ;;; Potential cause: a self-race in window U, or by the revert's | |
1507 ;;; landing during window X of some other user's steal-lock or window S | |
1508 ;;; of another user's revert. | |
1509 ;;; | |
1510 ;;; RCS: succeeds, refreshing the file from the identical version in | |
1511 ;;; the master. | |
1512 ;;; SCCS: fails with error ut4 (p file nonexistent). | |
1513 ;;; | |
1514 ;;; Either of these consequences is acceptable. | |
1515 ;;; | |
1516 ;;; 11. File is locked by calling user. It looks unchanged, but is actually | |
1517 ;;; changed. | |
1518 ;;; | |
1519 ;;; Potential cause: the file would have to be touched by a self-race | |
1520 ;;; during window Q. | |
1521 ;;; | |
1522 ;;; The revert will succeed, removing whatever changes came with | |
1523 ;;; the touch. It is theoretically possible that work could be lost. | |
1524 ;;; | |
1525 ;;; 12. File looks like it's locked by the calling user and unchanged, but | |
1526 ;;; it's actually locked by someone else. | |
1527 ;;; | |
1528 ;;; Potential cause: a steal-lock in window V. | |
1529 ;;; | |
1530 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u | |
1531 ;;; SCCS: fails with error un2 | |
1532 ;;; | |
1533 ;;; We can pass these errors up to the user. | |
1534 ;;; | |
1535 ;;; Apparent state D --- | |
1536 ;;; | |
1537 ;;; 13. File looks like it's locked by the calling user and changed, but it's | |
1538 ;;; actually unregistered. | |
1539 ;;; | |
1540 ;;; Potential cause: master file got nuked during window P. | |
1541 ;;; | |
1542 ;;; RCS: Checks in the user's version as an initial delta. | |
1543 ;;; SCCS: will fail with error ut4. | |
1544 ;;; | |
1545 ;;; This case is kind of nasty. It means VC may fail to detect the | |
1546 ;;; loss of previous version information. | |
1547 ;;; | |
1548 ;;; 14. File looks like it's locked by the calling user and changed, but it's | |
1549 ;;; actually unlocked. | |
1550 ;;; | |
1551 ;;; Potential cause: self-race in window V, or the checkin happening | |
1552 ;;; during the window X of someone else's steal-lock or window S of | |
1553 ;;; someone else's revert. | |
1554 ;;; | |
1555 ;;; RCS: ci will fail with "no lock set by <user>". | |
1556 ;;; SCCS: delta will fail with error ut4. | |
1557 ;;; | |
1558 ;;; 15. File looks like it's locked by the calling user and changed, but it's | |
1559 ;;; actually locked by the calling user and unchanged. | |
1560 ;;; | |
1561 ;;; Potential cause: another self-race --- a whole checkin/checkout | |
1562 ;;; sequence by the calling user would have to land in window R. | |
1563 ;;; | |
1564 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. | |
1565 ;;; RCS: reverts to the file state as of the second user's checkin, leaving | |
1566 ;;; the file unlocked. | |
1567 ;;; | |
1568 ;;; It is theoretically possible that work could be lost under RCS. | |
1569 ;;; | |
1570 ;;; 16. File looks like it's locked by the calling user and changed, but it's | |
1571 ;;; actually locked by a different user. | |
1572 ;;; | |
1573 ;;; RCS: ci error: no lock set by <user> | |
1574 ;;; SCCS: unget will fail with error un2 | |
1575 ;;; | |
1576 ;;; We can pass these errors up to the user. | |
1577 ;;; | |
1578 ;;; Apparent state E --- | |
1579 ;;; | |
1580 ;;; 17. File looks like it's locked by some other user, but it's actually | |
1581 ;;; unregistered. | |
1582 ;;; | |
1583 ;;; As case 13. | |
1584 ;;; | |
1585 ;;; 18. File looks like it's locked by some other user, but it's actually | |
1586 ;;; unlocked. | |
1587 ;;; | |
1588 ;;; Potential cause: someone released a lock during window W. | |
1589 ;;; | |
1590 ;;; RCS: The calling user will get the lock on the file. | |
1591 ;;; SCCS: unget -n will fail with cm4. | |
1592 ;;; | |
1593 ;;; Either of these consequences will be OK. | |
1594 ;;; | |
1595 ;;; 19. File looks like it's locked by some other user, but it's actually | |
1596 ;;; locked by the calling user and unchanged. | |
1597 ;;; | |
1598 ;;; Potential cause: the other user relinquishing a lock followed by | |
1599 ;;; a self-race, both in window W. | |
1600 ;;; | |
1601 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making | |
1602 ;;; the sequence a no-op. | |
1603 ;;; | |
1604 ;;; 20. File looks like it's locked by some other user, but it's actually | |
1605 ;;; locked by the calling user and changed. | |
1606 ;;; | |
1607 ;;; As case 19. | |
1608 ;;; | |
1609 ;;; PROBLEM CASES: | |
1610 ;;; | |
1611 ;;; In order of decreasing severity: | |
1612 ;;; | |
1613 ;;; Cases 11 and 15 under RCS are the only one that potentially lose work. | |
1614 ;;; They would require a self-race for this to happen. | |
1615 ;;; | |
1616 ;;; Case 13 in RCS loses information about previous deltas, retaining | |
1617 ;;; only the information in the current workfile. This can only happen | |
1618 ;;; if the master file gets nuked in window P. | |
1619 ;;; | |
1620 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with | |
1621 ;;; no change comment in the master. This would require a self-race in | |
1622 ;;; window P or R respectively. | |
1623 ;;; | |
1624 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes. | |
1625 ;;; | |
1626 ;;; Unfortunately, it appears to me that no recovery is possible in these | |
1627 ;;; cases. They don't yield error messages, so there's no way to tell that | |
1628 ;;; a race condition has occurred. | |
1629 ;;; | |
1630 ;;; All other cases don't change either the workfile or the master, and | |
1631 ;;; trigger command errors which the user will see. | |
1632 ;;; | |
1633 ;;; Thus, there is no explicit recovery code. | |
1634 | |
1635 ;;; vc.el ends here |