(rmail-last-rmail-file): Initialize to a file name.
[bpt/emacs.git] / lisp / vc.el
1 ;;; vc.el --- drive a version-control system from within Emacs
2
3 ;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
4
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6 ;; Version: 5.4
7
8 ;; This file is part of GNU Emacs.
9
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
13 ;; any later version.
14
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
19
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
23
24 ;;; Commentary:
25
26 ;; This mode is fully documented in the Emacs user's manual.
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 ;; If your site uses the ChangeLog convention supported by Emacs, the
43 ;; function vc-comment-to-change-log should prove a useful checkin hook.
44 ;;
45 ;; This code depends on call-process passing back the subprocess exit
46 ;; status. Thus, you need Emacs 18.58 or later to run it. For the
47 ;; vc-directory command to work properly as documented, you need 19.
48 ;; You also need Emacs 19's ring.el.
49 ;;
50 ;; The vc code maintains some internal state in order to reduce expensive
51 ;; version-control operations to a minimum. Some names are only computed
52 ;; once. If you perform version control operations with RCS/SCCS/CVS while
53 ;; vc's back is turned, or move/rename master files while vc is running,
54 ;; vc may get seriously confused. Don't do these things!
55 ;;
56 ;; Developer's notes on some concurrency issues are included at the end of
57 ;; the file.
58
59 ;;; Code:
60
61 (require 'vc-hooks)
62 (require 'ring)
63
64 (if (not (assoc 'vc-parent-buffer minor-mode-alist))
65 (setq minor-mode-alist
66 (cons '(vc-parent-buffer vc-parent-buffer-name)
67 minor-mode-alist)))
68
69 ;; General customization
70
71 (defvar vc-default-back-end nil
72 "*Back-end actually used by this interface; may be SCCS or RCS.
73 The value is only computed when needed to avoid an expensive search.")
74 (defvar vc-suppress-confirm nil
75 "*If non-nil, treat user as expert; suppress yes-no prompts on some things.")
76 (defvar vc-keep-workfiles t
77 "*If non-nil, don't delete working files after registering changes.")
78 (defvar vc-initial-comment nil
79 "*Prompt for initial comment when a file is registered.")
80 (defvar vc-command-messages nil
81 "*Display run messages from back-end commands.")
82 (defvar vc-mistrust-permissions 'file-symlink-p
83 "*Don't assume that permissions and ownership track version-control status.")
84 (defvar vc-checkin-switches nil
85 "*Extra switches passed to the checkin program by \\[vc-checkin].")
86 (defvar vc-path
87 (if (file-exists-p "/usr/sccs")
88 '("/usr/sccs") nil)
89 "*List of extra directories to search for version control commands.")
90
91 (defconst vc-maximum-comment-ring-size 32
92 "Maximum number of saved comments in the comment ring.")
93
94 ;;; This is duplicated in diff.el.
95 (defvar diff-switches "-c"
96 "*A string or list of strings specifying switches to be be passed to diff.")
97
98 ;;;###autoload
99 (defvar vc-checkin-hook nil
100 "*List of functions called after a checkin is done. See `run-hooks'.")
101
102 ;; Header-insertion hair
103
104 (defvar vc-header-alist
105 '((SCCS "\%W\%") (RCS "\$Id\$"))
106 "*Header keywords to be inserted when `vc-insert-headers' is executed.")
107 (defconst vc-static-header-alist
108 '(("\\.c$" .
109 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
110 "*Associate static header string templates with file types. A \%s in the
111 template is replaced with the first string associated with the file's
112 version-control type in `vc-header-alist'.")
113
114 (defvar vc-comment-alist
115 '((nroff-mode ".\\\"" ""))
116 "*Special comment delimiters to be used in generating vc headers only.
117 Add an entry in this list if you need to override the normal comment-start
118 and comment-end variables. This will only be necessary if the mode language
119 is sensitive to blank lines.")
120
121 ;; Variables the user doesn't need to know about.
122 (defvar vc-log-entry-mode nil)
123 (defvar vc-log-operation nil)
124 (defvar vc-log-after-operation-hook nil)
125 (defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer)
126 (defvar vc-parent-buffer nil)
127 (defvar vc-parent-buffer-name nil)
128
129 (defvar vc-log-file)
130 (defvar vc-log-version)
131
132 (defconst vc-name-assoc-file "VC-names")
133
134 (defvar vc-dired-mode nil)
135 (make-variable-buffer-local 'vc-dired-mode)
136
137 (defvar vc-comment-ring nil)
138 (defvar vc-comment-ring-index nil)
139 (defvar vc-last-comment-match nil)
140
141 ;; File property caching
142
143 (defun vc-file-clearprops (file)
144 ;; clear all properties of a given file
145 (setplist (intern file vc-file-prop-obarray) nil))
146
147 (defun vc-clear-context ()
148 "Clear all cached file properties and the comment ring."
149 (interactive)
150 (fillarray vc-file-prop-obarray nil)
151 ;; Note: there is potential for minor lossage here if there is an open
152 ;; log buffer with a nonzero local value of vc-comment-ring-index.
153 (setq vc-comment-ring nil))
154
155 ;; Random helper functions
156
157 (defun vc-registration-error (file)
158 (if file
159 (error "File %s is not under version control" file)
160 (error "Buffer %s is not associated with a file" (buffer-name))))
161
162 (defvar vc-binary-assoc nil)
163
164 (defun vc-find-binary (name)
165 "Look for a command anywhere on the subprocess-command search path."
166 (or (cdr (assoc name vc-binary-assoc))
167 (let ((full nil))
168 (catch 'found
169 (mapcar
170 (function (lambda (s)
171 (if (and s (file-exists-p (setq full (concat s "/" name))))
172 (throw 'found nil))))
173 exec-path))
174 (if full
175 (setq vc-binary-assoc (cons (cons name full) vc-binary-assoc)))
176 full)))
177
178 (defun vc-do-command (okstatus command file &rest flags)
179 "Execute a version-control command, notifying user and checking for errors.
180 The command is successful if its exit status does not exceed OKSTATUS.
181 Output from COMMAND goes to buffer *vc*. The last argument of the command is
182 the master name of FILE; this is appended to an optional list of FLAGS."
183 (setq file (expand-file-name file))
184 (if vc-command-messages
185 (message "Running %s on %s..." command file))
186 (let ((obuf (current-buffer)) (camefrom (current-buffer))
187 (squeezed nil)
188 (vc-file (and file (vc-name file)))
189 status)
190 (set-buffer (get-buffer-create "*vc*"))
191 (set (make-local-variable 'vc-parent-buffer) camefrom)
192 (set (make-local-variable 'vc-parent-buffer-name)
193 (concat " from " (buffer-name camefrom)))
194
195 (erase-buffer)
196
197 ;; This is so that command arguments typed in the *vc* buffer will
198 ;; have reasonable defaults.
199 (setq default-directory (file-name-directory file))
200
201 (mapcar
202 (function (lambda (s) (and s (setq squeezed (append squeezed (list s))))))
203 flags)
204 (if vc-file
205 (setq squeezed (append squeezed (list vc-file))))
206 (let ((default-directory (file-name-directory (or file "./")))
207 (exec-path (if vc-path (append exec-path vc-path) exec-path)))
208 (setq status (apply 'call-process command nil t nil squeezed)))
209 (goto-char (point-max))
210 (previous-line 1)
211 (if (or (not (integerp status)) (< okstatus status))
212 (progn
213 (previous-line 1)
214 (print (cons command squeezed))
215 (next-line 1)
216 (pop-to-buffer "*vc*")
217 (vc-shrink-to-fit)
218 (goto-char (point-min))
219 (error "Running %s...FAILED (%s)" command
220 (if (integerp status)
221 (format "status %d" status)
222 status))
223 )
224 (if vc-command-messages
225 (message "Running %s...OK" command))
226 )
227 (set-buffer obuf)
228 status)
229 )
230
231 ;;; Save a bit of the text around POSN in the current buffer, to help
232 ;;; us find the corresponding position again later. This works even
233 ;;; if all markers are destroyed or corrupted.
234 (defun vc-position-context (posn)
235 (list posn
236 (buffer-size)
237 (buffer-substring posn
238 (min (point-max) (+ posn 100)))))
239
240 ;;; Return the position of CONTEXT in the current buffer, or nil if we
241 ;;; couldn't find it.
242 (defun vc-find-position-by-context (context)
243 (let ((context-string (nth 2 context)))
244 (if (equal "" context-string)
245 (point-max)
246 (save-excursion
247 (let ((diff (- (nth 1 context) (buffer-size))))
248 (if (< diff 0) (setq diff (- diff)))
249 (goto-char (nth 0 context))
250 (if (or (search-forward context-string nil t)
251 ;; Can't use search-backward since the match may continue
252 ;; after point.
253 (progn (goto-char (- (point) diff (length context-string)))
254 ;; goto-char doesn't signal an error at
255 ;; beginning of buffer like backward-char would
256 (search-forward context-string nil t)))
257 ;; to beginning of OSTRING
258 (- (point) (length context-string))))))))
259
260 (defun vc-revert-buffer1 (&optional arg no-confirm)
261 ;; Most of this was shamelessly lifted from Sebastian Kremer's rcs.el mode.
262 ;; Revert buffer, try to keep point and mark where user expects them in spite
263 ;; of changes because of expanded version-control key words.
264 ;; This is quite important since otherwise typeahead won't work as expected.
265 (interactive "P")
266 (widen)
267 (let ((point-context (vc-position-context (point)))
268 ;; Use mark-marker to avoid confusion in transient-mark-mode.
269 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
270 (vc-position-context (mark-marker))))
271 ;; Make the right thing happen in transient-mark-mode.
272 (mark-active nil)
273 ;; We may want to reparse the compilation buffer after revert
274 (reparse (and (boundp 'compilation-error-list) ;compile loaded
275 (let ((curbuf (current-buffer)))
276 ;; Construct a list; each elt is nil or a buffer
277 ;; iff that buffer is a compilation output buffer
278 ;; that contains markers into the current buffer.
279 (save-excursion
280 (mapcar (function
281 (lambda (buffer)
282 (set-buffer buffer)
283 (let ((errors (or
284 compilation-old-error-list
285 compilation-error-list))
286 (buffer-error-marked-p nil))
287 (while (and (consp errors)
288 (not buffer-error-marked-p))
289 (and (markerp (cdr (car errors)))
290 (eq buffer
291 (marker-buffer
292 (cdr (car errors))))
293 (setq buffer-error-marked-p t))
294 (setq errors (cdr errors)))
295 (if buffer-error-marked-p buffer))))
296 (buffer-list)))))))
297
298 ;; the actual revisit
299 (revert-buffer arg no-confirm)
300
301 ;; Reparse affected compilation buffers.
302 (while reparse
303 (if (car reparse)
304 (save-excursion
305 (set-buffer (car reparse))
306 (let ((compilation-last-buffer (current-buffer)) ;select buffer
307 ;; Record the position in the compilation buffer of
308 ;; the last error next-error went to.
309 (error-pos (marker-position
310 (car (car-safe compilation-error-list)))))
311 ;; Reparse the error messages as far as they were parsed before.
312 (compile-reinitialize-errors '(4) compilation-parsing-end)
313 ;; Move the pointer up to find the error we were at before
314 ;; reparsing. Now next-error should properly go to the next one.
315 (while (and compilation-error-list
316 (/= error-pos (car (car compilation-error-list))))
317 (setq compilation-error-list (cdr compilation-error-list))))))
318 (setq reparse (cdr reparse)))
319
320 ;; Restore point and mark
321 (let ((new-point (vc-find-position-by-context point-context)))
322 (if new-point (goto-char new-point)))
323 (if mark-context
324 (let ((new-mark (vc-find-position-by-context mark-context)))
325 (if new-mark (set-mark new-mark))))))
326
327
328 (defun vc-buffer-sync ()
329 ;; Make sure the current buffer and its working file are in sync
330 (if (and (buffer-modified-p)
331 (or
332 vc-suppress-confirm
333 (y-or-n-p (format "%s has been modified. Write it out? "
334 (buffer-name)))))
335 (save-buffer)))
336
337 (defun vc-workfile-unchanged-p (file)
338 ;; Has the given workfile changed since last checkout?
339 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
340 (lastmod (nth 5 (file-attributes file))))
341 (if checkout-time
342 (equal lastmod checkout-time)
343 (if (zerop (vc-backend-diff file nil))
344 (progn
345 (vc-file-setprop file 'vc-checkout-time lastmod)
346 t)
347 (progn
348 (vc-file-setprop file 'vc-checkout-time '(0 . 0))
349 nil
350 ))
351 )))
352
353 (defun vc-next-action-on-file (file verbose &optional comment)
354 ;;; If comment is specified, it will be used as an admin or checkin comment.
355 (let (owner version (vc-file (vc-name file)))
356 (cond
357
358 ;; if there is no master file corresponding, create one
359 ((not vc-file)
360 (vc-register verbose comment)
361 (if vc-initial-comment
362 (setq vc-log-after-operation-hook
363 'vc-checkout-writable-buffer-hook)
364 (vc-checkout-writable-buffer file)))
365
366 ;; if there is no lock on the file, assert one and get it
367 ((not (setq owner (vc-locking-user file)))
368 (vc-checkout-writable-buffer file))
369
370 ;; a checked-out version exists, but the user may not own the lock
371 ((not (string-equal owner (user-login-name)))
372 (if comment
373 (error "Sorry, you can't steal the lock on %s this way" file))
374 (vc-steal-lock
375 file
376 (and verbose (read-string "Version to steal: "))
377 owner))
378
379 ;; OK, user owns the lock on the file
380 (t
381 (find-file file)
382
383 ;; give luser a chance to save before checking in.
384 (vc-buffer-sync)
385
386 ;; Revert if file is unchanged and buffer is too.
387 ;; If buffer is modified, that means the user just said no
388 ;; to saving it; in that case, don't revert,
389 ;; because the user might intend to save
390 ;; after finishing the log entry.
391 (if (and (vc-workfile-unchanged-p file)
392 (not (buffer-modified-p)))
393 (progn
394 (vc-backend-revert file)
395 ;; DO NOT revert the file without asking the user!
396 (vc-resynch-window file t nil))
397
398 ;; user may want to set nonstandard parameters
399 (if verbose
400 (setq version (read-string "New version level: ")))
401
402 ;; OK, let's do the checkin
403 (vc-checkin file version comment)
404 )))))
405
406 (defun vc-next-action-dired (file rev comment)
407 ;; We've accepted a log comment, now do a vc-next-action using it on all
408 ;; marked files.
409 (set-buffer vc-parent-buffer)
410 (dired-map-over-marks
411 (save-window-excursion
412 (let ((file (dired-get-filename)))
413 (message "Processing %s..." file)
414 (vc-next-action-on-file file nil comment)
415 (message "Processing %s...done" file)))
416 nil t)
417 )
418
419 ;; Here's the major entry point.
420
421 ;;;###autoload
422 (defun vc-next-action (verbose)
423 "Do the next logical checkin or checkout operation on the current file.
424 If the file is not already registered, this registers it for version
425 control and then retrieves a writable, locked copy for editing.
426 If the file is registered and not locked by anyone, this checks out
427 a writable and locked file ready for editing.
428 If the file is checked out and locked by the calling user, this
429 first checks to see if the file has changed since checkout. If not,
430 it performs a revert.
431 If the file has been changed, this pops up a buffer for entry
432 of a log message; when the message has been entered, it checks in the
433 resulting changes along with the log message as change commentary. If
434 the variable `vc-keep-workfiles' is non-nil (which is its default), a
435 read-only copy of the changed file is left in place afterwards.
436 If the file is registered and locked by someone else, you are given
437 the option to steal the lock.
438 If you call this from within a VC dired buffer with no files marked,
439 it will operate on the file in the current line.
440 If you call this from within a VC dired buffer, and one or more
441 files are marked, it will accept a log message and then operate on
442 each one. The log message will be used as a comment for any register
443 or checkin operations, but ignored when doing checkouts. Attempted
444 lock steals will raise an error."
445 (interactive "P")
446 (catch 'nogo
447 (if vc-dired-mode
448 (let ((files (dired-get-marked-files)))
449 (if (= (length files) 1)
450 (find-file-other-window (dired-get-filename))
451 (vc-start-entry nil nil nil
452 "Enter a change comment for the marked files."
453 'vc-next-action-dired)
454 (throw 'nogo))))
455 (while vc-parent-buffer
456 (pop-to-buffer vc-parent-buffer))
457 (if buffer-file-name
458 (vc-next-action-on-file buffer-file-name verbose)
459 (vc-registration-error nil))))
460
461 ;;; These functions help the vc-next-action entry point
462
463 (defun vc-checkout-writable-buffer (&optional file)
464 "Retrieve a writable copy of the latest version of the current buffer's file."
465 (vc-checkout (or file (buffer-file-name)) t)
466 )
467
468 ;;;###autoload
469 (defun vc-register (&optional override comment)
470 "Register the current file into your version-control system."
471 (interactive "P")
472 (if (vc-name buffer-file-name)
473 (error "This file is already registered"))
474 ;; Watch out for new buffers of size 0: the corresponding file
475 ;; does not exist yet, even though buffer-modified-p is nil.
476 (if (and (not (buffer-modified-p))
477 (zerop (buffer-size))
478 (not (file-exists-p buffer-file-name)))
479 (set-buffer-modified-p t))
480 (vc-buffer-sync)
481 (vc-admin
482 buffer-file-name
483 (and override
484 (read-string
485 (format "Initial version level for %s: " buffer-file-name))))
486 )
487
488 (defun vc-resynch-window (file &optional keep noquery)
489 ;; If the given file is in the current buffer,
490 ;; either revert on it so we see expanded keyworks,
491 ;; or unvisit it (depending on vc-keep-workfiles)
492 ;; NOQUERY if non-nil inhibits confirmation for reverting.
493 ;; NOQUERY should be t *only* if it is known the only difference
494 ;; between the buffer and the file is due to RCS rather than user editing!
495 (and (string= buffer-file-name file)
496 (if keep
497 (progn
498 (vc-revert-buffer1 t noquery)
499 (vc-mode-line buffer-file-name))
500 (progn
501 (delete-window)
502 (kill-buffer (current-buffer))))))
503
504 (defun vc-start-entry (file rev comment msg action)
505 ;; Accept a comment for an operation on FILE revision REV. If COMMENT
506 ;; is nil, pop up a VC-log buffer, emit MSG, and set the
507 ;; action on close to ACTION; otherwise, do action immediately.
508 ;; Remember the file's buffer in parent-buffer (current one if no file).
509 (let ((parent (if file (find-file-noselect file) (current-buffer))))
510 (if comment
511 (set-buffer (get-buffer-create "*VC-log*"))
512 (pop-to-buffer (get-buffer-create "*VC-log*")))
513 (set (make-local-variable 'vc-parent-buffer) parent)
514 (set (make-local-variable 'vc-parent-buffer-name)
515 (concat " from " (buffer-name vc-parent-buffer)))
516 (vc-mode-line (or file " (no file)"))
517 (vc-log-mode)
518 (setq vc-log-operation action)
519 (setq vc-log-file file)
520 (setq vc-log-version rev)
521 (if comment
522 (progn
523 (erase-buffer)
524 (if (eq comment t)
525 (vc-finish-logentry t)
526 (insert comment)
527 (vc-finish-logentry nil)))
528 (message "%s Type C-c C-c when done." msg))))
529
530 (defun vc-admin (file rev &optional comment)
531 "Check a file into your version-control system.
532 FILE is the unmodified name of the file. REV should be the base version
533 level to check it in under. COMMENT, if specified, is the checkin comment."
534 (vc-start-entry file rev
535 (or comment (not vc-initial-comment))
536 "Enter initial comment." 'vc-backend-admin))
537
538 (defun vc-checkout (file &optional writable)
539 "Retrieve a copy of the latest version of the given file."
540 ;; If ftp is on this system and the name matches the ange-ftp format
541 ;; for a remote file, the user is trying something that won't work.
542 (if (and (string-match "^/[^/:]+:" file) (vc-find-binary "ftp"))
543 (error "Sorry, you can't check out files over FTP"))
544 (vc-backend-checkout file writable)
545 (if (string-equal file buffer-file-name)
546 (vc-resynch-window file t t))
547 )
548
549 (defun vc-steal-lock (file rev &optional owner)
550 "Steal the lock on the current workfile."
551 (interactive)
552 (if (not owner)
553 (setq owner (vc-locking-user file)))
554 (if (not (y-or-n-p (format "Take the lock on %s:%s from %s? " file rev owner)))
555 (error "Steal cancelled"))
556 (pop-to-buffer (get-buffer-create "*VC-mail*"))
557 (setq default-directory (expand-file-name "~/"))
558 (auto-save-mode auto-save-default)
559 (mail-mode)
560 (erase-buffer)
561 (mail-setup owner (format "%s:%s" file rev) nil nil nil
562 (list (list 'vc-finish-steal file rev)))
563 (goto-char (point-max))
564 (insert
565 (format "I stole the lock on %s:%s, " file rev)
566 (current-time-string)
567 ".\n")
568 (message "Please explain why you stole the lock. Type C-c C-c when done."))
569
570 ;; This is called when the notification has been sent.
571 (defun vc-finish-steal (file version)
572 (vc-backend-steal file version)
573 (vc-resynch-window file t t))
574
575 (defun vc-checkin (file &optional rev comment)
576 "Check in the file specified by FILE.
577 The optional argument REV may be a string specifying the new version level
578 \(if nil increment the current level). The file is either retained with write
579 permissions zeroed, or deleted (according to the value of `vc-keep-workfiles').
580 COMMENT is a comment string; if omitted, a buffer is
581 popped up to accept a comment."
582 (setq vc-log-after-operation-hook 'vc-checkin-hook)
583 (vc-start-entry file rev comment "Enter a change comment." 'vc-backend-checkin))
584
585 ;;; Here is a checkin hook that may prove useful to sites using the
586 ;;; ChangeLog facility supported by Emacs.
587 (defun vc-comment-to-change-log (&optional whoami file-name)
588 "Enter last VC comment into change log file for current buffer's file.
589 Optional arg (interactive prefix) non-nil means prompt for user name and site.
590 Second arg is file name of change log. \
591 If nil, uses `change-log-default-name'."
592 (interactive (if current-prefix-arg
593 (list current-prefix-arg
594 (prompt-for-change-log-name))))
595 (let (;; Extract the comment first so we get any error before doing anything.
596 (comment (ring-ref vc-comment-ring 0))
597 ;; Don't let add-change-log-entry insert a defun name.
598 (add-log-current-defun-function 'ignore)
599 end)
600 ;; Call add-log to do half the work.
601 (add-change-log-entry whoami file-name t t)
602 ;; Insert the VC comment, leaving point before it.
603 (setq end (save-excursion (insert comment) (point-marker)))
604 (if (looking-at "\\s *\\s(")
605 ;; It starts with an open-paren, as in "(foo): Frobbed."
606 ;; So remove the ": " add-log inserted.
607 (delete-char -2))
608 ;; Canonicalize the white space between the file name and comment.
609 (just-one-space)
610 ;; Indent rest of the text the same way add-log indented the first line.
611 (let ((indentation (current-indentation)))
612 (save-excursion
613 (while (< (point) end)
614 (forward-line 1)
615 (indent-to indentation))
616 (setq end (point))))
617 ;; Fill the inserted text, preserving open-parens at bol.
618 (let ((paragraph-separate (concat paragraph-separate "\\|^\\s *\\s("))
619 (paragraph-start (concat paragraph-start "\\|^\\s *\\s(")))
620 (beginning-of-line)
621 (fill-region (point) end))
622 ;; Canonicalize the white space at the end of the entry so it is
623 ;; separated from the next entry by a single blank line.
624 (skip-syntax-forward " " end)
625 (delete-char (- (skip-syntax-backward " ")))
626 (or (eobp) (looking-at "\n\n")
627 (insert "\n"))))
628
629
630 (defun vc-finish-logentry (&optional nocomment)
631 "Complete the operation implied by the current log entry."
632 (interactive)
633 ;; Check and record the comment, if any.
634 (if (not nocomment)
635 (progn
636 (goto-char (point-max))
637 (if (not (bolp))
638 (newline))
639 ;; Comment too long?
640 (vc-backend-logentry-check vc-log-file)
641 ;; Record the comment in the comment ring
642 (if (null vc-comment-ring)
643 (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size)))
644 (ring-insert vc-comment-ring (buffer-string))
645 ))
646 ;; OK, do it to it
647 (if vc-log-operation
648 (save-excursion
649 (funcall vc-log-operation
650 vc-log-file
651 vc-log-version
652 (buffer-string)))
653 (error "No log operation is pending"))
654 ;; Return to "parent" buffer of this checkin and remove checkin window
655 (pop-to-buffer vc-parent-buffer)
656 (delete-windows-on (get-buffer "*VC-log*"))
657 (kill-buffer "*VC-log*")
658 ;; Now make sure we see the expanded headers
659 (if buffer-file-name
660 (vc-resynch-window buffer-file-name vc-keep-workfiles t))
661 (run-hooks vc-log-after-operation-hook))
662
663 ;; Code for access to the comment ring
664
665 (defun vc-previous-comment (arg)
666 "Cycle backwards through comment history."
667 (interactive "*p")
668 (let ((len (ring-length vc-comment-ring)))
669 (cond ((<= len 0)
670 (message "Empty comment ring")
671 (ding))
672 (t
673 (erase-buffer)
674 ;; Initialize the index on the first use of this command
675 ;; so that the first M-p gets index 0, and the first M-n gets
676 ;; index -1.
677 (if (null vc-comment-ring-index)
678 (setq vc-comment-ring-index
679 (if (> arg 0) -1
680 (if (< arg 0) 1 0))))
681 (setq vc-comment-ring-index
682 (ring-mod (+ vc-comment-ring-index arg) len))
683 (message "%d" (1+ vc-comment-ring-index))
684 (insert (ring-ref vc-comment-ring vc-comment-ring-index))))))
685
686 (defun vc-next-comment (arg)
687 "Cycle forwards through comment history."
688 (interactive "*p")
689 (vc-previous-comment (- arg)))
690
691 (defun vc-comment-search-reverse (str)
692 "Searches backwards through comment history for substring match."
693 (interactive "sComment substring: ")
694 (if (string= str "")
695 (setq str vc-last-comment-match)
696 (setq vc-last-comment-match str))
697 (if (null vc-comment-ring-index)
698 (setq vc-comment-ring-index -1))
699 (let ((str (regexp-quote str))
700 (len (ring-length vc-comment-ring))
701 (n (1+ vc-comment-ring-index)))
702 (while (and (< n len) (not (string-match str (ring-ref vc-comment-ring n))))
703 (setq n (+ n 1)))
704 (cond ((< n len)
705 (vc-previous-comment (- n vc-comment-ring-index)))
706 (t (error "Not found")))))
707
708 (defun vc-comment-search-forward (str)
709 "Searches forwards through comment history for substring match."
710 (interactive "sComment substring: ")
711 (if (string= str "")
712 (setq str vc-last-comment-match)
713 (setq vc-last-comment-match str))
714 (if (null vc-comment-ring-index)
715 (setq vc-comment-ring-index 0))
716 (let ((str (regexp-quote str))
717 (len (ring-length vc-comment-ring))
718 (n vc-comment-ring-index))
719 (while (and (>= n 0) (not (string-match str (ring-ref vc-comment-ring n))))
720 (setq n (- n 1)))
721 (cond ((>= n 0)
722 (vc-next-comment (- n vc-comment-ring-index)))
723 (t (error "Not found")))))
724
725 ;; Additional entry points for examining version histories
726
727 ;;;###autoload
728 (defun vc-diff (historic)
729 "Display diffs between file versions.
730 Normally this compares the current file and buffer with the most recent
731 checked in version of that file. This uses no arguments.
732 With a prefix argument, it reads the file name to use
733 and two version designators specifying which versions to compare."
734 (interactive "P")
735 (if vc-dired-mode
736 (set-buffer (find-file-noselect (dired-get-filename))))
737 (while vc-parent-buffer
738 (pop-to-buffer vc-parent-buffer))
739 (if historic
740 (call-interactively 'vc-version-diff)
741 (if (or (null buffer-file-name) (null (vc-name buffer-file-name)))
742 (error "There is no version-control master associated with this buffer"))
743 (let ((file buffer-file-name)
744 unchanged)
745 (or (and file (vc-name file))
746 (vc-registration-error file))
747 (vc-buffer-sync)
748 (setq unchanged (vc-workfile-unchanged-p buffer-file-name))
749 (if unchanged
750 (message "No changes to %s since latest version." file)
751 (vc-backend-diff file nil)
752 ;; Ideally, we'd like at this point to parse the diff so that
753 ;; the buffer effectively goes into compilation mode and we
754 ;; can visit the old and new change locations via next-error.
755 ;; Unfortunately, this is just too painful to do. The basic
756 ;; problem is that the `old' file doesn't exist to be
757 ;; visited. This plays hell with numerous assumptions in
758 ;; the diff.el and compile.el machinery.
759 (pop-to-buffer "*vc*")
760 (pop-to-buffer "*vc*")
761 (if (= 0 (buffer-size))
762 (progn
763 (setq unchanged t)
764 (message "No changes to %s since latest version." file))
765 (vc-shrink-to-fit)
766 (goto-char (point-min)))
767
768 )
769 (not unchanged)
770 )
771 )
772 )
773
774 (defun vc-version-diff (file rel1 rel2)
775 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
776 If FILE is a directory, generate diffs between versions for all registered
777 files in or below it."
778 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ")
779 (if (string-equal rel1 "") (setq rel1 nil))
780 (if (string-equal rel2 "") (setq rel2 nil))
781 (if (file-directory-p file)
782 (let ((camefrom (current-buffer)))
783 (set-buffer (get-buffer-create "*vc-status*"))
784 (set (make-local-variable 'vc-parent-buffer) camefrom)
785 (set (make-local-variable 'vc-parent-buffer-name)
786 (concat " from " (buffer-name camefrom)))
787 (erase-buffer)
788 (insert "Diffs between "
789 (or rel1 "last version checked in")
790 " and "
791 (or rel2 "current workfile(s)")
792 ":\n\n")
793 (set-buffer (get-buffer-create "*vc*"))
794 (cd file)
795 (vc-file-tree-walk
796 (function (lambda (f)
797 (message "Looking at %s" f)
798 (and
799 (not (file-directory-p f))
800 (vc-registered f)
801 (vc-backend-diff f rel1 rel2)
802 (append-to-buffer "*vc-status*" (point-min) (point-max)))
803 )))
804 (pop-to-buffer "*vc-status*")
805 (insert "\nEnd of diffs.\n")
806 (goto-char (point-min))
807 (set-buffer-modified-p nil)
808 )
809 (if (zerop (vc-backend-diff file rel1 rel2))
810 (message "No changes to %s between %s and %s." file rel1 rel2)
811 (pop-to-buffer "*vc*"))))
812
813 ;; Header-insertion code
814
815 ;;;###autoload
816 (defun vc-insert-headers ()
817 "Insert headers in a file for use with your version-control system.
818 Headers desired are inserted at the start of the buffer, and are pulled from
819 the variable `vc-header-alist'."
820 (interactive)
821 (if vc-dired-mode
822 (find-file-other-window (dired-get-filename)))
823 (while vc-parent-buffer
824 (pop-to-buffer vc-parent-buffer))
825 (save-excursion
826 (save-restriction
827 (widen)
828 (if (or (not (vc-check-headers))
829 (y-or-n-p "Version headers already exist. Insert another set? "))
830 (progn
831 (let* ((delims (cdr (assq major-mode vc-comment-alist)))
832 (comment-start-vc (or (car delims) comment-start "#"))
833 (comment-end-vc (or (car (cdr delims)) comment-end ""))
834 (hdstrings (cdr (assoc (vc-backend-deduce (buffer-file-name)) vc-header-alist))))
835 (mapcar (function (lambda (s)
836 (insert comment-start-vc "\t" s "\t"
837 comment-end-vc "\n")))
838 hdstrings)
839 (if vc-static-header-alist
840 (mapcar (function (lambda (f)
841 (if (string-match (car f) buffer-file-name)
842 (insert (format (cdr f) (car hdstrings))))))
843 vc-static-header-alist))
844 )
845 )))))
846
847 ;; The VC directory submode. Coopt Dired for this.
848 ;; All VC commands get mapped into logical equivalents.
849
850 (defvar vc-dired-prefix-map (make-sparse-keymap))
851 (define-key vc-dired-prefix-map "\C-xv" vc-prefix-map)
852
853 (or (not (boundp 'minor-mode-map-alist))
854 (assq 'vc-dired-mode minor-mode-map-alist)
855 (setq minor-mode-map-alist
856 (cons (cons 'vc-dired-mode vc-dired-prefix-map)
857 minor-mode-map-alist)))
858
859 (defun vc-dired-mode ()
860 "The augmented Dired minor mode used in VC directory buffers.
861 All Dired commands operate normally. Users currently locking listed files
862 are listed in place of the file's owner and group.
863 Keystrokes bound to VC commands will execute as though they had been called
864 on a buffer attached to the file named in the current Dired buffer line."
865 (setq vc-dired-mode t)
866 (setq vc-mode " under VC"))
867
868 (defun vc-dired-reformat-line (x)
869 ;; Hack a directory-listing line, plugging in locking-user info in
870 ;; place of the user and group info. Should have the beneficial
871 ;; side-effect of shortening the listing line. Each call starts with
872 ;; point immediately following the dired mark area on the line to be
873 ;; hacked.
874 ;;
875 ;; Simplest possible one:
876 ;; (insert (concat x "\t")))
877 ;;
878 ;; This code, like dired, assumes UNIX -l format.
879 (forward-word 1) ;; skip over any extra field due to -ibs options
880 (if x (setq x (concat "(" x ")")))
881 (if (re-search-forward "\\([0-9]+ \\).................\\( .*\\)" nil 0)
882 (let ((rep (substring (concat x " ") 0 9)))
883 (replace-match (concat "\\1" rep "\\2") t)))
884 )
885
886 ;;; Note in Emacs 18 the following defun gets overridden
887 ;;; with the symbol 'vc-directory-18. See below.
888 ;;;###autoload
889 (defun vc-directory (verbose)
890 "Show version-control status of all files under the current directory."
891 (interactive "P")
892 (let (nonempty
893 (dl (length default-directory))
894 (filelist nil) (userlist nil)
895 dired-buf
896 dired-buf-mod-count)
897 (vc-file-tree-walk
898 (function (lambda (f)
899 (if (vc-registered f)
900 (let ((user (vc-locking-user f)))
901 (and (or verbose user)
902 (setq filelist (cons (substring f dl) filelist))
903 (setq userlist (cons user userlist))))))))
904 (save-excursion
905 ;; This uses a semi-documented feature of dired; giving a switch
906 ;; argument forces the buffer to refresh each time.
907 (dired
908 (cons default-directory (nreverse filelist))
909 dired-listing-switches)
910 (setq dired-buf (current-buffer))
911 (setq nonempty (not (zerop (buffer-size)))))
912 (if nonempty
913 (progn
914 (pop-to-buffer dired-buf)
915 (vc-dired-mode)
916 (goto-char (point-min))
917 (setq buffer-read-only nil)
918 (forward-line 1) ;; Skip header line
919 (mapcar
920 (function
921 (lambda (x)
922 (forward-char 2) ;; skip dired's mark area
923 (vc-dired-reformat-line x)
924 (forward-line 1))) ;; go to next line
925 (nreverse userlist))
926 (setq buffer-read-only t)
927 (goto-char (point-min))
928 )
929 (message "No files are currently %s under %s"
930 (if verbose "registered" "locked") default-directory))
931 ))
932
933 ;; Emacs 18 version
934 (defun vc-directory-18 (verbose)
935 "Show version-control status of all files under the current directory."
936 (interactive "P")
937 (let (nonempty (dir default-directory))
938 (save-excursion
939 (set-buffer (get-buffer-create "*vc-status*"))
940 (erase-buffer)
941 (cd dir)
942 (vc-file-tree-walk
943 (function (lambda (f)
944 (if (vc-registered f)
945 (let ((user (vc-locking-user f)))
946 (if (or user verbose)
947 (insert (format
948 "%s %s\n"
949 (concat user) f))))))))
950 (setq nonempty (not (zerop (buffer-size)))))
951 (if nonempty
952 (progn
953 (pop-to-buffer "*vc-status*" t)
954 (vc-shrink-to-fit)
955 (goto-char (point-min)))
956 (message "No files are currently %s under %s"
957 (if verbose "registered" "locked") default-directory))
958 ))
959
960 (or (boundp 'minor-mode-map-alist)
961 (fset 'vc-directory 'vc-directory-18))
962
963 ; Emacs 18 also lacks these.
964 (or (boundp 'compilation-old-error-list)
965 (setq compilation-old-error-list nil))
966
967 ;; Named-configuration support for SCCS
968
969 (defun vc-add-triple (name file rev)
970 (save-excursion
971 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file))
972 (goto-char (point-max))
973 (insert name "\t:\t" file "\t" rev "\n")
974 (basic-save-buffer)
975 (kill-buffer (current-buffer))
976 ))
977
978 (defun vc-record-rename (file newname)
979 (save-excursion
980 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file))
981 (goto-char (point-min))
982 (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname))
983 (basic-save-buffer)
984 (kill-buffer (current-buffer))
985 ))
986
987 (defun vc-lookup-triple (file name)
988 ;; Return the numeric version corresponding to a named snapshot of file
989 ;; If name is nil or a version number string it's just passed through
990 (cond ((null name) "")
991 ((let ((firstchar (aref name 0)))
992 (and (>= firstchar ?0) (<= firstchar ?9)))
993 name)
994 (t
995 (car (vc-master-info
996 (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file)
997 (list (concat name "\t:\t" file "\t\\(.+\\)"))))
998 )))
999
1000 ;; Named-configuration entry points
1001
1002 (defun vc-quiescent-p ()
1003 ;; Is the current directory ready to be snapshot?
1004 (catch 'quiet
1005 (vc-file-tree-walk
1006 (function (lambda (f)
1007 (if (and (vc-registered f) (vc-locking-user f))
1008 (throw 'quiet nil)))))
1009 t))
1010
1011 ;;;###autoload
1012 (defun vc-create-snapshot (name)
1013 "Make a snapshot called NAME.
1014 The snapshot is made from all registered files at or below the current
1015 directory. For each file, the version level of its latest
1016 version becomes part of the named configuration."
1017 (interactive "sNew snapshot name: ")
1018 (if (not (vc-quiescent-p))
1019 (error "Can't make a snapshot since some files are locked")
1020 (vc-file-tree-walk
1021 (function (lambda (f) (and
1022 (vc-name f)
1023 (vc-backend-assign-name f name)))))
1024 ))
1025
1026 ;;;###autoload
1027 (defun vc-retrieve-snapshot (name)
1028 "Retrieve the snapshot called NAME.
1029 This function fails if any files are locked at or below the current directory
1030 Otherwise, all registered files are checked out (unlocked) at their version
1031 levels in the snapshot."
1032 (interactive "sSnapshot name to retrieve: ")
1033 (if (not (vc-quiescent-p))
1034 (error "Can't retrieve snapshot sine some files are locked")
1035 (vc-file-tree-walk
1036 (function (lambda (f) (and
1037 (vc-name f)
1038 (vc-error-occurred (vc-backend-checkout f nil name))))))
1039 ))
1040
1041 ;; Miscellaneous other entry points
1042
1043 ;;;###autoload
1044 (defun vc-print-log ()
1045 "List the change log of the current buffer in a window."
1046 (interactive)
1047 (if vc-dired-mode
1048 (set-buffer (find-file-noselect (dired-get-filename))))
1049 (while vc-parent-buffer
1050 (pop-to-buffer vc-parent-buffer))
1051 (if (and buffer-file-name (vc-name buffer-file-name))
1052 (progn
1053 (vc-backend-print-log buffer-file-name)
1054 (pop-to-buffer (get-buffer-create "*vc*"))
1055 (vc-shrink-to-fit)
1056 (goto-char (point-min))
1057 )
1058 (vc-registration-error buffer-file-name)
1059 )
1060 )
1061
1062 ;;;###autoload
1063 (defun vc-revert-buffer ()
1064 "Revert the current buffer's file back to the latest checked-in version.
1065 This asks for confirmation if the buffer contents are not identical
1066 to that version."
1067 (interactive)
1068 (if vc-dired-mode
1069 (find-file-other-window (dired-get-filename)))
1070 (while vc-parent-buffer
1071 (pop-to-buffer vc-parent-buffer))
1072 (let ((file buffer-file-name)
1073 (obuf (current-buffer)) (changed (vc-diff nil)))
1074 (if (and changed (or vc-suppress-confirm
1075 (not (yes-or-no-p "Discard changes? "))))
1076 (progn
1077 (delete-window)
1078 (error "Revert cancelled"))
1079 (set-buffer obuf))
1080 (if changed
1081 (delete-window))
1082 (vc-backend-revert file)
1083 (vc-resynch-window file t t)
1084 )
1085 )
1086
1087 ;;;###autoload
1088 (defun vc-cancel-version (norevert)
1089 "Get rid of most recently checked in version of this file.
1090 A prefix argument means do not revert the buffer afterwards."
1091 (interactive "P")
1092 (if vc-dired-mode
1093 (find-file-other-window (dired-get-filename)))
1094 (while vc-parent-buffer
1095 (pop-to-buffer vc-parent-buffer))
1096 (let* ((target (concat (vc-latest-version (buffer-file-name))))
1097 (yours (concat (vc-your-latest-version (buffer-file-name))))
1098 (prompt (if (string-equal yours target)
1099 "Remove your version %s from master? "
1100 "Version %s was not your change. Remove it anyway? ")))
1101 (if (null (yes-or-no-p (format prompt target)))
1102 nil
1103 (vc-backend-uncheck (buffer-file-name) target)
1104 (if (or norevert
1105 (not (yes-or-no-p "Revert buffer to most recent remaining version? ")))
1106 (vc-mode-line (buffer-file-name))
1107 (vc-checkout (buffer-file-name) nil)))
1108 ))
1109
1110 (defun vc-rename-file (old new)
1111 "Rename file OLD to NEW, and rename its master file likewise."
1112 (interactive "fVC rename file: \nFRename to: ")
1113 (let ((oldbuf (get-file-buffer old)))
1114 (if (buffer-modified-p oldbuf)
1115 (error "Please save files before moving them"))
1116 (if (get-file-buffer new)
1117 (error "Already editing new file name"))
1118 (let ((oldmaster (vc-name old)))
1119 (if oldmaster
1120 (if (vc-locking-user old)
1121 (error "Please check in files before moving them"))
1122 (if (or (file-symlink-p oldmaster)
1123 ;; This had FILE, I changed it to OLD. -- rms.
1124 (file-symlink-p (vc-backend-subdirectory-name old)))
1125 (error "This is not a safe thing to do in the presence of symbolic links"))
1126 (rename-file oldmaster (vc-name new)))
1127 (if (or (not oldmaster) (file-exists-p old))
1128 (rename-file old new)))
1129 ; ?? Renaming a file might change its contents due to keyword expansion.
1130 ; We should really check out a new copy if the old copy was precisely equal
1131 ; to some checked in version. However, testing for this is tricky....
1132 (if oldbuf
1133 (save-excursion
1134 (set-buffer oldbuf)
1135 (set-visited-file-name new)
1136 (set-buffer-modified-p nil))))
1137 ;; This had FILE, I changed it to OLD. -- rms.
1138 (vc-backend-dispatch old
1139 (vc-record-rename old new)
1140 nil)
1141 )
1142
1143 ;;;###autoload
1144 (defun vc-update-change-log (&rest args)
1145 "Find change log file and add entries from recent RCS logs.
1146 The mark is left at the end of the text prepended to the change log.
1147 With prefix arg of C-u, only find log entries for the current buffer's file.
1148 With any numeric prefix arg, find log entries for all files currently visited.
1149 Otherwise, find log entries for all registered files in the default directory.
1150 From a program, any arguments are passed to the `rcs2log' script."
1151 (interactive
1152 (cond ((consp current-prefix-arg) ;C-u
1153 (list buffer-file-name))
1154 (current-prefix-arg ;Numeric argument.
1155 (let ((files nil)
1156 (buffers (buffer-list))
1157 file)
1158 (while buffers
1159 (setq file (buffer-file-name (car buffers)))
1160 (and file (vc-backend-deduce file)
1161 (setq files (cons file files)))
1162 (setq buffers (cdr buffers)))
1163 files))
1164 (t
1165 (let ((RCS (concat default-directory "RCS")))
1166 (and (file-directory-p RCS)
1167 (mapcar (function
1168 (lambda (f)
1169 (if (string-match "\\(.*\\),v$" f)
1170 (substring f 0 (match-end 1))
1171 f)))
1172 (directory-files RCS nil "...\\|^[^.]\\|^.[^.]")))))))
1173 (let ((odefault default-directory))
1174 (find-file-other-window (find-change-log))
1175 (barf-if-buffer-read-only)
1176 (vc-buffer-sync)
1177 (undo-boundary)
1178 (goto-char (point-min))
1179 (push-mark)
1180 (message "Computing change log entries...")
1181 (message "Computing change log entries... %s"
1182 (if (or (null args)
1183 (eq 0 (apply 'call-process "rcs2log" nil t nil
1184 (mapcar (function
1185 (lambda (f)
1186 (file-relative-name
1187 (if (file-name-absolute-p f)
1188 f
1189 (concat odefault f)))))
1190 args))))
1191 "done" "failed"))))
1192
1193 ;; Functions for querying the master and lock files.
1194
1195 (defun vc-match-substring (bn)
1196 (buffer-substring (match-beginning bn) (match-end bn)))
1197
1198 (defun vc-parse-buffer (patterns &optional file properties)
1199 ;; Use PATTERNS to parse information out of the current buffer
1200 ;; by matching each regular expression in the list and returning \\1.
1201 ;; If a regexp has two tag brackets, assume the second is a date
1202 ;; field and we want the most recent entry matching the template.
1203 ;; If FILE and PROPERTIES are given, the latter must be a list of
1204 ;; properties of the same length as PATTERNS; each property is assigned
1205 ;; the corresponding value.
1206 (mapcar (function (lambda (p)
1207 (goto-char (point-min))
1208 (if (string-match "\\\\(.*\\\\(" p)
1209 (let ((latest-date "") (latest-val))
1210 (while (re-search-forward p nil t)
1211 (let ((date (vc-match-substring 2)))
1212 (if (string< latest-date date)
1213 (progn
1214 (setq latest-date date)
1215 (setq latest-val
1216 (vc-match-substring 1))))))
1217 latest-val))
1218 (prog1
1219 (and (re-search-forward p nil t)
1220 (let ((value (vc-match-substring 1)))
1221 (if file
1222 (vc-file-setprop file (car properties) value))
1223 value))
1224 (setq properties (cdr properties)))))
1225 patterns)
1226 )
1227
1228 (defun vc-master-info (file fields &optional rfile properties)
1229 ;; Search for information in a master file.
1230 (if (and file (file-exists-p file))
1231 (save-excursion
1232 (let ((buf))
1233 (setq buf (create-file-buffer file))
1234 (set-buffer buf))
1235 (erase-buffer)
1236 (insert-file-contents file nil)
1237 (set-buffer-modified-p nil)
1238 (auto-save-mode nil)
1239 (prog1
1240 (vc-parse-buffer fields rfile properties)
1241 (kill-buffer (current-buffer)))
1242 )
1243 (if rfile
1244 (mapcar
1245 (function (lambda (p) (vc-file-setprop rfile p nil)))
1246 properties))
1247 )
1248 )
1249
1250 (defun vc-log-info (command file patterns &optional properties)
1251 ;; Search for information in log program output
1252 (if (and file (file-exists-p file))
1253 (save-excursion
1254 (let ((buf))
1255 (setq buf (get-buffer-create "*vc*"))
1256 (set-buffer buf))
1257 (apply 'vc-do-command 0 command file nil)
1258 (set-buffer-modified-p nil)
1259 (prog1
1260 (vc-parse-buffer patterns file properties)
1261 (kill-buffer (current-buffer))
1262 )
1263 )
1264 (if file
1265 (mapcar
1266 (function (lambda (p) (vc-file-setprop file p nil)))
1267 properties))
1268 )
1269 )
1270
1271 (defun vc-locking-user (file)
1272 "Return the name of the person currently holding a lock on FILE.
1273 Return nil if there is no such person."
1274 (setq file (expand-file-name file)) ;; ??? Work around bug in 19.0.4
1275 (if (or (not vc-keep-workfiles)
1276 (eq vc-mistrust-permissions 't)
1277 (and vc-mistrust-permissions
1278 (funcall vc-mistrust-permissions (vc-backend-subdirectory-name file))))
1279 (vc-true-locking-user file)
1280 ;; This implementation assumes that any file which is under version
1281 ;; control and has -rw-r--r-- is locked by its owner. This is true
1282 ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--.
1283 ;; We have to be careful not to exclude files with execute bits on;
1284 ;; scripts can be under version control too. The advantage of this
1285 ;; hack is that calls to the very expensive vc-fetch-properties
1286 ;; function only have to be made if (a) the file is locked by someone
1287 ;; other than the current user, or (b) some untoward manipulation
1288 ;; behind vc's back has changed the owner or the `group' or `other'
1289 ;; write bits.
1290 (let ((attributes (file-attributes file)))
1291 (cond ((string-match ".r-.r-.r-." (nth 8 attributes))
1292 nil)
1293 ((and (= (nth 2 attributes) (user-uid))
1294 (string-match ".rw.r-.r-." (nth 8 attributes)))
1295 (user-login-name))
1296 (t
1297 (vc-true-locking-user file))))))
1298
1299 (defun vc-true-locking-user (file)
1300 ;; The slow but reliable version
1301 (vc-fetch-properties file)
1302 (vc-file-getprop file 'vc-locking-user))
1303
1304 (defun vc-latest-version (file)
1305 ;; Return version level of the latest version of FILE
1306 (vc-fetch-properties file)
1307 (vc-file-getprop file 'vc-latest-version))
1308
1309 (defun vc-your-latest-version (file)
1310 ;; Return version level of the latest version of FILE checked in by you
1311 (vc-fetch-properties file)
1312 (vc-file-getprop file 'vc-your-latest-version))
1313
1314 ;; Collect back-end-dependent stuff here
1315 ;;
1316 ;; Everything eventually funnels through these functions. To implement
1317 ;; support for a new version-control system, add another branch to the
1318 ;; vc-backend-dispatch macro and fill it in in each call. The variable
1319 ;; vc-master-templates in vc-hooks.el will also have to change.
1320
1321 (defmacro vc-backend-dispatch (f s r)
1322 "Execute FORM1 or FORM2 depending on whether we're using SCCS or RCS."
1323 (list 'let (list (list 'type (list 'vc-backend-deduce f)))
1324 (list 'cond
1325 (list (list 'eq 'type (quote 'SCCS)) s) ;; SCCS
1326 (list (list 'eq 'type (quote 'RCS)) r) ;; RCS
1327 )))
1328
1329 (defun vc-lock-file (file)
1330 ;; Generate lock file name corresponding to FILE
1331 (let ((master (vc-name file)))
1332 (and
1333 master
1334 (string-match "\\(.*/\\)s\\.\\(.*\\)" master)
1335 (concat
1336 (substring master (match-beginning 1) (match-end 1))
1337 "p."
1338 (substring master (match-beginning 2) (match-end 2))))))
1339
1340
1341 (defun vc-fetch-properties (file)
1342 ;; Re-fetch all properties associated with the given file.
1343 ;; Currently these properties are:
1344 ;; vc-locking-user
1345 ;; vc-locked-version
1346 ;; vc-latest-version
1347 ;; vc-your-latest-version
1348 (vc-backend-dispatch
1349 file
1350 ;; SCCS
1351 (progn
1352 (vc-master-info (vc-lock-file file)
1353 (list
1354 "^[^ ]+ [^ ]+ \\([^ ]+\\)"
1355 "^\\([^ ]+\\)")
1356 file
1357 '(vc-locking-user vc-locked-version))
1358 (vc-master-info (vc-name file)
1359 (list
1360 "^\001d D \\([^ ]+\\)"
1361 (concat "^\001d D \\([^ ]+\\) .* "
1362 (regexp-quote (user-login-name)) " ")
1363 )
1364 file
1365 '(vc-latest-version vc-your-latest-version))
1366 )
1367 ;; RCS
1368 (vc-log-info "rlog" file
1369 (list
1370 "^locks: strict\n\t\\([^:]+\\)"
1371 "^locks: strict\n\t[^:]+: \\(.+\\)"
1372 "^revision[\t ]+\\([0-9.]+\\).*\ndate: \\([ /0-9:]+\\);"
1373 (concat
1374 "^revision[\t ]+\\([0-9.]+\\)\n.*author: "
1375 (regexp-quote (user-login-name))
1376 ";"))
1377 '(vc-locking-user vc-locked-version
1378 vc-latest-version vc-your-latest-version))
1379 ))
1380
1381 (defun vc-backend-subdirectory-name (&optional file)
1382 ;; Where the master and lock files for the current directory are kept
1383 (symbol-name
1384 (or
1385 (and file (vc-backend-deduce file))
1386 vc-default-back-end
1387 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS)))))
1388
1389 (defun vc-backend-admin (file &optional rev comment)
1390 ;; Register a file into the version-control system
1391 ;; Automatically retrieves a read-only version of the file with
1392 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
1393 ;; it deletes the workfile.
1394 (vc-file-clearprops file)
1395 (or vc-default-back-end
1396 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS)))
1397 (message "Registering %s..." file)
1398 (let ((backend
1399 (cond
1400 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end)
1401 ((file-exists-p "RCS") 'RCS)
1402 ((file-exists-p "SCCS") 'SCCS)
1403 (t vc-default-back-end))))
1404 (cond ((eq backend 'SCCS)
1405 (vc-do-command 0 "admin" file ;; SCCS
1406 (and rev (concat "-r" rev))
1407 "-fb"
1408 (concat "-i" file)
1409 (and comment (concat "-y" comment))
1410 (format
1411 (car (rassq 'SCCS vc-master-templates))
1412 (or (file-name-directory file) "")
1413 (file-name-nondirectory file)))
1414 (delete-file file)
1415 (if vc-keep-workfiles
1416 (vc-do-command 0 "get" file)))
1417 ((eq backend 'RCS)
1418 (vc-do-command 0 "ci" file ;; RCS
1419 (concat (if vc-keep-workfiles "-u" "-r") rev)
1420 (and comment (concat "-t-" comment))
1421 file)
1422 )))
1423 (message "Registering %s...done" file)
1424 )
1425
1426 (defun vc-backend-checkout (file &optional writable rev)
1427 ;; Retrieve a copy of a saved version into a workfile
1428 (message "Checking out %s..." file)
1429 (vc-backend-dispatch file
1430 (progn
1431 (vc-do-command 0 "get" file ;; SCCS
1432 (if writable "-e")
1433 (and rev (concat "-r" (vc-lookup-triple file rev))))
1434 )
1435 (vc-do-command 0 "co" file ;; RCS
1436 (if writable "-l")
1437 (and rev (concat "-r" rev)))
1438 )
1439 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file)))
1440 (message "Checking out %s...done" file)
1441 )
1442
1443 (defun vc-backend-logentry-check (file)
1444 (vc-backend-dispatch file
1445 (if (>= (buffer-size) 512) ;; SCCS
1446 (progn
1447 (goto-char 512)
1448 (error
1449 "Log must be less than 512 characters; point is now at pos 512")))
1450 nil)
1451 )
1452
1453 (defun vc-backend-checkin (file &optional rev comment)
1454 ;; Register changes to FILE as level REV with explanatory COMMENT.
1455 ;; Automatically retrieves a read-only version of the file with
1456 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
1457 ;; it deletes the workfile.
1458 (message "Checking in %s..." file)
1459 (save-excursion
1460 ;; Change buffers to get local value of vc-checkin-switches.
1461 (set-buffer (or (get-file-buffer file) (current-buffer)))
1462 (vc-backend-dispatch file
1463 (progn
1464 (apply 'vc-do-command 0 "delta" file
1465 (if rev (concat "-r" rev))
1466 (concat "-y" comment)
1467 vc-checkin-switches)
1468 (if vc-keep-workfiles
1469 (vc-do-command 0 "get" file))
1470 )
1471 (apply 'vc-do-command 0 "ci" file
1472 (concat (if vc-keep-workfiles "-u" "-r") rev)
1473 (concat "-m" comment)
1474 vc-checkin-switches)
1475 ))
1476 (vc-file-setprop file 'vc-locking-user nil)
1477 (message "Checking in %s...done" file)
1478 )
1479
1480 (defun vc-backend-revert (file)
1481 ;; Revert file to latest checked-in version.
1482 (message "Reverting %s..." file)
1483 (vc-backend-dispatch
1484 file
1485 (progn ;; SCCS
1486 (vc-do-command 0 "unget" file nil)
1487 (vc-do-command 0 "get" file nil))
1488 (vc-do-command 0 "co" file "-f" "-u")) ;; RCS. This deletes the work file.
1489 (vc-file-setprop file 'vc-locking-user nil)
1490 (message "Reverting %s...done" file)
1491 )
1492
1493 (defun vc-backend-steal (file &optional rev)
1494 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M.
1495 (message "Stealing lock on %s..." file)
1496 (vc-backend-dispatch
1497 (progn
1498 (vc-do-command 0 "unget" file "-n" (if rev (concat "-r" rev)))
1499 (vc-do-command 0 "get" file "-g" (if rev (concat "-r" rev)))
1500 )
1501 (vc-do-command 0 "rcs" "-M" (concat "-u" rev) (concat "-l" rev) file))
1502 (vc-file-setprop file 'vc-locking-user (user-login-name))
1503 (message "Stealing lock on %s...done" file)
1504 )
1505
1506 (defun vc-backend-uncheck (file target)
1507 ;; Undo the latest checkin. Note: this code will have to get a lot
1508 ;; smarter when we support multiple branches.
1509 (message "Removing last change from %s..." file)
1510 (vc-backend-dispatch file
1511 (vc-do-command 0 "rmdel" file (concat "-r" target))
1512 (vc-do-command 0 "rcs" file (concat "-o" target))
1513 )
1514 (message "Removing last change from %s...done" file)
1515 )
1516
1517 (defun vc-backend-print-log (file)
1518 ;; Print change log associated with FILE to buffer *vc*.
1519 (vc-do-command 0
1520 (vc-backend-dispatch file "prs" "rlog")
1521 file)
1522 )
1523
1524 (defun vc-backend-assign-name (file name)
1525 ;; Assign to a FILE's latest version a given NAME.
1526 (vc-backend-dispatch file
1527 (vc-add-triple name file (vc-latest-version file)) ;; SCCS
1528 (vc-do-command 0 "rcs" file (concat "-n" name ":")) ;; RCS
1529 )
1530 )
1531
1532 (defun vc-backend-diff (file oldvers &optional newvers)
1533 ;; Get a difference report between two versions
1534 (if (eq (vc-backend-deduce file) 'SCCS)
1535 (setq oldvers (vc-lookup-triple file oldvers))
1536 (setq newvers (vc-lookup-triple file newvers)))
1537 (apply 'vc-do-command 1
1538 (or (vc-backend-dispatch file "vcdiff" "rcsdiff")
1539 (vc-registration-error file))
1540 file
1541 "-q"
1542 (and oldvers (concat "-r" oldvers))
1543 (and newvers (concat "-r" newvers))
1544 (if (listp diff-switches)
1545 diff-switches
1546 (list diff-switches))
1547 ))
1548
1549 (defun vc-check-headers ()
1550 "Check if the current file has any headers in it."
1551 (interactive)
1552 (save-excursion
1553 (goto-char (point-min))
1554 (vc-backend-dispatch buffer-file-name
1555 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS
1556 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS
1557 )
1558 ))
1559
1560 ;; Back-end-dependent stuff ends here.
1561
1562 ;; Set up key bindings for use while editing log messages
1563
1564 (defun vc-log-mode ()
1565 "Minor mode for driving version-control tools.
1566 These bindings are added to the global keymap when you enter this mode:
1567 \\[vc-next-action] perform next logical version-control operation on current file
1568 \\[vc-register] register current file
1569 \\[vc-toggle-read-only] like next-action, but won't register files
1570 \\[vc-insert-headers] insert version-control headers in current file
1571 \\[vc-print-log] display change history of current file
1572 \\[vc-revert-buffer] revert buffer to latest version
1573 \\[vc-cancel-version] undo latest checkin
1574 \\[vc-diff] show diffs between file versions
1575 \\[vc-directory] show all files locked by any user in or below .
1576 \\[vc-update-change-log] add change log entry from recent checkins
1577
1578 While you are entering a change log message for a version, the following
1579 additional bindings will be in effect.
1580
1581 \\[vc-finish-logentry] proceed with check in, ending log message entry
1582
1583 Whenever you do a checkin, your log comment is added to a ring of
1584 saved comments. These can be recalled as follows:
1585
1586 \\[vc-next-comment] replace region with next message in comment ring
1587 \\[vc-previous-comment] replace region with previous message in comment ring
1588 \\[vc-comment-search-reverse] search backward for regexp in the comment ring
1589 \\[vc-comment-search-forward] search backward for regexp in the comment ring
1590
1591 Entry to the change-log submode calls the value of text-mode-hook, then
1592 the value of vc-log-mode-hook.
1593
1594 Global user options:
1595 vc-initial-comment If non-nil, require user to enter a change
1596 comment upon first checkin of the file.
1597
1598 vc-keep-workfiles Non-nil value prevents workfiles from being
1599 deleted when changes are checked in
1600
1601 vc-suppress-confirm Suppresses some confirmation prompts,
1602 notably for reversions.
1603
1604 vc-header-alist Which keywords to insert when adding headers
1605 with \\[vc-insert-headers]. Defaults to
1606 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS.
1607
1608 vc-static-header-alist By default, version headers inserted in C files
1609 get stuffed in a static string area so that
1610 ident(RCS) or what(SCCS) can see them in the
1611 compiled object code. You can override this
1612 by setting this variable to nil, or change
1613 the header template by changing it.
1614
1615 vc-command-messages if non-nil, display run messages from the
1616 actual version-control utilities (this is
1617 intended primarily for people hacking vc
1618 itself).
1619 "
1620 (interactive)
1621 (set-syntax-table text-mode-syntax-table)
1622 (use-local-map vc-log-entry-mode)
1623 (setq local-abbrev-table text-mode-abbrev-table)
1624 (setq major-mode 'vc-log-mode)
1625 (setq mode-name "VC-Log")
1626 (make-local-variable 'vc-log-file)
1627 (make-local-variable 'vc-log-version)
1628 (make-local-variable 'vc-comment-ring-index)
1629 (set-buffer-modified-p nil)
1630 (setq buffer-file-name nil)
1631 (run-hooks 'text-mode-hook 'vc-log-mode-hook)
1632 )
1633
1634 ;; Initialization code, to be done just once at load-time
1635 (if vc-log-entry-mode
1636 nil
1637 (setq vc-log-entry-mode (make-sparse-keymap))
1638 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment)
1639 (define-key vc-log-entry-mode "\M-p" 'vc-previous-comment)
1640 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse)
1641 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward)
1642 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry)
1643 )
1644
1645 ;;; These things should probably be generally available
1646
1647 (defun vc-shrink-to-fit ()
1648 "Shrink window vertically until it's just large enough to contain its text."
1649 (let ((minsize (1+ (count-lines (point-min) (point-max)))))
1650 (if (< minsize (window-height))
1651 (let ((window-min-height 2))
1652 (shrink-window (- (window-height) minsize))))))
1653
1654 (defun vc-file-tree-walk (func &rest args)
1655 "Walk recursively through default directory.
1656 Invoke FUNC f ARGS on each non-directory file f underneath it."
1657 (vc-file-tree-walk-internal default-directory func args)
1658 (message "Traversing directory %s...done" default-directory))
1659
1660 (defun vc-file-tree-walk-internal (file func args)
1661 (if (not (file-directory-p file))
1662 (apply func file args)
1663 (message "Traversing directory %s..." file)
1664 (let ((dir (file-name-as-directory file)))
1665 (mapcar
1666 (function
1667 (lambda (f) (or
1668 (string-equal f ".")
1669 (string-equal f "..")
1670 (let ((dirf (concat dir f)))
1671 (or
1672 (file-symlink-p dirf) ;; Avoid possible loops
1673 (vc-file-tree-walk-internal dirf func args))))))
1674 (directory-files dir)))))
1675
1676 (provide 'vc)
1677
1678 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE
1679 ;;;
1680 ;;; These may be useful to anyone who has to debug or extend the package.
1681 ;;;
1682 ;;; A fundamental problem in VC is that there are time windows between
1683 ;;; vc-next-action's computations of the file's version-control state and
1684 ;;; the actions that change it. This is a window open to lossage in a
1685 ;;; multi-user environment; someone else could nip in and change the state
1686 ;;; of the master during it.
1687 ;;;
1688 ;;; The performance problem is that rlog/prs calls are very expensive; we want
1689 ;;; to avoid them as much as possible.
1690 ;;;
1691 ;;; ANALYSIS:
1692 ;;;
1693 ;;; The performance problem, it turns out, simplifies in practice to the
1694 ;;; problem of making vc-locking-user fast. The two other functions that call
1695 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one
1696 ;;; makes snapshots, the other deletes the calling user's last change in the
1697 ;;; master.
1698 ;;;
1699 ;;; The race condition implies that we have to either (a) lock the master
1700 ;;; during the entire execution of vc-next-action, or (b) detect and
1701 ;;; recover from errors resulting from dispatch on an out-of-date state.
1702 ;;;
1703 ;;; Alternative (a) appears to be unfeasible. The problem is that we can't
1704 ;;; guarantee that the lock will ever be removed. Suppose a user starts a
1705 ;;; checkin, the change message buffer pops up, and the user, having wandered
1706 ;;; off to do something else, simply forgets about it?
1707 ;;;
1708 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up
1709 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/
1710 ;;; unlocked state and its current owner from its permissions.
1711 ;;;
1712 ;;; This shortcut will fail if someone has manually changed the workfile's
1713 ;;; permissions; also if developers are munging the workfile in several
1714 ;;; directories, with symlinks to a master (in this latter case, the
1715 ;;; permissions shortcut will fail to detect a lock asserted from another
1716 ;;; directory).
1717 ;;;
1718 ;;; Note that these cases correspond exactly to the errors which could happen
1719 ;;; because of a competing checkin/checkout race in between two instances of
1720 ;;; vc-next-action.
1721 ;;;
1722 ;;; For VC's purposes, a workfile/master pair may have the following states:
1723 ;;;
1724 ;;; A. Unregistered. There is a workfile, there is no master.
1725 ;;;
1726 ;;; B. Registered and not locked by anyone.
1727 ;;;
1728 ;;; C. Locked by calling user and unchanged.
1729 ;;;
1730 ;;; D. Locked by the calling user and changed.
1731 ;;;
1732 ;;; E. Locked by someone other than the calling user.
1733 ;;;
1734 ;;; This makes for 25 states and 20 error conditions. Here's the matrix:
1735 ;;;
1736 ;;; VC's idea of state
1737 ;;; |
1738 ;;; V Actual state RCS action SCCS action Effect
1739 ;;; A B C D E
1740 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin
1741 ;;; B 5 . 6 7 8 co -l get -e checkout
1742 ;;; C 9 10 . 11 12 co -u unget; get revert
1743 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin
1744 ;;; E 17 18 19 20 . rcs -u -M ; rcs -l unget -n ; get -g steal lock
1745 ;;;
1746 ;;; All commands take the master file name as a last argument (not shown).
1747 ;;;
1748 ;;; In the discussion below, a "self-race" is a pathological situation in
1749 ;;; which VC operations are being attempted simultaneously by two or more
1750 ;;; Emacsen running under the same username.
1751 ;;;
1752 ;;; The vc-next-action code has the following windows:
1753 ;;;
1754 ;;; Window P:
1755 ;;; Between the check for existence of a master file and the call to
1756 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may
1757 ;;; never close if the initial-comment feature is on.
1758 ;;;
1759 ;;; Window Q:
1760 ;;; Between the call to vc-workfile-unchanged-p in and the immediately
1761 ;;; following revert (apparent state C).
1762 ;;;
1763 ;;; Window R:
1764 ;;; Between the call to vc-workfile-unchanged-p in and the following
1765 ;;; checkin (apparent state D). This window may never close.
1766 ;;;
1767 ;;; Window S:
1768 ;;; Between the unlock and the immediately following checkout during a
1769 ;;; revert operation (apparent state C). Included in window Q.
1770 ;;;
1771 ;;; Window T:
1772 ;;; Between vc-locking-user and the following checkout (apparent state B).
1773 ;;;
1774 ;;; Window U:
1775 ;;; Between vc-locking-user and the following revert (apparent state C).
1776 ;;; Includes windows Q and S.
1777 ;;;
1778 ;;; Window V:
1779 ;;; Between vc-locking-user and the following checkin (apparent state
1780 ;;; D). This window may never be closed if the user fails to complete the
1781 ;;; checkin message. Includes window R.
1782 ;;;
1783 ;;; Window W:
1784 ;;; Between vc-locking-user and the following steal-lock (apparent
1785 ;;; state E). This window may never close if the user fails to complete
1786 ;;; the steal-lock message. Includes window X.
1787 ;;;
1788 ;;; Window X:
1789 ;;; Between the unlock and the immediately following re-lock during a
1790 ;;; steal-lock operation (apparent state E). This window may never cloce
1791 ;;; if the user fails to complete the steal-lock message.
1792 ;;;
1793 ;;; Errors:
1794 ;;;
1795 ;;; Apparent state A ---
1796 ;;;
1797 ;;; 1. File looked unregistered but is actually registered and not locked.
1798 ;;;
1799 ;;; Potential cause: someone else's admin during window P, with
1800 ;;; caller's admin happening before their checkout.
1801 ;;;
1802 ;;; RCS: ci will fail with a "no lock set by <user>" message.
1803 ;;; SCCS: admin will fail with error (ad19).
1804 ;;;
1805 ;;; We can let these errors be passed up to the user.
1806 ;;;
1807 ;;; 2. File looked unregistered but is actually locked by caller, unchanged.
1808 ;;;
1809 ;;; Potential cause: self-race during window P.
1810 ;;;
1811 ;;; RCS: will revert the file to the last saved version and unlock it.
1812 ;;; SCCS: will fail with error (ad19).
1813 ;;;
1814 ;;; Either of these consequences is acceptable.
1815 ;;;
1816 ;;; 3. File looked unregistered but is actually locked by caller, changed.
1817 ;;;
1818 ;;; Potential cause: self-race during window P.
1819 ;;;
1820 ;;; RCS: will register the caller's workfile as a delta with a
1821 ;;; null change comment (the -t- switch will be ignored).
1822 ;;; SCCS: will fail with error (ad19).
1823 ;;;
1824 ;;; 4. File looked unregistered but is locked by someone else.
1825 ;;;
1826 ;;; Potential cause: someone else's admin during window P, with
1827 ;;; caller's admin happening *after* their checkout.
1828 ;;;
1829 ;;; RCS: will fail with a "no lock set by <user>" message.
1830 ;;; SCCS: will fail with error (ad19).
1831 ;;;
1832 ;;; We can let these errors be passed up to the user.
1833 ;;;
1834 ;;; Apparent state B ---
1835 ;;;
1836 ;;; 5. File looked registered and not locked, but is actually unregistered.
1837 ;;;
1838 ;;; Potential cause: master file got nuked during window P.
1839 ;;;
1840 ;;; RCS: will fail with "RCS/<file>: No such file or directory"
1841 ;;; SCCS: will fail with error ut4.
1842 ;;;
1843 ;;; We can let these errors be passed up to the user.
1844 ;;;
1845 ;;; 6. File looked registered and not locked, but is actually locked by the
1846 ;;; calling user and unchanged.
1847 ;;;
1848 ;;; Potential cause: self-race during window T.
1849 ;;;
1850 ;;; RCS: in the same directory as the previous workfile, co -l will fail
1851 ;;; with "co error: writable foo exists; checkout aborted". In any other
1852 ;;; directory, checkout will succeed.
1853 ;;; SCCS: will fail with ge17.
1854 ;;;
1855 ;;; Either of these consequences is acceptable.
1856 ;;;
1857 ;;; 7. File looked registered and not locked, but is actually locked by the
1858 ;;; calling user and changed.
1859 ;;;
1860 ;;; As case 6.
1861 ;;;
1862 ;;; 8. File looked registered and not locked, but is actually locked by another
1863 ;;; user.
1864 ;;;
1865 ;;; Potential cause: someone else checks it out during window T.
1866 ;;;
1867 ;;; RCS: co error: revision 1.3 already locked by <user>
1868 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it).
1869 ;;;
1870 ;;; We can let these errors be passed up to the user.
1871 ;;;
1872 ;;; Apparent state C ---
1873 ;;;
1874 ;;; 9. File looks locked by calling user and unchanged, but is unregistered.
1875 ;;;
1876 ;;; As case 5.
1877 ;;;
1878 ;;; 10. File looks locked by calling user and unchanged, but is actually not
1879 ;;; locked.
1880 ;;;
1881 ;;; Potential cause: a self-race in window U, or by the revert's
1882 ;;; landing during window X of some other user's steal-lock or window S
1883 ;;; of another user's revert.
1884 ;;;
1885 ;;; RCS: succeeds, refreshing the file from the identical version in
1886 ;;; the master.
1887 ;;; SCCS: fails with error ut4 (p file nonexistent).
1888 ;;;
1889 ;;; Either of these consequences is acceptable.
1890 ;;;
1891 ;;; 11. File is locked by calling user. It looks unchanged, but is actually
1892 ;;; changed.
1893 ;;;
1894 ;;; Potential cause: the file would have to be touched by a self-race
1895 ;;; during window Q.
1896 ;;;
1897 ;;; The revert will succeed, removing whatever changes came with
1898 ;;; the touch. It is theoretically possible that work could be lost.
1899 ;;;
1900 ;;; 12. File looks like it's locked by the calling user and unchanged, but
1901 ;;; it's actually locked by someone else.
1902 ;;;
1903 ;;; Potential cause: a steal-lock in window V.
1904 ;;;
1905 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u
1906 ;;; SCCS: fails with error un2
1907 ;;;
1908 ;;; We can pass these errors up to the user.
1909 ;;;
1910 ;;; Apparent state D ---
1911 ;;;
1912 ;;; 13. File looks like it's locked by the calling user and changed, but it's
1913 ;;; actually unregistered.
1914 ;;;
1915 ;;; Potential cause: master file got nuked during window P.
1916 ;;;
1917 ;;; RCS: Checks in the user's version as an initial delta.
1918 ;;; SCCS: will fail with error ut4.
1919 ;;;
1920 ;;; This case is kind of nasty. It means VC may fail to detect the
1921 ;;; loss of previous version information.
1922 ;;;
1923 ;;; 14. File looks like it's locked by the calling user and changed, but it's
1924 ;;; actually unlocked.
1925 ;;;
1926 ;;; Potential cause: self-race in window V, or the checkin happening
1927 ;;; during the window X of someone else's steal-lock or window S of
1928 ;;; someone else's revert.
1929 ;;;
1930 ;;; RCS: ci will fail with "no lock set by <user>".
1931 ;;; SCCS: delta will fail with error ut4.
1932 ;;;
1933 ;;; 15. File looks like it's locked by the calling user and changed, but it's
1934 ;;; actually locked by the calling user and unchanged.
1935 ;;;
1936 ;;; Potential cause: another self-race --- a whole checkin/checkout
1937 ;;; sequence by the calling user would have to land in window R.
1938 ;;;
1939 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual.
1940 ;;; RCS: reverts to the file state as of the second user's checkin, leaving
1941 ;;; the file unlocked.
1942 ;;;
1943 ;;; It is theoretically possible that work could be lost under RCS.
1944 ;;;
1945 ;;; 16. File looks like it's locked by the calling user and changed, but it's
1946 ;;; actually locked by a different user.
1947 ;;;
1948 ;;; RCS: ci error: no lock set by <user>
1949 ;;; SCCS: unget will fail with error un2
1950 ;;;
1951 ;;; We can pass these errors up to the user.
1952 ;;;
1953 ;;; Apparent state E ---
1954 ;;;
1955 ;;; 17. File looks like it's locked by some other user, but it's actually
1956 ;;; unregistered.
1957 ;;;
1958 ;;; As case 13.
1959 ;;;
1960 ;;; 18. File looks like it's locked by some other user, but it's actually
1961 ;;; unlocked.
1962 ;;;
1963 ;;; Potential cause: someone released a lock during window W.
1964 ;;;
1965 ;;; RCS: The calling user will get the lock on the file.
1966 ;;; SCCS: unget -n will fail with cm4.
1967 ;;;
1968 ;;; Either of these consequences will be OK.
1969 ;;;
1970 ;;; 19. File looks like it's locked by some other user, but it's actually
1971 ;;; locked by the calling user and unchanged.
1972 ;;;
1973 ;;; Potential cause: the other user relinquishing a lock followed by
1974 ;;; a self-race, both in window W.
1975 ;;;
1976 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making
1977 ;;; the sequence a no-op.
1978 ;;;
1979 ;;; 20. File looks like it's locked by some other user, but it's actually
1980 ;;; locked by the calling user and changed.
1981 ;;;
1982 ;;; As case 19.
1983 ;;;
1984 ;;; PROBLEM CASES:
1985 ;;;
1986 ;;; In order of decreasing severity:
1987 ;;;
1988 ;;; Cases 11 and 15 under RCS are the only one that potentially lose work.
1989 ;;; They would require a self-race for this to happen.
1990 ;;;
1991 ;;; Case 13 in RCS loses information about previous deltas, retaining
1992 ;;; only the information in the current workfile. This can only happen
1993 ;;; if the master file gets nuked in window P.
1994 ;;;
1995 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with
1996 ;;; no change comment in the master. This would require a self-race in
1997 ;;; window P or R respectively.
1998 ;;;
1999 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes.
2000 ;;;
2001 ;;; Unfortunately, it appears to me that no recovery is possible in these
2002 ;;; cases. They don't yield error messages, so there's no way to tell that
2003 ;;; a race condition has occurred.
2004 ;;;
2005 ;;; All other cases don't change either the workfile or the master, and
2006 ;;; trigger command errors which the user will see.
2007 ;;;
2008 ;;; Thus, there is no explicit recovery code.
2009
2010 ;;; vc.el ends here