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